[opcodes,pk,sim,xcc] great renumbering of 2011, part deux

1 files changed, 151 insertions, 155 deletions

diff --git a/pk/riscv-opc.h b/pk/riscv-opc.h
index 3bbbb61..8fdc700 100644
--- a/pk/riscv-opc.h
+++ b/pk/riscv-opc.h
@@ -1,305 +1,301 @@
 /* Automatically generated by parse-opcodes */
-#define MATCH_MFF_D 0x185ea
+#define MATCH_MFF_D 0x184d3
 #define  MASK_MFF_D 0x7c1ffff
-#define MATCH_FSINJN_D 0x61ea
+#define MATCH_FSINJN_D 0x60d3
 #define  MASK_FSINJN_D 0x1ffff
-#define MATCH_REMUW 0x1cf7
+#define MATCH_REMUW 0x7bb
 #define  MASK_REMUW 0x1ffff
 #define MATCH_BLTU 0x363
 #define  MASK_BLTU 0x3ff
-#define MATCH_FSINJN_S 0x606a
+#define MATCH_FSINJN_S 0x6053
 #define  MASK_FSINJN_S 0x1ffff
-#define MATCH_MFF_S 0x1846a
+#define MATCH_MFF_S 0x18453
 #define  MASK_MFF_S 0x7c1ffff
-#define MATCH_SLLIW 0x7f6
-#define  MASK_SLLIW 0x20ffff
-#define MATCH_FCVT_D_L 0xc1ea
+#define MATCH_SLLIW 0x9b
+#define  MASK_SLLIW 0x3f83ff
+#define MATCH_FCVT_D_L 0xc0d3
 #define  MASK_FCVT_D_L 0x3ff1ff
-#define MATCH_FCVT_D_W 0xe1ea
+#define MATCH_FCVT_D_W 0xe0d3
 #define  MASK_FCVT_D_W 0x3fffff
-#define MATCH_ADD 0x75
+#define MATCH_ADD 0x33
 #define  MASK_ADD 0x1ffff
-#define MATCH_FCVT_D_S 0x101ea
+#define MATCH_FCVT_D_S 0x100d3
 #define  MASK_FCVT_D_S 0x3fffff
-#define MATCH_LF_D 0x1e8
+#define MATCH_LF_D 0x187
 #define  MASK_LF_D 0x3ff
-#define MATCH_MFPCR 0xeb
+#define MATCH_MFPCR 0xff
 #define  MASK_MFPCR 0x7c1ffff
 #define MATCH_BNE 0xe3
 #define  MASK_BNE 0x3ff
-#define MATCH_MTPCR 0x4eb
+#define MATCH_MTPCR 0x4ff
 #define  MASK_MTPCR 0xf801ffff
-#define MATCH_FCVT_S_D 0x1306a
+#define MATCH_FCVT_S_D 0x11053
 #define  MASK_FCVT_S_D 0x3ff1ff
 #define MATCH_BGEU 0x3e3
 #define  MASK_BGEU 0x3ff
-#define MATCH_DI 0x46b
+#define MATCH_DI 0x47f
 #define  MASK_DI 0x7ffffff
-#define MATCH_SLTIU 0x1f4
+#define MATCH_SLTIU 0x193
 #define  MASK_SLTIU 0x3ff
-#define MATCH_MFFL_D 0x195ea
+#define MATCH_MFFL_D 0x194d3
 #define  MASK_MFFL_D 0x7c1ffff
-#define MATCH_FADD_S 0x6a
+#define MATCH_FADD_S 0x53
 #define  MASK_FADD_S 0x1f1ff
-#define MATCH_FCVT_S_W 0xe06a
+#define MATCH_FCVT_S_W 0xe053
 #define  MASK_FCVT_S_W 0x3ff1ff
-#define MATCH_MUL 0xf5
+#define MATCH_MUL 0x433
 #define  MASK_MUL 0x1ffff
