include/opcode/

2011-07-24  Maciej W. Rozycki  <macro@codesourcery.com>

	* mips.h (INSN_TRAP): Rename to...
	(INSN_NO_DELAY_SLOT): ... this.
	(INSN_SYNC): Remove macro.

gas/
2011-07-24  Maciej W. Rozycki  <macro@codesourcery.com>

	* config/tc-mips.c (can_swap_branch_p): Adjust for the rename of
	INSN_TRAP to INSN_NO_DELAY_SLOT.  Remove the check for INSN_SYNC
	as well as explicit checks for ERET and DERET when scheduling
	branch delay slots.

opcodes/
2011-07-24  Maciej W. Rozycki  <macro@codesourcery.com>

	* mips-opc.c (NODS): New macro.
	(TRAP): Adjust for the rename of INSN_TRAP to INSN_NO_DELAY_SLOT.
	(DSP_VOLA): Likewise.
	(mips_builtin_opcodes): Add NODS annotation to "deret" and
	"eret". Replace INSN_SYNC with NODS throughout.  Use NODS in
	place of TRAP for "wait", "waiti" and "yield".
	* mips16-opc.c (NODS): New macro.
	(TRAP): Adjust for the rename of INSN_TRAP to INSN_NO_DELAY_SLOT.
	(mips16_opcodes):  Use NODS in place of TRAP for "jalrc", "jrc",
	"restore" and "save".

diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 5e30fbcd48959da87f1caa78bb00b65d77fa15fb..7f4cdab11429e7bff8b47f37af062f964c01d267 100644 (file)
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-24  Maciej W. Rozycki  <macro@codesourcery.com>
+
+       * mips.h (INSN_TRAP): Rename to...
+       (INSN_NO_DELAY_SLOT): ... this.
+       (INSN_SYNC): Remove macro.
+
 2011-07-01  Eric B. Weddington  <eric.weddington@atmel.com>
 
        * avr.h (AVR_ISA_AVR6): Remove AVR_ISA_SPMX as it was actually

diff --git a/include/opcode/mips.h b/include/opcode/mips.h
index 0685baba09dd1bb22044f9ab4b61a3f334151228..72a478c47ad64b9e9cfdd869c29ae7770967a9d1 100644 (file)
--- a/include/opcode/mips.h
+++ b/include/opcode/mips.h
@@ -489,8 +489,9 @@ struct mips_opcode
 #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
+/* Not to be placed in a branch delay slot, either architecturally
+   or for ease of handling (such as with instructions that take a trap).  */
+#define INSN_NO_DELAY_SLOT         0x04000000
 /* Instruction stores value into memory.  */
 #define INSN_STORE_MEMORY          0x08000000
 /* Instruction uses single precision floating point.  */
@@ -499,8 +500,6 @@ struct mips_opcode
 #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
 /* Instruction is actually a macro.  It should be ignored by the
    disassembler, and requires special treatment by the assembler.  */
 #define INSN_MACRO                  0xffffffff