MBTumbl: Update ITxxx instructions to new format, add some macros that were disabled

[fpga/lx-cpu1/binutils-tumbl.git] / opcodes / microblaze-opcm.h

diff --git a/opcodes/microblaze-opcm.h b/opcodes/microblaze-opcm.h
index 04688595e3d8a2c3d0a50c613c6e5b0a2d002e33..b1ec3ae34ffa1ebe4a799afb3dca818125b944bd 100644 (file)
--- a/opcodes/microblaze-opcm.h
+++ b/opcodes/microblaze-opcm.h
@@ -27,14 +27,15 @@
 
 enum microblaze_instr
 {
-  add, rsub, addc, rsubc, addk, rsubk, addkc, rsubkc, cmp, cmpu, cmpi,
+  add, rsub, addc, rsubc, addk, rsubk, addkc, rsubkc, cmp, cmpu, cmpi, cmpui,
   addi, rsubi, addic, rsubic, addik, rsubik, addikc, rsubikc, mul, muli,
   bsll, bsra, bsrl, bslli, bsrai, bsrli, or, and, xor,
   andn, sra, src, srl, sext8, sext16, mts, mfs, br, brd, brl,
   bra, bral, beq, bne, blt, ble, bgt, bge, ori, andi, xori, andni,
   imm, rts, rti, bri, brli, brai, brali, beqi, bnei, blti, blei, bgti,
   bgei, lbu, lhu, lw, lwx, sb, sh, sw, swx, lbui, lhui, lwi,
-  sbi, shi, swi, halt, it, itt, ite,
+  sbi, shi, swi, halt, it, itt, ite, itu, ittu, iteu, iti, itti, itei,
+  itui, ittui, iteui,
   invalid_inst
 };
 
@@ -85,8 +86,7 @@ enum microblaze_instr_type
 #ifndef ARCH_mbtumbl
   anyware_inst,
 #else
-  halt_inst,
-  pseudo_inst
+  halt_inst
 #endif
 };
 
@@ -145,24 +145,15 @@ enum microblaze_instr_type
 
 /* Tumbl conditions for it, itt, ite */
 
-#define COND_ALL 0
-#define COND_EQ  1
-#define COND_NE  2
-#define COND_LT  3
-#define COND_LE  4
-#define COND_GT  5
-#define COND_GE  6
+#define COND_EQ  0
+#define COND_NE  1
+#define COND_LT  2
+#define COND_LE  3
+#define COND_GT  4
+#define COND_GE  5
 
-#define COND_LOW  0
-#define COND_MASK 0x7
-
-#define COND_TYPE_MASK 0x18
-#define COND_TYPE_LOW  3
-
-#define COND_TYPE_ALL 0
-#define COND_TYPE_IT  1
-#define COND_TYPE_ITT 2
-#define COND_TYPE_ITE 3
+#define COND_LOW  21
+#define COND_MASK 0x00E00000
 
 #endif