-#define MATCH_AMOMINU_D 0x19fa
+#define MATCH_AMOMINU_D 0x19c3
 #define  MASK_AMOMINU_D 0x1ffff
-#define MATCH_FSEL_S 0x67
-#define  MASK_FSEL_S 0xfff
-#define MATCH_SRLI 0xbf4
-#define  MASK_SRLI 0xffff
-#define MATCH_FCVTU_W_S 0xb06a
+#define MATCH_SRLI 0x293
+#define  MASK_SRLI 0x3f03ff
+#define MATCH_FCVTU_W_S 0xb053
 #define  MASK_FCVTU_W_S 0x3ff1ff
-#define MATCH_AMOMINU_W 0x197a
+#define MATCH_AMOMINU_W 0x1943
 #define  MASK_AMOMINU_W 0x1ffff
-#define MATCH_DIVUW 0x14f7
+#define MATCH_DIVUW 0x6bb
 #define  MASK_DIVUW 0x1ffff
-#define MATCH_MFFH_D 0x1a5ea
+#define MATCH_MFFH_D 0x1a4d3
 #define  MASK_MFFH_D 0x7c1ffff
-#define MATCH_SRLW 0xbf7
+#define MATCH_SRLW 0x2bb
 #define  MASK_SRLW 0x1ffff
-#define MATCH_MFCR 0xfb
+#define MATCH_MFCR 0x97
 #define  MASK_MFCR 0x7c1ffff
-#define MATCH_DIV 0x10f5
+#define MATCH_DIV 0x633
 #define  MASK_DIV 0x1ffff
-#define MATCH_FSEL_D 0x1e7
-#define  MASK_FSEL_D 0xfff
-#define MATCH_S_D 0x1f9
+#define MATCH_S_D 0x1a3
 #define  MASK_S_D 0x3ff
-#define MATCH_J 0x60
+#define MATCH_J 0x67
 #define  MASK_J 0x7f
-#define MATCH_S_B 0x79
+#define MATCH_S_B 0x23
 #define  MASK_S_B 0x3ff
-#define MATCH_FNMSUB_S 0x6e
+#define MATCH_FNMSUB_S 0x4b
 #define  MASK_FNMSUB_S 0x1ff
-#define MATCH_FCVT_L_S 0x806a
+#define MATCH_FCVT_L_S 0x8053
 #define  MASK_FCVT_L_S 0x3ff1ff
-#define MATCH_SYNC 0x17b
+#define MATCH_SYNC 0x117
 #define  MASK_SYNC 0xffffffff
-#define MATCH_S_H 0xf9
+#define MATCH_S_H 0xa3
 #define  MASK_S_H 0x3ff
-#define MATCH_MTF_S 0x1c46a
+#define MATCH_MTF_S 0x1c453
 #define  MASK_MTF_S 0x3fffff
-#define MATCH_S_W 0x179
+#define MATCH_S_W 0x123
 #define  MASK_S_W 0x3ff
-#define MATCH_FDIV_S 0x306a
+#define MATCH_FDIV_S 0x3053
 #define  MASK_FDIV_S 0x1f1ff
-#define MATCH_SF_D 0x1e9
+#define MATCH_SF_D 0x1a7
 #define  MASK_SF_D 0x3ff
-#define MATCH_MTCR 0x4fb
+#define MATCH_MTCR 0x497
 #define  MASK_MTCR 0xf801ffff
-#define MATCH_FCVT_L_D 0x81ea
+#define MATCH_FCVT_L_D 0x80d3
 #define  MASK_FCVT_L_D 0x3ff1ff
-#define MATCH_FNMSUB_D 0x1ee
+#define MATCH_FNMSUB_D 0xcb
 #define  MASK_FNMSUB_D 0x1ff
-#define MATCH_ADDW 0x77
+#define MATCH_ADDW 0x3b
 #define  MASK_ADDW 0x1ffff
