1999-05-03 15:29:06 +08:00
|
|
|
|
/* mips.h. Mips opcode list for GDB, the GNU debugger.
|
2003-01-03 04:03:09 +08:00
|
|
|
|
Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
|
2001-03-14 10:27:44 +08:00
|
|
|
|
Free Software Foundation, Inc.
|
1999-05-03 15:29:06 +08:00
|
|
|
|
Contributed by Ralph Campbell and OSF
|
|
|
|
|
Commented and modified by Ian Lance Taylor, Cygnus Support
|
|
|
|
|
|
|
|
|
|
This file is part of GDB, GAS, and the GNU binutils.
|
|
|
|
|
|
|
|
|
|
GDB, GAS, and the GNU binutils are free software; you can redistribute
|
|
|
|
|
them and/or modify them under the terms of the GNU General Public
|
|
|
|
|
License as published by the Free Software Foundation; either version
|
|
|
|
|
1, or (at your option) any later version.
|
|
|
|
|
|
|
|
|
|
GDB, GAS, and the GNU binutils are distributed in the hope that they
|
|
|
|
|
will be useful, but WITHOUT ANY WARRANTY; without even the implied
|
|
|
|
|
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
|
|
|
|
|
the GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this file; see the file COPYING. If not, write to the Free
|
|
|
|
|
Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
|
|
|
|
#ifndef _MIPS_H_
|
|
|
|
|
#define _MIPS_H_
|
|
|
|
|
|
|
|
|
|
/* These are bit masks and shift counts to use to access the various
|
|
|
|
|
fields of an instruction. To retrieve the X field of an
|
|
|
|
|
instruction, use the expression
|
|
|
|
|
(i >> OP_SH_X) & OP_MASK_X
|
|
|
|
|
To set the same field (to j), use
|
|
|
|
|
i = (i &~ (OP_MASK_X << OP_SH_X)) | (j << OP_SH_X)
|
|
|
|
|
|
|
|
|
|
Make sure you use fields that are appropriate for the instruction,
|
2001-02-11 06:26:55 +08:00
|
|
|
|
of course.
|
1999-05-03 15:29:06 +08:00
|
|
|
|
|
2001-02-11 06:26:55 +08:00
|
|
|
|
The 'i' format uses OP, RS, RT and IMMEDIATE.
|
1999-05-03 15:29:06 +08:00
|
|
|
|
|
|
|
|
|
The 'j' format uses OP and TARGET.
|
|
|
|
|
|
|
|
|
|
The 'r' format uses OP, RS, RT, RD, SHAMT and FUNCT.
|
|
|
|
|
|
|
|
|
|
The 'b' format uses OP, RS, RT and DELTA.
|
|
|
|
|
|
|
|
|
|
The floating point 'i' format uses OP, RS, RT and IMMEDIATE.
|
|
|
|
|
|
|
|
|
|
The floating point 'r' format uses OP, FMT, FT, FS, FD and FUNCT.
|
|
|
|
|
|
|
|
|
|
A breakpoint instruction uses OP, CODE and SPEC (10 bits of the
|
|
|
|
|
breakpoint instruction are not defined; Kane says the breakpoint
|
|
|
|
|
code field in BREAK is 20 bits; yet MIPS assemblers and debuggers
|
|
|
|
|
only use ten bits). An optional two-operand form of break/sdbbp
|
2000-12-02 04:05:32 +08:00
|
|
|
|
allows the lower ten bits to be set too, and MIPS32 and later
|
|
|
|
|
architectures allow 20 bits to be set with a signal operand
|
|
|
|
|
(using CODE20).
|
1999-05-03 15:29:06 +08:00
|
|
|
|
|
2000-12-02 04:05:32 +08:00
|
|
|
|
The syscall instruction uses CODE20.
|
1999-05-03 15:29:06 +08:00
|
|
|
|
|
|
|
|
|
The general coprocessor instructions use COPZ. */
|
|
|
|
|
|
|
|
|
|
#define OP_MASK_OP 0x3f
|
|
|
|
|
#define OP_SH_OP 26
|
|
|
|
|
#define OP_MASK_RS 0x1f
|
|
|
|
|
#define OP_SH_RS 21
|
|
|
|
|
#define OP_MASK_FR 0x1f
|
|
|
|
|
#define OP_SH_FR 21
|
|
|
|
|
#define OP_MASK_FMT 0x1f
|
|
|
|
|
#define OP_SH_FMT 21
|
|
|
|
|
#define OP_MASK_BCC 0x7
|
|
|
|
|
#define OP_SH_BCC 18
|
|
|
|
|
#define OP_MASK_CODE 0x3ff
|
|
|
|
|
#define OP_SH_CODE 16
|
|
|
|
|
#define OP_MASK_CODE2 0x3ff
|
|
|
|
|
#define OP_SH_CODE2 6
|
|
|
|
|
#define OP_MASK_RT 0x1f
|
|
|
|
|
#define OP_SH_RT 16
|
|
|
|
|
#define OP_MASK_FT 0x1f
|
|
|
|
|
#define OP_SH_FT 16
|
|
|
|
|
#define OP_MASK_CACHE 0x1f
|
|
|
|
|
#define OP_SH_CACHE 16
|
|
|
|
|
#define OP_MASK_RD 0x1f
|
|
|
|
|
#define OP_SH_RD 11
|
|
|
|
|
#define OP_MASK_FS 0x1f
|
|
|
|
|
#define OP_SH_FS 11
|
|
|
|
|
#define OP_MASK_PREFX 0x1f
|
|
|
|
|
#define OP_SH_PREFX 11
|
|
|
|
|
#define OP_MASK_CCC 0x7
|
|
|
|
|
#define OP_SH_CCC 8
|
2000-12-02 04:05:32 +08:00
|
|
|
|
#define OP_MASK_CODE20 0xfffff /* 20 bit syscall/breakpoint code. */
|
|
|
|
|
#define OP_SH_CODE20 6
|
1999-05-03 15:29:06 +08:00
|
|
|
|
#define OP_MASK_SHAMT 0x1f
|
|
|
|
|
#define OP_SH_SHAMT 6
|
|
|
|
|
#define OP_MASK_FD 0x1f
|
|
|
|
|
#define OP_SH_FD 6
|
|
|
|
|
#define OP_MASK_TARGET 0x3ffffff
|
|
|
|
|
#define OP_SH_TARGET 0
|
|
|
|
|
#define OP_MASK_COPZ 0x1ffffff
|
|
|
|
|
#define OP_SH_COPZ 0
|
|
|
|
|
#define OP_MASK_IMMEDIATE 0xffff
|
|
|
|
|
#define OP_SH_IMMEDIATE 0
|
|
|
|
|
#define OP_MASK_DELTA 0xffff
|
|
|
|
|
#define OP_SH_DELTA 0
|
|
|
|
|
#define OP_MASK_FUNCT 0x3f
|
|
|
|
|
#define OP_SH_FUNCT 0
|
|
|
|
|
#define OP_MASK_SPEC 0x3f
|
|
|
|
|
#define OP_SH_SPEC 0
|
2000-12-02 04:05:32 +08:00
|
|
|
|
#define OP_SH_LOCC 8 /* FP condition code. */
|
|
|
|
|
#define OP_SH_HICC 18 /* FP condition code. */
|
1999-05-03 15:29:06 +08:00
|
|
|
|
#define OP_MASK_CC 0x7
|
2000-12-02 04:05:32 +08:00
|
|
|
|
#define OP_SH_COP1NORM 25 /* Normal COP1 encoding. */
|
|
|
|
|
#define OP_MASK_COP1NORM 0x1 /* a single bit. */
|
|
|
|
|
#define OP_SH_COP1SPEC 21 /* COP1 encodings. */
|
1999-05-03 15:29:06 +08:00
|
|
|
|
#define OP_MASK_COP1SPEC 0xf
|
|
|
|
|
#define OP_MASK_COP1SCLR 0x4
|
|
|
|
|
#define OP_MASK_COP1CMP 0x3
|
|
|
|
|
#define OP_SH_COP1CMP 4
|
2000-12-02 04:05:32 +08:00
|
|
|
|
#define OP_SH_FORMAT 21 /* FP short format field. */
|
1999-05-03 15:29:06 +08:00
|
|
|
|
#define OP_MASK_FORMAT 0x7
|
|
|
|
|
#define OP_SH_TRUE 16
|
|
|
|
|
#define OP_MASK_TRUE 0x1
|
|
|
|
|
#define OP_SH_GE 17
|
|
|
|
|
#define OP_MASK_GE 0x01
|
|
|
|
|
#define OP_SH_UNSIGNED 16
|
|
|
|
|
#define OP_MASK_UNSIGNED 0x1
|
|
|
|
|
#define OP_SH_HINT 16
|
|
|
|
|
#define OP_MASK_HINT 0x1f
|
2000-12-02 04:05:32 +08:00
|
|
|
|
#define OP_SH_MMI 0 /* Multimedia (parallel) op. */
|
2001-02-11 06:26:55 +08:00
|
|
|
|
#define OP_MASK_MMI 0x3f
|
1999-05-03 15:29:06 +08:00
|
|
|
|
#define OP_SH_MMISUB 6
|
|
|
|
|
#define OP_MASK_MMISUB 0x1f
|
2000-12-02 04:05:32 +08:00
|
|
|
|
#define OP_MASK_PERFREG 0x1f /* Performance monitoring. */
|
1999-05-03 15:29:06 +08:00
|
|
|
|
#define OP_SH_PERFREG 1
|
2000-12-02 04:05:32 +08:00
|
|
|
|
#define OP_SH_SEL 0 /* Coprocessor select field. */
|
|
|
|
|
#define OP_MASK_SEL 0x7 /* The sel field of mfcZ and mtcZ. */
|
|
|
|
|
#define OP_SH_CODE19 6 /* 19 bit wait code. */
|
|
|
|
|
#define OP_MASK_CODE19 0x7ffff
|
[ gas/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
Ed Satterthwaite <ehs@broadcom.com>
* config/tc-mips.c (mips_set_options): New "ase_mdmx" member.
(mips_opts): Initialize "ase_mdmx" member.
(file_ase_mdmx): New variable.
(CPU_HAS_MDMX): New macro.
(md_begin): Initialize mips_opts.ase_mdmx and file_ase_mdmx
based on command line options and configuration defaults.
(macro_build): Note in comment that use of MDMX in macros is
not currently allowed.
(validate_mips_insn): Add support for the "O", "Q", "X", "Y", and
"Z" MDMX operand types.
(mips_ip): Accept MDMX instructions if mips_opts.ase_mdmx is set,
and add support for the "O", "Q", "X", "Y", and "Z" MDMX operand
types.
(OPTION_MDMX, OPTION_NO_MDMX, md_longopts, md_parse_option):
Add support for "-mdmx" and "-no-mdmx" options.
(OPTION_ELF_BASE): Move to accomodate new options.
(s_mipsset): Support ".set mdmx" and ".set nomdmx".
(mips_elf_final_processing): Set MDMX ASE ELF header flag if
file_ase_mdmx was set.
* doc/as.texinfo: Document -mdmx and -no-mdmx options.
* doc/c-mips.texi: Likewise, and document ".set mdmx" and ".set
nomdmx" directives.
[ gas/testsuite/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
* gas/mips/mips64-mdmx.s: New file.
* gas/mips/mips64-mdmx.d: Likewise.
* gas/mips/mips.exp: Run new "mips64-mdmx" test.
[ include/opcode/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
* mips.h (OP_SH_ALN, OP_MASK_ALN, OP_SH_VSEL, OP_MASK_VSEL)
(MDMX_FMTSEL_IMM_QH, MDMX_FMTSEL_IMM_OB, MDMX_FMTSEL_VEC_QH)
(MDMX_FMTSEL_VEC_OB, INSN_READ_MDMX_ACC, INSN_WRITE_MDMX_ACC)
(INSN_MDMX): New constants, for MDMX support.
(opcode character list): Add "O", "Q", "X", "Y", and "Z" for MDMX.
[ opcodes/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
Ed Satterthwaite <ehs@broadcom.com>
* mips-dis.c (print_insn_arg): Add support for 'O', 'Q', 'X', 'Y',
and 'Z' formats, for MDMX.
(mips_isa_type): Add MDMX instructions to the ISA
bit mask for bfd_mach_mipsisa64.
* mips-opc.c: Add support for MDMX instructions.
(MX): New definition.
* mips-dis.c: Update copyright years to include 2002.
2002-05-31 09:17:17 +08:00
|
|
|
|
#define OP_SH_ALN 21
|
|
|
|
|
#define OP_MASK_ALN 0x7
|
|
|
|
|
#define OP_SH_VSEL 21
|
|
|
|
|
#define OP_MASK_VSEL 0x1f
|
[include/opcode/]
* mips.h: Update comment for new opcodes.
(OP_MASK_VECBYTE, OP_SH_VECBYTE): New.
(OP_MASK_VECALIGN, OP_SH_VECALIGN): New.
(INSN_4111, INSN_4120, INSN_5400, INSN_5500): New.
(CPU_VR4120, CPU_VR5400, CPU_VR5500): New.
(OPCODE_IS_MEMBER): Handle the new CPU_* values and INSN_* flags.
Don't match CPU_R4111 with INSN_4100.
[opcodes/]
* mips-dis.c (print_insn_arg): Handle '[', ']', 'e' and '%'.
(mips_isa_type): Handle bfd_mach_mips4120, bfd_mach_mips5400
and bfd_mach_mips5500.
* mips-opc.c (V1): Include INSN_4111 and INSN_4120.
(N411, N412, N5, N54, N55): New convenience defines.
(mips_builtin_opcodes): Add vr4120, vr5400 and vr5500 opcodes.
Change dmadd16 and madd16 from V1 to N411.
2002-09-30 19:58:09 +08:00
|
|
|
|
#define OP_MASK_VECBYTE 0x7 /* Selector field is really 4 bits,
|
|
|
|
|
but 0x8-0xf don't select bytes. */
|
|
|
|
|
#define OP_SH_VECBYTE 22
|
|
|
|
|
#define OP_MASK_VECALIGN 0x7 /* Vector byte-align (alni.ob) op. */
|
|
|
|
|
#define OP_SH_VECALIGN 21
|
[ bfd/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* aoutx.h (NAME(aout,machine_type)): Add bfd_mach_mipsisa32r2 case.
* archures.c (bfd_mach_mipsisa32r2): New define.
* bfd-in2.h: Regenerate.
* cpu-mips.c (I_mipsisa32r2): New enum value.
(arch_info_struct): Add entry for I_mipsisa32r2.
* elfxx-mips.c (elf_mips_isa, _bfd_elf_mips_mach)
(_bfd_mips_elf_print_private_bfd_data): Handle E_MIPS_ARCH_32R2.
(_bfd_mips_elf_final_write_processing): Add
bfd_mach_mipsisa32r2 case.
(_bfd_mips_elf_merge_private_bfd_data): Handle merging of
binaries marked as using MIPS32 Release 2.
[ binutils/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* doc/binutils.texi (objdump): Note MIPS HWR (Hardware Register)
changes in MIPS -M options.
[ gas/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* configure.in: Recognize mipsisa32r2, mipsisa32r2el, and
CPU variants.
* configure: Regenerate.
* config/tc-mips.c (ISA_HAS_DROR, ISA_HAS_ROR): New defines.
(macro_build): Handle "K" operand.
(macro2): Use ISA_HAS_DROR and ISA_HAS_ROR in the places where
CPU_HAS_DROR and CPU_HAS_ROR are currently used.
(mips_ip): New variable "lastpos", and implement "+A", "+B",
and "+C" operands for MIPS32 Release 2 ins/ext instructions.
Implement "K" operand for MIPS32 Release 2 rdhwr instruction.
(validate_mips_insn): Implement "+" as a way to extend the
allowed operands, and implement "K", "+A", "+B", and "+C"
operands.
(OPTION_MIPS32R2): New define.
(md_longopts): Add entry for OPTION_MIPS32R2.
(OPTION_ELF_BASE): Adjust to accomodate OPTIONS_MIPS32R2.
(md_parse_option): Handle OPTION_MIPS32R2.
(s_mipsset): Reimplement handling of ".set mipsN" options
and add support for ".set mips32r2".
(mips_cpu_info_table): Add entry for "mips32r2" (MIPS32 Release 2).
(md_show_usage): Document "-mips32r2" option.
* doc/as.texinfo: Document "-mips32r2" option.
* doc/c-mips.texi: Likewise.
[ gas/testsuite/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* gas/mips/cp0-names-mips32r2.d: New test.
* gas/mips/hwr-names-mips32r2.d: New test.
* gas/mips/hwr-names-numeric.d: New test.
* gas/mips/hwr-names.s: New test source file.
* gas/mips/mips32r2.d: New test.
* gas/mips/mips32r2.s: New test source file.
* gas/mips/mips32r2-ill.l: New test.
* gas/mips/mips32r2-ill.s: New test source file.
* gas/mips/mips.exp: Add mips32r2 architecture data array
entry. Run new tests mentioned above.
[ include/elf/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips.h (E_MIPS_ARCH_32R2): New define.
[ include/opcode/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips.h: Document "+" as the start of two-character operand
type names, and add new "K", "+A", "+B", and "+C" operand types.
(OP_MASK_INSMSB, OP_SH_INSMSB, OP_MASK_EXTMSB)
(OP_SH_EXTMSB, INSN_ISA32R2, ISA_MIPS32R2, CPU_MIPS32R2): New
defines.
[ opcodes/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips-dis.c (mips_cp0_names_mips3264r2, mips_hwr_names_numeric)
(mips_hwr_names_mips3264r2): New arrays.
(mips_arch_choice): New "hwr_names" member.
(mips_arch_choices): Adjust for structure change, and add a new
entry for "mips32r2" ISA.
(mips_hwr_names): New variable.
(set_default_mips_dis_options): Set mips_hwr_names.
(parse_mips_dis_option): New "hwr-names" option which sets
mips_hwr_names, and adjust "reg-names=ARCH" to set mips_hwr_names.
(print_insn_arg): Change return type to "int"
and use that to indicate number of characters consumed.
Add support for "+" operand extension character, "+A", "+B",
"+C", and "K" operands.
(print_insn_mips): Adjust for changes to print_insn_arg.
(print_mips_disassembler_options): Adjust for "hwr-names"
addition and "reg-names" change.
* mips-opc (I33): New define (shorthand for INSN_ISA32R2).
(mips_builtin_opcodes): Note that "nop" and "ssnop" are special
forms of "sll". Add new MIPS32 Release 2 instructions: ehb,
di, ei, ext, ins, jr.hb, jalr.hb, mfhc1, mfhc2, mthc1, mthc2,
rdhwr, rdpgpr, seb, seh, synci, wrpgpr, wsbh.
Note that hardware rotate instructions (ror, rorv) can be
used on MIPS32 Release 2, and add the official mnemonics
for them (rotr, rotrv) and the similar "rotl" mnemonic for
left-rotate.
2002-12-31 15:29:29 +08:00
|
|
|
|
#define OP_MASK_INSMSB 0x1f /* "ins" MSB. */
|
|
|
|
|
#define OP_SH_INSMSB 11
|
|
|
|
|
#define OP_MASK_EXTMSBD 0x1f /* "ext" MSBD. */
|
|
|
|
|
#define OP_SH_EXTMSBD 11
|
[ gas/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
Ed Satterthwaite <ehs@broadcom.com>
* config/tc-mips.c (mips_set_options): New "ase_mdmx" member.
(mips_opts): Initialize "ase_mdmx" member.
(file_ase_mdmx): New variable.
(CPU_HAS_MDMX): New macro.
(md_begin): Initialize mips_opts.ase_mdmx and file_ase_mdmx
based on command line options and configuration defaults.
(macro_build): Note in comment that use of MDMX in macros is
not currently allowed.
(validate_mips_insn): Add support for the "O", "Q", "X", "Y", and
"Z" MDMX operand types.
(mips_ip): Accept MDMX instructions if mips_opts.ase_mdmx is set,
and add support for the "O", "Q", "X", "Y", and "Z" MDMX operand
types.
(OPTION_MDMX, OPTION_NO_MDMX, md_longopts, md_parse_option):
Add support for "-mdmx" and "-no-mdmx" options.
(OPTION_ELF_BASE): Move to accomodate new options.
(s_mipsset): Support ".set mdmx" and ".set nomdmx".
(mips_elf_final_processing): Set MDMX ASE ELF header flag if
file_ase_mdmx was set.
* doc/as.texinfo: Document -mdmx and -no-mdmx options.
* doc/c-mips.texi: Likewise, and document ".set mdmx" and ".set
nomdmx" directives.
[ gas/testsuite/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
* gas/mips/mips64-mdmx.s: New file.
* gas/mips/mips64-mdmx.d: Likewise.
* gas/mips/mips.exp: Run new "mips64-mdmx" test.
[ include/opcode/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
* mips.h (OP_SH_ALN, OP_MASK_ALN, OP_SH_VSEL, OP_MASK_VSEL)
(MDMX_FMTSEL_IMM_QH, MDMX_FMTSEL_IMM_OB, MDMX_FMTSEL_VEC_QH)
(MDMX_FMTSEL_VEC_OB, INSN_READ_MDMX_ACC, INSN_WRITE_MDMX_ACC)
(INSN_MDMX): New constants, for MDMX support.
(opcode character list): Add "O", "Q", "X", "Y", and "Z" for MDMX.
[ opcodes/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
Ed Satterthwaite <ehs@broadcom.com>
* mips-dis.c (print_insn_arg): Add support for 'O', 'Q', 'X', 'Y',
and 'Z' formats, for MDMX.
(mips_isa_type): Add MDMX instructions to the ISA
bit mask for bfd_mach_mipsisa64.
* mips-opc.c: Add support for MDMX instructions.
(MX): New definition.
* mips-dis.c: Update copyright years to include 2002.
2002-05-31 09:17:17 +08:00
|
|
|
|
|
[ binutils/ChangeLog ]
2002-12-27 Chris Demetriou <cgd@broadcom.com>
* doc/binutils.texi (objdump): Document MIPS -M options.
[ gas/testsuite/ChangeLog ]
2002-12-27 Chris Demetriou <cgd@broadcom.com>
* gas/mips/cp0-names-mips32.d: New file.
* gas/mips/cp0-names-mips64.d: New file.
* gas/mips/cp0-names-numeric.d: New file.
* gas/mips/cp0-names-sb1.d: New file.
* gas/mips/cp0-names.s: New file.
* gas/mips/fpr-names-32.d: New file.
* gas/mips/fpr-names-64.d: New file.
* gas/mips/fpr-names-n32.d: New file.
* gas/mips/fpr-names-numeric.d: New file.
* gas/mips/fpr-names.s: New file.
* gas/mips/gpr-names-32.d: New file.
* gas/mips/gpr-names-64.d: New file.
* gas/mips/gpr-names-n32.d: New file.
* gas/mips/gpr-names-numeric.d: New file.
* gas/mips/gpr-names.s: New file.
* gas/mips/mips.exp: Run new tests.
[ include/ChangeLog ]
2002-12-27 Chris Demetriou <cgd@broadcom.com>
* dis-asm.h (print_mips_disassembler_options): Prototype.
[ include/opcode/ChangeLog ]
2002-12-19 Chris Demetriou <cgd@broadcom.com>
* mips.h (OP_OP_COP0, OP_OP_COP1, OP_OP_COP2, OP_OP_COP3)
(OP_OP_LWC1, OP_OP_LWC2, OP_OP_LWC3, OP_OP_LDC1, OP_OP_LDC2)
(OP_OP_LDC3, OP_OP_SWC1, OP_OP_SWC2, OP_OP_SWC3, OP_OP_SDC1)
(OP_OP_SDC2, OP_OP_SDC3): Define.
[ opcodes/ChangeLog ]
2002-12-27 Chris Demetriou <cgd@broadcom.com>
* disassemble.c (disassembler_usage): Add invocation of
print_mips_disassembler_options.
* mips-dis.c (print_mips_disassembler_options)
(set_default_mips_dis_options, parse_mips_dis_option)
(parse_mips_dis_options, choose_abi_by_name, choose_arch_by_name)
(choose_arch_by_number): New functions.
(mips_abi_choice, mips_arch_choice): New structures.
(mips32_reg_names, mips64_reg_names, reg_names): Remove.
(mips_gpr_names_numeric, mips_gpr_names_oldabi)
(mips_gpr_names_newabi, mips_fpr_names_numeric)
(mips_fpr_names_32, mips_fpr_names_n32, mips_fpr_names_64)
(mips_cp0_names_numeric, mips_cp0_names_mips3264)
(mips_cp0_names_sb1, mips_abi_choices, mips_arch_choices)
(mips_processor, mips_isa, mips_gpr_names, mips_fpr_names)
(mips_cp0_names): New variables.
(print_insn_args): Use new variables to print GPR, FPR, and CP0
register names.
(mips_isa_type): Remove.
(print_insn_mips): Remove ISA and CPU setup since it is now done...
(_print_insn_mips): Here. Remove register setup code, and
call set_default_mips_dis_options and parse_mips_dis_options
instead.
(print_mips16_insn_arg): Use mips_gpr_names instead of mips32_names.
2002-12-27 16:00:31 +08:00
|
|
|
|
#define OP_OP_COP0 0x10
|
|
|
|
|
#define OP_OP_COP1 0x11
|
|
|
|
|
#define OP_OP_COP2 0x12
|
|
|
|
|
#define OP_OP_COP3 0x13
|
|
|
|
|
#define OP_OP_LWC1 0x31
|
|
|
|
|
#define OP_OP_LWC2 0x32
|
|
|
|
|
#define OP_OP_LWC3 0x33 /* a.k.a. pref */
|
|
|
|
|
#define OP_OP_LDC1 0x35
|
|
|
|
|
#define OP_OP_LDC2 0x36
|
|
|
|
|
#define OP_OP_LDC3 0x37 /* a.k.a. ld */
|
|
|
|
|
#define OP_OP_SWC1 0x39
|
|
|
|
|
#define OP_OP_SWC2 0x3a
|
|
|
|
|
#define OP_OP_SWC3 0x3b
|
|
|
|
|
#define OP_OP_SDC1 0x3d
|
|
|
|
|
#define OP_OP_SDC2 0x3e
|
|
|
|
|
#define OP_OP_SDC3 0x3f /* a.k.a. sd */
|
|
|
|
|
|
[ gas/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
Ed Satterthwaite <ehs@broadcom.com>
* config/tc-mips.c (mips_set_options): New "ase_mdmx" member.
(mips_opts): Initialize "ase_mdmx" member.
(file_ase_mdmx): New variable.
(CPU_HAS_MDMX): New macro.
(md_begin): Initialize mips_opts.ase_mdmx and file_ase_mdmx
based on command line options and configuration defaults.
(macro_build): Note in comment that use of MDMX in macros is
not currently allowed.
(validate_mips_insn): Add support for the "O", "Q", "X", "Y", and
"Z" MDMX operand types.
(mips_ip): Accept MDMX instructions if mips_opts.ase_mdmx is set,
and add support for the "O", "Q", "X", "Y", and "Z" MDMX operand
types.
(OPTION_MDMX, OPTION_NO_MDMX, md_longopts, md_parse_option):
Add support for "-mdmx" and "-no-mdmx" options.
(OPTION_ELF_BASE): Move to accomodate new options.
(s_mipsset): Support ".set mdmx" and ".set nomdmx".
(mips_elf_final_processing): Set MDMX ASE ELF header flag if
file_ase_mdmx was set.
* doc/as.texinfo: Document -mdmx and -no-mdmx options.
* doc/c-mips.texi: Likewise, and document ".set mdmx" and ".set
nomdmx" directives.
[ gas/testsuite/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
* gas/mips/mips64-mdmx.s: New file.
* gas/mips/mips64-mdmx.d: Likewise.
* gas/mips/mips.exp: Run new "mips64-mdmx" test.
[ include/opcode/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
* mips.h (OP_SH_ALN, OP_MASK_ALN, OP_SH_VSEL, OP_MASK_VSEL)
(MDMX_FMTSEL_IMM_QH, MDMX_FMTSEL_IMM_OB, MDMX_FMTSEL_VEC_QH)
(MDMX_FMTSEL_VEC_OB, INSN_READ_MDMX_ACC, INSN_WRITE_MDMX_ACC)
(INSN_MDMX): New constants, for MDMX support.
(opcode character list): Add "O", "Q", "X", "Y", and "Z" for MDMX.
[ opcodes/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
Ed Satterthwaite <ehs@broadcom.com>
* mips-dis.c (print_insn_arg): Add support for 'O', 'Q', 'X', 'Y',
and 'Z' formats, for MDMX.
(mips_isa_type): Add MDMX instructions to the ISA
bit mask for bfd_mach_mipsisa64.
* mips-opc.c: Add support for MDMX instructions.
(MX): New definition.
* mips-dis.c: Update copyright years to include 2002.
2002-05-31 09:17:17 +08:00
|
|
|
|
/* Values in the 'VSEL' field. */
|
|
|
|
|
#define MDMX_FMTSEL_IMM_QH 0x1d
|
|
|
|
|
#define MDMX_FMTSEL_IMM_OB 0x1e
|
|
|
|
|
#define MDMX_FMTSEL_VEC_QH 0x15
|
|
|
|
|
#define MDMX_FMTSEL_VEC_OB 0x16
|
2000-12-02 04:05:32 +08:00
|
|
|
|
|
1999-05-03 15:29:06 +08:00
|
|
|
|
/* This structure holds information for a particular instruction. */
|
|
|
|
|
|
|
|
|
|
struct mips_opcode
|
|
|
|
|
{
|
|
|
|
|
/* The name of the instruction. */
|
|
|
|
|
const char *name;
|
|
|
|
|
/* A string describing the arguments for this instruction. */
|
|
|
|
|
const char *args;
|
|
|
|
|
/* The basic opcode for the instruction. When assembling, this
|
|
|
|
|
opcode is modified by the arguments to produce the actual opcode
|
|
|
|
|
that is used. If pinfo is INSN_MACRO, then this is 0. */
|
|
|
|
|
unsigned long match;
|
|
|
|
|
/* If pinfo is not INSN_MACRO, then this is a bit mask for the
|
|
|
|
|
relevant portions of the opcode when disassembling. If the
|
|
|
|
|
actual opcode anded with the match field equals the opcode field,
|
|
|
|
|
then we have found the correct instruction. If pinfo is
|
|
|
|
|
INSN_MACRO, then this field is the macro identifier. */
|
|
|
|
|
unsigned long mask;
|
|
|
|
|
/* For a macro, this is INSN_MACRO. Otherwise, it is a collection
|
|
|
|
|
of bits describing the instruction, notably any relevant hazard
|
|
|
|
|
information. */
|
|
|
|
|
unsigned long pinfo;
|
|
|
|
|
/* A collection of bits describing the instruction sets of which this
|
|
|
|
|
instruction or macro is a member. */
|
|
|
|
|
unsigned long membership;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* These are the characters which may appears in the args field of an
|
|
|
|
|
instruction. They appear in the order in which the fields appear
|
|
|
|
|
when the instruction is used. Commas and parentheses in the args
|
|
|
|
|
string are ignored when assembling, and written into the output
|
|
|
|
|
when disassembling.
|
|
|
|
|
|
|
|
|
|
Each of these characters corresponds to a mask field defined above.
|
|
|
|
|
|
|
|
|
|
"<" 5 bit shift amount (OP_*_SHAMT)
|
|
|
|
|
">" shift amount between 32 and 63, stored after subtracting 32 (OP_*_SHAMT)
|
|
|
|
|
"a" 26 bit target address (OP_*_TARGET)
|
|
|
|
|
"b" 5 bit base register (OP_*_RS)
|
|
|
|
|
"c" 10 bit breakpoint code (OP_*_CODE)
|
|
|
|
|
"d" 5 bit destination register specifier (OP_*_RD)
|
|
|
|
|
"h" 5 bit prefx hint (OP_*_PREFX)
|
|
|
|
|
"i" 16 bit unsigned immediate (OP_*_IMMEDIATE)
|
|
|
|
|
"j" 16 bit signed immediate (OP_*_DELTA)
|
|
|
|
|
"k" 5 bit cache opcode in target register position (OP_*_CACHE)
|
[include/opcode/]
* mips.h: Update comment for new opcodes.
(OP_MASK_VECBYTE, OP_SH_VECBYTE): New.
(OP_MASK_VECALIGN, OP_SH_VECALIGN): New.
(INSN_4111, INSN_4120, INSN_5400, INSN_5500): New.
(CPU_VR4120, CPU_VR5400, CPU_VR5500): New.
(OPCODE_IS_MEMBER): Handle the new CPU_* values and INSN_* flags.
Don't match CPU_R4111 with INSN_4100.
[opcodes/]
* mips-dis.c (print_insn_arg): Handle '[', ']', 'e' and '%'.
(mips_isa_type): Handle bfd_mach_mips4120, bfd_mach_mips5400
and bfd_mach_mips5500.
* mips-opc.c (V1): Include INSN_4111 and INSN_4120.
(N411, N412, N5, N54, N55): New convenience defines.
(mips_builtin_opcodes): Add vr4120, vr5400 and vr5500 opcodes.
Change dmadd16 and madd16 from V1 to N411.
2002-09-30 19:58:09 +08:00
|
|
|
|
Also used for immediate operands in vr5400 vector insns.
|
1999-05-03 15:29:06 +08:00
|
|
|
|
"o" 16 bit signed offset (OP_*_DELTA)
|
|
|
|
|
"p" 16 bit PC relative branch target address (OP_*_DELTA)
|
|
|
|
|
"q" 10 bit extra breakpoint code (OP_*_CODE2)
|
|
|
|
|
"r" 5 bit same register used as both source and target (OP_*_RS)
|
|
|
|
|
"s" 5 bit source register specifier (OP_*_RS)
|
|
|
|
|
"t" 5 bit target register (OP_*_RT)
|
|
|
|
|
"u" 16 bit upper 16 bits of address (OP_*_IMMEDIATE)
|
|
|
|
|
"v" 5 bit same register used as both source and destination (OP_*_RS)
|
|
|
|
|
"w" 5 bit same register used as both target and destination (OP_*_RT)
|
2000-12-02 04:05:32 +08:00
|
|
|
|
"U" 5 bit same destination register in both OP_*_RD and OP_*_RT
|
|
|
|
|
(used by clo and clz)
|
1999-05-03 15:29:06 +08:00
|
|
|
|
"C" 25 bit coprocessor function code (OP_*_COPZ)
|
2000-12-02 04:05:32 +08:00
|
|
|
|
"B" 20 bit syscall/breakpoint function code (OP_*_CODE20)
|
|
|
|
|
"J" 19 bit wait function code (OP_*_CODE19)
|
1999-05-03 15:29:06 +08:00
|
|
|
|
"x" accept and ignore register name
|
|
|
|
|
"z" must be zero register
|
[ bfd/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* aoutx.h (NAME(aout,machine_type)): Add bfd_mach_mipsisa32r2 case.
* archures.c (bfd_mach_mipsisa32r2): New define.
* bfd-in2.h: Regenerate.
* cpu-mips.c (I_mipsisa32r2): New enum value.
(arch_info_struct): Add entry for I_mipsisa32r2.
* elfxx-mips.c (elf_mips_isa, _bfd_elf_mips_mach)
(_bfd_mips_elf_print_private_bfd_data): Handle E_MIPS_ARCH_32R2.
(_bfd_mips_elf_final_write_processing): Add
bfd_mach_mipsisa32r2 case.
(_bfd_mips_elf_merge_private_bfd_data): Handle merging of
binaries marked as using MIPS32 Release 2.
[ binutils/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* doc/binutils.texi (objdump): Note MIPS HWR (Hardware Register)
changes in MIPS -M options.
[ gas/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* configure.in: Recognize mipsisa32r2, mipsisa32r2el, and
CPU variants.
* configure: Regenerate.
* config/tc-mips.c (ISA_HAS_DROR, ISA_HAS_ROR): New defines.
(macro_build): Handle "K" operand.
(macro2): Use ISA_HAS_DROR and ISA_HAS_ROR in the places where
CPU_HAS_DROR and CPU_HAS_ROR are currently used.
(mips_ip): New variable "lastpos", and implement "+A", "+B",
and "+C" operands for MIPS32 Release 2 ins/ext instructions.
Implement "K" operand for MIPS32 Release 2 rdhwr instruction.
(validate_mips_insn): Implement "+" as a way to extend the
allowed operands, and implement "K", "+A", "+B", and "+C"
operands.
(OPTION_MIPS32R2): New define.
(md_longopts): Add entry for OPTION_MIPS32R2.
(OPTION_ELF_BASE): Adjust to accomodate OPTIONS_MIPS32R2.
(md_parse_option): Handle OPTION_MIPS32R2.
(s_mipsset): Reimplement handling of ".set mipsN" options
and add support for ".set mips32r2".
(mips_cpu_info_table): Add entry for "mips32r2" (MIPS32 Release 2).
(md_show_usage): Document "-mips32r2" option.
* doc/as.texinfo: Document "-mips32r2" option.
* doc/c-mips.texi: Likewise.
[ gas/testsuite/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* gas/mips/cp0-names-mips32r2.d: New test.
* gas/mips/hwr-names-mips32r2.d: New test.
* gas/mips/hwr-names-numeric.d: New test.
* gas/mips/hwr-names.s: New test source file.
* gas/mips/mips32r2.d: New test.
* gas/mips/mips32r2.s: New test source file.
* gas/mips/mips32r2-ill.l: New test.
* gas/mips/mips32r2-ill.s: New test source file.
* gas/mips/mips.exp: Add mips32r2 architecture data array
entry. Run new tests mentioned above.
[ include/elf/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips.h (E_MIPS_ARCH_32R2): New define.
[ include/opcode/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips.h: Document "+" as the start of two-character operand
type names, and add new "K", "+A", "+B", and "+C" operand types.
(OP_MASK_INSMSB, OP_SH_INSMSB, OP_MASK_EXTMSB)
(OP_SH_EXTMSB, INSN_ISA32R2, ISA_MIPS32R2, CPU_MIPS32R2): New
defines.
[ opcodes/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips-dis.c (mips_cp0_names_mips3264r2, mips_hwr_names_numeric)
(mips_hwr_names_mips3264r2): New arrays.
(mips_arch_choice): New "hwr_names" member.
(mips_arch_choices): Adjust for structure change, and add a new
entry for "mips32r2" ISA.
(mips_hwr_names): New variable.
(set_default_mips_dis_options): Set mips_hwr_names.
(parse_mips_dis_option): New "hwr-names" option which sets
mips_hwr_names, and adjust "reg-names=ARCH" to set mips_hwr_names.
(print_insn_arg): Change return type to "int"
and use that to indicate number of characters consumed.
Add support for "+" operand extension character, "+A", "+B",
"+C", and "K" operands.
(print_insn_mips): Adjust for changes to print_insn_arg.
(print_mips_disassembler_options): Adjust for "hwr-names"
addition and "reg-names" change.
* mips-opc (I33): New define (shorthand for INSN_ISA32R2).
(mips_builtin_opcodes): Note that "nop" and "ssnop" are special
forms of "sll". Add new MIPS32 Release 2 instructions: ehb,
di, ei, ext, ins, jr.hb, jalr.hb, mfhc1, mfhc2, mthc1, mthc2,
rdhwr, rdpgpr, seb, seh, synci, wrpgpr, wsbh.
Note that hardware rotate instructions (ror, rorv) can be
used on MIPS32 Release 2, and add the official mnemonics
for them (rotr, rotrv) and the similar "rotl" mnemonic for
left-rotate.
2002-12-31 15:29:29 +08:00
|
|
|
|
"K" 5 bit Hardware Register (rdhwr instruction) (OP_*_RD)
|
2003-01-03 04:03:09 +08:00
|
|
|
|
"+A" 5 bit ins/ext position, which becomes LSB (OP_*_SHAMT).
|
|
|
|
|
Enforces: 0 <= pos < 32.
|
|
|
|
|
"+B" 5 bit ins size, which becomes MSB (OP_*_INSMSB).
|
|
|
|
|
Requires that "+A" occur first to set position.
|
|
|
|
|
Enforces: 0 < (pos+size) <= 32.
|
|
|
|
|
"+C" 5 bit ext size, which becomes MSBD (OP_*_EXTMSBD).
|
|
|
|
|
Requires that "+A" occur first to set position.
|
|
|
|
|
Enforces: 0 < (pos+size) <= 32.
|
1999-05-03 15:29:06 +08:00
|
|
|
|
|
|
|
|
|
Floating point instructions:
|
|
|
|
|
"D" 5 bit destination register (OP_*_FD)
|
|
|
|
|
"M" 3 bit compare condition code (OP_*_CCC) (only used for mips4 and up)
|
|
|
|
|
"N" 3 bit branch condition code (OP_*_BCC) (only used for mips4 and up)
|
|
|
|
|
"S" 5 bit fs source 1 register (OP_*_FS)
|
|
|
|
|
"T" 5 bit ft source 2 register (OP_*_FT)
|
|
|
|
|
"R" 5 bit fr source 3 register (OP_*_FR)
|
|
|
|
|
"V" 5 bit same register used as floating source and destination (OP_*_FS)
|
|
|
|
|
"W" 5 bit same register used as floating target and destination (OP_*_FT)
|
|
|
|
|
|
|
|
|
|
Coprocessor instructions:
|
|
|
|
|
"E" 5 bit target register (OP_*_RT)
|
|
|
|
|
"G" 5 bit destination register (OP_*_RD)
|
2001-10-18 09:50:26 +08:00
|
|
|
|
"H" 3 bit sel field for (d)mtc* and (d)mfc* (OP_*_SEL)
|
1999-05-03 15:29:06 +08:00
|
|
|
|
"P" 5 bit performance-monitor register (OP_*_PERFREG)
|
[include/opcode/]
* mips.h: Update comment for new opcodes.
(OP_MASK_VECBYTE, OP_SH_VECBYTE): New.
(OP_MASK_VECALIGN, OP_SH_VECALIGN): New.
(INSN_4111, INSN_4120, INSN_5400, INSN_5500): New.
(CPU_VR4120, CPU_VR5400, CPU_VR5500): New.
(OPCODE_IS_MEMBER): Handle the new CPU_* values and INSN_* flags.
Don't match CPU_R4111 with INSN_4100.
[opcodes/]
* mips-dis.c (print_insn_arg): Handle '[', ']', 'e' and '%'.
(mips_isa_type): Handle bfd_mach_mips4120, bfd_mach_mips5400
and bfd_mach_mips5500.
* mips-opc.c (V1): Include INSN_4111 and INSN_4120.
(N411, N412, N5, N54, N55): New convenience defines.
(mips_builtin_opcodes): Add vr4120, vr5400 and vr5500 opcodes.
Change dmadd16 and madd16 from V1 to N411.
2002-09-30 19:58:09 +08:00
|
|
|
|
"e" 5 bit vector register byte specifier (OP_*_VECBYTE)
|
|
|
|
|
"%" 3 bit immediate vr5400 vector alignment operand (OP_*_VECALIGN)
|
|
|
|
|
see also "k" above
|
2002-12-31 16:11:18 +08:00
|
|
|
|
"+D" Combined destination register ("G") and sel ("H") for CP0 ops,
|
|
|
|
|
for pretty-printing in disassembly only.
|
1999-05-03 15:29:06 +08:00
|
|
|
|
|
|
|
|
|
Macro instructions:
|
|
|
|
|
"A" General 32 bit expression
|
|
|
|
|
"I" 32 bit immediate
|
|
|
|
|
"F" 64 bit floating point constant in .rdata
|
|
|
|
|
"L" 64 bit floating point constant in .lit8
|
|
|
|
|
"f" 32 bit floating point constant
|
|
|
|
|
"l" 32 bit floating point constant in .lit4
|
|
|
|
|
|
[ gas/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
Ed Satterthwaite <ehs@broadcom.com>
* config/tc-mips.c (mips_set_options): New "ase_mdmx" member.
(mips_opts): Initialize "ase_mdmx" member.
(file_ase_mdmx): New variable.
(CPU_HAS_MDMX): New macro.
(md_begin): Initialize mips_opts.ase_mdmx and file_ase_mdmx
based on command line options and configuration defaults.
(macro_build): Note in comment that use of MDMX in macros is
not currently allowed.
(validate_mips_insn): Add support for the "O", "Q", "X", "Y", and
"Z" MDMX operand types.
(mips_ip): Accept MDMX instructions if mips_opts.ase_mdmx is set,
and add support for the "O", "Q", "X", "Y", and "Z" MDMX operand
types.
(OPTION_MDMX, OPTION_NO_MDMX, md_longopts, md_parse_option):
Add support for "-mdmx" and "-no-mdmx" options.
(OPTION_ELF_BASE): Move to accomodate new options.
(s_mipsset): Support ".set mdmx" and ".set nomdmx".
(mips_elf_final_processing): Set MDMX ASE ELF header flag if
file_ase_mdmx was set.
* doc/as.texinfo: Document -mdmx and -no-mdmx options.
* doc/c-mips.texi: Likewise, and document ".set mdmx" and ".set
nomdmx" directives.
[ gas/testsuite/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
* gas/mips/mips64-mdmx.s: New file.
* gas/mips/mips64-mdmx.d: Likewise.
* gas/mips/mips.exp: Run new "mips64-mdmx" test.
[ include/opcode/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
* mips.h (OP_SH_ALN, OP_MASK_ALN, OP_SH_VSEL, OP_MASK_VSEL)
(MDMX_FMTSEL_IMM_QH, MDMX_FMTSEL_IMM_OB, MDMX_FMTSEL_VEC_QH)
(MDMX_FMTSEL_VEC_OB, INSN_READ_MDMX_ACC, INSN_WRITE_MDMX_ACC)
(INSN_MDMX): New constants, for MDMX support.
(opcode character list): Add "O", "Q", "X", "Y", and "Z" for MDMX.
[ opcodes/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
Ed Satterthwaite <ehs@broadcom.com>
* mips-dis.c (print_insn_arg): Add support for 'O', 'Q', 'X', 'Y',
and 'Z' formats, for MDMX.
(mips_isa_type): Add MDMX instructions to the ISA
bit mask for bfd_mach_mipsisa64.
* mips-opc.c: Add support for MDMX instructions.
(MX): New definition.
* mips-dis.c: Update copyright years to include 2002.
2002-05-31 09:17:17 +08:00
|
|
|
|
MDMX instruction operands (note that while these use the FP register
|
|
|
|
|
fields, they accept both $fN and $vN names for the registers):
|
|
|
|
|
"O" MDMX alignment offset (OP_*_ALN)
|
|
|
|
|
"Q" MDMX vector/scalar/immediate source (OP_*_VSEL and OP_*_FT)
|
|
|
|
|
"X" MDMX destination register (OP_*_FD)
|
|
|
|
|
"Y" MDMX source register (OP_*_FS)
|
|
|
|
|
"Z" MDMX source register (OP_*_FT)
|
|
|
|
|
|
1999-05-03 15:29:06 +08:00
|
|
|
|
Other:
|
|
|
|
|
"()" parens surrounding optional value
|
|
|
|
|
"," separates operands
|
[include/opcode/]
* mips.h: Update comment for new opcodes.
(OP_MASK_VECBYTE, OP_SH_VECBYTE): New.
(OP_MASK_VECALIGN, OP_SH_VECALIGN): New.
(INSN_4111, INSN_4120, INSN_5400, INSN_5500): New.
(CPU_VR4120, CPU_VR5400, CPU_VR5500): New.
(OPCODE_IS_MEMBER): Handle the new CPU_* values and INSN_* flags.
Don't match CPU_R4111 with INSN_4100.
[opcodes/]
* mips-dis.c (print_insn_arg): Handle '[', ']', 'e' and '%'.
(mips_isa_type): Handle bfd_mach_mips4120, bfd_mach_mips5400
and bfd_mach_mips5500.
* mips-opc.c (V1): Include INSN_4111 and INSN_4120.
(N411, N412, N5, N54, N55): New convenience defines.
(mips_builtin_opcodes): Add vr4120, vr5400 and vr5500 opcodes.
Change dmadd16 and madd16 from V1 to N411.
2002-09-30 19:58:09 +08:00
|
|
|
|
"[]" brackets around index for vector-op scalar operand specifier (vr5400)
|
[ bfd/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* aoutx.h (NAME(aout,machine_type)): Add bfd_mach_mipsisa32r2 case.
* archures.c (bfd_mach_mipsisa32r2): New define.
* bfd-in2.h: Regenerate.
* cpu-mips.c (I_mipsisa32r2): New enum value.
(arch_info_struct): Add entry for I_mipsisa32r2.
* elfxx-mips.c (elf_mips_isa, _bfd_elf_mips_mach)
(_bfd_mips_elf_print_private_bfd_data): Handle E_MIPS_ARCH_32R2.
(_bfd_mips_elf_final_write_processing): Add
bfd_mach_mipsisa32r2 case.
(_bfd_mips_elf_merge_private_bfd_data): Handle merging of
binaries marked as using MIPS32 Release 2.
[ binutils/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* doc/binutils.texi (objdump): Note MIPS HWR (Hardware Register)
changes in MIPS -M options.
[ gas/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* configure.in: Recognize mipsisa32r2, mipsisa32r2el, and
CPU variants.
* configure: Regenerate.
* config/tc-mips.c (ISA_HAS_DROR, ISA_HAS_ROR): New defines.
(macro_build): Handle "K" operand.
(macro2): Use ISA_HAS_DROR and ISA_HAS_ROR in the places where
CPU_HAS_DROR and CPU_HAS_ROR are currently used.
(mips_ip): New variable "lastpos", and implement "+A", "+B",
and "+C" operands for MIPS32 Release 2 ins/ext instructions.
Implement "K" operand for MIPS32 Release 2 rdhwr instruction.
(validate_mips_insn): Implement "+" as a way to extend the
allowed operands, and implement "K", "+A", "+B", and "+C"
operands.
(OPTION_MIPS32R2): New define.
(md_longopts): Add entry for OPTION_MIPS32R2.
(OPTION_ELF_BASE): Adjust to accomodate OPTIONS_MIPS32R2.
(md_parse_option): Handle OPTION_MIPS32R2.
(s_mipsset): Reimplement handling of ".set mipsN" options
and add support for ".set mips32r2".
(mips_cpu_info_table): Add entry for "mips32r2" (MIPS32 Release 2).
(md_show_usage): Document "-mips32r2" option.
* doc/as.texinfo: Document "-mips32r2" option.
* doc/c-mips.texi: Likewise.
[ gas/testsuite/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* gas/mips/cp0-names-mips32r2.d: New test.
* gas/mips/hwr-names-mips32r2.d: New test.
* gas/mips/hwr-names-numeric.d: New test.
* gas/mips/hwr-names.s: New test source file.
* gas/mips/mips32r2.d: New test.
* gas/mips/mips32r2.s: New test source file.
* gas/mips/mips32r2-ill.l: New test.
* gas/mips/mips32r2-ill.s: New test source file.
* gas/mips/mips.exp: Add mips32r2 architecture data array
entry. Run new tests mentioned above.
[ include/elf/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips.h (E_MIPS_ARCH_32R2): New define.
[ include/opcode/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips.h: Document "+" as the start of two-character operand
type names, and add new "K", "+A", "+B", and "+C" operand types.
(OP_MASK_INSMSB, OP_SH_INSMSB, OP_MASK_EXTMSB)
(OP_SH_EXTMSB, INSN_ISA32R2, ISA_MIPS32R2, CPU_MIPS32R2): New
defines.
[ opcodes/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips-dis.c (mips_cp0_names_mips3264r2, mips_hwr_names_numeric)
(mips_hwr_names_mips3264r2): New arrays.
(mips_arch_choice): New "hwr_names" member.
(mips_arch_choices): Adjust for structure change, and add a new
entry for "mips32r2" ISA.
(mips_hwr_names): New variable.
(set_default_mips_dis_options): Set mips_hwr_names.
(parse_mips_dis_option): New "hwr-names" option which sets
mips_hwr_names, and adjust "reg-names=ARCH" to set mips_hwr_names.
(print_insn_arg): Change return type to "int"
and use that to indicate number of characters consumed.
Add support for "+" operand extension character, "+A", "+B",
"+C", and "K" operands.
(print_insn_mips): Adjust for changes to print_insn_arg.
(print_mips_disassembler_options): Adjust for "hwr-names"
addition and "reg-names" change.
* mips-opc (I33): New define (shorthand for INSN_ISA32R2).
(mips_builtin_opcodes): Note that "nop" and "ssnop" are special
forms of "sll". Add new MIPS32 Release 2 instructions: ehb,
di, ei, ext, ins, jr.hb, jalr.hb, mfhc1, mfhc2, mthc1, mthc2,
rdhwr, rdpgpr, seb, seh, synci, wrpgpr, wsbh.
Note that hardware rotate instructions (ror, rorv) can be
used on MIPS32 Release 2, and add the official mnemonics
for them (rotr, rotrv) and the similar "rotl" mnemonic for
left-rotate.
2002-12-31 15:29:29 +08:00
|
|
|
|
"+" Start of extension sequence.
|
1999-05-03 15:29:06 +08:00
|
|
|
|
|
|
|
|
|
Characters used so far, for quick reference when adding more:
|
[ bfd/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* aoutx.h (NAME(aout,machine_type)): Add bfd_mach_mipsisa32r2 case.
* archures.c (bfd_mach_mipsisa32r2): New define.
* bfd-in2.h: Regenerate.
* cpu-mips.c (I_mipsisa32r2): New enum value.
(arch_info_struct): Add entry for I_mipsisa32r2.
* elfxx-mips.c (elf_mips_isa, _bfd_elf_mips_mach)
(_bfd_mips_elf_print_private_bfd_data): Handle E_MIPS_ARCH_32R2.
(_bfd_mips_elf_final_write_processing): Add
bfd_mach_mipsisa32r2 case.
(_bfd_mips_elf_merge_private_bfd_data): Handle merging of
binaries marked as using MIPS32 Release 2.
[ binutils/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* doc/binutils.texi (objdump): Note MIPS HWR (Hardware Register)
changes in MIPS -M options.
[ gas/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* configure.in: Recognize mipsisa32r2, mipsisa32r2el, and
CPU variants.
* configure: Regenerate.
* config/tc-mips.c (ISA_HAS_DROR, ISA_HAS_ROR): New defines.
(macro_build): Handle "K" operand.
(macro2): Use ISA_HAS_DROR and ISA_HAS_ROR in the places where
CPU_HAS_DROR and CPU_HAS_ROR are currently used.
(mips_ip): New variable "lastpos", and implement "+A", "+B",
and "+C" operands for MIPS32 Release 2 ins/ext instructions.
Implement "K" operand for MIPS32 Release 2 rdhwr instruction.
(validate_mips_insn): Implement "+" as a way to extend the
allowed operands, and implement "K", "+A", "+B", and "+C"
operands.
(OPTION_MIPS32R2): New define.
(md_longopts): Add entry for OPTION_MIPS32R2.
(OPTION_ELF_BASE): Adjust to accomodate OPTIONS_MIPS32R2.
(md_parse_option): Handle OPTION_MIPS32R2.
(s_mipsset): Reimplement handling of ".set mipsN" options
and add support for ".set mips32r2".
(mips_cpu_info_table): Add entry for "mips32r2" (MIPS32 Release 2).
(md_show_usage): Document "-mips32r2" option.
* doc/as.texinfo: Document "-mips32r2" option.
* doc/c-mips.texi: Likewise.
[ gas/testsuite/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* gas/mips/cp0-names-mips32r2.d: New test.
* gas/mips/hwr-names-mips32r2.d: New test.
* gas/mips/hwr-names-numeric.d: New test.
* gas/mips/hwr-names.s: New test source file.
* gas/mips/mips32r2.d: New test.
* gas/mips/mips32r2.s: New test source file.
* gas/mips/mips32r2-ill.l: New test.
* gas/mips/mips32r2-ill.s: New test source file.
* gas/mips/mips.exp: Add mips32r2 architecture data array
entry. Run new tests mentioned above.
[ include/elf/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips.h (E_MIPS_ARCH_32R2): New define.
[ include/opcode/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips.h: Document "+" as the start of two-character operand
type names, and add new "K", "+A", "+B", and "+C" operand types.
(OP_MASK_INSMSB, OP_SH_INSMSB, OP_MASK_EXTMSB)
(OP_SH_EXTMSB, INSN_ISA32R2, ISA_MIPS32R2, CPU_MIPS32R2): New
defines.
[ opcodes/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips-dis.c (mips_cp0_names_mips3264r2, mips_hwr_names_numeric)
(mips_hwr_names_mips3264r2): New arrays.
(mips_arch_choice): New "hwr_names" member.
(mips_arch_choices): Adjust for structure change, and add a new
entry for "mips32r2" ISA.
(mips_hwr_names): New variable.
(set_default_mips_dis_options): Set mips_hwr_names.
(parse_mips_dis_option): New "hwr-names" option which sets
mips_hwr_names, and adjust "reg-names=ARCH" to set mips_hwr_names.
(print_insn_arg): Change return type to "int"
and use that to indicate number of characters consumed.
Add support for "+" operand extension character, "+A", "+B",
"+C", and "K" operands.
(print_insn_mips): Adjust for changes to print_insn_arg.
(print_mips_disassembler_options): Adjust for "hwr-names"
addition and "reg-names" change.
* mips-opc (I33): New define (shorthand for INSN_ISA32R2).
(mips_builtin_opcodes): Note that "nop" and "ssnop" are special
forms of "sll". Add new MIPS32 Release 2 instructions: ehb,
di, ei, ext, ins, jr.hb, jalr.hb, mfhc1, mfhc2, mthc1, mthc2,
rdhwr, rdpgpr, seb, seh, synci, wrpgpr, wsbh.
Note that hardware rotate instructions (ror, rorv) can be
used on MIPS32 Release 2, and add the official mnemonics
for them (rotr, rotrv) and the similar "rotl" mnemonic for
left-rotate.
2002-12-31 15:29:29 +08:00
|
|
|
|
"%[]<>(),+"
|
|
|
|
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
[include/opcode/]
* mips.h: Update comment for new opcodes.
(OP_MASK_VECBYTE, OP_SH_VECBYTE): New.
(OP_MASK_VECALIGN, OP_SH_VECALIGN): New.
(INSN_4111, INSN_4120, INSN_5400, INSN_5500): New.
(CPU_VR4120, CPU_VR5400, CPU_VR5500): New.
(OPCODE_IS_MEMBER): Handle the new CPU_* values and INSN_* flags.
Don't match CPU_R4111 with INSN_4100.
[opcodes/]
* mips-dis.c (print_insn_arg): Handle '[', ']', 'e' and '%'.
(mips_isa_type): Handle bfd_mach_mips4120, bfd_mach_mips5400
and bfd_mach_mips5500.
* mips-opc.c (V1): Include INSN_4111 and INSN_4120.
(N411, N412, N5, N54, N55): New convenience defines.
(mips_builtin_opcodes): Add vr4120, vr5400 and vr5500 opcodes.
Change dmadd16 and madd16 from V1 to N411.
2002-09-30 19:58:09 +08:00
|
|
|
|
"abcdefhijklopqrstuvwxz"
|
[ bfd/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* aoutx.h (NAME(aout,machine_type)): Add bfd_mach_mipsisa32r2 case.
* archures.c (bfd_mach_mipsisa32r2): New define.
* bfd-in2.h: Regenerate.
* cpu-mips.c (I_mipsisa32r2): New enum value.
(arch_info_struct): Add entry for I_mipsisa32r2.
* elfxx-mips.c (elf_mips_isa, _bfd_elf_mips_mach)
(_bfd_mips_elf_print_private_bfd_data): Handle E_MIPS_ARCH_32R2.
(_bfd_mips_elf_final_write_processing): Add
bfd_mach_mipsisa32r2 case.
(_bfd_mips_elf_merge_private_bfd_data): Handle merging of
binaries marked as using MIPS32 Release 2.
[ binutils/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* doc/binutils.texi (objdump): Note MIPS HWR (Hardware Register)
changes in MIPS -M options.
[ gas/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* configure.in: Recognize mipsisa32r2, mipsisa32r2el, and
CPU variants.
* configure: Regenerate.
* config/tc-mips.c (ISA_HAS_DROR, ISA_HAS_ROR): New defines.
(macro_build): Handle "K" operand.
(macro2): Use ISA_HAS_DROR and ISA_HAS_ROR in the places where
CPU_HAS_DROR and CPU_HAS_ROR are currently used.
(mips_ip): New variable "lastpos", and implement "+A", "+B",
and "+C" operands for MIPS32 Release 2 ins/ext instructions.
Implement "K" operand for MIPS32 Release 2 rdhwr instruction.
(validate_mips_insn): Implement "+" as a way to extend the
allowed operands, and implement "K", "+A", "+B", and "+C"
operands.
(OPTION_MIPS32R2): New define.
(md_longopts): Add entry for OPTION_MIPS32R2.
(OPTION_ELF_BASE): Adjust to accomodate OPTIONS_MIPS32R2.
(md_parse_option): Handle OPTION_MIPS32R2.
(s_mipsset): Reimplement handling of ".set mipsN" options
and add support for ".set mips32r2".
(mips_cpu_info_table): Add entry for "mips32r2" (MIPS32 Release 2).
(md_show_usage): Document "-mips32r2" option.
* doc/as.texinfo: Document "-mips32r2" option.
* doc/c-mips.texi: Likewise.
[ gas/testsuite/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* gas/mips/cp0-names-mips32r2.d: New test.
* gas/mips/hwr-names-mips32r2.d: New test.
* gas/mips/hwr-names-numeric.d: New test.
* gas/mips/hwr-names.s: New test source file.
* gas/mips/mips32r2.d: New test.
* gas/mips/mips32r2.s: New test source file.
* gas/mips/mips32r2-ill.l: New test.
* gas/mips/mips32r2-ill.s: New test source file.
* gas/mips/mips.exp: Add mips32r2 architecture data array
entry. Run new tests mentioned above.
[ include/elf/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips.h (E_MIPS_ARCH_32R2): New define.
[ include/opcode/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips.h: Document "+" as the start of two-character operand
type names, and add new "K", "+A", "+B", and "+C" operand types.
(OP_MASK_INSMSB, OP_SH_INSMSB, OP_MASK_EXTMSB)
(OP_SH_EXTMSB, INSN_ISA32R2, ISA_MIPS32R2, CPU_MIPS32R2): New
defines.
[ opcodes/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips-dis.c (mips_cp0_names_mips3264r2, mips_hwr_names_numeric)
(mips_hwr_names_mips3264r2): New arrays.
(mips_arch_choice): New "hwr_names" member.
(mips_arch_choices): Adjust for structure change, and add a new
entry for "mips32r2" ISA.
(mips_hwr_names): New variable.
(set_default_mips_dis_options): Set mips_hwr_names.
(parse_mips_dis_option): New "hwr-names" option which sets
mips_hwr_names, and adjust "reg-names=ARCH" to set mips_hwr_names.
(print_insn_arg): Change return type to "int"
and use that to indicate number of characters consumed.
Add support for "+" operand extension character, "+A", "+B",
"+C", and "K" operands.
(print_insn_mips): Adjust for changes to print_insn_arg.
(print_mips_disassembler_options): Adjust for "hwr-names"
addition and "reg-names" change.
* mips-opc (I33): New define (shorthand for INSN_ISA32R2).
(mips_builtin_opcodes): Note that "nop" and "ssnop" are special
forms of "sll". Add new MIPS32 Release 2 instructions: ehb,
di, ei, ext, ins, jr.hb, jalr.hb, mfhc1, mfhc2, mthc1, mthc2,
rdhwr, rdpgpr, seb, seh, synci, wrpgpr, wsbh.
Note that hardware rotate instructions (ror, rorv) can be
used on MIPS32 Release 2, and add the official mnemonics
for them (rotr, rotrv) and the similar "rotl" mnemonic for
left-rotate.
2002-12-31 15:29:29 +08:00
|
|
|
|
|
|
|
|
|
Extension character sequences used so far ("+" followed by the
|
|
|
|
|
following), for quick reference when adding more:
|
2002-12-31 16:11:18 +08:00
|
|
|
|
"ABCD"
|
1999-05-03 15:29:06 +08:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/* These are the bits which may be set in the pinfo field of an
|
|
|
|
|
instructions, if it is not equal to INSN_MACRO. */
|
|
|
|
|
|
|
|
|
|
/* Modifies the general purpose register in OP_*_RD. */
|
|
|
|
|
#define INSN_WRITE_GPR_D 0x00000001
|
|
|
|
|
/* Modifies the general purpose register in OP_*_RT. */
|
|
|
|
|
#define INSN_WRITE_GPR_T 0x00000002
|
|
|
|
|
/* Modifies general purpose register 31. */
|
|
|
|
|
#define INSN_WRITE_GPR_31 0x00000004
|
|
|
|
|
/* Modifies the floating point register in OP_*_FD. */
|
|
|
|
|
#define INSN_WRITE_FPR_D 0x00000008
|
|
|
|
|
/* Modifies the floating point register in OP_*_FS. */
|
|
|
|
|
#define INSN_WRITE_FPR_S 0x00000010
|
|
|
|
|
/* Modifies the floating point register in OP_*_FT. */
|
|
|
|
|
#define INSN_WRITE_FPR_T 0x00000020
|
|
|
|
|
/* Reads the general purpose register in OP_*_RS. */
|
|
|
|
|
#define INSN_READ_GPR_S 0x00000040
|
|
|
|
|
/* Reads the general purpose register in OP_*_RT. */
|
|
|
|
|
#define INSN_READ_GPR_T 0x00000080
|
|
|
|
|
/* Reads the floating point register in OP_*_FS. */
|
|
|
|
|
#define INSN_READ_FPR_S 0x00000100
|
|
|
|
|
/* Reads the floating point register in OP_*_FT. */
|
|
|
|
|
#define INSN_READ_FPR_T 0x00000200
|
|
|
|
|
/* Reads the floating point register in OP_*_FR. */
|
|
|
|
|
#define INSN_READ_FPR_R 0x00000400
|
|
|
|
|
/* Modifies coprocessor condition code. */
|
|
|
|
|
#define INSN_WRITE_COND_CODE 0x00000800
|
|
|
|
|
/* Reads coprocessor condition code. */
|
|
|
|
|
#define INSN_READ_COND_CODE 0x00001000
|
|
|
|
|
/* TLB operation. */
|
|
|
|
|
#define INSN_TLB 0x00002000
|
|
|
|
|
/* Reads coprocessor register other than floating point register. */
|
|
|
|
|
#define INSN_COP 0x00004000
|
|
|
|
|
/* Instruction loads value from memory, requiring delay. */
|
|
|
|
|
#define INSN_LOAD_MEMORY_DELAY 0x00008000
|
|
|
|
|
/* Instruction loads value from coprocessor, requiring delay. */
|
|
|
|
|
#define INSN_LOAD_COPROC_DELAY 0x00010000
|
|
|
|
|
/* Instruction has unconditional branch delay slot. */
|
|
|
|
|
#define INSN_UNCOND_BRANCH_DELAY 0x00020000
|
|
|
|
|
/* Instruction has conditional branch delay slot. */
|
|
|
|
|
#define INSN_COND_BRANCH_DELAY 0x00040000
|
|
|
|
|
/* Conditional branch likely: if branch not taken, insn nullified. */
|
|
|
|
|
#define INSN_COND_BRANCH_LIKELY 0x00080000
|
|
|
|
|
/* Moves to coprocessor register, requiring delay. */
|
|
|
|
|
#define INSN_COPROC_MOVE_DELAY 0x00100000
|
|
|
|
|
/* Loads coprocessor register from memory, requiring delay. */
|
|
|
|
|
#define INSN_COPROC_MEMORY_DELAY 0x00200000
|
|
|
|
|
/* Reads the HI register. */
|
|
|
|
|
#define INSN_READ_HI 0x00400000
|
|
|
|
|
/* Reads the LO register. */
|
|
|
|
|
#define INSN_READ_LO 0x00800000
|
|
|
|
|
/* Modifies the HI register. */
|
|
|
|
|
#define INSN_WRITE_HI 0x01000000
|
|
|
|
|
/* Modifies the LO register. */
|
|
|
|
|
#define INSN_WRITE_LO 0x02000000
|
|
|
|
|
/* Takes a trap (easier to keep out of delay slot). */
|
|
|
|
|
#define INSN_TRAP 0x04000000
|
|
|
|
|
/* Instruction stores value into memory. */
|
|
|
|
|
#define INSN_STORE_MEMORY 0x08000000
|
|
|
|
|
/* Instruction uses single precision floating point. */
|
|
|
|
|
#define FP_S 0x10000000
|
|
|
|
|
/* Instruction uses double precision floating point. */
|
|
|
|
|
#define FP_D 0x20000000
|
|
|
|
|
/* Instruction is part of the tx39's integer multiply family. */
|
|
|
|
|
#define INSN_MULT 0x40000000
|
|
|
|
|
/* Instruction synchronize shared memory. */
|
|
|
|
|
#define INSN_SYNC 0x80000000
|
[ gas/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
Ed Satterthwaite <ehs@broadcom.com>
* config/tc-mips.c (mips_set_options): New "ase_mdmx" member.
(mips_opts): Initialize "ase_mdmx" member.
(file_ase_mdmx): New variable.
(CPU_HAS_MDMX): New macro.
(md_begin): Initialize mips_opts.ase_mdmx and file_ase_mdmx
based on command line options and configuration defaults.
(macro_build): Note in comment that use of MDMX in macros is
not currently allowed.
(validate_mips_insn): Add support for the "O", "Q", "X", "Y", and
"Z" MDMX operand types.
(mips_ip): Accept MDMX instructions if mips_opts.ase_mdmx is set,
and add support for the "O", "Q", "X", "Y", and "Z" MDMX operand
types.
(OPTION_MDMX, OPTION_NO_MDMX, md_longopts, md_parse_option):
Add support for "-mdmx" and "-no-mdmx" options.
(OPTION_ELF_BASE): Move to accomodate new options.
(s_mipsset): Support ".set mdmx" and ".set nomdmx".
(mips_elf_final_processing): Set MDMX ASE ELF header flag if
file_ase_mdmx was set.
* doc/as.texinfo: Document -mdmx and -no-mdmx options.
* doc/c-mips.texi: Likewise, and document ".set mdmx" and ".set
nomdmx" directives.
[ gas/testsuite/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
* gas/mips/mips64-mdmx.s: New file.
* gas/mips/mips64-mdmx.d: Likewise.
* gas/mips/mips.exp: Run new "mips64-mdmx" test.
[ include/opcode/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
* mips.h (OP_SH_ALN, OP_MASK_ALN, OP_SH_VSEL, OP_MASK_VSEL)
(MDMX_FMTSEL_IMM_QH, MDMX_FMTSEL_IMM_OB, MDMX_FMTSEL_VEC_QH)
(MDMX_FMTSEL_VEC_OB, INSN_READ_MDMX_ACC, INSN_WRITE_MDMX_ACC)
(INSN_MDMX): New constants, for MDMX support.
(opcode character list): Add "O", "Q", "X", "Y", and "Z" for MDMX.
[ opcodes/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
Ed Satterthwaite <ehs@broadcom.com>
* mips-dis.c (print_insn_arg): Add support for 'O', 'Q', 'X', 'Y',
and 'Z' formats, for MDMX.
(mips_isa_type): Add MDMX instructions to the ISA
bit mask for bfd_mach_mipsisa64.
* mips-opc.c: Add support for MDMX instructions.
(MX): New definition.
* mips-dis.c: Update copyright years to include 2002.
2002-05-31 09:17:17 +08:00
|
|
|
|
/* Instruction reads MDMX accumulator. XXX FIXME: No bits left! */
|
|
|
|
|
#define INSN_READ_MDMX_ACC 0
|
|
|
|
|
/* Instruction writes MDMX accumulator. XXX FIXME: No bits left! */
|
|
|
|
|
#define INSN_WRITE_MDMX_ACC 0
|
1999-05-03 15:29:06 +08:00
|
|
|
|
|
|
|
|
|
/* Instruction is actually a macro. It should be ignored by the
|
|
|
|
|
disassembler, and requires special treatment by the assembler. */
|
|
|
|
|
#define INSN_MACRO 0xffffffff
|
|
|
|
|
|
2000-12-02 05:35:38 +08:00
|
|
|
|
/* Masks used to mark instructions to indicate which MIPS ISA level
|
|
|
|
|
they were introduced in. ISAs, as defined below, are logical
|
2003-01-08 15:36:47 +08:00
|
|
|
|
ORs of these bits, indicating that they support the instructions
|
2000-12-02 05:35:38 +08:00
|
|
|
|
defined at the given level. */
|
|
|
|
|
|
2001-08-01 19:33:45 +08:00
|
|
|
|
#define INSN_ISA_MASK 0x00000fff
|
2003-01-08 15:36:47 +08:00
|
|
|
|
#define INSN_ISA1 0x00000001
|
|
|
|
|
#define INSN_ISA2 0x00000002
|
|
|
|
|
#define INSN_ISA3 0x00000004
|
|
|
|
|
#define INSN_ISA4 0x00000008
|
|
|
|
|
#define INSN_ISA5 0x00000010
|
|
|
|
|
#define INSN_ISA32 0x00000020
|
|
|
|
|
#define INSN_ISA64 0x00000040
|
|
|
|
|
#define INSN_ISA32R2 0x00000080
|
1999-05-03 15:29:06 +08:00
|
|
|
|
|
2002-03-16 11:09:18 +08:00
|
|
|
|
/* Masks used for MIPS-defined ASEs. */
|
2002-07-09 22:21:40 +08:00
|
|
|
|
#define INSN_ASE_MASK 0x0000f000
|
2002-03-16 11:09:18 +08:00
|
|
|
|
|
2002-07-09 22:21:40 +08:00
|
|
|
|
/* MIPS 16 ASE */
|
|
|
|
|
#define INSN_MIPS16 0x00002000
|
2002-03-16 11:09:18 +08:00
|
|
|
|
/* MIPS-3D ASE */
|
|
|
|
|
#define INSN_MIPS3D 0x00004000
|
[ gas/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
Ed Satterthwaite <ehs@broadcom.com>
* config/tc-mips.c (mips_set_options): New "ase_mdmx" member.
(mips_opts): Initialize "ase_mdmx" member.
(file_ase_mdmx): New variable.
(CPU_HAS_MDMX): New macro.
(md_begin): Initialize mips_opts.ase_mdmx and file_ase_mdmx
based on command line options and configuration defaults.
(macro_build): Note in comment that use of MDMX in macros is
not currently allowed.
(validate_mips_insn): Add support for the "O", "Q", "X", "Y", and
"Z" MDMX operand types.
(mips_ip): Accept MDMX instructions if mips_opts.ase_mdmx is set,
and add support for the "O", "Q", "X", "Y", and "Z" MDMX operand
types.
(OPTION_MDMX, OPTION_NO_MDMX, md_longopts, md_parse_option):
Add support for "-mdmx" and "-no-mdmx" options.
(OPTION_ELF_BASE): Move to accomodate new options.
(s_mipsset): Support ".set mdmx" and ".set nomdmx".
(mips_elf_final_processing): Set MDMX ASE ELF header flag if
file_ase_mdmx was set.
* doc/as.texinfo: Document -mdmx and -no-mdmx options.
* doc/c-mips.texi: Likewise, and document ".set mdmx" and ".set
nomdmx" directives.
[ gas/testsuite/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
* gas/mips/mips64-mdmx.s: New file.
* gas/mips/mips64-mdmx.d: Likewise.
* gas/mips/mips.exp: Run new "mips64-mdmx" test.
[ include/opcode/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
* mips.h (OP_SH_ALN, OP_MASK_ALN, OP_SH_VSEL, OP_MASK_VSEL)
(MDMX_FMTSEL_IMM_QH, MDMX_FMTSEL_IMM_OB, MDMX_FMTSEL_VEC_QH)
(MDMX_FMTSEL_VEC_OB, INSN_READ_MDMX_ACC, INSN_WRITE_MDMX_ACC)
(INSN_MDMX): New constants, for MDMX support.
(opcode character list): Add "O", "Q", "X", "Y", and "Z" for MDMX.
[ opcodes/ChangeLog ]
2002-05-30 Chris G. Demetriou <cgd@broadcom.com>
Ed Satterthwaite <ehs@broadcom.com>
* mips-dis.c (print_insn_arg): Add support for 'O', 'Q', 'X', 'Y',
and 'Z' formats, for MDMX.
(mips_isa_type): Add MDMX instructions to the ISA
bit mask for bfd_mach_mipsisa64.
* mips-opc.c: Add support for MDMX instructions.
(MX): New definition.
* mips-dis.c: Update copyright years to include 2002.
2002-05-31 09:17:17 +08:00
|
|
|
|
/* MDMX ASE */
|
|
|
|
|
#define INSN_MDMX 0x00008000
|
2002-03-16 11:09:18 +08:00
|
|
|
|
|
1999-05-03 15:29:06 +08:00
|
|
|
|
/* Chip specific instructions. These are bitmasks. */
|
2000-12-02 05:35:38 +08:00
|
|
|
|
|
1999-05-03 15:29:06 +08:00
|
|
|
|
/* MIPS R4650 instruction. */
|
2000-12-02 05:35:38 +08:00
|
|
|
|
#define INSN_4650 0x00010000
|
1999-05-03 15:29:06 +08:00
|
|
|
|
/* LSI R4010 instruction. */
|
2000-12-02 05:35:38 +08:00
|
|
|
|
#define INSN_4010 0x00020000
|
|
|
|
|
/* NEC VR4100 instruction. */
|
2000-12-13 03:25:07 +08:00
|
|
|
|
#define INSN_4100 0x00040000
|
1999-05-03 15:29:06 +08:00
|
|
|
|
/* Toshiba R3900 instruction. */
|
2000-12-13 03:25:07 +08:00
|
|
|
|
#define INSN_3900 0x00080000
|
2001-08-17 03:24:33 +08:00
|
|
|
|
/* MIPS R10000 instruction. */
|
|
|
|
|
#define INSN_10000 0x00100000
|
2001-10-18 09:42:16 +08:00
|
|
|
|
/* Broadcom SB-1 instruction. */
|
|
|
|
|
#define INSN_SB1 0x00200000
|
[include/opcode/]
* mips.h: Update comment for new opcodes.
(OP_MASK_VECBYTE, OP_SH_VECBYTE): New.
(OP_MASK_VECALIGN, OP_SH_VECALIGN): New.
(INSN_4111, INSN_4120, INSN_5400, INSN_5500): New.
(CPU_VR4120, CPU_VR5400, CPU_VR5500): New.
(OPCODE_IS_MEMBER): Handle the new CPU_* values and INSN_* flags.
Don't match CPU_R4111 with INSN_4100.
[opcodes/]
* mips-dis.c (print_insn_arg): Handle '[', ']', 'e' and '%'.
(mips_isa_type): Handle bfd_mach_mips4120, bfd_mach_mips5400
and bfd_mach_mips5500.
* mips-opc.c (V1): Include INSN_4111 and INSN_4120.
(N411, N412, N5, N54, N55): New convenience defines.
(mips_builtin_opcodes): Add vr4120, vr5400 and vr5500 opcodes.
Change dmadd16 and madd16 from V1 to N411.
2002-09-30 19:58:09 +08:00
|
|
|
|
/* NEC VR4111/VR4181 instruction. */
|
|
|
|
|
#define INSN_4111 0x00400000
|
|
|
|
|
/* NEC VR4120 instruction. */
|
|
|
|
|
#define INSN_4120 0x00800000
|
|
|
|
|
/* NEC VR5400 instruction. */
|
|
|
|
|
#define INSN_5400 0x01000000
|
|
|
|
|
/* NEC VR5500 instruction. */
|
|
|
|
|
#define INSN_5500 0x02000000
|
2000-12-02 05:35:38 +08:00
|
|
|
|
|
|
|
|
|
/* MIPS ISA defines, use instead of hardcoding ISA level. */
|
|
|
|
|
|
|
|
|
|
#define ISA_UNKNOWN 0 /* Gas internal use. */
|
|
|
|
|
#define ISA_MIPS1 (INSN_ISA1)
|
|
|
|
|
#define ISA_MIPS2 (ISA_MIPS1 | INSN_ISA2)
|
|
|
|
|
#define ISA_MIPS3 (ISA_MIPS2 | INSN_ISA3)
|
|
|
|
|
#define ISA_MIPS4 (ISA_MIPS3 | INSN_ISA4)
|
2000-12-02 08:55:22 +08:00
|
|
|
|
#define ISA_MIPS5 (ISA_MIPS4 | INSN_ISA5)
|
[ bfd/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* aoutx.h (NAME(aout,machine_type)): Add bfd_mach_mipsisa32r2 case.
* archures.c (bfd_mach_mipsisa32r2): New define.
* bfd-in2.h: Regenerate.
* cpu-mips.c (I_mipsisa32r2): New enum value.
(arch_info_struct): Add entry for I_mipsisa32r2.
* elfxx-mips.c (elf_mips_isa, _bfd_elf_mips_mach)
(_bfd_mips_elf_print_private_bfd_data): Handle E_MIPS_ARCH_32R2.
(_bfd_mips_elf_final_write_processing): Add
bfd_mach_mipsisa32r2 case.
(_bfd_mips_elf_merge_private_bfd_data): Handle merging of
binaries marked as using MIPS32 Release 2.
[ binutils/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* doc/binutils.texi (objdump): Note MIPS HWR (Hardware Register)
changes in MIPS -M options.
[ gas/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* configure.in: Recognize mipsisa32r2, mipsisa32r2el, and
CPU variants.
* configure: Regenerate.
* config/tc-mips.c (ISA_HAS_DROR, ISA_HAS_ROR): New defines.
(macro_build): Handle "K" operand.
(macro2): Use ISA_HAS_DROR and ISA_HAS_ROR in the places where
CPU_HAS_DROR and CPU_HAS_ROR are currently used.
(mips_ip): New variable "lastpos", and implement "+A", "+B",
and "+C" operands for MIPS32 Release 2 ins/ext instructions.
Implement "K" operand for MIPS32 Release 2 rdhwr instruction.
(validate_mips_insn): Implement "+" as a way to extend the
allowed operands, and implement "K", "+A", "+B", and "+C"
operands.
(OPTION_MIPS32R2): New define.
(md_longopts): Add entry for OPTION_MIPS32R2.
(OPTION_ELF_BASE): Adjust to accomodate OPTIONS_MIPS32R2.
(md_parse_option): Handle OPTION_MIPS32R2.
(s_mipsset): Reimplement handling of ".set mipsN" options
and add support for ".set mips32r2".
(mips_cpu_info_table): Add entry for "mips32r2" (MIPS32 Release 2).
(md_show_usage): Document "-mips32r2" option.
* doc/as.texinfo: Document "-mips32r2" option.
* doc/c-mips.texi: Likewise.
[ gas/testsuite/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* gas/mips/cp0-names-mips32r2.d: New test.
* gas/mips/hwr-names-mips32r2.d: New test.
* gas/mips/hwr-names-numeric.d: New test.
* gas/mips/hwr-names.s: New test source file.
* gas/mips/mips32r2.d: New test.
* gas/mips/mips32r2.s: New test source file.
* gas/mips/mips32r2-ill.l: New test.
* gas/mips/mips32r2-ill.s: New test source file.
* gas/mips/mips.exp: Add mips32r2 architecture data array
entry. Run new tests mentioned above.
[ include/elf/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips.h (E_MIPS_ARCH_32R2): New define.
[ include/opcode/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips.h: Document "+" as the start of two-character operand
type names, and add new "K", "+A", "+B", and "+C" operand types.
(OP_MASK_INSMSB, OP_SH_INSMSB, OP_MASK_EXTMSB)
(OP_SH_EXTMSB, INSN_ISA32R2, ISA_MIPS32R2, CPU_MIPS32R2): New
defines.
[ opcodes/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips-dis.c (mips_cp0_names_mips3264r2, mips_hwr_names_numeric)
(mips_hwr_names_mips3264r2): New arrays.
(mips_arch_choice): New "hwr_names" member.
(mips_arch_choices): Adjust for structure change, and add a new
entry for "mips32r2" ISA.
(mips_hwr_names): New variable.
(set_default_mips_dis_options): Set mips_hwr_names.
(parse_mips_dis_option): New "hwr-names" option which sets
mips_hwr_names, and adjust "reg-names=ARCH" to set mips_hwr_names.
(print_insn_arg): Change return type to "int"
and use that to indicate number of characters consumed.
Add support for "+" operand extension character, "+A", "+B",
"+C", and "K" operands.
(print_insn_mips): Adjust for changes to print_insn_arg.
(print_mips_disassembler_options): Adjust for "hwr-names"
addition and "reg-names" change.
* mips-opc (I33): New define (shorthand for INSN_ISA32R2).
(mips_builtin_opcodes): Note that "nop" and "ssnop" are special
forms of "sll". Add new MIPS32 Release 2 instructions: ehb,
di, ei, ext, ins, jr.hb, jalr.hb, mfhc1, mfhc2, mthc1, mthc2,
rdhwr, rdpgpr, seb, seh, synci, wrpgpr, wsbh.
Note that hardware rotate instructions (ror, rorv) can be
used on MIPS32 Release 2, and add the official mnemonics
for them (rotr, rotrv) and the similar "rotl" mnemonic for
left-rotate.
2002-12-31 15:29:29 +08:00
|
|
|
|
|
2000-12-02 05:35:38 +08:00
|
|
|
|
#define ISA_MIPS32 (ISA_MIPS2 | INSN_ISA32)
|
2000-12-02 08:55:22 +08:00
|
|
|
|
#define ISA_MIPS64 (ISA_MIPS5 | INSN_ISA32 | INSN_ISA64)
|
2000-02-22 22:39:20 +08:00
|
|
|
|
|
[ bfd/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* aoutx.h (NAME(aout,machine_type)): Add bfd_mach_mipsisa32r2 case.
* archures.c (bfd_mach_mipsisa32r2): New define.
* bfd-in2.h: Regenerate.
* cpu-mips.c (I_mipsisa32r2): New enum value.
(arch_info_struct): Add entry for I_mipsisa32r2.
* elfxx-mips.c (elf_mips_isa, _bfd_elf_mips_mach)
(_bfd_mips_elf_print_private_bfd_data): Handle E_MIPS_ARCH_32R2.
(_bfd_mips_elf_final_write_processing): Add
bfd_mach_mipsisa32r2 case.
(_bfd_mips_elf_merge_private_bfd_data): Handle merging of
binaries marked as using MIPS32 Release 2.
[ binutils/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* doc/binutils.texi (objdump): Note MIPS HWR (Hardware Register)
changes in MIPS -M options.
[ gas/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* configure.in: Recognize mipsisa32r2, mipsisa32r2el, and
CPU variants.
* configure: Regenerate.
* config/tc-mips.c (ISA_HAS_DROR, ISA_HAS_ROR): New defines.
(macro_build): Handle "K" operand.
(macro2): Use ISA_HAS_DROR and ISA_HAS_ROR in the places where
CPU_HAS_DROR and CPU_HAS_ROR are currently used.
(mips_ip): New variable "lastpos", and implement "+A", "+B",
and "+C" operands for MIPS32 Release 2 ins/ext instructions.
Implement "K" operand for MIPS32 Release 2 rdhwr instruction.
(validate_mips_insn): Implement "+" as a way to extend the
allowed operands, and implement "K", "+A", "+B", and "+C"
operands.
(OPTION_MIPS32R2): New define.
(md_longopts): Add entry for OPTION_MIPS32R2.
(OPTION_ELF_BASE): Adjust to accomodate OPTIONS_MIPS32R2.
(md_parse_option): Handle OPTION_MIPS32R2.
(s_mipsset): Reimplement handling of ".set mipsN" options
and add support for ".set mips32r2".
(mips_cpu_info_table): Add entry for "mips32r2" (MIPS32 Release 2).
(md_show_usage): Document "-mips32r2" option.
* doc/as.texinfo: Document "-mips32r2" option.
* doc/c-mips.texi: Likewise.
[ gas/testsuite/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* gas/mips/cp0-names-mips32r2.d: New test.
* gas/mips/hwr-names-mips32r2.d: New test.
* gas/mips/hwr-names-numeric.d: New test.
* gas/mips/hwr-names.s: New test source file.
* gas/mips/mips32r2.d: New test.
* gas/mips/mips32r2.s: New test source file.
* gas/mips/mips32r2-ill.l: New test.
* gas/mips/mips32r2-ill.s: New test source file.
* gas/mips/mips.exp: Add mips32r2 architecture data array
entry. Run new tests mentioned above.
[ include/elf/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips.h (E_MIPS_ARCH_32R2): New define.
[ include/opcode/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips.h: Document "+" as the start of two-character operand
type names, and add new "K", "+A", "+B", and "+C" operand types.
(OP_MASK_INSMSB, OP_SH_INSMSB, OP_MASK_EXTMSB)
(OP_SH_EXTMSB, INSN_ISA32R2, ISA_MIPS32R2, CPU_MIPS32R2): New
defines.
[ opcodes/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips-dis.c (mips_cp0_names_mips3264r2, mips_hwr_names_numeric)
(mips_hwr_names_mips3264r2): New arrays.
(mips_arch_choice): New "hwr_names" member.
(mips_arch_choices): Adjust for structure change, and add a new
entry for "mips32r2" ISA.
(mips_hwr_names): New variable.
(set_default_mips_dis_options): Set mips_hwr_names.
(parse_mips_dis_option): New "hwr-names" option which sets
mips_hwr_names, and adjust "reg-names=ARCH" to set mips_hwr_names.
(print_insn_arg): Change return type to "int"
and use that to indicate number of characters consumed.
Add support for "+" operand extension character, "+A", "+B",
"+C", and "K" operands.
(print_insn_mips): Adjust for changes to print_insn_arg.
(print_mips_disassembler_options): Adjust for "hwr-names"
addition and "reg-names" change.
* mips-opc (I33): New define (shorthand for INSN_ISA32R2).
(mips_builtin_opcodes): Note that "nop" and "ssnop" are special
forms of "sll". Add new MIPS32 Release 2 instructions: ehb,
di, ei, ext, ins, jr.hb, jalr.hb, mfhc1, mfhc2, mthc1, mthc2,
rdhwr, rdpgpr, seb, seh, synci, wrpgpr, wsbh.
Note that hardware rotate instructions (ror, rorv) can be
used on MIPS32 Release 2, and add the official mnemonics
for them (rotr, rotrv) and the similar "rotl" mnemonic for
left-rotate.
2002-12-31 15:29:29 +08:00
|
|
|
|
#define ISA_MIPS32R2 (ISA_MIPS32 | INSN_ISA32R2)
|
|
|
|
|
|
2000-09-14 09:47:37 +08:00
|
|
|
|
/* CPU defines, use instead of hardcoding processor number. Keep this
|
|
|
|
|
in sync with bfd/archures.c in order for machine selection to work. */
|
2000-12-02 05:35:38 +08:00
|
|
|
|
#define CPU_UNKNOWN 0 /* Gas internal use. */
|
2000-09-14 09:47:37 +08:00
|
|
|
|
#define CPU_R3000 3000
|
|
|
|
|
#define CPU_R3900 3900
|
|
|
|
|
#define CPU_R4000 4000
|
|
|
|
|
#define CPU_R4010 4010
|
|
|
|
|
#define CPU_VR4100 4100
|
|
|
|
|
#define CPU_R4111 4111
|
[include/opcode/]
* mips.h: Update comment for new opcodes.
(OP_MASK_VECBYTE, OP_SH_VECBYTE): New.
(OP_MASK_VECALIGN, OP_SH_VECALIGN): New.
(INSN_4111, INSN_4120, INSN_5400, INSN_5500): New.
(CPU_VR4120, CPU_VR5400, CPU_VR5500): New.
(OPCODE_IS_MEMBER): Handle the new CPU_* values and INSN_* flags.
Don't match CPU_R4111 with INSN_4100.
[opcodes/]
* mips-dis.c (print_insn_arg): Handle '[', ']', 'e' and '%'.
(mips_isa_type): Handle bfd_mach_mips4120, bfd_mach_mips5400
and bfd_mach_mips5500.
* mips-opc.c (V1): Include INSN_4111 and INSN_4120.
(N411, N412, N5, N54, N55): New convenience defines.
(mips_builtin_opcodes): Add vr4120, vr5400 and vr5500 opcodes.
Change dmadd16 and madd16 from V1 to N411.
2002-09-30 19:58:09 +08:00
|
|
|
|
#define CPU_VR4120 4120
|
2000-09-14 09:47:37 +08:00
|
|
|
|
#define CPU_R4300 4300
|
|
|
|
|
#define CPU_R4400 4400
|
|
|
|
|
#define CPU_R4600 4600
|
|
|
|
|
#define CPU_R4650 4650
|
|
|
|
|
#define CPU_R5000 5000
|
[include/opcode/]
* mips.h: Update comment for new opcodes.
(OP_MASK_VECBYTE, OP_SH_VECBYTE): New.
(OP_MASK_VECALIGN, OP_SH_VECALIGN): New.
(INSN_4111, INSN_4120, INSN_5400, INSN_5500): New.
(CPU_VR4120, CPU_VR5400, CPU_VR5500): New.
(OPCODE_IS_MEMBER): Handle the new CPU_* values and INSN_* flags.
Don't match CPU_R4111 with INSN_4100.
[opcodes/]
* mips-dis.c (print_insn_arg): Handle '[', ']', 'e' and '%'.
(mips_isa_type): Handle bfd_mach_mips4120, bfd_mach_mips5400
and bfd_mach_mips5500.
* mips-opc.c (V1): Include INSN_4111 and INSN_4120.
(N411, N412, N5, N54, N55): New convenience defines.
(mips_builtin_opcodes): Add vr4120, vr5400 and vr5500 opcodes.
Change dmadd16 and madd16 from V1 to N411.
2002-09-30 19:58:09 +08:00
|
|
|
|
#define CPU_VR5400 5400
|
|
|
|
|
#define CPU_VR5500 5500
|
2000-09-14 09:47:37 +08:00
|
|
|
|
#define CPU_R6000 6000
|
|
|
|
|
#define CPU_R8000 8000
|
|
|
|
|
#define CPU_R10000 10000
|
2001-05-24 01:26:39 +08:00
|
|
|
|
#define CPU_R12000 12000
|
2000-09-14 09:47:37 +08:00
|
|
|
|
#define CPU_MIPS16 16
|
|
|
|
|
#define CPU_MIPS32 32
|
[ bfd/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* aoutx.h (NAME(aout,machine_type)): Add bfd_mach_mipsisa32r2 case.
* archures.c (bfd_mach_mipsisa32r2): New define.
* bfd-in2.h: Regenerate.
* cpu-mips.c (I_mipsisa32r2): New enum value.
(arch_info_struct): Add entry for I_mipsisa32r2.
* elfxx-mips.c (elf_mips_isa, _bfd_elf_mips_mach)
(_bfd_mips_elf_print_private_bfd_data): Handle E_MIPS_ARCH_32R2.
(_bfd_mips_elf_final_write_processing): Add
bfd_mach_mipsisa32r2 case.
(_bfd_mips_elf_merge_private_bfd_data): Handle merging of
binaries marked as using MIPS32 Release 2.
[ binutils/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* doc/binutils.texi (objdump): Note MIPS HWR (Hardware Register)
changes in MIPS -M options.
[ gas/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* configure.in: Recognize mipsisa32r2, mipsisa32r2el, and
CPU variants.
* configure: Regenerate.
* config/tc-mips.c (ISA_HAS_DROR, ISA_HAS_ROR): New defines.
(macro_build): Handle "K" operand.
(macro2): Use ISA_HAS_DROR and ISA_HAS_ROR in the places where
CPU_HAS_DROR and CPU_HAS_ROR are currently used.
(mips_ip): New variable "lastpos", and implement "+A", "+B",
and "+C" operands for MIPS32 Release 2 ins/ext instructions.
Implement "K" operand for MIPS32 Release 2 rdhwr instruction.
(validate_mips_insn): Implement "+" as a way to extend the
allowed operands, and implement "K", "+A", "+B", and "+C"
operands.
(OPTION_MIPS32R2): New define.
(md_longopts): Add entry for OPTION_MIPS32R2.
(OPTION_ELF_BASE): Adjust to accomodate OPTIONS_MIPS32R2.
(md_parse_option): Handle OPTION_MIPS32R2.
(s_mipsset): Reimplement handling of ".set mipsN" options
and add support for ".set mips32r2".
(mips_cpu_info_table): Add entry for "mips32r2" (MIPS32 Release 2).
(md_show_usage): Document "-mips32r2" option.
* doc/as.texinfo: Document "-mips32r2" option.
* doc/c-mips.texi: Likewise.
[ gas/testsuite/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* gas/mips/cp0-names-mips32r2.d: New test.
* gas/mips/hwr-names-mips32r2.d: New test.
* gas/mips/hwr-names-numeric.d: New test.
* gas/mips/hwr-names.s: New test source file.
* gas/mips/mips32r2.d: New test.
* gas/mips/mips32r2.s: New test source file.
* gas/mips/mips32r2-ill.l: New test.
* gas/mips/mips32r2-ill.s: New test source file.
* gas/mips/mips.exp: Add mips32r2 architecture data array
entry. Run new tests mentioned above.
[ include/elf/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips.h (E_MIPS_ARCH_32R2): New define.
[ include/opcode/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips.h: Document "+" as the start of two-character operand
type names, and add new "K", "+A", "+B", and "+C" operand types.
(OP_MASK_INSMSB, OP_SH_INSMSB, OP_MASK_EXTMSB)
(OP_SH_EXTMSB, INSN_ISA32R2, ISA_MIPS32R2, CPU_MIPS32R2): New
defines.
[ opcodes/ChangeLog ]
2002-12-30 Chris Demetriou <cgd@broadcom.com>
* mips-dis.c (mips_cp0_names_mips3264r2, mips_hwr_names_numeric)
(mips_hwr_names_mips3264r2): New arrays.
(mips_arch_choice): New "hwr_names" member.
(mips_arch_choices): Adjust for structure change, and add a new
entry for "mips32r2" ISA.
(mips_hwr_names): New variable.
(set_default_mips_dis_options): Set mips_hwr_names.
(parse_mips_dis_option): New "hwr-names" option which sets
mips_hwr_names, and adjust "reg-names=ARCH" to set mips_hwr_names.
(print_insn_arg): Change return type to "int"
and use that to indicate number of characters consumed.
Add support for "+" operand extension character, "+A", "+B",
"+C", and "K" operands.
(print_insn_mips): Adjust for changes to print_insn_arg.
(print_mips_disassembler_options): Adjust for "hwr-names"
addition and "reg-names" change.
* mips-opc (I33): New define (shorthand for INSN_ISA32R2).
(mips_builtin_opcodes): Note that "nop" and "ssnop" are special
forms of "sll". Add new MIPS32 Release 2 instructions: ehb,
di, ei, ext, ins, jr.hb, jalr.hb, mfhc1, mfhc2, mthc1, mthc2,
rdhwr, rdpgpr, seb, seh, synci, wrpgpr, wsbh.
Note that hardware rotate instructions (ror, rorv) can be
used on MIPS32 Release 2, and add the official mnemonics
for them (rotr, rotrv) and the similar "rotl" mnemonic for
left-rotate.
2002-12-31 15:29:29 +08:00
|
|
|
|
#define CPU_MIPS32R2 33
|
2000-12-02 08:55:22 +08:00
|
|
|
|
#define CPU_MIPS5 5
|
|
|
|
|
#define CPU_MIPS64 64
|
2000-12-02 09:10:33 +08:00
|
|
|
|
#define CPU_SB1 12310201 /* octal 'SB', 01. */
|
2000-09-14 09:47:37 +08:00
|
|
|
|
|
2002-03-16 11:09:18 +08:00
|
|
|
|
/* Test for membership in an ISA including chip specific ISAs. INSN
|
|
|
|
|
is pointer to an element of the opcode table; ISA is the specified
|
|
|
|
|
ISA/ASE bitmask to test against; and CPU is the CPU specific ISA to
|
|
|
|
|
test, or zero if no CPU specific ISA test is desired. */
|
2001-08-11 00:20:43 +08:00
|
|
|
|
|
|
|
|
|
#define OPCODE_IS_MEMBER(insn, isa, cpu) \
|
|
|
|
|
(((insn)->membership & isa) != 0 \
|
2000-09-14 09:47:37 +08:00
|
|
|
|
|| (cpu == CPU_R4650 && ((insn)->membership & INSN_4650) != 0) \
|
|
|
|
|
|| (cpu == CPU_R4010 && ((insn)->membership & INSN_4010) != 0) \
|
[include/opcode/]
* mips.h: Update comment for new opcodes.
(OP_MASK_VECBYTE, OP_SH_VECBYTE): New.
(OP_MASK_VECALIGN, OP_SH_VECALIGN): New.
(INSN_4111, INSN_4120, INSN_5400, INSN_5500): New.
(CPU_VR4120, CPU_VR5400, CPU_VR5500): New.
(OPCODE_IS_MEMBER): Handle the new CPU_* values and INSN_* flags.
Don't match CPU_R4111 with INSN_4100.
[opcodes/]
* mips-dis.c (print_insn_arg): Handle '[', ']', 'e' and '%'.
(mips_isa_type): Handle bfd_mach_mips4120, bfd_mach_mips5400
and bfd_mach_mips5500.
* mips-opc.c (V1): Include INSN_4111 and INSN_4120.
(N411, N412, N5, N54, N55): New convenience defines.
(mips_builtin_opcodes): Add vr4120, vr5400 and vr5500 opcodes.
Change dmadd16 and madd16 from V1 to N411.
2002-09-30 19:58:09 +08:00
|
|
|
|
|| (cpu == CPU_VR4100 && ((insn)->membership & INSN_4100) != 0) \
|
2001-08-17 03:24:33 +08:00
|
|
|
|
|| (cpu == CPU_R3900 && ((insn)->membership & INSN_3900) != 0) \
|
|
|
|
|
|| ((cpu == CPU_R10000 || cpu == CPU_R12000) \
|
2001-10-18 09:42:16 +08:00
|
|
|
|
&& ((insn)->membership & INSN_10000) != 0) \
|
2001-11-05 11:07:26 +08:00
|
|
|
|
|| (cpu == CPU_SB1 && ((insn)->membership & INSN_SB1) != 0) \
|
[include/opcode/]
* mips.h: Update comment for new opcodes.
(OP_MASK_VECBYTE, OP_SH_VECBYTE): New.
(OP_MASK_VECALIGN, OP_SH_VECALIGN): New.
(INSN_4111, INSN_4120, INSN_5400, INSN_5500): New.
(CPU_VR4120, CPU_VR5400, CPU_VR5500): New.
(OPCODE_IS_MEMBER): Handle the new CPU_* values and INSN_* flags.
Don't match CPU_R4111 with INSN_4100.
[opcodes/]
* mips-dis.c (print_insn_arg): Handle '[', ']', 'e' and '%'.
(mips_isa_type): Handle bfd_mach_mips4120, bfd_mach_mips5400
and bfd_mach_mips5500.
* mips-opc.c (V1): Include INSN_4111 and INSN_4120.
(N411, N412, N5, N54, N55): New convenience defines.
(mips_builtin_opcodes): Add vr4120, vr5400 and vr5500 opcodes.
Change dmadd16 and madd16 from V1 to N411.
2002-09-30 19:58:09 +08:00
|
|
|
|
|| (cpu == CPU_R4111 && ((insn)->membership & INSN_4111) != 0) \
|
|
|
|
|
|| (cpu == CPU_VR4120 && ((insn)->membership & INSN_4120) != 0) \
|
|
|
|
|
|| (cpu == CPU_VR5400 && ((insn)->membership & INSN_5400) != 0) \
|
|
|
|
|
|| (cpu == CPU_VR5500 && ((insn)->membership & INSN_5500) != 0) \
|
2001-10-19 06:41:35 +08:00
|
|
|
|
|| 0) /* Please keep this term for easier source merging. */
|
1999-05-03 15:29:06 +08:00
|
|
|
|
|
|
|
|
|
/* This is a list of macro expanded instructions.
|
2001-02-11 06:26:55 +08:00
|
|
|
|
|
2000-12-02 05:35:38 +08:00
|
|
|
|
_I appended means immediate
|
|
|
|
|
_A appended means address
|
|
|
|
|
_AB appended means address with base register
|
|
|
|
|
_D appended means 64 bit floating point constant
|
|
|
|
|
_S appended means 32 bit floating point constant. */
|
|
|
|
|
|
|
|
|
|
enum
|
|
|
|
|
{
|
|
|
|
|
M_ABS,
|
|
|
|
|
M_ADD_I,
|
|
|
|
|
M_ADDU_I,
|
|
|
|
|
M_AND_I,
|
|
|
|
|
M_BEQ,
|
|
|
|
|
M_BEQ_I,
|
|
|
|
|
M_BEQL_I,
|
|
|
|
|
M_BGE,
|
|
|
|
|
M_BGEL,
|
|
|
|
|
M_BGE_I,
|
|
|
|
|
M_BGEL_I,
|
|
|
|
|
M_BGEU,
|
|
|
|
|
M_BGEUL,
|
|
|
|
|
M_BGEU_I,
|
|
|
|
|
M_BGEUL_I,
|
|
|
|
|
M_BGT,
|
|
|
|
|
M_BGTL,
|
|
|
|
|
M_BGT_I,
|
|
|
|
|
M_BGTL_I,
|
|
|
|
|
M_BGTU,
|
|
|
|
|
M_BGTUL,
|
|
|
|
|
M_BGTU_I,
|
|
|
|
|
M_BGTUL_I,
|
|
|
|
|
M_BLE,
|
|
|
|
|
M_BLEL,
|
|
|
|
|
M_BLE_I,
|
|
|
|
|
M_BLEL_I,
|
|
|
|
|
M_BLEU,
|
|
|
|
|
M_BLEUL,
|
|
|
|
|
M_BLEU_I,
|
|
|
|
|
M_BLEUL_I,
|
|
|
|
|
M_BLT,
|
|
|
|
|
M_BLTL,
|
|
|
|
|
M_BLT_I,
|
|
|
|
|
M_BLTL_I,
|
|
|
|
|
M_BLTU,
|
|
|
|
|
M_BLTUL,
|
|
|
|
|
M_BLTU_I,
|
|
|
|
|
M_BLTUL_I,
|
|
|
|
|
M_BNE,
|
|
|
|
|
M_BNE_I,
|
|
|
|
|
M_BNEL_I,
|
|
|
|
|
M_DABS,
|
|
|
|
|
M_DADD_I,
|
|
|
|
|
M_DADDU_I,
|
|
|
|
|
M_DDIV_3,
|
|
|
|
|
M_DDIV_3I,
|
|
|
|
|
M_DDIVU_3,
|
|
|
|
|
M_DDIVU_3I,
|
|
|
|
|
M_DIV_3,
|
|
|
|
|
M_DIV_3I,
|
|
|
|
|
M_DIVU_3,
|
|
|
|
|
M_DIVU_3I,
|
|
|
|
|
M_DLA_AB,
|
|
|
|
|
M_DLI,
|
|
|
|
|
M_DMUL,
|
2001-02-11 06:26:55 +08:00
|
|
|
|
M_DMUL_I,
|
2000-12-02 05:35:38 +08:00
|
|
|
|
M_DMULO,
|
2001-02-11 06:26:55 +08:00
|
|
|
|
M_DMULO_I,
|
2000-12-02 05:35:38 +08:00
|
|
|
|
M_DMULOU,
|
2001-02-11 06:26:55 +08:00
|
|
|
|
M_DMULOU_I,
|
2000-12-02 05:35:38 +08:00
|
|
|
|
M_DREM_3,
|
|
|
|
|
M_DREM_3I,
|
|
|
|
|
M_DREMU_3,
|
|
|
|
|
M_DREMU_3I,
|
|
|
|
|
M_DSUB_I,
|
|
|
|
|
M_DSUBU_I,
|
|
|
|
|
M_DSUBU_I_2,
|
|
|
|
|
M_J_A,
|
|
|
|
|
M_JAL_1,
|
|
|
|
|
M_JAL_2,
|
|
|
|
|
M_JAL_A,
|
|
|
|
|
M_L_DOB,
|
|
|
|
|
M_L_DAB,
|
|
|
|
|
M_LA_AB,
|
|
|
|
|
M_LB_A,
|
|
|
|
|
M_LB_AB,
|
|
|
|
|
M_LBU_A,
|
|
|
|
|
M_LBU_AB,
|
|
|
|
|
M_LD_A,
|
|
|
|
|
M_LD_OB,
|
|
|
|
|
M_LD_AB,
|
|
|
|
|
M_LDC1_AB,
|
|
|
|
|
M_LDC2_AB,
|
|
|
|
|
M_LDC3_AB,
|
|
|
|
|
M_LDL_AB,
|
|
|
|
|
M_LDR_AB,
|
|
|
|
|
M_LH_A,
|
|
|
|
|
M_LH_AB,
|
|
|
|
|
M_LHU_A,
|
|
|
|
|
M_LHU_AB,
|
|
|
|
|
M_LI,
|
|
|
|
|
M_LI_D,
|
|
|
|
|
M_LI_DD,
|
|
|
|
|
M_LI_S,
|
|
|
|
|
M_LI_SS,
|
|
|
|
|
M_LL_AB,
|
|
|
|
|
M_LLD_AB,
|
|
|
|
|
M_LS_A,
|
|
|
|
|
M_LW_A,
|
|
|
|
|
M_LW_AB,
|
|
|
|
|
M_LWC0_A,
|
|
|
|
|
M_LWC0_AB,
|
|
|
|
|
M_LWC1_A,
|
|
|
|
|
M_LWC1_AB,
|
|
|
|
|
M_LWC2_A,
|
|
|
|
|
M_LWC2_AB,
|
|
|
|
|
M_LWC3_A,
|
|
|
|
|
M_LWC3_AB,
|
|
|
|
|
M_LWL_A,
|
|
|
|
|
M_LWL_AB,
|
|
|
|
|
M_LWR_A,
|
|
|
|
|
M_LWR_AB,
|
|
|
|
|
M_LWU_AB,
|
2001-08-11 00:20:43 +08:00
|
|
|
|
M_MOVE,
|
2000-12-02 05:35:38 +08:00
|
|
|
|
M_MUL,
|
2001-02-11 06:26:55 +08:00
|
|
|
|
M_MUL_I,
|
2000-12-02 05:35:38 +08:00
|
|
|
|
M_MULO,
|
2001-02-11 06:26:55 +08:00
|
|
|
|
M_MULO_I,
|
2000-12-02 05:35:38 +08:00
|
|
|
|
M_MULOU,
|
2001-02-11 06:26:55 +08:00
|
|
|
|
M_MULOU_I,
|
2000-12-02 05:35:38 +08:00
|
|
|
|
M_NOR_I,
|
|
|
|
|
M_OR_I,
|
|
|
|
|
M_REM_3,
|
|
|
|
|
M_REM_3I,
|
|
|
|
|
M_REMU_3,
|
|
|
|
|
M_REMU_3I,
|
? gas/testsuite/gas/mips/rol64.d
? gas/testsuite/gas/mips/rol64.s
Index: gas/ChangeLog
===================================================================
RCS file: /cvs/src/src/gas/ChangeLog,v
retrieving revision 1.1334
diff -u -p -r1.1334 ChangeLog
--- gas/ChangeLog 21 May 2002 20:01:51 -0000 1.1334
+++ gas/ChangeLog 21 May 2002 23:32:51 -0000
@@ -1,3 +1,8 @@
+2002-05-22 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+ * config/tc-mips.c (macro2): Add 64 bit drol, dror macros.
+ Optimize the rotate by zero case.
+
2002-05-21 Nick Clifton <nickc@cambridge.redhat.com>
* configure.in: Remove accidental enabling of bfd_gas=yes for
Index: gas/config/tc-mips.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-mips.c,v
retrieving revision 1.123
diff -u -p -r1.123 tc-mips.c
--- gas/config/tc-mips.c 14 May 2002 23:35:59 -0000 1.123
+++ gas/config/tc-mips.c 21 May 2002 23:32:52 -0000
@@ -6686,6 +6686,17 @@ macro2 (ip)
--mips_opts.noreorder;
break;
+ case M_DROL:
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsubu",
+ "d,v,t", AT, 0, treg);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsrlv",
+ "d,t,s", AT, sreg, AT);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsllv",
+ "d,t,s", dreg, sreg, treg);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
+ break;
+
case M_ROL:
macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "subu",
"d,v,t", AT, 0, treg);
@@ -6697,15 +6708,55 @@ macro2 (ip)
"d,v,t", dreg, dreg, AT);
break;
+ case M_DROL_I:
+ {
+ unsigned int rot;
+ char *l, *r;
+
+ if (imm_expr.X_op != O_constant)
+ as_bad (_("rotate count too large"));
+ rot = imm_expr.X_add_number & 0x3f;
+ if (! rot)
+ break;
+ l = (rot < 0x20) ? "dsll" : "dsll32";
+ r = ((0x40 - rot) < 0x20) ? "dsrl" : "dsrl32";
+ rot &= 0x1f;
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, l,
+ "d,w,<", AT, sreg, rot);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, r,
+ "d,w,<", dreg, sreg, (0x20 - rot) & 0x1f);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
+ }
+ break;
+
case M_ROL_I:
- if (imm_expr.X_op != O_constant)
- as_bad (_("rotate count too large"));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "sll", "d,w,<",
- AT, sreg, (int) (imm_expr.X_add_number & 0x1f));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "srl", "d,w,<",
- dreg, sreg, (int) ((0 - imm_expr.X_add_number) & 0x1f));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or", "d,v,t",
- dreg, dreg, AT);
+ {
+ unsigned int rot;
+
+ if (imm_expr.X_op != O_constant)
+ as_bad (_("rotate count too large"));
+ rot = imm_expr.X_add_number & 0x1f;
+ if (! rot)
+ break;
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "sll",
+ "d,w,<", AT, sreg, rot);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "srl",
+ "d,w,<", dreg, sreg, (0x20 - rot) & 0x1f);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
+ }
+ break;
+
+ case M_DROR:
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsubu",
+ "d,v,t", AT, 0, treg);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsllv",
+ "d,t,s", AT, sreg, AT);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsrlv",
+ "d,t,s", dreg, sreg, treg);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
break;
case M_ROR:
@@ -6719,15 +6770,44 @@ macro2 (ip)
"d,v,t", dreg, dreg, AT);
break;
+ case M_DROR_I:
+ {
+ unsigned int rot;
+ char *l, *r;
+
+ if (imm_expr.X_op != O_constant)
+ as_bad (_("rotate count too large"));
+ rot = imm_expr.X_add_number & 0x3f;
+ if (! rot)
+ break;
+ r = (rot < 0x20) ? "dsrl" : "dsrl32";
+ l = ((0x40 - rot) < 0x20) ? "dsll" : "dsll32";
+ rot &= 0x1f;
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, r,
+ "d,w,<", AT, sreg, rot);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, l,
+ "d,w,<", dreg, sreg, (0x20 - rot) & 0x1f);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
+ }
+ break;
+
case M_ROR_I:
- if (imm_expr.X_op != O_constant)
- as_bad (_("rotate count too large"));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "srl", "d,w,<",
- AT, sreg, (int) (imm_expr.X_add_number & 0x1f));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "sll", "d,w,<",
- dreg, sreg, (int) ((0 - imm_expr.X_add_number) & 0x1f));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or", "d,v,t",
- dreg, dreg, AT);
+ {
+ unsigned int rot;
+
+ if (imm_expr.X_op != O_constant)
+ as_bad (_("rotate count too large"));
+ rot = imm_expr.X_add_number & 0x1f;
+ if (! rot)
+ break;
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "srl",
+ "d,w,<", AT, sreg, rot);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "sll",
+ "d,w,<", dreg, sreg, (0x20 - rot) & 0x1f);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
+ }
break;
case M_S_DOB:
Index: gas/testsuite/ChangeLog
===================================================================
RCS file: /cvs/src/src/gas/testsuite/ChangeLog,v
retrieving revision 1.315
diff -u -p -r1.315 ChangeLog
--- gas/testsuite/ChangeLog 20 May 2002 17:05:34 -0000 1.315
+++ gas/testsuite/ChangeLog 21 May 2002 23:32:54 -0000
@@ -1,3 +1,9 @@
+2002-05-22 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+ * gas/mips/rol64.s: New file, test of drol, dror macros.
+ * gas/mips/rol64.d: Likewise.
+ * gas/mips/mips.exp: Add new test.
+
2002-05-20 Nick Clifton <nickc@cambridge.redhat.com>
* gas/arm/arm.exp: Replace deprecated command line switches
Index: gas/testsuite/gas/mips/mips.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/mips/mips.exp,v
retrieving revision 1.32
diff -u -p -r1.32 mips.exp
--- gas/testsuite/gas/mips/mips.exp 4 Apr 2002 08:23:30 -0000 1.32
+++ gas/testsuite/gas/mips/mips.exp 21 May 2002 23:32:54 -0000
@@ -122,6 +122,7 @@ if { [istarget mips*-*-*] } then {
run_dump_test "mul"
}
run_dump_test "rol"
+ run_dump_test "rol64"
if !$aout { run_dump_test "sb" }
run_dump_test "trunc"
if !$aout { run_dump_test "ulh" }
Index: include/opcode/ChangeLog
===================================================================
RCS file: /cvs/src/src/include/opcode/ChangeLog,v
retrieving revision 1.167
diff -u -p -r1.167 ChangeLog
--- include/opcode/ChangeLog 17 May 2002 19:01:03 -0000 1.167
+++ include/opcode/ChangeLog 21 May 2002 23:32:57 -0000
@@ -1,3 +1,7 @@
+2002-05-22 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+ * mips.h: Add M_DROL, M_DROL_I, M_DROR, M_DROR_I macro cases.
+
2002-05-17 Andrey Volkov <avolkov@sources.redhat.com>
* h8300.h: Corrected defs of all control regs
Index: include/opcode/mips.h
===================================================================
RCS file: /cvs/src/src/include/opcode/mips.h,v
retrieving revision 1.24
diff -u -p -r1.24 mips.h
--- include/opcode/mips.h 16 Mar 2002 03:09:18 -0000 1.24
+++ include/opcode/mips.h 21 May 2002 23:32:57 -0000
@@ -526,9 +526,13 @@ enum
M_REM_3I,
M_REMU_3,
M_REMU_3I,
+ M_DROL,
M_ROL,
+ M_DROL_I,
M_ROL_I,
+ M_DROR,
M_ROR,
+ M_DROR_I,
M_ROR_I,
M_S_DA,
M_S_DOB,
Index: opcodes/ChangeLog
===================================================================
RCS file: /cvs/src/src/opcodes/ChangeLog,v
retrieving revision 1.447
diff -u -p -r1.447 ChangeLog
--- opcodes/ChangeLog 17 May 2002 14:36:45 -0000 1.447
+++ opcodes/ChangeLog 21 May 2002 23:33:00 -0000
@@ -1,3 +1,7 @@
+2002-05-22 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+ * mips-opc.c (mips_builtin_opcodes): Add drol, dror macros.
+
Fri May 17 14:26:44 2002 J"orn Rennecke <joern.rennecke@superh.com>
* disassemble.c (disassembler): Just use print_insn_sh for bfd_arch_sh.
Index: opcodes/mips-opc.c
===================================================================
RCS file: /cvs/src/src/opcodes/mips-opc.c,v
retrieving revision 1.32
diff -u -p -r1.32 mips-opc.c
--- opcodes/mips-opc.c 17 Mar 2002 02:42:25 -0000 1.32
+++ opcodes/mips-opc.c 21 May 2002 23:33:00 -0000
@@ -492,6 +492,10 @@ const struct mips_opcode mips_builtin_op
{"dremu", "z,s,t", 0x0000001f, 0xfc00ffff, RD_s|RD_t|WR_HILO, I3 },
{"dremu", "d,v,t", 3, (int) M_DREMU_3, INSN_MACRO, I3 },
{"dremu", "d,v,I", 3, (int) M_DREMU_3I, INSN_MACRO, I3 },
+{"drol", "d,v,t", 0, (int) M_DROL, INSN_MACRO, I3 },
+{"drol", "d,v,I", 0, (int) M_DROL_I, INSN_MACRO, I3 },
+{"dror", "d,v,t", 0, (int) M_DROR, INSN_MACRO, I3 },
+{"dror", "d,v,I", 0, (int) M_DROR_I, INSN_MACRO, I3 },
{"dsllv", "d,t,s", 0x00000014, 0xfc0007ff, WR_d|RD_t|RD_s, I3 },
{"dsll32", "d,w,<", 0x0000003c, 0xffe0003f, WR_d|RD_t, I3 },
{"dsll", "d,w,s", 0x00000014, 0xfc0007ff, WR_d|RD_t|RD_s, I3 }, /* dsllv */
2002-05-22 07:54:46 +08:00
|
|
|
|
M_DROL,
|
2000-12-02 05:35:38 +08:00
|
|
|
|
M_ROL,
|
? gas/testsuite/gas/mips/rol64.d
? gas/testsuite/gas/mips/rol64.s
Index: gas/ChangeLog
===================================================================
RCS file: /cvs/src/src/gas/ChangeLog,v
retrieving revision 1.1334
diff -u -p -r1.1334 ChangeLog
--- gas/ChangeLog 21 May 2002 20:01:51 -0000 1.1334
+++ gas/ChangeLog 21 May 2002 23:32:51 -0000
@@ -1,3 +1,8 @@
+2002-05-22 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+ * config/tc-mips.c (macro2): Add 64 bit drol, dror macros.
+ Optimize the rotate by zero case.
+
2002-05-21 Nick Clifton <nickc@cambridge.redhat.com>
* configure.in: Remove accidental enabling of bfd_gas=yes for
Index: gas/config/tc-mips.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-mips.c,v
retrieving revision 1.123
diff -u -p -r1.123 tc-mips.c
--- gas/config/tc-mips.c 14 May 2002 23:35:59 -0000 1.123
+++ gas/config/tc-mips.c 21 May 2002 23:32:52 -0000
@@ -6686,6 +6686,17 @@ macro2 (ip)
--mips_opts.noreorder;
break;
+ case M_DROL:
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsubu",
+ "d,v,t", AT, 0, treg);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsrlv",
+ "d,t,s", AT, sreg, AT);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsllv",
+ "d,t,s", dreg, sreg, treg);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
+ break;
+
case M_ROL:
macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "subu",
"d,v,t", AT, 0, treg);
@@ -6697,15 +6708,55 @@ macro2 (ip)
"d,v,t", dreg, dreg, AT);
break;
+ case M_DROL_I:
+ {
+ unsigned int rot;
+ char *l, *r;
+
+ if (imm_expr.X_op != O_constant)
+ as_bad (_("rotate count too large"));
+ rot = imm_expr.X_add_number & 0x3f;
+ if (! rot)
+ break;
+ l = (rot < 0x20) ? "dsll" : "dsll32";
+ r = ((0x40 - rot) < 0x20) ? "dsrl" : "dsrl32";
+ rot &= 0x1f;
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, l,
+ "d,w,<", AT, sreg, rot);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, r,
+ "d,w,<", dreg, sreg, (0x20 - rot) & 0x1f);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
+ }
+ break;
+
case M_ROL_I:
- if (imm_expr.X_op != O_constant)
- as_bad (_("rotate count too large"));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "sll", "d,w,<",
- AT, sreg, (int) (imm_expr.X_add_number & 0x1f));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "srl", "d,w,<",
- dreg, sreg, (int) ((0 - imm_expr.X_add_number) & 0x1f));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or", "d,v,t",
- dreg, dreg, AT);
+ {
+ unsigned int rot;
+
+ if (imm_expr.X_op != O_constant)
+ as_bad (_("rotate count too large"));
+ rot = imm_expr.X_add_number & 0x1f;
+ if (! rot)
+ break;
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "sll",
+ "d,w,<", AT, sreg, rot);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "srl",
+ "d,w,<", dreg, sreg, (0x20 - rot) & 0x1f);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
+ }
+ break;
+
+ case M_DROR:
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsubu",
+ "d,v,t", AT, 0, treg);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsllv",
+ "d,t,s", AT, sreg, AT);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsrlv",
+ "d,t,s", dreg, sreg, treg);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
break;
case M_ROR:
@@ -6719,15 +6770,44 @@ macro2 (ip)
"d,v,t", dreg, dreg, AT);
break;
+ case M_DROR_I:
+ {
+ unsigned int rot;
+ char *l, *r;
+
+ if (imm_expr.X_op != O_constant)
+ as_bad (_("rotate count too large"));
+ rot = imm_expr.X_add_number & 0x3f;
+ if (! rot)
+ break;
+ r = (rot < 0x20) ? "dsrl" : "dsrl32";
+ l = ((0x40 - rot) < 0x20) ? "dsll" : "dsll32";
+ rot &= 0x1f;
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, r,
+ "d,w,<", AT, sreg, rot);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, l,
+ "d,w,<", dreg, sreg, (0x20 - rot) & 0x1f);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
+ }
+ break;
+
case M_ROR_I:
- if (imm_expr.X_op != O_constant)
- as_bad (_("rotate count too large"));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "srl", "d,w,<",
- AT, sreg, (int) (imm_expr.X_add_number & 0x1f));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "sll", "d,w,<",
- dreg, sreg, (int) ((0 - imm_expr.X_add_number) & 0x1f));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or", "d,v,t",
- dreg, dreg, AT);
+ {
+ unsigned int rot;
+
+ if (imm_expr.X_op != O_constant)
+ as_bad (_("rotate count too large"));
+ rot = imm_expr.X_add_number & 0x1f;
+ if (! rot)
+ break;
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "srl",
+ "d,w,<", AT, sreg, rot);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "sll",
+ "d,w,<", dreg, sreg, (0x20 - rot) & 0x1f);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
+ }
break;
case M_S_DOB:
Index: gas/testsuite/ChangeLog
===================================================================
RCS file: /cvs/src/src/gas/testsuite/ChangeLog,v
retrieving revision 1.315
diff -u -p -r1.315 ChangeLog
--- gas/testsuite/ChangeLog 20 May 2002 17:05:34 -0000 1.315
+++ gas/testsuite/ChangeLog 21 May 2002 23:32:54 -0000
@@ -1,3 +1,9 @@
+2002-05-22 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+ * gas/mips/rol64.s: New file, test of drol, dror macros.
+ * gas/mips/rol64.d: Likewise.
+ * gas/mips/mips.exp: Add new test.
+
2002-05-20 Nick Clifton <nickc@cambridge.redhat.com>
* gas/arm/arm.exp: Replace deprecated command line switches
Index: gas/testsuite/gas/mips/mips.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/mips/mips.exp,v
retrieving revision 1.32
diff -u -p -r1.32 mips.exp
--- gas/testsuite/gas/mips/mips.exp 4 Apr 2002 08:23:30 -0000 1.32
+++ gas/testsuite/gas/mips/mips.exp 21 May 2002 23:32:54 -0000
@@ -122,6 +122,7 @@ if { [istarget mips*-*-*] } then {
run_dump_test "mul"
}
run_dump_test "rol"
+ run_dump_test "rol64"
if !$aout { run_dump_test "sb" }
run_dump_test "trunc"
if !$aout { run_dump_test "ulh" }
Index: include/opcode/ChangeLog
===================================================================
RCS file: /cvs/src/src/include/opcode/ChangeLog,v
retrieving revision 1.167
diff -u -p -r1.167 ChangeLog
--- include/opcode/ChangeLog 17 May 2002 19:01:03 -0000 1.167
+++ include/opcode/ChangeLog 21 May 2002 23:32:57 -0000
@@ -1,3 +1,7 @@
+2002-05-22 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+ * mips.h: Add M_DROL, M_DROL_I, M_DROR, M_DROR_I macro cases.
+
2002-05-17 Andrey Volkov <avolkov@sources.redhat.com>
* h8300.h: Corrected defs of all control regs
Index: include/opcode/mips.h
===================================================================
RCS file: /cvs/src/src/include/opcode/mips.h,v
retrieving revision 1.24
diff -u -p -r1.24 mips.h
--- include/opcode/mips.h 16 Mar 2002 03:09:18 -0000 1.24
+++ include/opcode/mips.h 21 May 2002 23:32:57 -0000
@@ -526,9 +526,13 @@ enum
M_REM_3I,
M_REMU_3,
M_REMU_3I,
+ M_DROL,
M_ROL,
+ M_DROL_I,
M_ROL_I,
+ M_DROR,
M_ROR,
+ M_DROR_I,
M_ROR_I,
M_S_DA,
M_S_DOB,
Index: opcodes/ChangeLog
===================================================================
RCS file: /cvs/src/src/opcodes/ChangeLog,v
retrieving revision 1.447
diff -u -p -r1.447 ChangeLog
--- opcodes/ChangeLog 17 May 2002 14:36:45 -0000 1.447
+++ opcodes/ChangeLog 21 May 2002 23:33:00 -0000
@@ -1,3 +1,7 @@
+2002-05-22 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+ * mips-opc.c (mips_builtin_opcodes): Add drol, dror macros.
+
Fri May 17 14:26:44 2002 J"orn Rennecke <joern.rennecke@superh.com>
* disassemble.c (disassembler): Just use print_insn_sh for bfd_arch_sh.
Index: opcodes/mips-opc.c
===================================================================
RCS file: /cvs/src/src/opcodes/mips-opc.c,v
retrieving revision 1.32
diff -u -p -r1.32 mips-opc.c
--- opcodes/mips-opc.c 17 Mar 2002 02:42:25 -0000 1.32
+++ opcodes/mips-opc.c 21 May 2002 23:33:00 -0000
@@ -492,6 +492,10 @@ const struct mips_opcode mips_builtin_op
{"dremu", "z,s,t", 0x0000001f, 0xfc00ffff, RD_s|RD_t|WR_HILO, I3 },
{"dremu", "d,v,t", 3, (int) M_DREMU_3, INSN_MACRO, I3 },
{"dremu", "d,v,I", 3, (int) M_DREMU_3I, INSN_MACRO, I3 },
+{"drol", "d,v,t", 0, (int) M_DROL, INSN_MACRO, I3 },
+{"drol", "d,v,I", 0, (int) M_DROL_I, INSN_MACRO, I3 },
+{"dror", "d,v,t", 0, (int) M_DROR, INSN_MACRO, I3 },
+{"dror", "d,v,I", 0, (int) M_DROR_I, INSN_MACRO, I3 },
{"dsllv", "d,t,s", 0x00000014, 0xfc0007ff, WR_d|RD_t|RD_s, I3 },
{"dsll32", "d,w,<", 0x0000003c, 0xffe0003f, WR_d|RD_t, I3 },
{"dsll", "d,w,s", 0x00000014, 0xfc0007ff, WR_d|RD_t|RD_s, I3 }, /* dsllv */
2002-05-22 07:54:46 +08:00
|
|
|
|
M_DROL_I,
|
2000-12-02 05:35:38 +08:00
|
|
|
|
M_ROL_I,
|
? gas/testsuite/gas/mips/rol64.d
? gas/testsuite/gas/mips/rol64.s
Index: gas/ChangeLog
===================================================================
RCS file: /cvs/src/src/gas/ChangeLog,v
retrieving revision 1.1334
diff -u -p -r1.1334 ChangeLog
--- gas/ChangeLog 21 May 2002 20:01:51 -0000 1.1334
+++ gas/ChangeLog 21 May 2002 23:32:51 -0000
@@ -1,3 +1,8 @@
+2002-05-22 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+ * config/tc-mips.c (macro2): Add 64 bit drol, dror macros.
+ Optimize the rotate by zero case.
+
2002-05-21 Nick Clifton <nickc@cambridge.redhat.com>
* configure.in: Remove accidental enabling of bfd_gas=yes for
Index: gas/config/tc-mips.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-mips.c,v
retrieving revision 1.123
diff -u -p -r1.123 tc-mips.c
--- gas/config/tc-mips.c 14 May 2002 23:35:59 -0000 1.123
+++ gas/config/tc-mips.c 21 May 2002 23:32:52 -0000
@@ -6686,6 +6686,17 @@ macro2 (ip)
--mips_opts.noreorder;
break;
+ case M_DROL:
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsubu",
+ "d,v,t", AT, 0, treg);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsrlv",
+ "d,t,s", AT, sreg, AT);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsllv",
+ "d,t,s", dreg, sreg, treg);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
+ break;
+
case M_ROL:
macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "subu",
"d,v,t", AT, 0, treg);
@@ -6697,15 +6708,55 @@ macro2 (ip)
"d,v,t", dreg, dreg, AT);
break;
+ case M_DROL_I:
+ {
+ unsigned int rot;
+ char *l, *r;
+
+ if (imm_expr.X_op != O_constant)
+ as_bad (_("rotate count too large"));
+ rot = imm_expr.X_add_number & 0x3f;
+ if (! rot)
+ break;
+ l = (rot < 0x20) ? "dsll" : "dsll32";
+ r = ((0x40 - rot) < 0x20) ? "dsrl" : "dsrl32";
+ rot &= 0x1f;
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, l,
+ "d,w,<", AT, sreg, rot);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, r,
+ "d,w,<", dreg, sreg, (0x20 - rot) & 0x1f);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
+ }
+ break;
+
case M_ROL_I:
- if (imm_expr.X_op != O_constant)
- as_bad (_("rotate count too large"));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "sll", "d,w,<",
- AT, sreg, (int) (imm_expr.X_add_number & 0x1f));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "srl", "d,w,<",
- dreg, sreg, (int) ((0 - imm_expr.X_add_number) & 0x1f));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or", "d,v,t",
- dreg, dreg, AT);
+ {
+ unsigned int rot;
+
+ if (imm_expr.X_op != O_constant)
+ as_bad (_("rotate count too large"));
+ rot = imm_expr.X_add_number & 0x1f;
+ if (! rot)
+ break;
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "sll",
+ "d,w,<", AT, sreg, rot);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "srl",
+ "d,w,<", dreg, sreg, (0x20 - rot) & 0x1f);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
+ }
+ break;
+
+ case M_DROR:
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsubu",
+ "d,v,t", AT, 0, treg);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsllv",
+ "d,t,s", AT, sreg, AT);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsrlv",
+ "d,t,s", dreg, sreg, treg);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
break;
case M_ROR:
@@ -6719,15 +6770,44 @@ macro2 (ip)
"d,v,t", dreg, dreg, AT);
break;
+ case M_DROR_I:
+ {
+ unsigned int rot;
+ char *l, *r;
+
+ if (imm_expr.X_op != O_constant)
+ as_bad (_("rotate count too large"));
+ rot = imm_expr.X_add_number & 0x3f;
+ if (! rot)
+ break;
+ r = (rot < 0x20) ? "dsrl" : "dsrl32";
+ l = ((0x40 - rot) < 0x20) ? "dsll" : "dsll32";
+ rot &= 0x1f;
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, r,
+ "d,w,<", AT, sreg, rot);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, l,
+ "d,w,<", dreg, sreg, (0x20 - rot) & 0x1f);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
+ }
+ break;
+
case M_ROR_I:
- if (imm_expr.X_op != O_constant)
- as_bad (_("rotate count too large"));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "srl", "d,w,<",
- AT, sreg, (int) (imm_expr.X_add_number & 0x1f));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "sll", "d,w,<",
- dreg, sreg, (int) ((0 - imm_expr.X_add_number) & 0x1f));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or", "d,v,t",
- dreg, dreg, AT);
+ {
+ unsigned int rot;
+
+ if (imm_expr.X_op != O_constant)
+ as_bad (_("rotate count too large"));
+ rot = imm_expr.X_add_number & 0x1f;
+ if (! rot)
+ break;
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "srl",
+ "d,w,<", AT, sreg, rot);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "sll",
+ "d,w,<", dreg, sreg, (0x20 - rot) & 0x1f);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
+ }
break;
case M_S_DOB:
Index: gas/testsuite/ChangeLog
===================================================================
RCS file: /cvs/src/src/gas/testsuite/ChangeLog,v
retrieving revision 1.315
diff -u -p -r1.315 ChangeLog
--- gas/testsuite/ChangeLog 20 May 2002 17:05:34 -0000 1.315
+++ gas/testsuite/ChangeLog 21 May 2002 23:32:54 -0000
@@ -1,3 +1,9 @@
+2002-05-22 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+ * gas/mips/rol64.s: New file, test of drol, dror macros.
+ * gas/mips/rol64.d: Likewise.
+ * gas/mips/mips.exp: Add new test.
+
2002-05-20 Nick Clifton <nickc@cambridge.redhat.com>
* gas/arm/arm.exp: Replace deprecated command line switches
Index: gas/testsuite/gas/mips/mips.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/mips/mips.exp,v
retrieving revision 1.32
diff -u -p -r1.32 mips.exp
--- gas/testsuite/gas/mips/mips.exp 4 Apr 2002 08:23:30 -0000 1.32
+++ gas/testsuite/gas/mips/mips.exp 21 May 2002 23:32:54 -0000
@@ -122,6 +122,7 @@ if { [istarget mips*-*-*] } then {
run_dump_test "mul"
}
run_dump_test "rol"
+ run_dump_test "rol64"
if !$aout { run_dump_test "sb" }
run_dump_test "trunc"
if !$aout { run_dump_test "ulh" }
Index: include/opcode/ChangeLog
===================================================================
RCS file: /cvs/src/src/include/opcode/ChangeLog,v
retrieving revision 1.167
diff -u -p -r1.167 ChangeLog
--- include/opcode/ChangeLog 17 May 2002 19:01:03 -0000 1.167
+++ include/opcode/ChangeLog 21 May 2002 23:32:57 -0000
@@ -1,3 +1,7 @@
+2002-05-22 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+ * mips.h: Add M_DROL, M_DROL_I, M_DROR, M_DROR_I macro cases.
+
2002-05-17 Andrey Volkov <avolkov@sources.redhat.com>
* h8300.h: Corrected defs of all control regs
Index: include/opcode/mips.h
===================================================================
RCS file: /cvs/src/src/include/opcode/mips.h,v
retrieving revision 1.24
diff -u -p -r1.24 mips.h
--- include/opcode/mips.h 16 Mar 2002 03:09:18 -0000 1.24
+++ include/opcode/mips.h 21 May 2002 23:32:57 -0000
@@ -526,9 +526,13 @@ enum
M_REM_3I,
M_REMU_3,
M_REMU_3I,
+ M_DROL,
M_ROL,
+ M_DROL_I,
M_ROL_I,
+ M_DROR,
M_ROR,
+ M_DROR_I,
M_ROR_I,
M_S_DA,
M_S_DOB,
Index: opcodes/ChangeLog
===================================================================
RCS file: /cvs/src/src/opcodes/ChangeLog,v
retrieving revision 1.447
diff -u -p -r1.447 ChangeLog
--- opcodes/ChangeLog 17 May 2002 14:36:45 -0000 1.447
+++ opcodes/ChangeLog 21 May 2002 23:33:00 -0000
@@ -1,3 +1,7 @@
+2002-05-22 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+ * mips-opc.c (mips_builtin_opcodes): Add drol, dror macros.
+
Fri May 17 14:26:44 2002 J"orn Rennecke <joern.rennecke@superh.com>
* disassemble.c (disassembler): Just use print_insn_sh for bfd_arch_sh.
Index: opcodes/mips-opc.c
===================================================================
RCS file: /cvs/src/src/opcodes/mips-opc.c,v
retrieving revision 1.32
diff -u -p -r1.32 mips-opc.c
--- opcodes/mips-opc.c 17 Mar 2002 02:42:25 -0000 1.32
+++ opcodes/mips-opc.c 21 May 2002 23:33:00 -0000
@@ -492,6 +492,10 @@ const struct mips_opcode mips_builtin_op
{"dremu", "z,s,t", 0x0000001f, 0xfc00ffff, RD_s|RD_t|WR_HILO, I3 },
{"dremu", "d,v,t", 3, (int) M_DREMU_3, INSN_MACRO, I3 },
{"dremu", "d,v,I", 3, (int) M_DREMU_3I, INSN_MACRO, I3 },
+{"drol", "d,v,t", 0, (int) M_DROL, INSN_MACRO, I3 },
+{"drol", "d,v,I", 0, (int) M_DROL_I, INSN_MACRO, I3 },
+{"dror", "d,v,t", 0, (int) M_DROR, INSN_MACRO, I3 },
+{"dror", "d,v,I", 0, (int) M_DROR_I, INSN_MACRO, I3 },
{"dsllv", "d,t,s", 0x00000014, 0xfc0007ff, WR_d|RD_t|RD_s, I3 },
{"dsll32", "d,w,<", 0x0000003c, 0xffe0003f, WR_d|RD_t, I3 },
{"dsll", "d,w,s", 0x00000014, 0xfc0007ff, WR_d|RD_t|RD_s, I3 }, /* dsllv */
2002-05-22 07:54:46 +08:00
|
|
|
|
M_DROR,
|
2000-12-02 05:35:38 +08:00
|
|
|
|
M_ROR,
|
? gas/testsuite/gas/mips/rol64.d
? gas/testsuite/gas/mips/rol64.s
Index: gas/ChangeLog
===================================================================
RCS file: /cvs/src/src/gas/ChangeLog,v
retrieving revision 1.1334
diff -u -p -r1.1334 ChangeLog
--- gas/ChangeLog 21 May 2002 20:01:51 -0000 1.1334
+++ gas/ChangeLog 21 May 2002 23:32:51 -0000
@@ -1,3 +1,8 @@
+2002-05-22 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+ * config/tc-mips.c (macro2): Add 64 bit drol, dror macros.
+ Optimize the rotate by zero case.
+
2002-05-21 Nick Clifton <nickc@cambridge.redhat.com>
* configure.in: Remove accidental enabling of bfd_gas=yes for
Index: gas/config/tc-mips.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-mips.c,v
retrieving revision 1.123
diff -u -p -r1.123 tc-mips.c
--- gas/config/tc-mips.c 14 May 2002 23:35:59 -0000 1.123
+++ gas/config/tc-mips.c 21 May 2002 23:32:52 -0000
@@ -6686,6 +6686,17 @@ macro2 (ip)
--mips_opts.noreorder;
break;
+ case M_DROL:
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsubu",
+ "d,v,t", AT, 0, treg);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsrlv",
+ "d,t,s", AT, sreg, AT);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsllv",
+ "d,t,s", dreg, sreg, treg);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
+ break;
+
case M_ROL:
macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "subu",
"d,v,t", AT, 0, treg);
@@ -6697,15 +6708,55 @@ macro2 (ip)
"d,v,t", dreg, dreg, AT);
break;
+ case M_DROL_I:
+ {
+ unsigned int rot;
+ char *l, *r;
+
+ if (imm_expr.X_op != O_constant)
+ as_bad (_("rotate count too large"));
+ rot = imm_expr.X_add_number & 0x3f;
+ if (! rot)
+ break;
+ l = (rot < 0x20) ? "dsll" : "dsll32";
+ r = ((0x40 - rot) < 0x20) ? "dsrl" : "dsrl32";
+ rot &= 0x1f;
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, l,
+ "d,w,<", AT, sreg, rot);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, r,
+ "d,w,<", dreg, sreg, (0x20 - rot) & 0x1f);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
+ }
+ break;
+
case M_ROL_I:
- if (imm_expr.X_op != O_constant)
- as_bad (_("rotate count too large"));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "sll", "d,w,<",
- AT, sreg, (int) (imm_expr.X_add_number & 0x1f));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "srl", "d,w,<",
- dreg, sreg, (int) ((0 - imm_expr.X_add_number) & 0x1f));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or", "d,v,t",
- dreg, dreg, AT);
+ {
+ unsigned int rot;
+
+ if (imm_expr.X_op != O_constant)
+ as_bad (_("rotate count too large"));
+ rot = imm_expr.X_add_number & 0x1f;
+ if (! rot)
+ break;
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "sll",
+ "d,w,<", AT, sreg, rot);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "srl",
+ "d,w,<", dreg, sreg, (0x20 - rot) & 0x1f);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
+ }
+ break;
+
+ case M_DROR:
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsubu",
+ "d,v,t", AT, 0, treg);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsllv",
+ "d,t,s", AT, sreg, AT);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "dsrlv",
+ "d,t,s", dreg, sreg, treg);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
break;
case M_ROR:
@@ -6719,15 +6770,44 @@ macro2 (ip)
"d,v,t", dreg, dreg, AT);
break;
+ case M_DROR_I:
+ {
+ unsigned int rot;
+ char *l, *r;
+
+ if (imm_expr.X_op != O_constant)
+ as_bad (_("rotate count too large"));
+ rot = imm_expr.X_add_number & 0x3f;
+ if (! rot)
+ break;
+ r = (rot < 0x20) ? "dsrl" : "dsrl32";
+ l = ((0x40 - rot) < 0x20) ? "dsll" : "dsll32";
+ rot &= 0x1f;
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, r,
+ "d,w,<", AT, sreg, rot);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, l,
+ "d,w,<", dreg, sreg, (0x20 - rot) & 0x1f);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
+ }
+ break;
+
case M_ROR_I:
- if (imm_expr.X_op != O_constant)
- as_bad (_("rotate count too large"));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "srl", "d,w,<",
- AT, sreg, (int) (imm_expr.X_add_number & 0x1f));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "sll", "d,w,<",
- dreg, sreg, (int) ((0 - imm_expr.X_add_number) & 0x1f));
- macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or", "d,v,t",
- dreg, dreg, AT);
+ {
+ unsigned int rot;
+
+ if (imm_expr.X_op != O_constant)
+ as_bad (_("rotate count too large"));
+ rot = imm_expr.X_add_number & 0x1f;
+ if (! rot)
+ break;
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "srl",
+ "d,w,<", AT, sreg, rot);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "sll",
+ "d,w,<", dreg, sreg, (0x20 - rot) & 0x1f);
+ macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "or",
+ "d,v,t", dreg, dreg, AT);
+ }
break;
case M_S_DOB:
Index: gas/testsuite/ChangeLog
===================================================================
RCS file: /cvs/src/src/gas/testsuite/ChangeLog,v
retrieving revision 1.315
diff -u -p -r1.315 ChangeLog
--- gas/testsuite/ChangeLog 20 May 2002 17:05:34 -0000 1.315
+++ gas/testsuite/ChangeLog 21 May 2002 23:32:54 -0000
@@ -1,3 +1,9 @@
+2002-05-22 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+ * gas/mips/rol64.s: New file, test of drol, dror macros.
+ * gas/mips/rol64.d: Likewise.
+ * gas/mips/mips.exp: Add new test.
+
2002-05-20 Nick Clifton <nickc@cambridge.redhat.com>
* gas/arm/arm.exp: Replace deprecated command line switches
Index: gas/testsuite/gas/mips/mips.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/mips/mips.exp,v
retrieving revision 1.32
diff -u -p -r1.32 mips.exp
--- gas/testsuite/gas/mips/mips.exp 4 Apr 2002 08:23:30 -0000 1.32
+++ gas/testsuite/gas/mips/mips.exp 21 May 2002 23:32:54 -0000
@@ -122,6 +122,7 @@ if { [istarget mips*-*-*] } then {
run_dump_test "mul"
}
run_dump_test "rol"
+ run_dump_test "rol64"
if !$aout { run_dump_test "sb" }
run_dump_test "trunc"
if !$aout { run_dump_test "ulh" }
Index: include/opcode/ChangeLog
===================================================================
RCS file: /cvs/src/src/include/opcode/ChangeLog,v
retrieving revision 1.167
diff -u -p -r1.167 ChangeLog
--- include/opcode/ChangeLog 17 May 2002 19:01:03 -0000 1.167
+++ include/opcode/ChangeLog 21 May 2002 23:32:57 -0000
@@ -1,3 +1,7 @@
+2002-05-22 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+ * mips.h: Add M_DROL, M_DROL_I, M_DROR, M_DROR_I macro cases.
+
2002-05-17 Andrey Volkov <avolkov@sources.redhat.com>
* h8300.h: Corrected defs of all control regs
Index: include/opcode/mips.h
===================================================================
RCS file: /cvs/src/src/include/opcode/mips.h,v
retrieving revision 1.24
diff -u -p -r1.24 mips.h
--- include/opcode/mips.h 16 Mar 2002 03:09:18 -0000 1.24
+++ include/opcode/mips.h 21 May 2002 23:32:57 -0000
@@ -526,9 +526,13 @@ enum
M_REM_3I,
M_REMU_3,
M_REMU_3I,
+ M_DROL,
M_ROL,
+ M_DROL_I,
M_ROL_I,
+ M_DROR,
M_ROR,
+ M_DROR_I,
M_ROR_I,
M_S_DA,
M_S_DOB,
Index: opcodes/ChangeLog
===================================================================
RCS file: /cvs/src/src/opcodes/ChangeLog,v
retrieving revision 1.447
diff -u -p -r1.447 ChangeLog
--- opcodes/ChangeLog 17 May 2002 14:36:45 -0000 1.447
+++ opcodes/ChangeLog 21 May 2002 23:33:00 -0000
@@ -1,3 +1,7 @@
+2002-05-22 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+ * mips-opc.c (mips_builtin_opcodes): Add drol, dror macros.
+
Fri May 17 14:26:44 2002 J"orn Rennecke <joern.rennecke@superh.com>
* disassemble.c (disassembler): Just use print_insn_sh for bfd_arch_sh.
Index: opcodes/mips-opc.c
===================================================================
RCS file: /cvs/src/src/opcodes/mips-opc.c,v
retrieving revision 1.32
diff -u -p -r1.32 mips-opc.c
--- opcodes/mips-opc.c 17 Mar 2002 02:42:25 -0000 1.32
+++ opcodes/mips-opc.c 21 May 2002 23:33:00 -0000
@@ -492,6 +492,10 @@ const struct mips_opcode mips_builtin_op
{"dremu", "z,s,t", 0x0000001f, 0xfc00ffff, RD_s|RD_t|WR_HILO, I3 },
{"dremu", "d,v,t", 3, (int) M_DREMU_3, INSN_MACRO, I3 },
{"dremu", "d,v,I", 3, (int) M_DREMU_3I, INSN_MACRO, I3 },
+{"drol", "d,v,t", 0, (int) M_DROL, INSN_MACRO, I3 },
+{"drol", "d,v,I", 0, (int) M_DROL_I, INSN_MACRO, I3 },
+{"dror", "d,v,t", 0, (int) M_DROR, INSN_MACRO, I3 },
+{"dror", "d,v,I", 0, (int) M_DROR_I, INSN_MACRO, I3 },
{"dsllv", "d,t,s", 0x00000014, 0xfc0007ff, WR_d|RD_t|RD_s, I3 },
{"dsll32", "d,w,<", 0x0000003c, 0xffe0003f, WR_d|RD_t, I3 },
{"dsll", "d,w,s", 0x00000014, 0xfc0007ff, WR_d|RD_t|RD_s, I3 }, /* dsllv */
2002-05-22 07:54:46 +08:00
|
|
|
|
M_DROR_I,
|
2000-12-02 05:35:38 +08:00
|
|
|
|
M_ROR_I,
|
|
|
|
|
M_S_DA,
|
|
|
|
|
M_S_DOB,
|
|
|
|
|
M_S_DAB,
|
|
|
|
|
M_S_S,
|
|
|
|
|
M_SC_AB,
|
|
|
|
|
M_SCD_AB,
|
|
|
|
|
M_SD_A,
|
|
|
|
|
M_SD_OB,
|
|
|
|
|
M_SD_AB,
|
|
|
|
|
M_SDC1_AB,
|
|
|
|
|
M_SDC2_AB,
|
|
|
|
|
M_SDC3_AB,
|
|
|
|
|
M_SDL_AB,
|
|
|
|
|
M_SDR_AB,
|
|
|
|
|
M_SEQ,
|
|
|
|
|
M_SEQ_I,
|
|
|
|
|
M_SGE,
|
|
|
|
|
M_SGE_I,
|
|
|
|
|
M_SGEU,
|
|
|
|
|
M_SGEU_I,
|
|
|
|
|
M_SGT,
|
|
|
|
|
M_SGT_I,
|
|
|
|
|
M_SGTU,
|
|
|
|
|
M_SGTU_I,
|
|
|
|
|
M_SLE,
|
|
|
|
|
M_SLE_I,
|
|
|
|
|
M_SLEU,
|
|
|
|
|
M_SLEU_I,
|
|
|
|
|
M_SLT_I,
|
|
|
|
|
M_SLTU_I,
|
|
|
|
|
M_SNE,
|
|
|
|
|
M_SNE_I,
|
|
|
|
|
M_SB_A,
|
|
|
|
|
M_SB_AB,
|
|
|
|
|
M_SH_A,
|
|
|
|
|
M_SH_AB,
|
|
|
|
|
M_SW_A,
|
|
|
|
|
M_SW_AB,
|
|
|
|
|
M_SWC0_A,
|
|
|
|
|
M_SWC0_AB,
|
|
|
|
|
M_SWC1_A,
|
|
|
|
|
M_SWC1_AB,
|
|
|
|
|
M_SWC2_A,
|
|
|
|
|
M_SWC2_AB,
|
|
|
|
|
M_SWC3_A,
|
|
|
|
|
M_SWC3_AB,
|
|
|
|
|
M_SWL_A,
|
|
|
|
|
M_SWL_AB,
|
|
|
|
|
M_SWR_A,
|
|
|
|
|
M_SWR_AB,
|
|
|
|
|
M_SUB_I,
|
|
|
|
|
M_SUBU_I,
|
|
|
|
|
M_SUBU_I_2,
|
|
|
|
|
M_TEQ_I,
|
|
|
|
|
M_TGE_I,
|
|
|
|
|
M_TGEU_I,
|
|
|
|
|
M_TLT_I,
|
|
|
|
|
M_TLTU_I,
|
|
|
|
|
M_TNE_I,
|
|
|
|
|
M_TRUNCWD,
|
|
|
|
|
M_TRUNCWS,
|
|
|
|
|
M_ULD,
|
|
|
|
|
M_ULD_A,
|
|
|
|
|
M_ULH,
|
|
|
|
|
M_ULH_A,
|
|
|
|
|
M_ULHU,
|
|
|
|
|
M_ULHU_A,
|
|
|
|
|
M_ULW,
|
|
|
|
|
M_ULW_A,
|
|
|
|
|
M_USH,
|
|
|
|
|
M_USH_A,
|
|
|
|
|
M_USW,
|
|
|
|
|
M_USW_A,
|
|
|
|
|
M_USD,
|
|
|
|
|
M_USD_A,
|
|
|
|
|
M_XOR_I,
|
|
|
|
|
M_COP0,
|
|
|
|
|
M_COP1,
|
|
|
|
|
M_COP2,
|
|
|
|
|
M_COP3,
|
|
|
|
|
M_NUM_MACROS
|
1999-05-03 15:29:06 +08:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* The order of overloaded instructions matters. Label arguments and
|
|
|
|
|
register arguments look the same. Instructions that can have either
|
|
|
|
|
for arguments must apear in the correct order in this table for the
|
|
|
|
|
assembler to pick the right one. In other words, entries with
|
|
|
|
|
immediate operands must apear after the same instruction with
|
|
|
|
|
registers.
|
|
|
|
|
|
|
|
|
|
Many instructions are short hand for other instructions (i.e., The
|
|
|
|
|
jal <register> instruction is short for jalr <register>). */
|
|
|
|
|
|
|
|
|
|
extern const struct mips_opcode mips_builtin_opcodes[];
|
|
|
|
|
extern const int bfd_mips_num_builtin_opcodes;
|
|
|
|
|
extern struct mips_opcode *mips_opcodes;
|
|
|
|
|
extern int bfd_mips_num_opcodes;
|
|
|
|
|
#define NUMOPCODES bfd_mips_num_opcodes
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* The rest of this file adds definitions for the mips16 TinyRISC
|
|
|
|
|
processor. */
|
|
|
|
|
|
|
|
|
|
/* These are the bitmasks and shift counts used for the different
|
|
|
|
|
fields in the instruction formats. Other than OP, no masks are
|
|
|
|
|
provided for the fixed portions of an instruction, since they are
|
|
|
|
|
not needed.
|
|
|
|
|
|
|
|
|
|
The I format uses IMM11.
|
|
|
|
|
|
|
|
|
|
The RI format uses RX and IMM8.
|
|
|
|
|
|
|
|
|
|
The RR format uses RX, and RY.
|
|
|
|
|
|
|
|
|
|
The RRI format uses RX, RY, and IMM5.
|
|
|
|
|
|
|
|
|
|
The RRR format uses RX, RY, and RZ.
|
|
|
|
|
|
|
|
|
|
The RRI_A format uses RX, RY, and IMM4.
|
|
|
|
|
|
|
|
|
|
The SHIFT format uses RX, RY, and SHAMT.
|
|
|
|
|
|
|
|
|
|
The I8 format uses IMM8.
|
|
|
|
|
|
|
|
|
|
The I8_MOVR32 format uses RY and REGR32.
|
|
|
|
|
|
|
|
|
|
The IR_MOV32R format uses REG32R and MOV32Z.
|
|
|
|
|
|
|
|
|
|
The I64 format uses IMM8.
|
|
|
|
|
|
|
|
|
|
The RI64 format uses RY and IMM5.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#define MIPS16OP_MASK_OP 0x1f
|
|
|
|
|
#define MIPS16OP_SH_OP 11
|
|
|
|
|
#define MIPS16OP_MASK_IMM11 0x7ff
|
|
|
|
|
#define MIPS16OP_SH_IMM11 0
|
|
|
|
|
#define MIPS16OP_MASK_RX 0x7
|
|
|
|
|
#define MIPS16OP_SH_RX 8
|
|
|
|
|
#define MIPS16OP_MASK_IMM8 0xff
|
|
|
|
|
#define MIPS16OP_SH_IMM8 0
|
|
|
|
|
#define MIPS16OP_MASK_RY 0x7
|
|
|
|
|
#define MIPS16OP_SH_RY 5
|
|
|
|
|
#define MIPS16OP_MASK_IMM5 0x1f
|
|
|
|
|
#define MIPS16OP_SH_IMM5 0
|
|
|
|
|
#define MIPS16OP_MASK_RZ 0x7
|
|
|
|
|
#define MIPS16OP_SH_RZ 2
|
|
|
|
|
#define MIPS16OP_MASK_IMM4 0xf
|
|
|
|
|
#define MIPS16OP_SH_IMM4 0
|
|
|
|
|
#define MIPS16OP_MASK_REGR32 0x1f
|
|
|
|
|
#define MIPS16OP_SH_REGR32 0
|
|
|
|
|
#define MIPS16OP_MASK_REG32R 0x1f
|
|
|
|
|
#define MIPS16OP_SH_REG32R 3
|
|
|
|
|
#define MIPS16OP_EXTRACT_REG32R(i) ((((i) >> 5) & 7) | ((i) & 0x18))
|
|
|
|
|
#define MIPS16OP_MASK_MOVE32Z 0x7
|
|
|
|
|
#define MIPS16OP_SH_MOVE32Z 0
|
|
|
|
|
#define MIPS16OP_MASK_IMM6 0x3f
|
|
|
|
|
#define MIPS16OP_SH_IMM6 5
|
|
|
|
|
|
|
|
|
|
/* These are the characters which may appears in the args field of an
|
|
|
|
|
instruction. They appear in the order in which the fields appear
|
|
|
|
|
when the instruction is used. Commas and parentheses in the args
|
|
|
|
|
string are ignored when assembling, and written into the output
|
|
|
|
|
when disassembling.
|
|
|
|
|
|
|
|
|
|
"y" 3 bit register (MIPS16OP_*_RY)
|
|
|
|
|
"x" 3 bit register (MIPS16OP_*_RX)
|
|
|
|
|
"z" 3 bit register (MIPS16OP_*_RZ)
|
|
|
|
|
"Z" 3 bit register (MIPS16OP_*_MOVE32Z)
|
|
|
|
|
"v" 3 bit same register as source and destination (MIPS16OP_*_RX)
|
|
|
|
|
"w" 3 bit same register as source and destination (MIPS16OP_*_RY)
|
|
|
|
|
"0" zero register ($0)
|
|
|
|
|
"S" stack pointer ($sp or $29)
|
|
|
|
|
"P" program counter
|
|
|
|
|
"R" return address register ($ra or $31)
|
|
|
|
|
"X" 5 bit MIPS register (MIPS16OP_*_REGR32)
|
|
|
|
|
"Y" 5 bit MIPS register (MIPS16OP_*_REG32R)
|
|
|
|
|
"6" 6 bit unsigned break code (MIPS16OP_*_IMM6)
|
|
|
|
|
"a" 26 bit jump address
|
|
|
|
|
"e" 11 bit extension value
|
|
|
|
|
"l" register list for entry instruction
|
|
|
|
|
"L" register list for exit instruction
|
|
|
|
|
|
|
|
|
|
The remaining codes may be extended. Except as otherwise noted,
|
|
|
|
|
the full extended operand is a 16 bit signed value.
|
|
|
|
|
"<" 3 bit unsigned shift count * 0 (MIPS16OP_*_RZ) (full 5 bit unsigned)
|
|
|
|
|
">" 3 bit unsigned shift count * 0 (MIPS16OP_*_RX) (full 5 bit unsigned)
|
|
|
|
|
"[" 3 bit unsigned shift count * 0 (MIPS16OP_*_RZ) (full 6 bit unsigned)
|
|
|
|
|
"]" 3 bit unsigned shift count * 0 (MIPS16OP_*_RX) (full 6 bit unsigned)
|
|
|
|
|
"4" 4 bit signed immediate * 0 (MIPS16OP_*_IMM4) (full 15 bit signed)
|
|
|
|
|
"5" 5 bit unsigned immediate * 0 (MIPS16OP_*_IMM5)
|
|
|
|
|
"H" 5 bit unsigned immediate * 2 (MIPS16OP_*_IMM5)
|
|
|
|
|
"W" 5 bit unsigned immediate * 4 (MIPS16OP_*_IMM5)
|
|
|
|
|
"D" 5 bit unsigned immediate * 8 (MIPS16OP_*_IMM5)
|
|
|
|
|
"j" 5 bit signed immediate * 0 (MIPS16OP_*_IMM5)
|
|
|
|
|
"8" 8 bit unsigned immediate * 0 (MIPS16OP_*_IMM8)
|
|
|
|
|
"V" 8 bit unsigned immediate * 4 (MIPS16OP_*_IMM8)
|
|
|
|
|
"C" 8 bit unsigned immediate * 8 (MIPS16OP_*_IMM8)
|
|
|
|
|
"U" 8 bit unsigned immediate * 0 (MIPS16OP_*_IMM8) (full 16 bit unsigned)
|
|
|
|
|
"k" 8 bit signed immediate * 0 (MIPS16OP_*_IMM8)
|
|
|
|
|
"K" 8 bit signed immediate * 8 (MIPS16OP_*_IMM8)
|
|
|
|
|
"p" 8 bit conditional branch address (MIPS16OP_*_IMM8)
|
|
|
|
|
"q" 11 bit branch address (MIPS16OP_*_IMM11)
|
|
|
|
|
"A" 8 bit PC relative address * 4 (MIPS16OP_*_IMM8)
|
|
|
|
|
"B" 5 bit PC relative address * 8 (MIPS16OP_*_IMM5)
|
|
|
|
|
"E" 5 bit PC relative address * 4 (MIPS16OP_*_IMM5)
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/* For the mips16, we use the same opcode table format and a few of
|
|
|
|
|
the same flags. However, most of the flags are different. */
|
|
|
|
|
|
|
|
|
|
/* Modifies the register in MIPS16OP_*_RX. */
|
|
|
|
|
#define MIPS16_INSN_WRITE_X 0x00000001
|
|
|
|
|
/* Modifies the register in MIPS16OP_*_RY. */
|
|
|
|
|
#define MIPS16_INSN_WRITE_Y 0x00000002
|
|
|
|
|
/* Modifies the register in MIPS16OP_*_RZ. */
|
|
|
|
|
#define MIPS16_INSN_WRITE_Z 0x00000004
|
|
|
|
|
/* Modifies the T ($24) register. */
|
|
|
|
|
#define MIPS16_INSN_WRITE_T 0x00000008
|
|
|
|
|
/* Modifies the SP ($29) register. */
|
|
|
|
|
#define MIPS16_INSN_WRITE_SP 0x00000010
|
|
|
|
|
/* Modifies the RA ($31) register. */
|
|
|
|
|
#define MIPS16_INSN_WRITE_31 0x00000020
|
|
|
|
|
/* Modifies the general purpose register in MIPS16OP_*_REG32R. */
|
|
|
|
|
#define MIPS16_INSN_WRITE_GPR_Y 0x00000040
|
|
|
|
|
/* Reads the register in MIPS16OP_*_RX. */
|
|
|
|
|
#define MIPS16_INSN_READ_X 0x00000080
|
|
|
|
|
/* Reads the register in MIPS16OP_*_RY. */
|
|
|
|
|
#define MIPS16_INSN_READ_Y 0x00000100
|
|
|
|
|
/* Reads the register in MIPS16OP_*_MOVE32Z. */
|
|
|
|
|
#define MIPS16_INSN_READ_Z 0x00000200
|
|
|
|
|
/* Reads the T ($24) register. */
|
|
|
|
|
#define MIPS16_INSN_READ_T 0x00000400
|
|
|
|
|
/* Reads the SP ($29) register. */
|
|
|
|
|
#define MIPS16_INSN_READ_SP 0x00000800
|
|
|
|
|
/* Reads the RA ($31) register. */
|
|
|
|
|
#define MIPS16_INSN_READ_31 0x00001000
|
|
|
|
|
/* Reads the program counter. */
|
|
|
|
|
#define MIPS16_INSN_READ_PC 0x00002000
|
|
|
|
|
/* Reads the general purpose register in MIPS16OP_*_REGR32. */
|
|
|
|
|
#define MIPS16_INSN_READ_GPR_X 0x00004000
|
|
|
|
|
/* Is a branch insn. */
|
|
|
|
|
#define MIPS16_INSN_BRANCH 0x00010000
|
|
|
|
|
|
|
|
|
|
/* The following flags have the same value for the mips16 opcode
|
|
|
|
|
table:
|
|
|
|
|
INSN_UNCOND_BRANCH_DELAY
|
|
|
|
|
INSN_COND_BRANCH_DELAY
|
|
|
|
|
INSN_COND_BRANCH_LIKELY (never used)
|
|
|
|
|
INSN_READ_HI
|
|
|
|
|
INSN_READ_LO
|
|
|
|
|
INSN_WRITE_HI
|
|
|
|
|
INSN_WRITE_LO
|
|
|
|
|
INSN_TRAP
|
|
|
|
|
INSN_ISA3
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
extern const struct mips_opcode mips16_opcodes[];
|
|
|
|
|
extern const int bfd_mips16_num_opcodes;
|
|
|
|
|
|
|
|
|
|
#endif /* _MIPS_H_ */
|