diff options
Diffstat (limited to 'sim/m32r/readx.c')
| -rw-r--r-- | sim/m32r/readx.c | 798 |
1 files changed, 478 insertions, 320 deletions
diff --git a/sim/m32r/readx.c b/sim/m32r/readx.c index 2f46e06..fdaa077 100644 --- a/sim/m32r/readx.c +++ b/sim/m32r/readx.c @@ -42,116 +42,116 @@ with this program; if not, write to the Free Software Foundation, Inc., && case_read_READ_FMT_0_ADD, && case_read_READ_FMT_2_AND3, && case_read_READ_FMT_4_ADDI, + && case_read_READ_FMT_5_ADDV, + && case_read_READ_FMT_6_ADDV3, + && case_read_READ_FMT_7_ADDX, + && case_read_READ_FMT_8_BC8, + && case_read_READ_FMT_9_BC24, + && case_read_READ_FMT_10_BEQ, + && case_read_READ_FMT_11_BEQZ, + && case_read_READ_FMT_11_BEQZ, + && case_read_READ_FMT_11_BEQZ, + && case_read_READ_FMT_11_BEQZ, + && case_read_READ_FMT_11_BEQZ, + && case_read_READ_FMT_11_BEQZ, + && case_read_READ_FMT_12_BL8, + && case_read_READ_FMT_13_BL24, + && case_read_READ_FMT_14_BCL8, + && case_read_READ_FMT_15_BCL24, + && case_read_READ_FMT_8_BC8, + && case_read_READ_FMT_9_BC24, + && case_read_READ_FMT_10_BEQ, + && case_read_READ_FMT_16_BRA8, + && case_read_READ_FMT_17_BRA24, + && case_read_READ_FMT_14_BCL8, + && case_read_READ_FMT_15_BCL24, + && case_read_READ_FMT_18_CMP, + && case_read_READ_FMT_19_CMPI, + && case_read_READ_FMT_18_CMP, + && case_read_READ_FMT_20_CMPUI, + && case_read_READ_FMT_18_CMP, + && case_read_READ_FMT_21_CMPZ, + && case_read_READ_FMT_22_DIV, + && case_read_READ_FMT_22_DIV, + && case_read_READ_FMT_22_DIV, + && case_read_READ_FMT_22_DIV, + && case_read_READ_FMT_22_DIV, + && case_read_READ_FMT_23_JC, + && case_read_READ_FMT_23_JC, + && case_read_READ_FMT_24_JL, + && case_read_READ_FMT_25_JMP, + && case_read_READ_FMT_26_LD, + && case_read_READ_FMT_27_LD_D, + && case_read_READ_FMT_28_LDB, + && case_read_READ_FMT_29_LDB_D, + && case_read_READ_FMT_30_LDH, + && case_read_READ_FMT_31_LDH_D, + && case_read_READ_FMT_28_LDB, + && case_read_READ_FMT_29_LDB_D, + && case_read_READ_FMT_30_LDH, + && case_read_READ_FMT_31_LDH_D, + && case_read_READ_FMT_32_LD_PLUS, + && case_read_READ_FMT_33_LD24, + && case_read_READ_FMT_34_LDI8, + && case_read_READ_FMT_35_LDI16, + && case_read_READ_FMT_36_LOCK, + && case_read_READ_FMT_37_MACHI_A, + && case_read_READ_FMT_37_MACHI_A, && case_read_READ_FMT_0_ADD, - && case_read_READ_FMT_5_ADDV3, - && case_read_READ_FMT_6_ADDX, - && case_read_READ_FMT_7_BC8, - && case_read_READ_FMT_8_BC24, - && case_read_READ_FMT_9_BEQ, - && case_read_READ_FMT_10_BEQZ, - && case_read_READ_FMT_10_BEQZ, - && case_read_READ_FMT_10_BEQZ, - && case_read_READ_FMT_10_BEQZ, - && case_read_READ_FMT_10_BEQZ, - && case_read_READ_FMT_10_BEQZ, - && case_read_READ_FMT_11_BL8, - && case_read_READ_FMT_12_BL24, - && case_read_READ_FMT_13_BCL8, - && case_read_READ_FMT_14_BCL24, - && case_read_READ_FMT_7_BC8, - && case_read_READ_FMT_8_BC24, - && case_read_READ_FMT_9_BEQ, - && case_read_READ_FMT_15_BRA8, - && case_read_READ_FMT_16_BRA24, - && case_read_READ_FMT_13_BCL8, - && case_read_READ_FMT_14_BCL24, - && case_read_READ_FMT_17_CMP, - && case_read_READ_FMT_18_CMPI, - && case_read_READ_FMT_17_CMP, - && case_read_READ_FMT_19_CMPUI, - && case_read_READ_FMT_17_CMP, - && case_read_READ_FMT_20_CMPZ, - && case_read_READ_FMT_21_DIV, - && case_read_READ_FMT_21_DIV, - && case_read_READ_FMT_21_DIV, - && case_read_READ_FMT_21_DIV, - && case_read_READ_FMT_21_DIV, - && case_read_READ_FMT_22_JC, - && case_read_READ_FMT_22_JC, - && case_read_READ_FMT_23_JL, - && case_read_READ_FMT_24_JMP, - && case_read_READ_FMT_25_LD, - && case_read_READ_FMT_26_LD_D, - && case_read_READ_FMT_27_LDB, - && case_read_READ_FMT_28_LDB_D, - && case_read_READ_FMT_29_LDH, - && case_read_READ_FMT_30_LDH_D, - && case_read_READ_FMT_27_LDB, - && case_read_READ_FMT_28_LDB_D, - && case_read_READ_FMT_29_LDH, - && case_read_READ_FMT_30_LDH_D, - && case_read_READ_FMT_25_LD, - && case_read_READ_FMT_31_LD24, - && case_read_READ_FMT_32_LDI8, - && case_read_READ_FMT_33_LDI16, + && case_read_READ_FMT_38_MULHI_A, + && case_read_READ_FMT_38_MULHI_A, + && case_read_READ_FMT_39_MV, + && case_read_READ_FMT_40_MVFACHI_A, + && case_read_READ_FMT_40_MVFACHI_A, + && case_read_READ_FMT_40_MVFACHI_A, + && case_read_READ_FMT_41_MVFC, + && case_read_READ_FMT_42_MVTACHI_A, + && case_read_READ_FMT_42_MVTACHI_A, + && case_read_READ_FMT_43_MVTC, + && case_read_READ_FMT_39_MV, + && case_read_READ_FMT_44_NOP, + && case_read_READ_FMT_39_MV, + && case_read_READ_FMT_45_RAC_D, + && case_read_READ_FMT_46_RAC_DS, + && case_read_READ_FMT_47_RAC_DSI, + && case_read_READ_FMT_45_RAC_D, + && case_read_READ_FMT_46_RAC_DS, + && case_read_READ_FMT_47_RAC_DSI, + && case_read_READ_FMT_48_RTE, + && case_read_READ_FMT_49_SETH, && case_read_READ_FMT_0_ADD, - && case_read_READ_FMT_34_MACHI_A, - && case_read_READ_FMT_34_MACHI_A, + && case_read_READ_FMT_50_SLL3, + && case_read_READ_FMT_51_SLLI, && case_read_READ_FMT_0_ADD, - && case_read_READ_FMT_35_MULHI_A, - && case_read_READ_FMT_35_MULHI_A, - && case_read_READ_FMT_36_MV, - && case_read_READ_FMT_37_MVFACHI_A, - && case_read_READ_FMT_37_MVFACHI_A, - && case_read_READ_FMT_37_MVFACHI_A, - && case_read_READ_FMT_38_MVFC, - && case_read_READ_FMT_39_MVTACHI_A, - && case_read_READ_FMT_39_MVTACHI_A, - && case_read_READ_FMT_40_MVTC, - && case_read_READ_FMT_36_MV, - && case_read_READ_FMT_41_NOP, - && case_read_READ_FMT_36_MV, - && case_read_READ_FMT_42_RAC_D, - && case_read_READ_FMT_43_RAC_DS, - && case_read_READ_FMT_44_RAC_DSI, - && case_read_READ_FMT_42_RAC_D, - && case_read_READ_FMT_43_RAC_DS, - && case_read_READ_FMT_44_RAC_DSI, - && case_read_READ_FMT_45_RTE, - && case_read_READ_FMT_46_SETH, + && case_read_READ_FMT_50_SLL3, + && case_read_READ_FMT_51_SLLI, && case_read_READ_FMT_0_ADD, - && case_read_READ_FMT_5_ADDV3, - && case_read_READ_FMT_47_SLLI, + && case_read_READ_FMT_50_SLL3, + && case_read_READ_FMT_51_SLLI, + && case_read_READ_FMT_52_ST, + && case_read_READ_FMT_53_ST_D, + && case_read_READ_FMT_54_STB, + && case_read_READ_FMT_55_STB_D, + && case_read_READ_FMT_56_STH, + && case_read_READ_FMT_57_STH_D, + && case_read_READ_FMT_58_ST_PLUS, + && case_read_READ_FMT_58_ST_PLUS, && case_read_READ_FMT_0_ADD, - && case_read_READ_FMT_5_ADDV3, - && case_read_READ_FMT_47_SLLI, - && case_read_READ_FMT_0_ADD, - && case_read_READ_FMT_5_ADDV3, - && case_read_READ_FMT_47_SLLI, - && case_read_READ_FMT_17_CMP, - && case_read_READ_FMT_48_ST_D, - && case_read_READ_FMT_17_CMP, - && case_read_READ_FMT_48_ST_D, - && case_read_READ_FMT_17_CMP, - && case_read_READ_FMT_48_ST_D, - && case_read_READ_FMT_17_CMP, - && case_read_READ_FMT_17_CMP, - && case_read_READ_FMT_0_ADD, - && case_read_READ_FMT_0_ADD, - && case_read_READ_FMT_6_ADDX, - && case_read_READ_FMT_49_TRAP, - && case_read_READ_FMT_17_CMP, - && case_read_READ_FMT_50_SATB, - && case_read_READ_FMT_50_SATB, - && case_read_READ_FMT_51_SAT, - && case_read_READ_FMT_20_CMPZ, - && case_read_READ_FMT_52_SADD, - && case_read_READ_FMT_53_MACWU1, - && case_read_READ_FMT_54_MSBLO, - && case_read_READ_FMT_17_CMP, - && case_read_READ_FMT_53_MACWU1, - && case_read_READ_FMT_55_SC, - && case_read_READ_FMT_55_SC, + && case_read_READ_FMT_5_ADDV, + && case_read_READ_FMT_7_ADDX, + && case_read_READ_FMT_59_TRAP, + && case_read_READ_FMT_60_UNLOCK, + && case_read_READ_FMT_61_SATB, + && case_read_READ_FMT_61_SATB, + && case_read_READ_FMT_62_SAT, + && case_read_READ_FMT_21_CMPZ, + && case_read_READ_FMT_63_SADD, + && case_read_READ_FMT_64_MACWU1, + && case_read_READ_FMT_65_MSBLO, + && case_read_READ_FMT_66_MULWU1, + && case_read_READ_FMT_64_MACWU1, + && case_read_READ_FMT_67_SC, + && case_read_READ_FMT_67_SC, 0 }; extern DECODE *m32rx_decode_vars[]; @@ -240,11 +240,24 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_5_ADDV3) : /* e.g. addv3 $dr,$sr,#$simm16 */ + CASE (read, READ_FMT_5_ADDV) : /* e.g. addv $dr,$sr */ { -#define OPRND(f) par_exec->operands.fmt_5_addv3.f - EXTRACT_FMT_5_ADDV3_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */ - EXTRACT_FMT_5_ADDV3_CODE +#define OPRND(f) par_exec->operands.fmt_5_addv.f + EXTRACT_FMT_5_ADDV_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_5_ADDV_CODE + + /* Fetch the input operands for the semantic handler. */ + OPRND (dr) = CPU (h_gr[f_r1]); + OPRND (sr) = CPU (h_gr[f_r2]); +#undef OPRND + } + BREAK (read); + + CASE (read, READ_FMT_6_ADDV3) : /* e.g. addv3 $dr,$sr,#$simm16 */ + { +#define OPRND(f) par_exec->operands.fmt_6_addv3.f + EXTRACT_FMT_6_ADDV3_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */ + EXTRACT_FMT_6_ADDV3_CODE /* Fetch the input operands for the semantic handler. */ OPRND (simm16) = f_simm16; @@ -253,11 +266,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_6_ADDX) : /* e.g. addx $dr,$sr */ + CASE (read, READ_FMT_7_ADDX) : /* e.g. addx $dr,$sr */ { -#define OPRND(f) par_exec->operands.fmt_6_addx.f - EXTRACT_FMT_6_ADDX_VARS /* f-op1 f-r1 f-op2 f-r2 */ - EXTRACT_FMT_6_ADDX_CODE +#define OPRND(f) par_exec->operands.fmt_7_addx.f + EXTRACT_FMT_7_ADDX_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_7_ADDX_CODE /* Fetch the input operands for the semantic handler. */ OPRND (condbit) = CPU (h_cond); @@ -267,142 +280,142 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_7_BC8) : /* e.g. bc $disp8 */ + CASE (read, READ_FMT_8_BC8) : /* e.g. bc $disp8 */ { -#define OPRND(f) par_exec->operands.fmt_7_bc8.f - EXTRACT_FMT_7_BC8_VARS /* f-op1 f-r1 f-disp8 */ - EXTRACT_FMT_7_BC8_CODE +#define OPRND(f) par_exec->operands.fmt_8_bc8.f + EXTRACT_FMT_8_BC8_VARS /* f-op1 f-r1 f-disp8 */ + EXTRACT_FMT_8_BC8_CODE /* Fetch the input operands for the semantic handler. */ OPRND (condbit) = CPU (h_cond); - OPRND (disp8) = f_disp8; + RECORD_IADDR (OPRND (disp8), (pc & -4L) + f_disp8); #undef OPRND } BREAK (read); - CASE (read, READ_FMT_8_BC24) : /* e.g. bc $disp24 */ + CASE (read, READ_FMT_9_BC24) : /* e.g. bc $disp24 */ { -#define OPRND(f) par_exec->operands.fmt_8_bc24.f - EXTRACT_FMT_8_BC24_VARS /* f-op1 f-r1 f-disp24 */ - EXTRACT_FMT_8_BC24_CODE +#define OPRND(f) par_exec->operands.fmt_9_bc24.f + EXTRACT_FMT_9_BC24_VARS /* f-op1 f-r1 f-disp24 */ + EXTRACT_FMT_9_BC24_CODE /* Fetch the input operands for the semantic handler. */ OPRND (condbit) = CPU (h_cond); - OPRND (disp24) = f_disp24; + OPRND (disp24) = pc + f_disp24; #undef OPRND } BREAK (read); - CASE (read, READ_FMT_9_BEQ) : /* e.g. beq $src1,$src2,$disp16 */ + CASE (read, READ_FMT_10_BEQ) : /* e.g. beq $src1,$src2,$disp16 */ { -#define OPRND(f) par_exec->operands.fmt_9_beq.f - EXTRACT_FMT_9_BEQ_VARS /* f-op1 f-r1 f-op2 f-r2 f-disp16 */ - EXTRACT_FMT_9_BEQ_CODE +#define OPRND(f) par_exec->operands.fmt_10_beq.f + EXTRACT_FMT_10_BEQ_VARS /* f-op1 f-r1 f-op2 f-r2 f-disp16 */ + EXTRACT_FMT_10_BEQ_CODE /* Fetch the input operands for the semantic handler. */ - OPRND (disp16) = f_disp16; + OPRND (disp16) = pc + f_disp16; OPRND (src1) = CPU (h_gr[f_r1]); OPRND (src2) = CPU (h_gr[f_r2]); #undef OPRND } BREAK (read); - CASE (read, READ_FMT_10_BEQZ) : /* e.g. beqz $src2,$disp16 */ + CASE (read, READ_FMT_11_BEQZ) : /* e.g. beqz $src2,$disp16 */ { -#define OPRND(f) par_exec->operands.fmt_10_beqz.f - EXTRACT_FMT_10_BEQZ_VARS /* f-op1 f-r1 f-op2 f-r2 f-disp16 */ - EXTRACT_FMT_10_BEQZ_CODE +#define OPRND(f) par_exec->operands.fmt_11_beqz.f + EXTRACT_FMT_11_BEQZ_VARS /* f-op1 f-r1 f-op2 f-r2 f-disp16 */ + EXTRACT_FMT_11_BEQZ_CODE /* Fetch the input operands for the semantic handler. */ - OPRND (disp16) = f_disp16; + OPRND (disp16) = pc + f_disp16; OPRND (src2) = CPU (h_gr[f_r2]); #undef OPRND } BREAK (read); - CASE (read, READ_FMT_11_BL8) : /* e.g. bl $disp8 */ + CASE (read, READ_FMT_12_BL8) : /* e.g. bl $disp8 */ { -#define OPRND(f) par_exec->operands.fmt_11_bl8.f - EXTRACT_FMT_11_BL8_VARS /* f-op1 f-r1 f-disp8 */ - EXTRACT_FMT_11_BL8_CODE +#define OPRND(f) par_exec->operands.fmt_12_bl8.f + EXTRACT_FMT_12_BL8_VARS /* f-op1 f-r1 f-disp8 */ + EXTRACT_FMT_12_BL8_CODE /* Fetch the input operands for the semantic handler. */ - OPRND (disp8) = f_disp8; + RECORD_IADDR (OPRND (disp8), (pc & -4L) + f_disp8); OPRND (pc) = CPU (h_pc); #undef OPRND } BREAK (read); - CASE (read, READ_FMT_12_BL24) : /* e.g. bl $disp24 */ + CASE (read, READ_FMT_13_BL24) : /* e.g. bl $disp24 */ { -#define OPRND(f) par_exec->operands.fmt_12_bl24.f - EXTRACT_FMT_12_BL24_VARS /* f-op1 f-r1 f-disp24 */ - EXTRACT_FMT_12_BL24_CODE +#define OPRND(f) par_exec->operands.fmt_13_bl24.f + EXTRACT_FMT_13_BL24_VARS /* f-op1 f-r1 f-disp24 */ + EXTRACT_FMT_13_BL24_CODE /* Fetch the input operands for the semantic handler. */ - OPRND (disp24) = f_disp24; + OPRND (disp24) = pc + f_disp24; OPRND (pc) = CPU (h_pc); #undef OPRND } BREAK (read); - CASE (read, READ_FMT_13_BCL8) : /* e.g. bcl $disp8 */ + CASE (read, READ_FMT_14_BCL8) : /* e.g. bcl $disp8 */ { -#define OPRND(f) par_exec->operands.fmt_13_bcl8.f - EXTRACT_FMT_13_BCL8_VARS /* f-op1 f-r1 f-disp8 */ - EXTRACT_FMT_13_BCL8_CODE +#define OPRND(f) par_exec->operands.fmt_14_bcl8.f + EXTRACT_FMT_14_BCL8_VARS /* f-op1 f-r1 f-disp8 */ + EXTRACT_FMT_14_BCL8_CODE /* Fetch the input operands for the semantic handler. */ OPRND (condbit) = CPU (h_cond); - OPRND (disp8) = f_disp8; + RECORD_IADDR (OPRND (disp8), (pc & -4L) + f_disp8); OPRND (pc) = CPU (h_pc); #undef OPRND } BREAK (read); - CASE (read, READ_FMT_14_BCL24) : /* e.g. bcl $disp24 */ + CASE (read, READ_FMT_15_BCL24) : /* e.g. bcl $disp24 */ { -#define OPRND(f) par_exec->operands.fmt_14_bcl24.f - EXTRACT_FMT_14_BCL24_VARS /* f-op1 f-r1 f-disp24 */ - EXTRACT_FMT_14_BCL24_CODE +#define OPRND(f) par_exec->operands.fmt_15_bcl24.f + EXTRACT_FMT_15_BCL24_VARS /* f-op1 f-r1 f-disp24 */ + EXTRACT_FMT_15_BCL24_CODE /* Fetch the input operands for the semantic handler. */ OPRND (condbit) = CPU (h_cond); - OPRND (disp24) = f_disp24; + OPRND (disp24) = pc + f_disp24; OPRND (pc) = CPU (h_pc); #undef OPRND } BREAK (read); - CASE (read, READ_FMT_15_BRA8) : /* e.g. bra $disp8 */ + CASE (read, READ_FMT_16_BRA8) : /* e.g. bra $disp8 */ { -#define OPRND(f) par_exec->operands.fmt_15_bra8.f - EXTRACT_FMT_15_BRA8_VARS /* f-op1 f-r1 f-disp8 */ - EXTRACT_FMT_15_BRA8_CODE +#define OPRND(f) par_exec->operands.fmt_16_bra8.f + EXTRACT_FMT_16_BRA8_VARS /* f-op1 f-r1 f-disp8 */ + EXTRACT_FMT_16_BRA8_CODE /* Fetch the input operands for the semantic handler. */ - OPRND (disp8) = f_disp8; + RECORD_IADDR (OPRND (disp8), (pc & -4L) + f_disp8); #undef OPRND } BREAK (read); - CASE (read, READ_FMT_16_BRA24) : /* e.g. bra $disp24 */ + CASE (read, READ_FMT_17_BRA24) : /* e.g. bra $disp24 */ { -#define OPRND(f) par_exec->operands.fmt_16_bra24.f - EXTRACT_FMT_16_BRA24_VARS /* f-op1 f-r1 f-disp24 */ - EXTRACT_FMT_16_BRA24_CODE +#define OPRND(f) par_exec->operands.fmt_17_bra24.f + EXTRACT_FMT_17_BRA24_VARS /* f-op1 f-r1 f-disp24 */ + EXTRACT_FMT_17_BRA24_CODE /* Fetch the input operands for the semantic handler. */ - OPRND (disp24) = f_disp24; + OPRND (disp24) = pc + f_disp24; #undef OPRND } BREAK (read); - CASE (read, READ_FMT_17_CMP) : /* e.g. cmp $src1,$src2 */ + CASE (read, READ_FMT_18_CMP) : /* e.g. cmp $src1,$src2 */ { -#define OPRND(f) par_exec->operands.fmt_17_cmp.f - EXTRACT_FMT_17_CMP_VARS /* f-op1 f-r1 f-op2 f-r2 */ - EXTRACT_FMT_17_CMP_CODE +#define OPRND(f) par_exec->operands.fmt_18_cmp.f + EXTRACT_FMT_18_CMP_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_18_CMP_CODE /* Fetch the input operands for the semantic handler. */ OPRND (src1) = CPU (h_gr[f_r1]); @@ -411,11 +424,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_18_CMPI) : /* e.g. cmpi $src2,#$simm16 */ + CASE (read, READ_FMT_19_CMPI) : /* e.g. cmpi $src2,#$simm16 */ { -#define OPRND(f) par_exec->operands.fmt_18_cmpi.f - EXTRACT_FMT_18_CMPI_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */ - EXTRACT_FMT_18_CMPI_CODE +#define OPRND(f) par_exec->operands.fmt_19_cmpi.f + EXTRACT_FMT_19_CMPI_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */ + EXTRACT_FMT_19_CMPI_CODE /* Fetch the input operands for the semantic handler. */ OPRND (simm16) = f_simm16; @@ -424,11 +437,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_19_CMPUI) : /* e.g. cmpui $src2,#$uimm16 */ + CASE (read, READ_FMT_20_CMPUI) : /* e.g. cmpui $src2,#$uimm16 */ { -#define OPRND(f) par_exec->operands.fmt_19_cmpui.f - EXTRACT_FMT_19_CMPUI_VARS /* f-op1 f-r1 f-op2 f-r2 f-uimm16 */ - EXTRACT_FMT_19_CMPUI_CODE +#define OPRND(f) par_exec->operands.fmt_20_cmpui.f + EXTRACT_FMT_20_CMPUI_VARS /* f-op1 f-r1 f-op2 f-r2 f-uimm16 */ + EXTRACT_FMT_20_CMPUI_CODE /* Fetch the input operands for the semantic handler. */ OPRND (src2) = CPU (h_gr[f_r2]); @@ -437,11 +450,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_20_CMPZ) : /* e.g. cmpz $src2 */ + CASE (read, READ_FMT_21_CMPZ) : /* e.g. cmpz $src2 */ { -#define OPRND(f) par_exec->operands.fmt_20_cmpz.f - EXTRACT_FMT_20_CMPZ_VARS /* f-op1 f-r1 f-op2 f-r2 */ - EXTRACT_FMT_20_CMPZ_CODE +#define OPRND(f) par_exec->operands.fmt_21_cmpz.f + EXTRACT_FMT_21_CMPZ_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_21_CMPZ_CODE /* Fetch the input operands for the semantic handler. */ OPRND (src2) = CPU (h_gr[f_r2]); @@ -449,11 +462,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_21_DIV) : /* e.g. div $dr,$sr */ + CASE (read, READ_FMT_22_DIV) : /* e.g. div $dr,$sr */ { -#define OPRND(f) par_exec->operands.fmt_21_div.f - EXTRACT_FMT_21_DIV_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */ - EXTRACT_FMT_21_DIV_CODE +#define OPRND(f) par_exec->operands.fmt_22_div.f + EXTRACT_FMT_22_DIV_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */ + EXTRACT_FMT_22_DIV_CODE /* Fetch the input operands for the semantic handler. */ OPRND (dr) = CPU (h_gr[f_r1]); @@ -462,11 +475,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_22_JC) : /* e.g. jc $sr */ + CASE (read, READ_FMT_23_JC) : /* e.g. jc $sr */ { -#define OPRND(f) par_exec->operands.fmt_22_jc.f - EXTRACT_FMT_22_JC_VARS /* f-op1 f-r1 f-op2 f-r2 */ - EXTRACT_FMT_22_JC_CODE +#define OPRND(f) par_exec->operands.fmt_23_jc.f + EXTRACT_FMT_23_JC_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_23_JC_CODE /* Fetch the input operands for the semantic handler. */ OPRND (condbit) = CPU (h_cond); @@ -475,11 +488,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_23_JL) : /* e.g. jl $sr */ + CASE (read, READ_FMT_24_JL) : /* e.g. jl $sr */ { -#define OPRND(f) par_exec->operands.fmt_23_jl.f - EXTRACT_FMT_23_JL_VARS /* f-op1 f-r1 f-op2 f-r2 */ - EXTRACT_FMT_23_JL_CODE +#define OPRND(f) par_exec->operands.fmt_24_jl.f + EXTRACT_FMT_24_JL_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_24_JL_CODE /* Fetch the input operands for the semantic handler. */ OPRND (pc) = CPU (h_pc); @@ -488,11 +501,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_24_JMP) : /* e.g. jmp $sr */ + CASE (read, READ_FMT_25_JMP) : /* e.g. jmp $sr */ { -#define OPRND(f) par_exec->operands.fmt_24_jmp.f - EXTRACT_FMT_24_JMP_VARS /* f-op1 f-r1 f-op2 f-r2 */ - EXTRACT_FMT_24_JMP_CODE +#define OPRND(f) par_exec->operands.fmt_25_jmp.f + EXTRACT_FMT_25_JMP_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_25_JMP_CODE /* Fetch the input operands for the semantic handler. */ OPRND (sr) = CPU (h_gr[f_r2]); @@ -500,11 +513,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_25_LD) : /* e.g. ld $dr,@$sr */ + CASE (read, READ_FMT_26_LD) : /* e.g. ld $dr,@$sr */ { -#define OPRND(f) par_exec->operands.fmt_25_ld.f - EXTRACT_FMT_25_LD_VARS /* f-op1 f-r1 f-op2 f-r2 */ - EXTRACT_FMT_25_LD_CODE +#define OPRND(f) par_exec->operands.fmt_26_ld.f + EXTRACT_FMT_26_LD_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_26_LD_CODE /* Fetch the input operands for the semantic handler. */ OPRND (h_memory_sr) = GETMEMSI (current_cpu, CPU (h_gr[f_r2])); @@ -513,11 +526,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_26_LD_D) : /* e.g. ld $dr,@($slo16,$sr) */ + CASE (read, READ_FMT_27_LD_D) : /* e.g. ld $dr,@($slo16,$sr) */ { -#define OPRND(f) par_exec->operands.fmt_26_ld_d.f - EXTRACT_FMT_26_LD_D_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */ - EXTRACT_FMT_26_LD_D_CODE +#define OPRND(f) par_exec->operands.fmt_27_ld_d.f + EXTRACT_FMT_27_LD_D_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */ + EXTRACT_FMT_27_LD_D_CODE /* Fetch the input operands for the semantic handler. */ OPRND (h_memory_add_WI_sr_slo16) = GETMEMSI (current_cpu, ADDSI (CPU (h_gr[f_r2]), f_simm16)); @@ -527,11 +540,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_27_LDB) : /* e.g. ldb $dr,@$sr */ + CASE (read, READ_FMT_28_LDB) : /* e.g. ldb $dr,@$sr */ { -#define OPRND(f) par_exec->operands.fmt_27_ldb.f - EXTRACT_FMT_27_LDB_VARS /* f-op1 f-r1 f-op2 f-r2 */ - EXTRACT_FMT_27_LDB_CODE +#define OPRND(f) par_exec->operands.fmt_28_ldb.f + EXTRACT_FMT_28_LDB_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_28_LDB_CODE /* Fetch the input operands for the semantic handler. */ OPRND (h_memory_sr) = GETMEMQI (current_cpu, CPU (h_gr[f_r2])); @@ -540,11 +553,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_28_LDB_D) : /* e.g. ldb $dr,@($slo16,$sr) */ + CASE (read, READ_FMT_29_LDB_D) : /* e.g. ldb $dr,@($slo16,$sr) */ { -#define OPRND(f) par_exec->operands.fmt_28_ldb_d.f - EXTRACT_FMT_28_LDB_D_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */ - EXTRACT_FMT_28_LDB_D_CODE +#define OPRND(f) par_exec->operands.fmt_29_ldb_d.f + EXTRACT_FMT_29_LDB_D_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */ + EXTRACT_FMT_29_LDB_D_CODE /* Fetch the input operands for the semantic handler. */ OPRND (h_memory_add_WI_sr_slo16) = GETMEMQI (current_cpu, ADDSI (CPU (h_gr[f_r2]), f_simm16)); @@ -554,11 +567,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_29_LDH) : /* e.g. ldh $dr,@$sr */ + CASE (read, READ_FMT_30_LDH) : /* e.g. ldh $dr,@$sr */ { -#define OPRND(f) par_exec->operands.fmt_29_ldh.f - EXTRACT_FMT_29_LDH_VARS /* f-op1 f-r1 f-op2 f-r2 */ - EXTRACT_FMT_29_LDH_CODE +#define OPRND(f) par_exec->operands.fmt_30_ldh.f + EXTRACT_FMT_30_LDH_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_30_LDH_CODE /* Fetch the input operands for the semantic handler. */ OPRND (h_memory_sr) = GETMEMHI (current_cpu, CPU (h_gr[f_r2])); @@ -567,11 +580,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_30_LDH_D) : /* e.g. ldh $dr,@($slo16,$sr) */ + CASE (read, READ_FMT_31_LDH_D) : /* e.g. ldh $dr,@($slo16,$sr) */ { -#define OPRND(f) par_exec->operands.fmt_30_ldh_d.f - EXTRACT_FMT_30_LDH_D_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */ - EXTRACT_FMT_30_LDH_D_CODE +#define OPRND(f) par_exec->operands.fmt_31_ldh_d.f + EXTRACT_FMT_31_LDH_D_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */ + EXTRACT_FMT_31_LDH_D_CODE /* Fetch the input operands for the semantic handler. */ OPRND (h_memory_add_WI_sr_slo16) = GETMEMHI (current_cpu, ADDSI (CPU (h_gr[f_r2]), f_simm16)); @@ -581,11 +594,24 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_31_LD24) : /* e.g. ld24 $dr,#$uimm24 */ + CASE (read, READ_FMT_32_LD_PLUS) : /* e.g. ld $dr,@$sr+ */ { -#define OPRND(f) par_exec->operands.fmt_31_ld24.f - EXTRACT_FMT_31_LD24_VARS /* f-op1 f-r1 f-uimm24 */ - EXTRACT_FMT_31_LD24_CODE +#define OPRND(f) par_exec->operands.fmt_32_ld_plus.f + EXTRACT_FMT_32_LD_PLUS_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_32_LD_PLUS_CODE + + /* Fetch the input operands for the semantic handler. */ + OPRND (h_memory_sr) = GETMEMSI (current_cpu, CPU (h_gr[f_r2])); + OPRND (sr) = CPU (h_gr[f_r2]); +#undef OPRND + } + BREAK (read); + + CASE (read, READ_FMT_33_LD24) : /* e.g. ld24 $dr,#$uimm24 */ + { +#define OPRND(f) par_exec->operands.fmt_33_ld24.f + EXTRACT_FMT_33_LD24_VARS /* f-op1 f-r1 f-uimm24 */ + EXTRACT_FMT_33_LD24_CODE /* Fetch the input operands for the semantic handler. */ OPRND (uimm24) = f_uimm24; @@ -593,11 +619,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_32_LDI8) : /* e.g. ldi $dr,#$simm8 */ + CASE (read, READ_FMT_34_LDI8) : /* e.g. ldi $dr,#$simm8 */ { -#define OPRND(f) par_exec->operands.fmt_32_ldi8.f - EXTRACT_FMT_32_LDI8_VARS /* f-op1 f-r1 f-simm8 */ - EXTRACT_FMT_32_LDI8_CODE +#define OPRND(f) par_exec->operands.fmt_34_ldi8.f + EXTRACT_FMT_34_LDI8_VARS /* f-op1 f-r1 f-simm8 */ + EXTRACT_FMT_34_LDI8_CODE /* Fetch the input operands for the semantic handler. */ OPRND (simm8) = f_simm8; @@ -605,11 +631,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_33_LDI16) : /* e.g. ldi $dr,$slo16 */ + CASE (read, READ_FMT_35_LDI16) : /* e.g. ldi $dr,$slo16 */ { -#define OPRND(f) par_exec->operands.fmt_33_ldi16.f - EXTRACT_FMT_33_LDI16_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */ - EXTRACT_FMT_33_LDI16_CODE +#define OPRND(f) par_exec->operands.fmt_35_ldi16.f + EXTRACT_FMT_35_LDI16_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */ + EXTRACT_FMT_35_LDI16_CODE /* Fetch the input operands for the semantic handler. */ OPRND (slo16) = f_simm16; @@ -617,11 +643,24 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_34_MACHI_A) : /* e.g. machi $src1,$src2,$acc */ + CASE (read, READ_FMT_36_LOCK) : /* e.g. lock $dr,@$sr */ + { +#define OPRND(f) par_exec->operands.fmt_36_lock.f + EXTRACT_FMT_36_LOCK_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_36_LOCK_CODE + + /* Fetch the input operands for the semantic handler. */ + OPRND (dr) = CPU (h_gr[f_r1]); + OPRND (sr) = CPU (h_gr[f_r2]); +#undef OPRND + } + BREAK (read); + + CASE (read, READ_FMT_37_MACHI_A) : /* e.g. machi $src1,$src2,$acc */ { -#define OPRND(f) par_exec->operands.fmt_34_machi_a.f - EXTRACT_FMT_34_MACHI_A_VARS /* f-op1 f-r1 f-acc f-op23 f-r2 */ - EXTRACT_FMT_34_MACHI_A_CODE +#define OPRND(f) par_exec->operands.fmt_37_machi_a.f + EXTRACT_FMT_37_MACHI_A_VARS /* f-op1 f-r1 f-acc f-op23 f-r2 */ + EXTRACT_FMT_37_MACHI_A_CODE /* Fetch the input operands for the semantic handler. */ OPRND (acc) = m32rx_h_accums_get (current_cpu, f_acc); @@ -631,11 +670,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_35_MULHI_A) : /* e.g. mulhi $src1,$src2,$acc */ + CASE (read, READ_FMT_38_MULHI_A) : /* e.g. mulhi $src1,$src2,$acc */ { -#define OPRND(f) par_exec->operands.fmt_35_mulhi_a.f - EXTRACT_FMT_35_MULHI_A_VARS /* f-op1 f-r1 f-acc f-op23 f-r2 */ - EXTRACT_FMT_35_MULHI_A_CODE +#define OPRND(f) par_exec->operands.fmt_38_mulhi_a.f + EXTRACT_FMT_38_MULHI_A_VARS /* f-op1 f-r1 f-acc f-op23 f-r2 */ + EXTRACT_FMT_38_MULHI_A_CODE /* Fetch the input operands for the semantic handler. */ OPRND (src1) = CPU (h_gr[f_r1]); @@ -644,11 +683,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_36_MV) : /* e.g. mv $dr,$sr */ + CASE (read, READ_FMT_39_MV) : /* e.g. mv $dr,$sr */ { -#define OPRND(f) par_exec->operands.fmt_36_mv.f - EXTRACT_FMT_36_MV_VARS /* f-op1 f-r1 f-op2 f-r2 */ - EXTRACT_FMT_36_MV_CODE +#define OPRND(f) par_exec->operands.fmt_39_mv.f + EXTRACT_FMT_39_MV_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_39_MV_CODE /* Fetch the input operands for the semantic handler. */ OPRND (sr) = CPU (h_gr[f_r2]); @@ -656,11 +695,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_37_MVFACHI_A) : /* e.g. mvfachi $dr,$accs */ + CASE (read, READ_FMT_40_MVFACHI_A) : /* e.g. mvfachi $dr,$accs */ { -#define OPRND(f) par_exec->operands.fmt_37_mvfachi_a.f - EXTRACT_FMT_37_MVFACHI_A_VARS /* f-op1 f-r1 f-op2 f-accs f-op3 */ - EXTRACT_FMT_37_MVFACHI_A_CODE +#define OPRND(f) par_exec->operands.fmt_40_mvfachi_a.f + EXTRACT_FMT_40_MVFACHI_A_VARS /* f-op1 f-r1 f-op2 f-accs f-op3 */ + EXTRACT_FMT_40_MVFACHI_A_CODE /* Fetch the input operands for the semantic handler. */ OPRND (accs) = m32rx_h_accums_get (current_cpu, f_accs); @@ -668,11 +707,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_38_MVFC) : /* e.g. mvfc $dr,$scr */ + CASE (read, READ_FMT_41_MVFC) : /* e.g. mvfc $dr,$scr */ { -#define OPRND(f) par_exec->operands.fmt_38_mvfc.f - EXTRACT_FMT_38_MVFC_VARS /* f-op1 f-r1 f-op2 f-r2 */ - EXTRACT_FMT_38_MVFC_CODE +#define OPRND(f) par_exec->operands.fmt_41_mvfc.f + EXTRACT_FMT_41_MVFC_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_41_MVFC_CODE /* Fetch the input operands for the semantic handler. */ OPRND (scr) = m32rx_h_cr_get (current_cpu, f_r2); @@ -680,11 +719,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_39_MVTACHI_A) : /* e.g. mvtachi $src1,$accs */ + CASE (read, READ_FMT_42_MVTACHI_A) : /* e.g. mvtachi $src1,$accs */ { -#define OPRND(f) par_exec->operands.fmt_39_mvtachi_a.f - EXTRACT_FMT_39_MVTACHI_A_VARS /* f-op1 f-r1 f-op2 f-accs f-op3 */ - EXTRACT_FMT_39_MVTACHI_A_CODE +#define OPRND(f) par_exec->operands.fmt_42_mvtachi_a.f + EXTRACT_FMT_42_MVTACHI_A_VARS /* f-op1 f-r1 f-op2 f-accs f-op3 */ + EXTRACT_FMT_42_MVTACHI_A_CODE /* Fetch the input operands for the semantic handler. */ OPRND (accs) = m32rx_h_accums_get (current_cpu, f_accs); @@ -693,11 +732,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_40_MVTC) : /* e.g. mvtc $sr,$dcr */ + CASE (read, READ_FMT_43_MVTC) : /* e.g. mvtc $sr,$dcr */ { -#define OPRND(f) par_exec->operands.fmt_40_mvtc.f - EXTRACT_FMT_40_MVTC_VARS /* f-op1 f-r1 f-op2 f-r2 */ - EXTRACT_FMT_40_MVTC_CODE +#define OPRND(f) par_exec->operands.fmt_43_mvtc.f + EXTRACT_FMT_43_MVTC_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_43_MVTC_CODE /* Fetch the input operands for the semantic handler. */ OPRND (sr) = CPU (h_gr[f_r2]); @@ -705,22 +744,22 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_41_NOP) : /* e.g. nop */ + CASE (read, READ_FMT_44_NOP) : /* e.g. nop */ { -#define OPRND(f) par_exec->operands.fmt_41_nop.f - EXTRACT_FMT_41_NOP_VARS /* f-op1 f-r1 f-op2 f-r2 */ - EXTRACT_FMT_41_NOP_CODE +#define OPRND(f) par_exec->operands.fmt_44_nop.f + EXTRACT_FMT_44_NOP_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_44_NOP_CODE /* Fetch the input operands for the semantic handler. */ #undef OPRND } BREAK (read); - CASE (read, READ_FMT_42_RAC_D) : /* e.g. rac $accd */ + CASE (read, READ_FMT_45_RAC_D) : /* e.g. rac $accd */ { -#define OPRND(f) par_exec->operands.fmt_42_rac_d.f - EXTRACT_FMT_42_RAC_D_VARS /* f-op1 f-accd f-bits67 f-op2 f-accs f-bit14 f-imm1 */ - EXTRACT_FMT_42_RAC_D_CODE +#define OPRND(f) par_exec->operands.fmt_45_rac_d.f + EXTRACT_FMT_45_RAC_D_VARS /* f-op1 f-accd f-bits67 f-op2 f-accs f-bit14 f-imm1 */ + EXTRACT_FMT_45_RAC_D_CODE /* Fetch the input operands for the semantic handler. */ OPRND (accum) = CPU (h_accum); @@ -728,11 +767,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_43_RAC_DS) : /* e.g. rac $accd,$accs */ + CASE (read, READ_FMT_46_RAC_DS) : /* e.g. rac $accd,$accs */ { -#define OPRND(f) par_exec->operands.fmt_43_rac_ds.f - EXTRACT_FMT_43_RAC_DS_VARS /* f-op1 f-accd f-bits67 f-op2 f-accs f-bit14 f-imm1 */ - EXTRACT_FMT_43_RAC_DS_CODE +#define OPRND(f) par_exec->operands.fmt_46_rac_ds.f + EXTRACT_FMT_46_RAC_DS_VARS /* f-op1 f-accd f-bits67 f-op2 f-accs f-bit14 f-imm1 */ + EXTRACT_FMT_46_RAC_DS_CODE /* Fetch the input operands for the semantic handler. */ OPRND (accs) = m32rx_h_accums_get (current_cpu, f_accs); @@ -740,11 +779,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_44_RAC_DSI) : /* e.g. rac $accd,$accs,#$imm1 */ + CASE (read, READ_FMT_47_RAC_DSI) : /* e.g. rac $accd,$accs,#$imm1 */ { -#define OPRND(f) par_exec->operands.fmt_44_rac_dsi.f - EXTRACT_FMT_44_RAC_DSI_VARS /* f-op1 f-accd f-bits67 f-op2 f-accs f-bit14 f-imm1 */ - EXTRACT_FMT_44_RAC_DSI_CODE +#define OPRND(f) par_exec->operands.fmt_47_rac_dsi.f + EXTRACT_FMT_47_RAC_DSI_VARS /* f-op1 f-accd f-bits67 f-op2 f-accs f-bit14 f-imm1 */ + EXTRACT_FMT_47_RAC_DSI_CODE /* Fetch the input operands for the semantic handler. */ OPRND (accs) = m32rx_h_accums_get (current_cpu, f_accs); @@ -753,11 +792,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_45_RTE) : /* e.g. rte */ + CASE (read, READ_FMT_48_RTE) : /* e.g. rte */ { -#define OPRND(f) par_exec->operands.fmt_45_rte.f - EXTRACT_FMT_45_RTE_VARS /* f-op1 f-r1 f-op2 f-r2 */ - EXTRACT_FMT_45_RTE_CODE +#define OPRND(f) par_exec->operands.fmt_48_rte.f + EXTRACT_FMT_48_RTE_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_48_RTE_CODE /* Fetch the input operands for the semantic handler. */ OPRND (h_bcond_0) = CPU (h_bcond); @@ -768,11 +807,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_46_SETH) : /* e.g. seth $dr,#$hi16 */ + CASE (read, READ_FMT_49_SETH) : /* e.g. seth $dr,#$hi16 */ { -#define OPRND(f) par_exec->operands.fmt_46_seth.f - EXTRACT_FMT_46_SETH_VARS /* f-op1 f-r1 f-op2 f-r2 f-hi16 */ - EXTRACT_FMT_46_SETH_CODE +#define OPRND(f) par_exec->operands.fmt_49_seth.f + EXTRACT_FMT_49_SETH_VARS /* f-op1 f-r1 f-op2 f-r2 f-hi16 */ + EXTRACT_FMT_49_SETH_CODE /* Fetch the input operands for the semantic handler. */ OPRND (hi16) = f_hi16; @@ -780,11 +819,24 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_47_SLLI) : /* e.g. slli $dr,#$uimm5 */ + CASE (read, READ_FMT_50_SLL3) : /* e.g. sll3 $dr,$sr,#$simm16 */ { -#define OPRND(f) par_exec->operands.fmt_47_slli.f - EXTRACT_FMT_47_SLLI_VARS /* f-op1 f-r1 f-shift-op2 f-uimm5 */ - EXTRACT_FMT_47_SLLI_CODE +#define OPRND(f) par_exec->operands.fmt_50_sll3.f + EXTRACT_FMT_50_SLL3_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */ + EXTRACT_FMT_50_SLL3_CODE + + /* Fetch the input operands for the semantic handler. */ + OPRND (simm16) = f_simm16; + OPRND (sr) = CPU (h_gr[f_r2]); +#undef OPRND + } + BREAK (read); + + CASE (read, READ_FMT_51_SLLI) : /* e.g. slli $dr,#$uimm5 */ + { +#define OPRND(f) par_exec->operands.fmt_51_slli.f + EXTRACT_FMT_51_SLLI_VARS /* f-op1 f-r1 f-shift-op2 f-uimm5 */ + EXTRACT_FMT_51_SLLI_CODE /* Fetch the input operands for the semantic handler. */ OPRND (dr) = CPU (h_gr[f_r1]); @@ -793,11 +845,24 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_48_ST_D) : /* e.g. st $src1,@($slo16,$src2) */ + CASE (read, READ_FMT_52_ST) : /* e.g. st $src1,@$src2 */ { -#define OPRND(f) par_exec->operands.fmt_48_st_d.f - EXTRACT_FMT_48_ST_D_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */ - EXTRACT_FMT_48_ST_D_CODE +#define OPRND(f) par_exec->operands.fmt_52_st.f + EXTRACT_FMT_52_ST_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_52_ST_CODE + + /* Fetch the input operands for the semantic handler. */ + OPRND (src1) = CPU (h_gr[f_r1]); + OPRND (src2) = CPU (h_gr[f_r2]); +#undef OPRND + } + BREAK (read); + + CASE (read, READ_FMT_53_ST_D) : /* e.g. st $src1,@($slo16,$src2) */ + { +#define OPRND(f) par_exec->operands.fmt_53_st_d.f + EXTRACT_FMT_53_ST_D_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */ + EXTRACT_FMT_53_ST_D_CODE /* Fetch the input operands for the semantic handler. */ OPRND (slo16) = f_simm16; @@ -807,11 +872,78 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_49_TRAP) : /* e.g. trap #$uimm4 */ + CASE (read, READ_FMT_54_STB) : /* e.g. stb $src1,@$src2 */ + { +#define OPRND(f) par_exec->operands.fmt_54_stb.f + EXTRACT_FMT_54_STB_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_54_STB_CODE + + /* Fetch the input operands for the semantic handler. */ + OPRND (src1) = CPU (h_gr[f_r1]); + OPRND (src2) = CPU (h_gr[f_r2]); +#undef OPRND + } + BREAK (read); + + CASE (read, READ_FMT_55_STB_D) : /* e.g. stb $src1,@($slo16,$src2) */ { -#define OPRND(f) par_exec->operands.fmt_49_trap.f - EXTRACT_FMT_49_TRAP_VARS /* f-op1 f-r1 f-op2 f-uimm4 */ - EXTRACT_FMT_49_TRAP_CODE +#define OPRND(f) par_exec->operands.fmt_55_stb_d.f + EXTRACT_FMT_55_STB_D_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */ + EXTRACT_FMT_55_STB_D_CODE + + /* Fetch the input operands for the semantic handler. */ + OPRND (slo16) = f_simm16; + OPRND (src1) = CPU (h_gr[f_r1]); + OPRND (src2) = CPU (h_gr[f_r2]); +#undef OPRND + } + BREAK (read); + + CASE (read, READ_FMT_56_STH) : /* e.g. sth $src1,@$src2 */ + { +#define OPRND(f) par_exec->operands.fmt_56_sth.f + EXTRACT_FMT_56_STH_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_56_STH_CODE + + /* Fetch the input operands for the semantic handler. */ + OPRND (src1) = CPU (h_gr[f_r1]); + OPRND (src2) = CPU (h_gr[f_r2]); +#undef OPRND + } + BREAK (read); + + CASE (read, READ_FMT_57_STH_D) : /* e.g. sth $src1,@($slo16,$src2) */ + { +#define OPRND(f) par_exec->operands.fmt_57_sth_d.f + EXTRACT_FMT_57_STH_D_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */ + EXTRACT_FMT_57_STH_D_CODE + + /* Fetch the input operands for the semantic handler. */ + OPRND (slo16) = f_simm16; + OPRND (src1) = CPU (h_gr[f_r1]); + OPRND (src2) = CPU (h_gr[f_r2]); +#undef OPRND + } + BREAK (read); + + CASE (read, READ_FMT_58_ST_PLUS) : /* e.g. st $src1,@+$src2 */ + { +#define OPRND(f) par_exec->operands.fmt_58_st_plus.f + EXTRACT_FMT_58_ST_PLUS_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_58_ST_PLUS_CODE + + /* Fetch the input operands for the semantic handler. */ + OPRND (src1) = CPU (h_gr[f_r1]); + OPRND (src2) = CPU (h_gr[f_r2]); +#undef OPRND + } + BREAK (read); + + CASE (read, READ_FMT_59_TRAP) : /* e.g. trap #$uimm4 */ + { +#define OPRND(f) par_exec->operands.fmt_59_trap.f + EXTRACT_FMT_59_TRAP_VARS /* f-op1 f-r1 f-op2 f-uimm4 */ + EXTRACT_FMT_59_TRAP_CODE /* Fetch the input operands for the semantic handler. */ OPRND (uimm4) = f_uimm4; @@ -819,36 +951,49 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_50_SATB) : /* e.g. satb $dr,$src2 */ + CASE (read, READ_FMT_60_UNLOCK) : /* e.g. unlock $src1,@$src2 */ { -#define OPRND(f) par_exec->operands.fmt_50_satb.f - EXTRACT_FMT_50_SATB_VARS /* f-op1 f-r1 f-op2 f-r2 f-uimm16 */ - EXTRACT_FMT_50_SATB_CODE +#define OPRND(f) par_exec->operands.fmt_60_unlock.f + EXTRACT_FMT_60_UNLOCK_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_60_UNLOCK_CODE /* Fetch the input operands for the semantic handler. */ + OPRND (src1) = CPU (h_gr[f_r1]); OPRND (src2) = CPU (h_gr[f_r2]); #undef OPRND } BREAK (read); - CASE (read, READ_FMT_51_SAT) : /* e.g. sat $dr,$src2 */ + CASE (read, READ_FMT_61_SATB) : /* e.g. satb $dr,$sr */ + { +#define OPRND(f) par_exec->operands.fmt_61_satb.f + EXTRACT_FMT_61_SATB_VARS /* f-op1 f-r1 f-op2 f-r2 f-uimm16 */ + EXTRACT_FMT_61_SATB_CODE + + /* Fetch the input operands for the semantic handler. */ + OPRND (sr) = CPU (h_gr[f_r2]); +#undef OPRND + } + BREAK (read); + + CASE (read, READ_FMT_62_SAT) : /* e.g. sat $dr,$sr */ { -#define OPRND(f) par_exec->operands.fmt_51_sat.f - EXTRACT_FMT_51_SAT_VARS /* f-op1 f-r1 f-op2 f-r2 f-uimm16 */ - EXTRACT_FMT_51_SAT_CODE +#define OPRND(f) par_exec->operands.fmt_62_sat.f + EXTRACT_FMT_62_SAT_VARS /* f-op1 f-r1 f-op2 f-r2 f-uimm16 */ + EXTRACT_FMT_62_SAT_CODE /* Fetch the input operands for the semantic handler. */ OPRND (condbit) = CPU (h_cond); - OPRND (src2) = CPU (h_gr[f_r2]); + OPRND (sr) = CPU (h_gr[f_r2]); #undef OPRND } BREAK (read); - CASE (read, READ_FMT_52_SADD) : /* e.g. sadd */ + CASE (read, READ_FMT_63_SADD) : /* e.g. sadd */ { -#define OPRND(f) par_exec->operands.fmt_52_sadd.f - EXTRACT_FMT_52_SADD_VARS /* f-op1 f-r1 f-op2 f-r2 */ - EXTRACT_FMT_52_SADD_CODE +#define OPRND(f) par_exec->operands.fmt_63_sadd.f + EXTRACT_FMT_63_SADD_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_63_SADD_CODE /* Fetch the input operands for the semantic handler. */ OPRND (h_accums_0) = m32rx_h_accums_get (current_cpu, 0); @@ -857,11 +1002,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_53_MACWU1) : /* e.g. macwu1 $src1,$src2 */ + CASE (read, READ_FMT_64_MACWU1) : /* e.g. macwu1 $src1,$src2 */ { -#define OPRND(f) par_exec->operands.fmt_53_macwu1.f - EXTRACT_FMT_53_MACWU1_VARS /* f-op1 f-r1 f-op2 f-r2 */ - EXTRACT_FMT_53_MACWU1_CODE +#define OPRND(f) par_exec->operands.fmt_64_macwu1.f + EXTRACT_FMT_64_MACWU1_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_64_MACWU1_CODE /* Fetch the input operands for the semantic handler. */ OPRND (h_accums_1) = m32rx_h_accums_get (current_cpu, 1); @@ -871,11 +1016,11 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_54_MSBLO) : /* e.g. msblo $src1,$src2 */ + CASE (read, READ_FMT_65_MSBLO) : /* e.g. msblo $src1,$src2 */ { -#define OPRND(f) par_exec->operands.fmt_54_msblo.f - EXTRACT_FMT_54_MSBLO_VARS /* f-op1 f-r1 f-op2 f-r2 */ - EXTRACT_FMT_54_MSBLO_CODE +#define OPRND(f) par_exec->operands.fmt_65_msblo.f + EXTRACT_FMT_65_MSBLO_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_65_MSBLO_CODE /* Fetch the input operands for the semantic handler. */ OPRND (accum) = CPU (h_accum); @@ -885,11 +1030,24 @@ with this program; if not, write to the Free Software Foundation, Inc., } BREAK (read); - CASE (read, READ_FMT_55_SC) : /* e.g. sc */ + CASE (read, READ_FMT_66_MULWU1) : /* e.g. mulwu1 $src1,$src2 */ + { +#define OPRND(f) par_exec->operands.fmt_66_mulwu1.f + EXTRACT_FMT_66_MULWU1_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_66_MULWU1_CODE + + /* Fetch the input operands for the semantic handler. */ + OPRND (src1) = CPU (h_gr[f_r1]); + OPRND (src2) = CPU (h_gr[f_r2]); +#undef OPRND + } + BREAK (read); + + CASE (read, READ_FMT_67_SC) : /* e.g. sc */ { -#define OPRND(f) par_exec->operands.fmt_55_sc.f - EXTRACT_FMT_55_SC_VARS /* f-op1 f-r1 f-op2 f-r2 */ - EXTRACT_FMT_55_SC_CODE +#define OPRND(f) par_exec->operands.fmt_67_sc.f + EXTRACT_FMT_67_SC_VARS /* f-op1 f-r1 f-op2 f-r2 */ + EXTRACT_FMT_67_SC_CODE /* Fetch the input operands for the semantic handler. */ OPRND (condbit) = CPU (h_cond); |