-#define MATCH_SLTU 0xc75
-#define  MASK_SLTU 0x1ffff
-#define MATCH_XOR 0x1875
+#define MATCH_SLL 0xb3
+#define  MASK_SLL 0x1ffff
+#define MATCH_XOR 0x233
 #define  MASK_XOR 0x1ffff
-#define MATCH_SUB 0x475
+#define MATCH_SUB 0x10033
 #define  MASK_SUB 0x1ffff
-#define MATCH_ERET 0x16b
+#define MATCH_ERET 0x17f
 #define  MASK_ERET 0xffffffff
-#define MATCH_FCVTU_D_W 0xf1ea
+#define MATCH_FCVTU_D_W 0xf0d3
 #define  MASK_FCVTU_D_W 0x3fffff
 #define MATCH_BLT 0x263
 #define  MASK_BLT 0x3ff
-#define MATCH_FC_LT_S 0x1606a
+#define MATCH_FC_LT_S 0x16053
 #define  MASK_FC_LT_S 0x1ffff
-#define MATCH_REM 0x18f5
+#define MATCH_REM 0x733
 #define  MASK_REM 0x1ffff
-#define MATCH_SRLIW 0xbf6
-#define  MASK_SRLIW 0x20ffff
-#define MATCH_LUI 0x71
+#define MATCH_SRLIW 0x29b
+#define  MASK_SRLIW 0x3f83ff
+#define MATCH_LUI 0x37
 #define  MASK_LUI 0x7f
-#define MATCH_L_W 0x178
+#define MATCH_L_W 0x103
 #define  MASK_L_W 0x3ff
-#define MATCH_ADDI 0x74
+#define MATCH_ADDI 0x13
 #define  MASK_ADDI 0x3ff
-#define MATCH_FC_LT_D 0x161ea
+#define MATCH_FC_LT_D 0x160d3
 #define  MASK_FC_LT_D 0x1ffff
-#define MATCH_MULH 0x8f5
+#define MATCH_MULH 0x533
 #define  MASK_MULH 0x1ffff
-#define MATCH_FMUL_S 0x206a
+#define MATCH_FMUL_S 0x2053
 #define  MASK_FMUL_S 0x1f1ff
-#define MATCH_SRAI 0xff4
-#define  MASK_SRAI 0xffff
-#define MATCH_AMOAND_D 0x9fa
+#define MATCH_SRAI 0x10293
+#define  MASK_SRAI 0x3f03ff
+#define MATCH_AMOAND_D 0x9c3
 #define  MASK_AMOAND_D 0x1ffff
-#define MATCH_SRAW 0xff7
+#define MATCH_SRAW 0x102bb
 #define  MASK_SRAW 0x1ffff
-#define MATCH_FMUL_D 0x21ea
+#define MATCH_FMUL_D 0x20d3
 #define  MASK_FMUL_D 0x1f1ff
-#define MATCH_ORI 0x2f4
+#define MATCH_ORI 0x313
 #define  MASK_ORI 0x3ff
-#define MATCH_ADDIW 0x76
+#define MATCH_ADDIW 0x1b
 #define  MASK_ADDIW 0x3ff
-#define MATCH_AMOAND_W 0x97a
+#define MATCH_AMOAND_W 0x943
 #define  MASK_AMOAND_W 0x1ffff
-#define MATCH_MTFLH_D 0x1c7ea
+#define MATCH_MTFLH_D 0x1c6d3
 #define  MASK_MTFLH_D 0x1ffff
-#define MATCH_SRA 0xff5
+#define MATCH_SRA 0x102b3
 #define  MASK_SRA 0x1ffff
-#define MATCH_L_BU 0x278
+#define MATCH_L_BU 0x203
 #define  MASK_L_BU 0x3ff
-#define MATCH_SRAIW 0xff6
-#define  MASK_SRAIW 0x20ffff
-#define MATCH_SRL 0xbf5
+#define MATCH_SRAIW 0x1029b
+#define  MASK_SRAIW 0x3f83ff
+#define MATCH_SRL 0x2b3
 #define  MASK_SRL 0x1ffff
-#define MATCH_FC_EQ_D 0x151ea
+#define MATCH_FC_EQ_D 0x150d3
 #define  MASK_FC_EQ_D 0x1ffff
-#define MATCH_OR 0x1475
+#define MATCH_OR 0x333
 #define  MASK_OR 0x1ffff
-#define MATCH_FMADD_D 0x1ec
+#define MATCH_FMADD_D 0xc3
 #define  MASK_FMADD_D 0x1ff
-#define MATCH_SUBW 0x477
+#define MATCH_SUBW 0x1003b
 #define  MASK_SUBW 0x1ffff
-#define MATCH_JALR_C 0x62
+#define MATCH_JALR_C 0x6b
 #define  MASK_JALR_C 0x3ff
-#define MATCH_LF_W 0x168
+#define MATCH_LF_W 0x107
 #define  MASK_LF_W 0x3ff
-#define MATCH_AMOMAXU_D 0x1dfa
+#define MATCH_AMOMAXU_D 0x1dc3
 #define  MASK_AMOMAXU_D 0x1ffff
-#define MATCH_SF_W 0x169
+#define MATCH_SF_W 0x127
 #define  MASK_SF_W 0x3ff
-#define MATCH_JALR_J 0x162
+#define MATCH_JALR_J 0x16b
 #define  MASK_JALR_J 0x3ff
-#define MATCH_XORI 0x374
+#define MATCH_XORI 0x213
 #define  MASK_XORI 0x3ff
-#define MATCH_JALR_R 0xe2
+#define MATCH_JALR_R 0xeb
 #define  MASK_JALR_R 0x3ff
-#define MATCH_AMOMAXU_W 0x1d7a
+#define MATCH_AMOMAXU_W 0x1d43
 #define  MASK_AMOMAXU_W 0x1ffff
-#define MATCH_AMOMIN_D 0x11fa
+#define MATCH_AMOMIN_D 0x11c3
 #define  MASK_AMOMIN_D 0x1ffff
-#define MATCH_EI 0x6b
+#define MATCH_EI 0x7f
 #define  MASK_EI 0x7ffffff
-#define MATCH_FSMUL_S 0x706a
+#define MATCH_FSMUL_S 0x7053
 #define  MASK_FSMUL_S 0x1ffff
-#define MATCH_ANDI 0x274
+#define MATCH_ANDI 0x393
 #define  MASK_ANDI 0x3ff
-#define MATCH_FNMADD_S 0x6f
+#define MATCH_FNMADD_S 0x4f
 #define  MASK_FNMADD_S 0x1ff
-#define MATCH_JAL 0x61
+#define MATCH_JAL 0x6f
 #define  MASK_JAL 0x7f
-#define MATCH_MULW 0xf7
+#define MATCH_MULW 0x43b
 #define  MASK_MULW 0x1ffff
-#define MATCH_FSMUL_D 0x71ea
+#define MATCH_FSMUL_D 0x70d3
 #define  MASK_FSMUL_D 0x1ffff
-#define MATCH_FNMADD_D 0x1ef
+#define MATCH_FNMADD_D 0xcf
 #define  MASK_FNMADD_D 0x1ff
-#define MATCH_AMOADD_D 0x1fa
+#define MATCH_AMOADD_D 0x1c3
 #define  MASK_AMOADD_D 0x1ffff
-#define MATCH_FSINJ_D 0x51ea
+#define MATCH_FSINJ_D 0x50d3
 #define  MASK_FSINJ_D 0x1ffff
-#define MATCH_AMOMAX_W 0x157a
+#define MATCH_AMOMAX_W 0x1543
 #define  MASK_AMOMAX_W 0x1ffff
-#define MATCH_FCVT_W_S 0xa06a
+#define MATCH_FCVT_W_S 0xa053
 #define  MASK_FCVT_W_S 0x3ff1ff
-#define MATCH_AMOADD_W 0x17a
+#define MATCH_AMOADD_W 0x143
 #define  MASK_AMOADD_W 0x1ffff
-#define MATCH_FSINJ_S 0x506a
+#define MATCH_FSINJ_S 0x5053
 #define  MASK_FSINJ_S 0x1ffff
-#define MATCH_AMOMAX_D 0x15fa
+#define MATCH_AMOMAX_D 0x15c3
 #define  MASK_AMOMAX_D 0x1ffff
-#define MATCH_FCVT_W_D 0xa1ea
+#define MATCH_FCVT_W_D 0xa0d3
 #define  MASK_FCVT_W_D 0x3ff1ff
 #define MATCH_BGE 0x2e3
 #define  MASK_BGE 0x3ff
-#define MATCH_SLT 0x875
+#define MATCH_SLT 0x133
 #define  MASK_SLT 0x1ffff
-#define MATCH_SLLW 0x7f7
+#define MATCH_SLLW 0xbb
 #define  MASK_SLLW 0x1ffff
-#define MATCH_AMOOR_D 0xdfa
+#define MATCH_AMOOR_D 0xdc3
 #define  MASK_AMOOR_D 0x1ffff
-#define MATCH_SLTI 0x174
+#define MATCH_SLTI 0x113
 #define  MASK_SLTI 0x3ff
-#define MATCH_REMU 0x1cf5
+#define MATCH_REMU 0x7b3
 #define  MASK_REMU 0x1ffff
-#define MATCH_REMW 0x18f7
+#define MATCH_REMW 0x73b
 #define  MASK_REMW 0x1ffff
-#define MATCH_SLL 0x7f5
-#define  MASK_SLL 0x1ffff
-#define MATCH_L_HU 0x2f8
+#define MATCH_SLTU 0x1b3
+#define  MASK_SLTU 0x1ffff
+#define MATCH_L_HU 0x283
 #define  MASK_L_HU 0x3ff
-#define MATCH_SLLI 0x7f4
-#define  MASK_SLLI 0xffff
-#define MATCH_AMOOR_W 0xd7a
+#define MATCH_SLLI 0x93
+#define  MASK_SLLI 0x3f03ff
+#define MATCH_AMOOR_W 0xd43
 #define  MASK_AMOOR_W 0x1ffff
 #define MATCH_BEQ 0x63
 #define  MASK_BEQ 0x3ff
-#define MATCH_FSUB_S 0x106a
+#define MATCH_FSUB_S 0x1053
 #define  MASK_FSUB_S 0x1f1ff
-#define MATCH_AND 0x1075
+#define MATCH_AND 0x3b3
 #define  MASK_AND 0x1ffff
-#define MATCH_FC_LE_S 0x1706a
+#define MATCH_FC_LE_S 0x17053
 #define  MASK_FC_LE_S 0x1ffff
-#define MATCH_SYSCALL 0x1fb
+#define MATCH_SYSCALL 0x197
 #define  MASK_SYSCALL 0xffc003ff
-#define MATCH_FCVTU_S_W 0xf06a
+#define MATCH_FCVTU_S_W 0xf053
 #define  MASK_FCVTU_S_W 0x3ff1ff
-#define MATCH_MTF_D 0x1c5ea
+#define MATCH_MTF_D 0x1c4d3
 #define  MASK_MTF_D 0x3fffff
-#define MATCH_FC_LE_D 0x171ea
+#define MATCH_FC_LE_D 0x170d3
 #define  MASK_FC_LE_D 0x1ffff
-#define MATCH_FCVTU_S_L 0xd06a
+#define MATCH_FCVTU_S_L 0xd053
 #define  MASK_FCVTU_S_L 0x3ff1ff
-#define MATCH_MULHU 0xcf5
+#define MATCH_MULHU 0x5b3
 #define  MASK_MULHU 0x1ffff
-#define MATCH_FCVTU_W_D 0xb1ea
+#define MATCH_FCVTU_W_D 0xb0d3
 #define  MASK_FCVTU_W_D 0x3ff1ff
-#define MATCH_FCVTU_L_S 0x906a
+#define MATCH_FCVTU_L_S 0x9053
 #define  MASK_FCVTU_L_S 0x3ff1ff
-#define MATCH_FADD_D 0x1ea
+#define MATCH_FADD_D 0xd3
 #define  MASK_FADD_D 0x1f1ff
-#define MATCH_RDNPC 0x7b
+#define MATCH_RDNPC 0x17
 #define  MASK_RDNPC 0x7ffffff
-#define MATCH_FCVT_S_L 0xc06a
+#define MATCH_FCVT_S_L 0xc053
 #define  MASK_FCVT_S_L 0x3ff1ff
-#define MATCH_SYNCI 0x3f8
+#define MATCH_SYNCI 0x383
 #define  MASK_SYNCI 0xf80003ff
 #define MATCH_UNIMP 0x0
 #define  MASK_UNIMP 0xffffffff
-#define MATCH_FCVTU_L_D 0x91ea
+#define MATCH_FCVTU_L_D 0x90d3
 #define  MASK_FCVTU_L_D 0x3ff1ff
-#define MATCH_FSUB_D 0x11ea
+#define MATCH_FSUB_D 0x10d3
 #define  MASK_FSUB_D 0x1f1ff
-#define MATCH_FMADD_S 0x6c
+#define MATCH_FMADD_S 0x43
 #define  MASK_FMADD_S 0x1ff
-#define MATCH_FSQRT_S 0x406a
+#define MATCH_FSQRT_S 0x4053
 #define  MASK_FSQRT_S 0x3ff1ff
-#define MATCH_AMOMIN_W 0x117a
+#define MATCH_AMOMIN_W 0x1143
 #define  MASK_AMOMIN_W 0x1ffff
-#define MATCH_AMOSWAP_D 0x5fa
+#define MATCH_AMOSWAP_D 0x5c3
 #define  MASK_AMOSWAP_D 0x1ffff
-#define MATCH_FSQRT_D 0x41ea
+#define MATCH_FSQRT_D 0x40d3
 #define  MASK_FSQRT_D 0x3ff1ff
-#define MATCH_FC_EQ_S 0x1506a
+#define MATCH_FC_EQ_S 0x15053
 #define  MASK_FC_EQ_S 0x1ffff
-#define MATCH_FDIV_D 0x31ea
+#define MATCH_FDIV_D 0x30d3
 #define  MASK_FDIV_D 0x1f1ff
-#define MATCH_L_H 0xf8
+#define MATCH_L_H 0x83
 #define  MASK_L_H 0x3ff
-#define MATCH_DIVW 0x10f7
+#define MATCH_DIVW 0x63b
 #define  MASK_DIVW 0x1ffff
-#define MATCH_L_D 0x1f8
+#define MATCH_L_D 0x183
 #define  MASK_L_D 0x3ff
-#define MATCH_DIVU 0x14f5
+#define MATCH_DIVU 0x6b3
 #define  MASK_DIVU 0x1ffff
-#define MATCH_AMOSWAP_W 0x57a
+#define MATCH_AMOSWAP_W 0x543
 #define  MASK_AMOSWAP_W 0x1ffff
-#define MATCH_FCVTU_D_L 0xd1ea
+#define MATCH_FCVTU_D_L 0xd0d3
 #define  MASK_FCVTU_D_L 0x3ff1ff
-#define MATCH_L_B 0x78
+#define MATCH_L_B 0x3
 #define  MASK_L_B 0x3ff
-#define MATCH_L_WU 0x378
+#define MATCH_L_WU 0x303
 #define  MASK_L_WU 0x3ff
-#define MATCH_FMSUB_S 0x6d
+#define MATCH_FMSUB_S 0x47
 #define  MASK_FMSUB_S 0x1ff
-#define MATCH_FMSUB_D 0x1ed
+#define MATCH_FMSUB_D 0xc7
 #define  MASK_FMSUB_D 0x1ff