X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fcris%2Fdecodev32.c;h=d6daef267bde2536e9c5999db8f9a37b4b7514e1;hb=f809832224cc45eb58812f6d4bb03cbf52fad980;hp=aa9d353690f61320c622b46258c4b4877a73f69b;hpb=cf2bf87e2161ad7fb1a4fe4abc3e3b70bcaae4b5;p=deliverable%2Fbinutils-gdb.git diff --git a/sim/cris/decodev32.c b/sim/cris/decodev32.c index aa9d353690..d6daef267b 100644 --- a/sim/cris/decodev32.c +++ b/sim/cris/decodev32.c @@ -2,23 +2,22 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996-2005 Free Software Foundation, Inc. +Copyright 1996-2020 Free Software Foundation, Inc. This file is part of the GNU simulators. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. + This file is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. -This program is distributed in the hope that it 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. + It is distributed in the hope that it 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 program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + You should have received a copy of the GNU General Public License along + with this program; if not, see . */ @@ -92,22 +91,18 @@ static const struct insn_sem crisv32f_insn_sem[] = { CRIS_INSN_MOVE_R_SPRV32, CRISV32F_INSN_MOVE_R_SPRV32, CRISV32F_SFMT_MOVE_R_SPRV32 }, { CRIS_INSN_MOVE_SPR_RV32, CRISV32F_INSN_MOVE_SPR_RV32, CRISV32F_SFMT_MOVE_SPR_RV32 }, { CRIS_INSN_MOVE_M_SPRV32, CRISV32F_INSN_MOVE_M_SPRV32, CRISV32F_SFMT_MOVE_M_SPRV32 }, - { CRIS_INSN_MOVE_C_SPRV32_P0, CRISV32F_INSN_MOVE_C_SPRV32_P0, CRISV32F_SFMT_MOVE_C_SPRV32_P0 }, - { CRIS_INSN_MOVE_C_SPRV32_P1, CRISV32F_INSN_MOVE_C_SPRV32_P1, CRISV32F_SFMT_MOVE_C_SPRV32_P0 }, - { CRIS_INSN_MOVE_C_SPRV32_P2, CRISV32F_INSN_MOVE_C_SPRV32_P2, CRISV32F_SFMT_MOVE_C_SPRV32_P0 }, - { CRIS_INSN_MOVE_C_SPRV32_P3, CRISV32F_INSN_MOVE_C_SPRV32_P3, CRISV32F_SFMT_MOVE_C_SPRV32_P0 }, - { CRIS_INSN_MOVE_C_SPRV32_P4, CRISV32F_INSN_MOVE_C_SPRV32_P4, CRISV32F_SFMT_MOVE_C_SPRV32_P0 }, - { CRIS_INSN_MOVE_C_SPRV32_P5, CRISV32F_INSN_MOVE_C_SPRV32_P5, CRISV32F_SFMT_MOVE_C_SPRV32_P0 }, - { CRIS_INSN_MOVE_C_SPRV32_P6, CRISV32F_INSN_MOVE_C_SPRV32_P6, CRISV32F_SFMT_MOVE_C_SPRV32_P0 }, - { CRIS_INSN_MOVE_C_SPRV32_P7, CRISV32F_INSN_MOVE_C_SPRV32_P7, CRISV32F_SFMT_MOVE_C_SPRV32_P0 }, - { CRIS_INSN_MOVE_C_SPRV32_P8, CRISV32F_INSN_MOVE_C_SPRV32_P8, CRISV32F_SFMT_MOVE_C_SPRV32_P0 }, - { CRIS_INSN_MOVE_C_SPRV32_P9, CRISV32F_INSN_MOVE_C_SPRV32_P9, CRISV32F_SFMT_MOVE_C_SPRV32_P0 }, - { CRIS_INSN_MOVE_C_SPRV32_P10, CRISV32F_INSN_MOVE_C_SPRV32_P10, CRISV32F_SFMT_MOVE_C_SPRV32_P0 }, - { CRIS_INSN_MOVE_C_SPRV32_P11, CRISV32F_INSN_MOVE_C_SPRV32_P11, CRISV32F_SFMT_MOVE_C_SPRV32_P0 }, - { CRIS_INSN_MOVE_C_SPRV32_P12, CRISV32F_INSN_MOVE_C_SPRV32_P12, CRISV32F_SFMT_MOVE_C_SPRV32_P0 }, - { CRIS_INSN_MOVE_C_SPRV32_P13, CRISV32F_INSN_MOVE_C_SPRV32_P13, CRISV32F_SFMT_MOVE_C_SPRV32_P0 }, - { CRIS_INSN_MOVE_C_SPRV32_P14, CRISV32F_INSN_MOVE_C_SPRV32_P14, CRISV32F_SFMT_MOVE_C_SPRV32_P0 }, - { CRIS_INSN_MOVE_C_SPRV32_P15, CRISV32F_INSN_MOVE_C_SPRV32_P15, CRISV32F_SFMT_MOVE_C_SPRV32_P0 }, + { CRIS_INSN_MOVE_C_SPRV32_P2, CRISV32F_INSN_MOVE_C_SPRV32_P2, CRISV32F_SFMT_MOVE_C_SPRV32_P2 }, + { CRIS_INSN_MOVE_C_SPRV32_P3, CRISV32F_INSN_MOVE_C_SPRV32_P3, CRISV32F_SFMT_MOVE_C_SPRV32_P2 }, + { CRIS_INSN_MOVE_C_SPRV32_P5, CRISV32F_INSN_MOVE_C_SPRV32_P5, CRISV32F_SFMT_MOVE_C_SPRV32_P2 }, + { CRIS_INSN_MOVE_C_SPRV32_P6, CRISV32F_INSN_MOVE_C_SPRV32_P6, CRISV32F_SFMT_MOVE_C_SPRV32_P2 }, + { CRIS_INSN_MOVE_C_SPRV32_P7, CRISV32F_INSN_MOVE_C_SPRV32_P7, CRISV32F_SFMT_MOVE_C_SPRV32_P2 }, + { CRIS_INSN_MOVE_C_SPRV32_P9, CRISV32F_INSN_MOVE_C_SPRV32_P9, CRISV32F_SFMT_MOVE_C_SPRV32_P2 }, + { CRIS_INSN_MOVE_C_SPRV32_P10, CRISV32F_INSN_MOVE_C_SPRV32_P10, CRISV32F_SFMT_MOVE_C_SPRV32_P2 }, + { CRIS_INSN_MOVE_C_SPRV32_P11, CRISV32F_INSN_MOVE_C_SPRV32_P11, CRISV32F_SFMT_MOVE_C_SPRV32_P2 }, + { CRIS_INSN_MOVE_C_SPRV32_P12, CRISV32F_INSN_MOVE_C_SPRV32_P12, CRISV32F_SFMT_MOVE_C_SPRV32_P2 }, + { CRIS_INSN_MOVE_C_SPRV32_P13, CRISV32F_INSN_MOVE_C_SPRV32_P13, CRISV32F_SFMT_MOVE_C_SPRV32_P2 }, + { CRIS_INSN_MOVE_C_SPRV32_P14, CRISV32F_INSN_MOVE_C_SPRV32_P14, CRISV32F_SFMT_MOVE_C_SPRV32_P2 }, + { CRIS_INSN_MOVE_C_SPRV32_P15, CRISV32F_INSN_MOVE_C_SPRV32_P15, CRISV32F_SFMT_MOVE_C_SPRV32_P2 }, { CRIS_INSN_MOVE_SPR_MV32, CRISV32F_INSN_MOVE_SPR_MV32, CRISV32F_SFMT_MOVE_SPR_MV32 }, { CRIS_INSN_MOVE_SS_R, CRISV32F_INSN_MOVE_SS_R, CRISV32F_SFMT_MOVE_SS_R }, { CRIS_INSN_MOVE_R_SS, CRISV32F_INSN_MOVE_R_SS, CRISV32F_SFMT_MOVE_R_SS }, @@ -182,7 +177,7 @@ static const struct insn_sem crisv32f_insn_sem[] = { CRIS_INSN_DSTEP, CRISV32F_INSN_DSTEP, CRISV32F_SFMT_DSTEP }, { CRIS_INSN_ABS, CRISV32F_INSN_ABS, CRISV32F_SFMT_MOVS_B_R }, { CRIS_INSN_AND_B_R, CRISV32F_INSN_AND_B_R, CRISV32F_SFMT_AND_B_R }, - { CRIS_INSN_AND_W_R, CRISV32F_INSN_AND_W_R, CRISV32F_SFMT_AND_W_R }, + { CRIS_INSN_AND_W_R, CRISV32F_INSN_AND_W_R, CRISV32F_SFMT_AND_B_R }, { CRIS_INSN_AND_D_R, CRISV32F_INSN_AND_D_R, CRISV32F_SFMT_AND_D_R }, { CRIS_INSN_AND_M_B_M, CRISV32F_INSN_AND_M_B_M, CRISV32F_SFMT_AND_M_B_M }, { CRIS_INSN_AND_M_W_M, CRISV32F_INSN_AND_M_W_M, CRISV32F_SFMT_AND_M_W_M }, @@ -192,7 +187,7 @@ static const struct insn_sem crisv32f_insn_sem[] = { CRIS_INSN_ANDCDR, CRISV32F_INSN_ANDCDR, CRISV32F_SFMT_ANDCDR }, { CRIS_INSN_ANDQ, CRISV32F_INSN_ANDQ, CRISV32F_SFMT_ANDQ }, { CRIS_INSN_ORR_B_R, CRISV32F_INSN_ORR_B_R, CRISV32F_SFMT_AND_B_R }, - { CRIS_INSN_ORR_W_R, CRISV32F_INSN_ORR_W_R, CRISV32F_SFMT_AND_W_R }, + { CRIS_INSN_ORR_W_R, CRISV32F_INSN_ORR_W_R, CRISV32F_SFMT_AND_B_R }, { CRIS_INSN_ORR_D_R, CRISV32F_INSN_ORR_D_R, CRISV32F_SFMT_AND_D_R }, { CRIS_INSN_OR_M_B_M, CRISV32F_INSN_OR_M_B_M, CRISV32F_SFMT_AND_M_B_M }, { CRIS_INSN_OR_M_W_M, CRISV32F_INSN_OR_M_W_M, CRISV32F_SFMT_AND_M_W_M }, @@ -203,8 +198,8 @@ static const struct insn_sem crisv32f_insn_sem[] = { CRIS_INSN_ORQ, CRISV32F_INSN_ORQ, CRISV32F_SFMT_ANDQ }, { CRIS_INSN_XOR, CRISV32F_INSN_XOR, CRISV32F_SFMT_DSTEP }, { CRIS_INSN_SWAP, CRISV32F_INSN_SWAP, CRISV32F_SFMT_SWAP }, - { CRIS_INSN_ASRR_B_R, CRISV32F_INSN_ASRR_B_R, CRISV32F_SFMT_ASRR_B_R }, - { CRIS_INSN_ASRR_W_R, CRISV32F_INSN_ASRR_W_R, CRISV32F_SFMT_ASRR_B_R }, + { CRIS_INSN_ASRR_B_R, CRISV32F_INSN_ASRR_B_R, CRISV32F_SFMT_AND_B_R }, + { CRIS_INSN_ASRR_W_R, CRISV32F_INSN_ASRR_W_R, CRISV32F_SFMT_AND_B_R }, { CRIS_INSN_ASRR_D_R, CRISV32F_INSN_ASRR_D_R, CRISV32F_SFMT_AND_D_R }, { CRIS_INSN_ASRQ, CRISV32F_INSN_ASRQ, CRISV32F_SFMT_ASRQ }, { CRIS_INSN_LSRR_B_R, CRISV32F_INSN_LSRR_B_R, CRISV32F_SFMT_LSRR_B_R }, @@ -260,7 +255,8 @@ static const struct insn_sem crisv32f_insn_sem[] = { CRIS_INSN_FTAGD, CRISV32F_INSN_FTAGD, CRISV32F_SFMT_FIDXI }, }; -static const struct insn_sem crisv32f_insn_sem_invalid = { +static const struct insn_sem crisv32f_insn_sem_invalid = +{ VIRTUAL_INSN_X_INVALID, CRISV32F_INSN_X_INVALID, CRISV32F_SFMT_EMPTY }; @@ -310,7 +306,7 @@ crisv32f_init_idesc_table (SIM_CPU *cpu) init_idesc (cpu, id, t); /* Now fill in the values for the chosen cpu. */ - for (t = crisv32f_insn_sem, tend = t + sizeof (crisv32f_insn_sem) / sizeof (*t); + for (t = crisv32f_insn_sem, tend = t + ARRAY_SIZE (crisv32f_insn_sem); t != tend; ++t) { init_idesc (cpu, & table[t->index], t); @@ -324,14 +320,14 @@ crisv32f_init_idesc_table (SIM_CPU *cpu) const IDESC * crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, - CGEN_INSN_INT base_insn, + CGEN_INSN_WORD base_insn, ARGBUF *abuf) { /* Result of decoder. */ CRISV32F_INSN_TYPE itype; { - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; { unsigned int val = (((insn >> 4) & (255 << 0))); @@ -371,14 +367,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 15 : - if ((base_insn & 0xf00) == 0x0) - { itype = CRISV32F_INSN_BCC_B; goto extract_sfmt_bcc_b; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 14 : - if ((base_insn & 0xff00) == 0xe000) - { itype = CRISV32F_INSN_BA_B; goto extract_sfmt_ba_b; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 15 : itype = CRISV32F_INSN_BCC_B; goto extract_sfmt_bcc_b; + case 14 : itype = CRISV32F_INSN_BA_B; goto extract_sfmt_ba_b; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -397,404 +387,122 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 28 : /* fall through */ case 29 : /* fall through */ case 30 : /* fall through */ - case 31 : - if ((base_insn & 0xf00) == 0x100) - { itype = CRISV32F_INSN_ADDOQ; goto extract_sfmt_addoq; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 31 : itype = CRISV32F_INSN_ADDOQ; goto extract_sfmt_addoq; case 32 : /* fall through */ case 33 : /* fall through */ case 34 : /* fall through */ - case 35 : - if ((base_insn & 0xfc0) == 0x200) - { itype = CRISV32F_INSN_ADDQ; goto extract_sfmt_addq; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 35 : itype = CRISV32F_INSN_ADDQ; goto extract_sfmt_addq; case 36 : /* fall through */ case 37 : /* fall through */ case 38 : /* fall through */ - case 39 : - if ((base_insn & 0xfc0) == 0x240) - { itype = CRISV32F_INSN_MOVEQ; goto extract_sfmt_moveq; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 39 : itype = CRISV32F_INSN_MOVEQ; goto extract_sfmt_moveq; case 40 : /* fall through */ case 41 : /* fall through */ case 42 : /* fall through */ - case 43 : - if ((base_insn & 0xfc0) == 0x280) - { itype = CRISV32F_INSN_SUBQ; goto extract_sfmt_addq; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 43 : itype = CRISV32F_INSN_SUBQ; goto extract_sfmt_addq; case 44 : /* fall through */ case 45 : /* fall through */ case 46 : /* fall through */ - case 47 : - if ((base_insn & 0xfc0) == 0x2c0) - { itype = CRISV32F_INSN_CMPQ; goto extract_sfmt_cmpq; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 47 : itype = CRISV32F_INSN_CMPQ; goto extract_sfmt_cmpq; case 48 : /* fall through */ case 49 : /* fall through */ case 50 : /* fall through */ - case 51 : - if ((base_insn & 0xfc0) == 0x300) - { itype = CRISV32F_INSN_ANDQ; goto extract_sfmt_andq; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 51 : itype = CRISV32F_INSN_ANDQ; goto extract_sfmt_andq; case 52 : /* fall through */ case 53 : /* fall through */ case 54 : /* fall through */ - case 55 : - if ((base_insn & 0xfc0) == 0x340) - { itype = CRISV32F_INSN_ORQ; goto extract_sfmt_andq; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 55 : itype = CRISV32F_INSN_ORQ; goto extract_sfmt_andq; case 56 : /* fall through */ - case 57 : - if ((base_insn & 0xfe0) == 0x380) - { itype = CRISV32F_INSN_BTSTQ; goto extract_sfmt_btstq; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 57 : itype = CRISV32F_INSN_BTSTQ; goto extract_sfmt_btstq; case 58 : /* fall through */ - case 59 : - if ((base_insn & 0xfe0) == 0x3a0) - { itype = CRISV32F_INSN_ASRQ; goto extract_sfmt_asrq; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 59 : itype = CRISV32F_INSN_ASRQ; goto extract_sfmt_asrq; case 60 : /* fall through */ - case 61 : - if ((base_insn & 0xfe0) == 0x3c0) - { itype = CRISV32F_INSN_LSLQ; goto extract_sfmt_asrq; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 61 : itype = CRISV32F_INSN_LSLQ; goto extract_sfmt_asrq; case 62 : /* fall through */ - case 63 : - if ((base_insn & 0xfe0) == 0x3e0) - { itype = CRISV32F_INSN_LSRQ; goto extract_sfmt_asrq; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 64 : - if ((base_insn & 0xff0) == 0x400) - { itype = CRISV32F_INSN_ADDU_B_R; goto extract_sfmt_add_d_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 65 : - if ((base_insn & 0xff0) == 0x410) - { itype = CRISV32F_INSN_ADDU_W_R; goto extract_sfmt_add_d_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 66 : - if ((base_insn & 0xff0) == 0x420) - { itype = CRISV32F_INSN_ADDS_B_R; goto extract_sfmt_add_d_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 67 : - if ((base_insn & 0xff0) == 0x430) - { itype = CRISV32F_INSN_ADDS_W_R; goto extract_sfmt_add_d_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 68 : - if ((base_insn & 0xff0) == 0x440) - { itype = CRISV32F_INSN_MOVU_B_R; goto extract_sfmt_movs_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 69 : - if ((base_insn & 0xff0) == 0x450) - { itype = CRISV32F_INSN_MOVU_W_R; goto extract_sfmt_movs_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 70 : - if ((base_insn & 0xff0) == 0x460) - { itype = CRISV32F_INSN_MOVS_B_R; goto extract_sfmt_movs_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 71 : - if ((base_insn & 0xff0) == 0x470) - { itype = CRISV32F_INSN_MOVS_W_R; goto extract_sfmt_movs_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 72 : - if ((base_insn & 0xff0) == 0x480) - { itype = CRISV32F_INSN_SUBU_B_R; goto extract_sfmt_add_d_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 73 : - if ((base_insn & 0xff0) == 0x490) - { itype = CRISV32F_INSN_SUBU_W_R; goto extract_sfmt_add_d_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 74 : - if ((base_insn & 0xff0) == 0x4a0) - { itype = CRISV32F_INSN_SUBS_B_R; goto extract_sfmt_add_d_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 75 : - if ((base_insn & 0xff0) == 0x4b0) - { itype = CRISV32F_INSN_SUBS_W_R; goto extract_sfmt_add_d_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 76 : - if ((base_insn & 0xff0) == 0x4c0) - { itype = CRISV32F_INSN_LSLR_B_R; goto extract_sfmt_lsrr_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 77 : - if ((base_insn & 0xff0) == 0x4d0) - { itype = CRISV32F_INSN_LSLR_W_R; goto extract_sfmt_lsrr_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 78 : - if ((base_insn & 0xff0) == 0x4e0) - { itype = CRISV32F_INSN_LSLR_D_R; goto extract_sfmt_lsrr_d_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 79 : - if ((base_insn & 0xff0) == 0x4f0) - { itype = CRISV32F_INSN_BTST; goto extract_sfmt_btst; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 80 : - if ((base_insn & 0xff0) == 0x500) - { itype = CRISV32F_INSN_ADDI_B_R; goto extract_sfmt_addi_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 81 : - if ((base_insn & 0xff0) == 0x510) - { itype = CRISV32F_INSN_ADDI_W_R; goto extract_sfmt_addi_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 82 : - if ((base_insn & 0xff0) == 0x520) - { itype = CRISV32F_INSN_ADDI_D_R; goto extract_sfmt_addi_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 83 : - if ((base_insn & 0xff0) == 0x530) - { itype = CRISV32F_INSN_SCC; goto extract_sfmt_scc; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 84 : - if ((base_insn & 0xff0) == 0x540) - { itype = CRISV32F_INSN_ADDI_ACR_B_R; goto extract_sfmt_addi_acr_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 85 : - if ((base_insn & 0xff0) == 0x550) - { itype = CRISV32F_INSN_ADDI_ACR_W_R; goto extract_sfmt_addi_acr_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 86 : - if ((base_insn & 0xff0) == 0x560) - { itype = CRISV32F_INSN_ADDI_ACR_D_R; goto extract_sfmt_addi_acr_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 87 : - if ((base_insn & 0xff0) == 0x570) - { itype = CRISV32F_INSN_ADDC_R; goto extract_sfmt_add_d_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 88 : - if ((base_insn & 0xff0) == 0x580) - { itype = CRISV32F_INSN_NEG_B_R; goto extract_sfmt_neg_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 89 : - if ((base_insn & 0xff0) == 0x590) - { itype = CRISV32F_INSN_NEG_W_R; goto extract_sfmt_neg_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 90 : - if ((base_insn & 0xff0) == 0x5a0) - { itype = CRISV32F_INSN_NEG_D_R; goto extract_sfmt_neg_d_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 91 : - if ((base_insn & 0xff0) == 0x5b0) - { itype = CRISV32F_INSN_SETF; goto extract_sfmt_setf; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 92 : - if ((base_insn & 0xff0) == 0x5c0) - { itype = CRISV32F_INSN_BOUND_R_B_R; goto extract_sfmt_dstep; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 93 : - if ((base_insn & 0xff0) == 0x5d0) - { itype = CRISV32F_INSN_BOUND_R_W_R; goto extract_sfmt_dstep; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 94 : - if ((base_insn & 0xff0) == 0x5e0) - { itype = CRISV32F_INSN_BOUND_R_D_R; goto extract_sfmt_dstep; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 95 : - if ((base_insn & 0xff0) == 0x5f0) - { itype = CRISV32F_INSN_CLEARF; goto extract_sfmt_setf; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 96 : - if ((base_insn & 0xff0) == 0x600) - { itype = CRISV32F_INSN_ADD_B_R; goto extract_sfmt_add_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 97 : - if ((base_insn & 0xff0) == 0x610) - { itype = CRISV32F_INSN_ADD_W_R; goto extract_sfmt_add_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 98 : - if ((base_insn & 0xff0) == 0x620) - { itype = CRISV32F_INSN_ADD_D_R; goto extract_sfmt_add_d_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 99 : - if ((base_insn & 0xff0) == 0x630) - { itype = CRISV32F_INSN_MOVE_R_SPRV32; goto extract_sfmt_move_r_sprv32; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 100 : - if ((base_insn & 0xff0) == 0x640) - { itype = CRISV32F_INSN_MOVE_B_R; goto extract_sfmt_move_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 101 : - if ((base_insn & 0xff0) == 0x650) - { itype = CRISV32F_INSN_MOVE_W_R; goto extract_sfmt_move_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 102 : - if ((base_insn & 0xff0) == 0x660) - { itype = CRISV32F_INSN_MOVE_D_R; goto extract_sfmt_move_d_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 103 : - if ((base_insn & 0xff0) == 0x670) - { itype = CRISV32F_INSN_MOVE_SPR_RV32; goto extract_sfmt_move_spr_rv32; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 104 : - if ((base_insn & 0xff0) == 0x680) - { itype = CRISV32F_INSN_SUB_B_R; goto extract_sfmt_add_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 105 : - if ((base_insn & 0xff0) == 0x690) - { itype = CRISV32F_INSN_SUB_W_R; goto extract_sfmt_add_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 106 : - if ((base_insn & 0xff0) == 0x6a0) - { itype = CRISV32F_INSN_SUB_D_R; goto extract_sfmt_add_d_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 107 : - if ((base_insn & 0xff0) == 0x6b0) - { itype = CRISV32F_INSN_ABS; goto extract_sfmt_movs_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 108 : - if ((base_insn & 0xff0) == 0x6c0) - { itype = CRISV32F_INSN_CMP_R_B_R; goto extract_sfmt_cmp_r_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 109 : - if ((base_insn & 0xff0) == 0x6d0) - { itype = CRISV32F_INSN_CMP_R_W_R; goto extract_sfmt_cmp_r_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 110 : - if ((base_insn & 0xff0) == 0x6e0) - { itype = CRISV32F_INSN_CMP_R_D_R; goto extract_sfmt_cmp_r_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 111 : - if ((base_insn & 0xff0) == 0x6f0) - { itype = CRISV32F_INSN_DSTEP; goto extract_sfmt_dstep; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 112 : - if ((base_insn & 0xff0) == 0x700) - { itype = CRISV32F_INSN_AND_B_R; goto extract_sfmt_and_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 113 : - if ((base_insn & 0xff0) == 0x710) - { itype = CRISV32F_INSN_AND_W_R; goto extract_sfmt_and_w_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 114 : - if ((base_insn & 0xff0) == 0x720) - { itype = CRISV32F_INSN_AND_D_R; goto extract_sfmt_and_d_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 115 : - if ((base_insn & 0xff0) == 0x730) - { itype = CRISV32F_INSN_LZ; goto extract_sfmt_movs_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 116 : - if ((base_insn & 0xff0) == 0x740) - { itype = CRISV32F_INSN_ORR_B_R; goto extract_sfmt_and_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 117 : - if ((base_insn & 0xff0) == 0x750) - { itype = CRISV32F_INSN_ORR_W_R; goto extract_sfmt_and_w_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 118 : - if ((base_insn & 0xff0) == 0x760) - { itype = CRISV32F_INSN_ORR_D_R; goto extract_sfmt_and_d_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 119 : - if ((base_insn & 0xff0) == 0x770) - { itype = CRISV32F_INSN_SWAP; goto extract_sfmt_swap; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 120 : - if ((base_insn & 0xff0) == 0x780) - { itype = CRISV32F_INSN_ASRR_B_R; goto extract_sfmt_asrr_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 121 : - if ((base_insn & 0xff0) == 0x790) - { itype = CRISV32F_INSN_ASRR_W_R; goto extract_sfmt_asrr_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 122 : - if ((base_insn & 0xff0) == 0x7a0) - { itype = CRISV32F_INSN_ASRR_D_R; goto extract_sfmt_and_d_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 123 : - if ((base_insn & 0xff0) == 0x7b0) - { itype = CRISV32F_INSN_XOR; goto extract_sfmt_dstep; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 124 : - if ((base_insn & 0xff0) == 0x7c0) - { itype = CRISV32F_INSN_LSRR_B_R; goto extract_sfmt_lsrr_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 125 : - if ((base_insn & 0xff0) == 0x7d0) - { itype = CRISV32F_INSN_LSRR_W_R; goto extract_sfmt_lsrr_b_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 126 : - if ((base_insn & 0xff0) == 0x7e0) - { itype = CRISV32F_INSN_LSRR_D_R; goto extract_sfmt_lsrr_d_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 127 : - if ((base_insn & 0xff0) == 0x7f0) - { itype = CRISV32F_INSN_MCP; goto extract_sfmt_mcp; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 128 : - if ((base_insn & 0xbf0) == 0x800) - { itype = CRISV32F_INSN_ADDU_M_B_M; goto extract_sfmt_adds_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 129 : - if ((base_insn & 0xbf0) == 0x810) - { itype = CRISV32F_INSN_ADDU_M_W_M; goto extract_sfmt_adds_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 130 : - if ((base_insn & 0xbf0) == 0x820) - { itype = CRISV32F_INSN_ADDS_M_B_M; goto extract_sfmt_adds_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 131 : - if ((base_insn & 0xbf0) == 0x830) - { itype = CRISV32F_INSN_ADDS_M_W_M; goto extract_sfmt_adds_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 132 : - if ((base_insn & 0xbf0) == 0x840) - { itype = CRISV32F_INSN_MOVU_M_B_M; goto extract_sfmt_movs_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 133 : - if ((base_insn & 0xbf0) == 0x850) - { itype = CRISV32F_INSN_MOVU_M_W_M; goto extract_sfmt_movs_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 134 : - if ((base_insn & 0xbf0) == 0x860) - { itype = CRISV32F_INSN_MOVS_M_B_M; goto extract_sfmt_movs_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 135 : - if ((base_insn & 0xbf0) == 0x870) - { itype = CRISV32F_INSN_MOVS_M_W_M; goto extract_sfmt_movs_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 136 : - if ((base_insn & 0xbf0) == 0x880) - { itype = CRISV32F_INSN_SUBU_M_B_M; goto extract_sfmt_adds_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 137 : - if ((base_insn & 0xbf0) == 0x890) - { itype = CRISV32F_INSN_SUBU_M_W_M; goto extract_sfmt_adds_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 138 : - if ((base_insn & 0xbf0) == 0x8a0) - { itype = CRISV32F_INSN_SUBS_M_B_M; goto extract_sfmt_adds_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 139 : - if ((base_insn & 0xbf0) == 0x8b0) - { itype = CRISV32F_INSN_SUBS_M_W_M; goto extract_sfmt_adds_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 140 : - if ((base_insn & 0xbf0) == 0x8c0) - { itype = CRISV32F_INSN_CMPU_M_B_M; goto extract_sfmt_cmp_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 141 : - if ((base_insn & 0xbf0) == 0x8d0) - { itype = CRISV32F_INSN_CMPU_M_W_M; goto extract_sfmt_cmp_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 142 : - if ((base_insn & 0xbf0) == 0x8e0) - { itype = CRISV32F_INSN_CMPS_M_B_M; goto extract_sfmt_cmp_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 143 : - if ((base_insn & 0xbf0) == 0x8f0) - { itype = CRISV32F_INSN_CMPS_M_W_M; goto extract_sfmt_cmp_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 144 : - if ((base_insn & 0xff0) == 0x900) - { itype = CRISV32F_INSN_MULU_B; goto extract_sfmt_muls_b; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 145 : - if ((base_insn & 0xff0) == 0x910) - { itype = CRISV32F_INSN_MULU_W; goto extract_sfmt_muls_b; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 146 : - if ((base_insn & 0xff0) == 0x920) - { itype = CRISV32F_INSN_MULU_D; goto extract_sfmt_muls_b; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 63 : itype = CRISV32F_INSN_LSRQ; goto extract_sfmt_asrq; + case 64 : itype = CRISV32F_INSN_ADDU_B_R; goto extract_sfmt_add_d_r; + case 65 : itype = CRISV32F_INSN_ADDU_W_R; goto extract_sfmt_add_d_r; + case 66 : itype = CRISV32F_INSN_ADDS_B_R; goto extract_sfmt_add_d_r; + case 67 : itype = CRISV32F_INSN_ADDS_W_R; goto extract_sfmt_add_d_r; + case 68 : itype = CRISV32F_INSN_MOVU_B_R; goto extract_sfmt_movs_b_r; + case 69 : itype = CRISV32F_INSN_MOVU_W_R; goto extract_sfmt_movs_b_r; + case 70 : itype = CRISV32F_INSN_MOVS_B_R; goto extract_sfmt_movs_b_r; + case 71 : itype = CRISV32F_INSN_MOVS_W_R; goto extract_sfmt_movs_b_r; + case 72 : itype = CRISV32F_INSN_SUBU_B_R; goto extract_sfmt_add_d_r; + case 73 : itype = CRISV32F_INSN_SUBU_W_R; goto extract_sfmt_add_d_r; + case 74 : itype = CRISV32F_INSN_SUBS_B_R; goto extract_sfmt_add_d_r; + case 75 : itype = CRISV32F_INSN_SUBS_W_R; goto extract_sfmt_add_d_r; + case 76 : itype = CRISV32F_INSN_LSLR_B_R; goto extract_sfmt_lsrr_b_r; + case 77 : itype = CRISV32F_INSN_LSLR_W_R; goto extract_sfmt_lsrr_b_r; + case 78 : itype = CRISV32F_INSN_LSLR_D_R; goto extract_sfmt_lsrr_d_r; + case 79 : itype = CRISV32F_INSN_BTST; goto extract_sfmt_btst; + case 80 : itype = CRISV32F_INSN_ADDI_B_R; goto extract_sfmt_addi_b_r; + case 81 : itype = CRISV32F_INSN_ADDI_W_R; goto extract_sfmt_addi_b_r; + case 82 : itype = CRISV32F_INSN_ADDI_D_R; goto extract_sfmt_addi_b_r; + case 83 : itype = CRISV32F_INSN_SCC; goto extract_sfmt_scc; + case 84 : itype = CRISV32F_INSN_ADDI_ACR_B_R; goto extract_sfmt_addi_acr_b_r; + case 85 : itype = CRISV32F_INSN_ADDI_ACR_W_R; goto extract_sfmt_addi_acr_b_r; + case 86 : itype = CRISV32F_INSN_ADDI_ACR_D_R; goto extract_sfmt_addi_acr_b_r; + case 87 : itype = CRISV32F_INSN_ADDC_R; goto extract_sfmt_add_d_r; + case 88 : itype = CRISV32F_INSN_NEG_B_R; goto extract_sfmt_neg_b_r; + case 89 : itype = CRISV32F_INSN_NEG_W_R; goto extract_sfmt_neg_b_r; + case 90 : itype = CRISV32F_INSN_NEG_D_R; goto extract_sfmt_neg_d_r; + case 91 : itype = CRISV32F_INSN_SETF; goto extract_sfmt_setf; + case 92 : itype = CRISV32F_INSN_BOUND_R_B_R; goto extract_sfmt_dstep; + case 93 : itype = CRISV32F_INSN_BOUND_R_W_R; goto extract_sfmt_dstep; + case 94 : itype = CRISV32F_INSN_BOUND_R_D_R; goto extract_sfmt_dstep; + case 95 : itype = CRISV32F_INSN_CLEARF; goto extract_sfmt_setf; + case 96 : itype = CRISV32F_INSN_ADD_B_R; goto extract_sfmt_add_b_r; + case 97 : itype = CRISV32F_INSN_ADD_W_R; goto extract_sfmt_add_b_r; + case 98 : itype = CRISV32F_INSN_ADD_D_R; goto extract_sfmt_add_d_r; + case 99 : itype = CRISV32F_INSN_MOVE_R_SPRV32; goto extract_sfmt_move_r_sprv32; + case 100 : itype = CRISV32F_INSN_MOVE_B_R; goto extract_sfmt_move_b_r; + case 101 : itype = CRISV32F_INSN_MOVE_W_R; goto extract_sfmt_move_b_r; + case 102 : itype = CRISV32F_INSN_MOVE_D_R; goto extract_sfmt_move_d_r; + case 103 : itype = CRISV32F_INSN_MOVE_SPR_RV32; goto extract_sfmt_move_spr_rv32; + case 104 : itype = CRISV32F_INSN_SUB_B_R; goto extract_sfmt_add_b_r; + case 105 : itype = CRISV32F_INSN_SUB_W_R; goto extract_sfmt_add_b_r; + case 106 : itype = CRISV32F_INSN_SUB_D_R; goto extract_sfmt_add_d_r; + case 107 : itype = CRISV32F_INSN_ABS; goto extract_sfmt_movs_b_r; + case 108 : itype = CRISV32F_INSN_CMP_R_B_R; goto extract_sfmt_cmp_r_b_r; + case 109 : itype = CRISV32F_INSN_CMP_R_W_R; goto extract_sfmt_cmp_r_b_r; + case 110 : itype = CRISV32F_INSN_CMP_R_D_R; goto extract_sfmt_cmp_r_b_r; + case 111 : itype = CRISV32F_INSN_DSTEP; goto extract_sfmt_dstep; + case 112 : itype = CRISV32F_INSN_AND_B_R; goto extract_sfmt_and_b_r; + case 113 : itype = CRISV32F_INSN_AND_W_R; goto extract_sfmt_and_b_r; + case 114 : itype = CRISV32F_INSN_AND_D_R; goto extract_sfmt_and_d_r; + case 115 : itype = CRISV32F_INSN_LZ; goto extract_sfmt_movs_b_r; + case 116 : itype = CRISV32F_INSN_ORR_B_R; goto extract_sfmt_and_b_r; + case 117 : itype = CRISV32F_INSN_ORR_W_R; goto extract_sfmt_and_b_r; + case 118 : itype = CRISV32F_INSN_ORR_D_R; goto extract_sfmt_and_d_r; + case 119 : itype = CRISV32F_INSN_SWAP; goto extract_sfmt_swap; + case 120 : itype = CRISV32F_INSN_ASRR_B_R; goto extract_sfmt_and_b_r; + case 121 : itype = CRISV32F_INSN_ASRR_W_R; goto extract_sfmt_and_b_r; + case 122 : itype = CRISV32F_INSN_ASRR_D_R; goto extract_sfmt_and_d_r; + case 123 : itype = CRISV32F_INSN_XOR; goto extract_sfmt_dstep; + case 124 : itype = CRISV32F_INSN_LSRR_B_R; goto extract_sfmt_lsrr_b_r; + case 125 : itype = CRISV32F_INSN_LSRR_W_R; goto extract_sfmt_lsrr_b_r; + case 126 : itype = CRISV32F_INSN_LSRR_D_R; goto extract_sfmt_lsrr_d_r; + case 127 : itype = CRISV32F_INSN_MCP; goto extract_sfmt_mcp; + case 128 : itype = CRISV32F_INSN_ADDU_M_B_M; goto extract_sfmt_adds_m_b_m; + case 129 : itype = CRISV32F_INSN_ADDU_M_W_M; goto extract_sfmt_adds_m_w_m; + case 130 : itype = CRISV32F_INSN_ADDS_M_B_M; goto extract_sfmt_adds_m_b_m; + case 131 : itype = CRISV32F_INSN_ADDS_M_W_M; goto extract_sfmt_adds_m_w_m; + case 132 : itype = CRISV32F_INSN_MOVU_M_B_M; goto extract_sfmt_movs_m_b_m; + case 133 : itype = CRISV32F_INSN_MOVU_M_W_M; goto extract_sfmt_movs_m_w_m; + case 134 : itype = CRISV32F_INSN_MOVS_M_B_M; goto extract_sfmt_movs_m_b_m; + case 135 : itype = CRISV32F_INSN_MOVS_M_W_M; goto extract_sfmt_movs_m_w_m; + case 136 : itype = CRISV32F_INSN_SUBU_M_B_M; goto extract_sfmt_adds_m_b_m; + case 137 : itype = CRISV32F_INSN_SUBU_M_W_M; goto extract_sfmt_adds_m_w_m; + case 138 : itype = CRISV32F_INSN_SUBS_M_B_M; goto extract_sfmt_adds_m_b_m; + case 139 : itype = CRISV32F_INSN_SUBS_M_W_M; goto extract_sfmt_adds_m_w_m; + case 140 : itype = CRISV32F_INSN_CMPU_M_B_M; goto extract_sfmt_cmp_m_b_m; + case 141 : itype = CRISV32F_INSN_CMPU_M_W_M; goto extract_sfmt_cmp_m_w_m; + case 142 : itype = CRISV32F_INSN_CMPS_M_B_M; goto extract_sfmt_cmp_m_b_m; + case 143 : itype = CRISV32F_INSN_CMPS_M_W_M; goto extract_sfmt_cmp_m_w_m; + case 144 : itype = CRISV32F_INSN_MULU_B; goto extract_sfmt_muls_b; + case 145 : itype = CRISV32F_INSN_MULU_W; goto extract_sfmt_muls_b; + case 146 : itype = CRISV32F_INSN_MULU_D; goto extract_sfmt_muls_b; case 147 : { unsigned int val = (((insn >> 12) & (15 << 0))); @@ -816,10 +524,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, if ((base_insn & 0xffff) == 0x5930) { itype = CRISV32F_INSN_RFN; goto extract_sfmt_rfn; } itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 14 : - if ((base_insn & 0xfff0) == 0xe930) - { itype = CRISV32F_INSN_BREAK; goto extract_sfmt_break; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_BREAK; goto extract_sfmt_break; case 15 : if ((base_insn & 0xffff) == 0xf930) { itype = CRISV32F_INSN_HALT; goto extract_sfmt_halt; } @@ -827,79 +532,28 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } - case 148 : - if ((base_insn & 0xbf0) == 0x940) - { itype = CRISV32F_INSN_ADDO_M_B_M; goto extract_sfmt_addo_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 149 : - if ((base_insn & 0xbf0) == 0x950) - { itype = CRISV32F_INSN_ADDO_M_W_M; goto extract_sfmt_addo_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 150 : - if ((base_insn & 0xbf0) == 0x960) - { itype = CRISV32F_INSN_ADDO_M_D_M; goto extract_sfmt_addo_m_d_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 151 : - if ((base_insn & 0xff0) == 0x970) - { itype = CRISV32F_INSN_LAPCQ; goto extract_sfmt_lapcq; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 154 : - if ((base_insn & 0xbf0) == 0x9a0) - { itype = CRISV32F_INSN_ADDC_M; goto extract_sfmt_addc_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 155 : - if ((base_insn & 0xff0) == 0x9b0) - { itype = CRISV32F_INSN_JAS_R; goto extract_sfmt_jas_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 148 : itype = CRISV32F_INSN_ADDO_M_B_M; goto extract_sfmt_addo_m_b_m; + case 149 : itype = CRISV32F_INSN_ADDO_M_W_M; goto extract_sfmt_addo_m_w_m; + case 150 : itype = CRISV32F_INSN_ADDO_M_D_M; goto extract_sfmt_addo_m_d_m; + case 151 : itype = CRISV32F_INSN_LAPCQ; goto extract_sfmt_lapcq; + case 154 : itype = CRISV32F_INSN_ADDC_M; goto extract_sfmt_addc_m; + case 155 : itype = CRISV32F_INSN_JAS_R; goto extract_sfmt_jas_r; case 159 : if ((base_insn & 0xfff) == 0x9f0) { itype = CRISV32F_INSN_JUMP_P; goto extract_sfmt_jump_p; } itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 160 : - if ((base_insn & 0xbf0) == 0xa00) - { itype = CRISV32F_INSN_ADD_M_B_M; goto extract_sfmt_add_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 161 : - if ((base_insn & 0xbf0) == 0xa10) - { itype = CRISV32F_INSN_ADD_M_W_M; goto extract_sfmt_add_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 162 : - if ((base_insn & 0xbf0) == 0xa20) - { itype = CRISV32F_INSN_ADD_M_D_M; goto extract_sfmt_add_m_d_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 163 : - if ((base_insn & 0xbf0) == 0xa30) - { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 164 : - if ((base_insn & 0xbf0) == 0xa40) - { itype = CRISV32F_INSN_MOVE_M_B_M; goto extract_sfmt_move_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 165 : - if ((base_insn & 0xbf0) == 0xa50) - { itype = CRISV32F_INSN_MOVE_M_W_M; goto extract_sfmt_move_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 166 : - if ((base_insn & 0xbf0) == 0xa60) - { itype = CRISV32F_INSN_MOVE_M_D_M; goto extract_sfmt_move_m_d_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 160 : itype = CRISV32F_INSN_ADD_M_B_M; goto extract_sfmt_add_m_b_m; + case 161 : itype = CRISV32F_INSN_ADD_M_W_M; goto extract_sfmt_add_m_w_m; + case 162 : itype = CRISV32F_INSN_ADD_M_D_M; goto extract_sfmt_add_m_d_m; + case 163 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; + case 164 : itype = CRISV32F_INSN_MOVE_M_B_M; goto extract_sfmt_move_m_b_m; + case 165 : itype = CRISV32F_INSN_MOVE_M_W_M; goto extract_sfmt_move_m_w_m; + case 166 : itype = CRISV32F_INSN_MOVE_M_D_M; goto extract_sfmt_move_m_d_m; case 167 : /* fall through */ - case 231 : - if ((base_insn & 0xbf0) == 0xa70) - { itype = CRISV32F_INSN_MOVE_SPR_MV32; goto extract_sfmt_move_spr_mv32; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 168 : - if ((base_insn & 0xbf0) == 0xa80) - { itype = CRISV32F_INSN_SUB_M_B_M; goto extract_sfmt_add_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 169 : - if ((base_insn & 0xbf0) == 0xa90) - { itype = CRISV32F_INSN_SUB_M_W_M; goto extract_sfmt_add_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 170 : - if ((base_insn & 0xbf0) == 0xaa0) - { itype = CRISV32F_INSN_SUB_M_D_M; goto extract_sfmt_add_m_d_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 231 : itype = CRISV32F_INSN_MOVE_SPR_MV32; goto extract_sfmt_move_spr_mv32; + case 168 : itype = CRISV32F_INSN_SUB_M_B_M; goto extract_sfmt_add_m_b_m; + case 169 : itype = CRISV32F_INSN_SUB_M_W_M; goto extract_sfmt_add_m_w_m; + case 170 : itype = CRISV32F_INSN_SUB_M_D_M; goto extract_sfmt_add_m_d_m; case 171 : { unsigned int val = (((insn >> 12) & (1 << 0))); @@ -916,50 +570,17 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } - case 172 : - if ((base_insn & 0xbf0) == 0xac0) - { itype = CRISV32F_INSN_CMP_M_B_M; goto extract_sfmt_cmp_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 173 : - if ((base_insn & 0xbf0) == 0xad0) - { itype = CRISV32F_INSN_CMP_M_W_M; goto extract_sfmt_cmp_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 174 : - if ((base_insn & 0xbf0) == 0xae0) - { itype = CRISV32F_INSN_CMP_M_D_M; goto extract_sfmt_cmp_m_d_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 176 : - if ((base_insn & 0xbf0) == 0xb00) - { itype = CRISV32F_INSN_AND_M_B_M; goto extract_sfmt_and_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 177 : - if ((base_insn & 0xbf0) == 0xb10) - { itype = CRISV32F_INSN_AND_M_W_M; goto extract_sfmt_and_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 178 : - if ((base_insn & 0xbf0) == 0xb20) - { itype = CRISV32F_INSN_AND_M_D_M; goto extract_sfmt_and_m_d_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 179 : - if ((base_insn & 0xff0) == 0xb30) - { itype = CRISV32F_INSN_JASC_R; goto extract_sfmt_jasc_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 180 : - if ((base_insn & 0xbf0) == 0xb40) - { itype = CRISV32F_INSN_OR_M_B_M; goto extract_sfmt_and_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 181 : - if ((base_insn & 0xbf0) == 0xb50) - { itype = CRISV32F_INSN_OR_M_W_M; goto extract_sfmt_and_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 182 : - if ((base_insn & 0xbf0) == 0xb60) - { itype = CRISV32F_INSN_OR_M_D_M; goto extract_sfmt_and_m_d_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 183 : - if ((base_insn & 0xff0) == 0xb70) - { itype = CRISV32F_INSN_MOVE_R_SS; goto extract_sfmt_move_r_ss; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 172 : itype = CRISV32F_INSN_CMP_M_B_M; goto extract_sfmt_cmp_m_b_m; + case 173 : itype = CRISV32F_INSN_CMP_M_W_M; goto extract_sfmt_cmp_m_w_m; + case 174 : itype = CRISV32F_INSN_CMP_M_D_M; goto extract_sfmt_cmp_m_d_m; + case 176 : itype = CRISV32F_INSN_AND_M_B_M; goto extract_sfmt_and_m_b_m; + case 177 : itype = CRISV32F_INSN_AND_M_W_M; goto extract_sfmt_and_m_w_m; + case 178 : itype = CRISV32F_INSN_AND_M_D_M; goto extract_sfmt_and_m_d_m; + case 179 : itype = CRISV32F_INSN_JASC_R; goto extract_sfmt_jasc_r; + case 180 : itype = CRISV32F_INSN_OR_M_B_M; goto extract_sfmt_and_m_b_m; + case 181 : itype = CRISV32F_INSN_OR_M_W_M; goto extract_sfmt_and_m_w_m; + case 182 : itype = CRISV32F_INSN_OR_M_D_M; goto extract_sfmt_and_m_d_m; + case 183 : itype = CRISV32F_INSN_MOVE_R_SS; goto extract_sfmt_move_r_ss; case 184 : /* fall through */ case 248 : if ((base_insn & 0xfbf0) == 0xb80) @@ -976,30 +597,15 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, { itype = CRISV32F_INSN_TEST_M_D_M; goto extract_sfmt_test_m_d_m; } itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; case 187 : /* fall through */ - case 251 : - if ((base_insn & 0xbf0) == 0xbb0) - { itype = CRISV32F_INSN_MOVEM_M_R_V32; goto extract_sfmt_movem_m_r_v32; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 251 : itype = CRISV32F_INSN_MOVEM_M_R_V32; goto extract_sfmt_movem_m_r_v32; case 188 : /* fall through */ - case 252 : - if ((base_insn & 0xbf0) == 0xbc0) - { itype = CRISV32F_INSN_MOVE_R_M_B_M; goto extract_sfmt_move_r_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 252 : itype = CRISV32F_INSN_MOVE_R_M_B_M; goto extract_sfmt_move_r_m_b_m; case 189 : /* fall through */ - case 253 : - if ((base_insn & 0xbf0) == 0xbd0) - { itype = CRISV32F_INSN_MOVE_R_M_W_M; goto extract_sfmt_move_r_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 253 : itype = CRISV32F_INSN_MOVE_R_M_W_M; goto extract_sfmt_move_r_m_w_m; case 190 : /* fall through */ - case 254 : - if ((base_insn & 0xbf0) == 0xbe0) - { itype = CRISV32F_INSN_MOVE_R_M_D_M; goto extract_sfmt_move_r_m_d_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 254 : itype = CRISV32F_INSN_MOVE_R_M_D_M; goto extract_sfmt_move_r_m_d_m; case 191 : /* fall through */ - case 255 : - if ((base_insn & 0xbf0) == 0xbf0) - { itype = CRISV32F_INSN_MOVEM_R_M_V32; goto extract_sfmt_movem_r_m_v32; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 255 : itype = CRISV32F_INSN_MOVEM_R_M_V32; goto extract_sfmt_movem_r_m_v32; case 192 : { unsigned int val = (((insn >> 0) & (15 << 0))); @@ -1019,14 +625,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0x800) - { itype = CRISV32F_INSN_ADDU_M_B_M; goto extract_sfmt_adds_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xc0f) - { itype = CRISV32F_INSN_ADDUCBR; goto extract_sfmt_addscbr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_ADDU_M_B_M; goto extract_sfmt_adds_m_b_m; + case 15 : itype = CRISV32F_INSN_ADDUCBR; goto extract_sfmt_addscbr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1049,14 +649,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0x810) - { itype = CRISV32F_INSN_ADDU_M_W_M; goto extract_sfmt_adds_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xc1f) - { itype = CRISV32F_INSN_ADDUCWR; goto extract_sfmt_addscwr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_ADDU_M_W_M; goto extract_sfmt_adds_m_w_m; + case 15 : itype = CRISV32F_INSN_ADDUCWR; goto extract_sfmt_addscwr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1079,14 +673,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0x820) - { itype = CRISV32F_INSN_ADDS_M_B_M; goto extract_sfmt_adds_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xc2f) - { itype = CRISV32F_INSN_ADDSCBR; goto extract_sfmt_addscbr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_ADDS_M_B_M; goto extract_sfmt_adds_m_b_m; + case 15 : itype = CRISV32F_INSN_ADDSCBR; goto extract_sfmt_addscbr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1109,14 +697,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0x830) - { itype = CRISV32F_INSN_ADDS_M_W_M; goto extract_sfmt_adds_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xc3f) - { itype = CRISV32F_INSN_ADDSCWR; goto extract_sfmt_addscwr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_ADDS_M_W_M; goto extract_sfmt_adds_m_w_m; + case 15 : itype = CRISV32F_INSN_ADDSCWR; goto extract_sfmt_addscwr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1139,14 +721,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0x840) - { itype = CRISV32F_INSN_MOVU_M_B_M; goto extract_sfmt_movs_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xc4f) - { itype = CRISV32F_INSN_MOVUCBR; goto extract_sfmt_movucbr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_MOVU_M_B_M; goto extract_sfmt_movs_m_b_m; + case 15 : itype = CRISV32F_INSN_MOVUCBR; goto extract_sfmt_movucbr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1169,14 +745,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0x850) - { itype = CRISV32F_INSN_MOVU_M_W_M; goto extract_sfmt_movs_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xc5f) - { itype = CRISV32F_INSN_MOVUCWR; goto extract_sfmt_movucwr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_MOVU_M_W_M; goto extract_sfmt_movs_m_w_m; + case 15 : itype = CRISV32F_INSN_MOVUCWR; goto extract_sfmt_movucwr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1199,14 +769,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0x860) - { itype = CRISV32F_INSN_MOVS_M_B_M; goto extract_sfmt_movs_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xc6f) - { itype = CRISV32F_INSN_MOVSCBR; goto extract_sfmt_movscbr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_MOVS_M_B_M; goto extract_sfmt_movs_m_b_m; + case 15 : itype = CRISV32F_INSN_MOVSCBR; goto extract_sfmt_movscbr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1229,14 +793,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0x870) - { itype = CRISV32F_INSN_MOVS_M_W_M; goto extract_sfmt_movs_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xc7f) - { itype = CRISV32F_INSN_MOVSCWR; goto extract_sfmt_movscwr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_MOVS_M_W_M; goto extract_sfmt_movs_m_w_m; + case 15 : itype = CRISV32F_INSN_MOVSCWR; goto extract_sfmt_movscwr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1259,14 +817,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0x880) - { itype = CRISV32F_INSN_SUBU_M_B_M; goto extract_sfmt_adds_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xc8f) - { itype = CRISV32F_INSN_SUBUCBR; goto extract_sfmt_addscbr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_SUBU_M_B_M; goto extract_sfmt_adds_m_b_m; + case 15 : itype = CRISV32F_INSN_SUBUCBR; goto extract_sfmt_addscbr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1289,14 +841,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0x890) - { itype = CRISV32F_INSN_SUBU_M_W_M; goto extract_sfmt_adds_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xc9f) - { itype = CRISV32F_INSN_SUBUCWR; goto extract_sfmt_addscwr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_SUBU_M_W_M; goto extract_sfmt_adds_m_w_m; + case 15 : itype = CRISV32F_INSN_SUBUCWR; goto extract_sfmt_addscwr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1319,14 +865,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0x8a0) - { itype = CRISV32F_INSN_SUBS_M_B_M; goto extract_sfmt_adds_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xcaf) - { itype = CRISV32F_INSN_SUBSCBR; goto extract_sfmt_addscbr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_SUBS_M_B_M; goto extract_sfmt_adds_m_b_m; + case 15 : itype = CRISV32F_INSN_SUBSCBR; goto extract_sfmt_addscbr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1349,14 +889,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0x8b0) - { itype = CRISV32F_INSN_SUBS_M_W_M; goto extract_sfmt_adds_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xcbf) - { itype = CRISV32F_INSN_SUBSCWR; goto extract_sfmt_addscwr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_SUBS_M_W_M; goto extract_sfmt_adds_m_w_m; + case 15 : itype = CRISV32F_INSN_SUBSCWR; goto extract_sfmt_addscwr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1379,14 +913,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0x8c0) - { itype = CRISV32F_INSN_CMPU_M_B_M; goto extract_sfmt_cmp_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xccf) - { itype = CRISV32F_INSN_CMPUCBR; goto extract_sfmt_cmpucbr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_CMPU_M_B_M; goto extract_sfmt_cmp_m_b_m; + case 15 : itype = CRISV32F_INSN_CMPUCBR; goto extract_sfmt_cmpucbr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1409,14 +937,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0x8d0) - { itype = CRISV32F_INSN_CMPU_M_W_M; goto extract_sfmt_cmp_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xcdf) - { itype = CRISV32F_INSN_CMPUCWR; goto extract_sfmt_cmpucwr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_CMPU_M_W_M; goto extract_sfmt_cmp_m_w_m; + case 15 : itype = CRISV32F_INSN_CMPUCWR; goto extract_sfmt_cmpucwr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1439,14 +961,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0x8e0) - { itype = CRISV32F_INSN_CMPS_M_B_M; goto extract_sfmt_cmp_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xcef) - { itype = CRISV32F_INSN_CMPSCBR; goto extract_sfmt_cmpcbr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_CMPS_M_B_M; goto extract_sfmt_cmp_m_b_m; + case 15 : itype = CRISV32F_INSN_CMPSCBR; goto extract_sfmt_cmpcbr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1469,29 +985,14 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0x8f0) - { itype = CRISV32F_INSN_CMPS_M_W_M; goto extract_sfmt_cmp_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xcff) - { itype = CRISV32F_INSN_CMPSCWR; goto extract_sfmt_cmpcwr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_CMPS_M_W_M; goto extract_sfmt_cmp_m_w_m; + case 15 : itype = CRISV32F_INSN_CMPSCWR; goto extract_sfmt_cmpcwr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } - case 208 : - if ((base_insn & 0xff0) == 0xd00) - { itype = CRISV32F_INSN_MULS_B; goto extract_sfmt_muls_b; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 209 : - if ((base_insn & 0xff0) == 0xd10) - { itype = CRISV32F_INSN_MULS_W; goto extract_sfmt_muls_b; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 210 : - if ((base_insn & 0xff0) == 0xd20) - { itype = CRISV32F_INSN_MULS_D; goto extract_sfmt_muls_b; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 208 : itype = CRISV32F_INSN_MULS_B; goto extract_sfmt_muls_b; + case 209 : itype = CRISV32F_INSN_MULS_W; goto extract_sfmt_muls_b; + case 210 : itype = CRISV32F_INSN_MULS_D; goto extract_sfmt_muls_b; case 211 : { unsigned int val = (((insn >> 12) & (1 << 0))); @@ -1527,14 +1028,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0x940) - { itype = CRISV32F_INSN_ADDO_M_B_M; goto extract_sfmt_addo_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xd4f) - { itype = CRISV32F_INSN_ADDO_CB; goto extract_sfmt_addo_cb; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_ADDO_M_B_M; goto extract_sfmt_addo_m_b_m; + case 15 : itype = CRISV32F_INSN_ADDO_CB; goto extract_sfmt_addo_cb; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1557,14 +1052,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0x950) - { itype = CRISV32F_INSN_ADDO_M_W_M; goto extract_sfmt_addo_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xd5f) - { itype = CRISV32F_INSN_ADDO_CW; goto extract_sfmt_addo_cw; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_ADDO_M_W_M; goto extract_sfmt_addo_m_w_m; + case 15 : itype = CRISV32F_INSN_ADDO_CW; goto extract_sfmt_addo_cw; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1587,14 +1076,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0x960) - { itype = CRISV32F_INSN_ADDO_M_D_M; goto extract_sfmt_addo_m_d_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xd6f) - { itype = CRISV32F_INSN_ADDO_CD; goto extract_sfmt_addo_cd; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_ADDO_M_D_M; goto extract_sfmt_addo_m_d_m; + case 15 : itype = CRISV32F_INSN_ADDO_CD; goto extract_sfmt_addo_cd; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1621,14 +1104,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0x9a0) - { itype = CRISV32F_INSN_ADDC_M; goto extract_sfmt_addc_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xdaf) - { itype = CRISV32F_INSN_ADDC_C; goto extract_sfmt_addcdr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_ADDC_M; goto extract_sfmt_addc_m; + case 15 : itype = CRISV32F_INSN_ADDC_C; goto extract_sfmt_addcdr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1697,14 +1174,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa00) - { itype = CRISV32F_INSN_ADD_M_B_M; goto extract_sfmt_add_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xe0f) - { itype = CRISV32F_INSN_ADDCBR; goto extract_sfmt_addcbr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_ADD_M_B_M; goto extract_sfmt_add_m_b_m; + case 15 : itype = CRISV32F_INSN_ADDCBR; goto extract_sfmt_addcbr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1727,14 +1198,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa10) - { itype = CRISV32F_INSN_ADD_M_W_M; goto extract_sfmt_add_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xe1f) - { itype = CRISV32F_INSN_ADDCWR; goto extract_sfmt_addcwr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_ADD_M_W_M; goto extract_sfmt_add_m_w_m; + case 15 : itype = CRISV32F_INSN_ADDCWR; goto extract_sfmt_addcwr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1757,14 +1222,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa20) - { itype = CRISV32F_INSN_ADD_M_D_M; goto extract_sfmt_add_m_d_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xe2f) - { itype = CRISV32F_INSN_ADDCDR; goto extract_sfmt_addcdr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_ADD_M_D_M; goto extract_sfmt_add_m_d_m; + case 15 : itype = CRISV32F_INSN_ADDCDR; goto extract_sfmt_addcdr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1773,66 +1232,10 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 12) & (15 << 0))); switch (val) { - case 0 : - { - unsigned int val = (((insn >> 0) & (15 << 0))); - switch (val) - { - case 0 : /* fall through */ - case 1 : /* fall through */ - case 2 : /* fall through */ - case 3 : /* fall through */ - case 4 : /* fall through */ - case 5 : /* fall through */ - case 6 : /* fall through */ - case 7 : /* fall through */ - case 8 : /* fall through */ - case 9 : /* fall through */ - case 10 : /* fall through */ - case 11 : /* fall through */ - case 12 : /* fall through */ - case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa30) - { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xffff) == 0xe3f) - { itype = CRISV32F_INSN_MOVE_C_SPRV32_P0; goto extract_sfmt_move_c_sprv32_p0; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - } - } - case 1 : - { - unsigned int val = (((insn >> 0) & (15 << 0))); - switch (val) - { - case 0 : /* fall through */ - case 1 : /* fall through */ - case 2 : /* fall through */ - case 3 : /* fall through */ - case 4 : /* fall through */ - case 5 : /* fall through */ - case 6 : /* fall through */ - case 7 : /* fall through */ - case 8 : /* fall through */ - case 9 : /* fall through */ - case 10 : /* fall through */ - case 11 : /* fall through */ - case 12 : /* fall through */ - case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa30) - { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xffff) == 0x1e3f) - { itype = CRISV32F_INSN_MOVE_C_SPRV32_P1; goto extract_sfmt_move_c_sprv32_p0; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - } - } + case 0 : /* fall through */ + case 1 : /* fall through */ + case 4 : /* fall through */ + case 8 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; case 2 : { unsigned int val = (((insn >> 0) & (15 << 0))); @@ -1852,14 +1255,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa30) - { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xffff) == 0x2e3f) - { itype = CRISV32F_INSN_MOVE_C_SPRV32_P2; goto extract_sfmt_move_c_sprv32_p0; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; + case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P2; goto extract_sfmt_move_c_sprv32_p2; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1882,44 +1279,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa30) - { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xffff) == 0x3e3f) - { itype = CRISV32F_INSN_MOVE_C_SPRV32_P3; goto extract_sfmt_move_c_sprv32_p0; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - } - } - case 4 : - { - unsigned int val = (((insn >> 0) & (15 << 0))); - switch (val) - { - case 0 : /* fall through */ - case 1 : /* fall through */ - case 2 : /* fall through */ - case 3 : /* fall through */ - case 4 : /* fall through */ - case 5 : /* fall through */ - case 6 : /* fall through */ - case 7 : /* fall through */ - case 8 : /* fall through */ - case 9 : /* fall through */ - case 10 : /* fall through */ - case 11 : /* fall through */ - case 12 : /* fall through */ - case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa30) - { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xffff) == 0x4e3f) - { itype = CRISV32F_INSN_MOVE_C_SPRV32_P4; goto extract_sfmt_move_c_sprv32_p0; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; + case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P3; goto extract_sfmt_move_c_sprv32_p2; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1942,14 +1303,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa30) - { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xffff) == 0x5e3f) - { itype = CRISV32F_INSN_MOVE_C_SPRV32_P5; goto extract_sfmt_move_c_sprv32_p0; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; + case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P5; goto extract_sfmt_move_c_sprv32_p2; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1972,14 +1327,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa30) - { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xffff) == 0x6e3f) - { itype = CRISV32F_INSN_MOVE_C_SPRV32_P6; goto extract_sfmt_move_c_sprv32_p0; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; + case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P6; goto extract_sfmt_move_c_sprv32_p2; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2002,44 +1351,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa30) - { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xffff) == 0x7e3f) - { itype = CRISV32F_INSN_MOVE_C_SPRV32_P7; goto extract_sfmt_move_c_sprv32_p0; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - } - } - case 8 : - { - unsigned int val = (((insn >> 0) & (15 << 0))); - switch (val) - { - case 0 : /* fall through */ - case 1 : /* fall through */ - case 2 : /* fall through */ - case 3 : /* fall through */ - case 4 : /* fall through */ - case 5 : /* fall through */ - case 6 : /* fall through */ - case 7 : /* fall through */ - case 8 : /* fall through */ - case 9 : /* fall through */ - case 10 : /* fall through */ - case 11 : /* fall through */ - case 12 : /* fall through */ - case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa30) - { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xffff) == 0x8e3f) - { itype = CRISV32F_INSN_MOVE_C_SPRV32_P8; goto extract_sfmt_move_c_sprv32_p0; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; + case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P7; goto extract_sfmt_move_c_sprv32_p2; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2062,14 +1375,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa30) - { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xffff) == 0x9e3f) - { itype = CRISV32F_INSN_MOVE_C_SPRV32_P9; goto extract_sfmt_move_c_sprv32_p0; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; + case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P9; goto extract_sfmt_move_c_sprv32_p2; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2092,14 +1399,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa30) - { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xffff) == 0xae3f) - { itype = CRISV32F_INSN_MOVE_C_SPRV32_P10; goto extract_sfmt_move_c_sprv32_p0; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; + case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P10; goto extract_sfmt_move_c_sprv32_p2; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2122,14 +1423,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa30) - { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xffff) == 0xbe3f) - { itype = CRISV32F_INSN_MOVE_C_SPRV32_P11; goto extract_sfmt_move_c_sprv32_p0; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; + case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P11; goto extract_sfmt_move_c_sprv32_p2; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2152,14 +1447,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa30) - { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xffff) == 0xce3f) - { itype = CRISV32F_INSN_MOVE_C_SPRV32_P12; goto extract_sfmt_move_c_sprv32_p0; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; + case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P12; goto extract_sfmt_move_c_sprv32_p2; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2182,14 +1471,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa30) - { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xffff) == 0xde3f) - { itype = CRISV32F_INSN_MOVE_C_SPRV32_P13; goto extract_sfmt_move_c_sprv32_p0; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; + case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P13; goto extract_sfmt_move_c_sprv32_p2; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2212,14 +1495,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa30) - { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xffff) == 0xee3f) - { itype = CRISV32F_INSN_MOVE_C_SPRV32_P14; goto extract_sfmt_move_c_sprv32_p0; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; + case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P14; goto extract_sfmt_move_c_sprv32_p2; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2242,14 +1519,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa30) - { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xffff) == 0xfe3f) - { itype = CRISV32F_INSN_MOVE_C_SPRV32_P15; goto extract_sfmt_move_c_sprv32_p0; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; + case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P15; goto extract_sfmt_move_c_sprv32_p2; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2275,14 +1546,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa40) - { itype = CRISV32F_INSN_MOVE_M_B_M; goto extract_sfmt_move_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xe4f) - { itype = CRISV32F_INSN_MOVECBR; goto extract_sfmt_movecbr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_MOVE_M_B_M; goto extract_sfmt_move_m_b_m; + case 15 : itype = CRISV32F_INSN_MOVECBR; goto extract_sfmt_movecbr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2305,14 +1570,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa50) - { itype = CRISV32F_INSN_MOVE_M_W_M; goto extract_sfmt_move_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xe5f) - { itype = CRISV32F_INSN_MOVECWR; goto extract_sfmt_movecwr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_MOVE_M_W_M; goto extract_sfmt_move_m_w_m; + case 15 : itype = CRISV32F_INSN_MOVECWR; goto extract_sfmt_movecwr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2335,14 +1594,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa60) - { itype = CRISV32F_INSN_MOVE_M_D_M; goto extract_sfmt_move_m_d_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xe6f) - { itype = CRISV32F_INSN_MOVECDR; goto extract_sfmt_movecdr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_MOVE_M_D_M; goto extract_sfmt_move_m_d_m; + case 15 : itype = CRISV32F_INSN_MOVECDR; goto extract_sfmt_movecdr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2365,14 +1618,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa80) - { itype = CRISV32F_INSN_SUB_M_B_M; goto extract_sfmt_add_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xe8f) - { itype = CRISV32F_INSN_SUBCBR; goto extract_sfmt_addcbr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_SUB_M_B_M; goto extract_sfmt_add_m_b_m; + case 15 : itype = CRISV32F_INSN_SUBCBR; goto extract_sfmt_addcbr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2395,14 +1642,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xa90) - { itype = CRISV32F_INSN_SUB_M_W_M; goto extract_sfmt_add_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xe9f) - { itype = CRISV32F_INSN_SUBCWR; goto extract_sfmt_addcwr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_SUB_M_W_M; goto extract_sfmt_add_m_w_m; + case 15 : itype = CRISV32F_INSN_SUBCWR; goto extract_sfmt_addcwr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2425,14 +1666,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xaa0) - { itype = CRISV32F_INSN_SUB_M_D_M; goto extract_sfmt_add_m_d_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xeaf) - { itype = CRISV32F_INSN_SUBCDR; goto extract_sfmt_addcdr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_SUB_M_D_M; goto extract_sfmt_add_m_d_m; + case 15 : itype = CRISV32F_INSN_SUBCDR; goto extract_sfmt_addcdr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2459,14 +1694,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xac0) - { itype = CRISV32F_INSN_CMP_M_B_M; goto extract_sfmt_cmp_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xecf) - { itype = CRISV32F_INSN_CMPCBR; goto extract_sfmt_cmpcbr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_CMP_M_B_M; goto extract_sfmt_cmp_m_b_m; + case 15 : itype = CRISV32F_INSN_CMPCBR; goto extract_sfmt_cmpcbr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2489,14 +1718,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xad0) - { itype = CRISV32F_INSN_CMP_M_W_M; goto extract_sfmt_cmp_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xedf) - { itype = CRISV32F_INSN_CMPCWR; goto extract_sfmt_cmpcwr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_CMP_M_W_M; goto extract_sfmt_cmp_m_w_m; + case 15 : itype = CRISV32F_INSN_CMPCWR; goto extract_sfmt_cmpcwr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2519,14 +1742,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xae0) - { itype = CRISV32F_INSN_CMP_M_D_M; goto extract_sfmt_cmp_m_d_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xeef) - { itype = CRISV32F_INSN_CMPCDR; goto extract_sfmt_cmpcdr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_CMP_M_D_M; goto extract_sfmt_cmp_m_d_m; + case 15 : itype = CRISV32F_INSN_CMPCDR; goto extract_sfmt_cmpcdr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2553,14 +1770,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xb00) - { itype = CRISV32F_INSN_AND_M_B_M; goto extract_sfmt_and_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xf0f) - { itype = CRISV32F_INSN_ANDCBR; goto extract_sfmt_andcbr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_AND_M_B_M; goto extract_sfmt_and_m_b_m; + case 15 : itype = CRISV32F_INSN_ANDCBR; goto extract_sfmt_andcbr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2583,14 +1794,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xb10) - { itype = CRISV32F_INSN_AND_M_W_M; goto extract_sfmt_and_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xf1f) - { itype = CRISV32F_INSN_ANDCWR; goto extract_sfmt_andcwr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_AND_M_W_M; goto extract_sfmt_and_m_w_m; + case 15 : itype = CRISV32F_INSN_ANDCWR; goto extract_sfmt_andcwr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2613,14 +1818,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xb20) - { itype = CRISV32F_INSN_AND_M_D_M; goto extract_sfmt_and_m_d_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xf2f) - { itype = CRISV32F_INSN_ANDCDR; goto extract_sfmt_andcdr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_AND_M_D_M; goto extract_sfmt_and_m_d_m; + case 15 : itype = CRISV32F_INSN_ANDCDR; goto extract_sfmt_andcdr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2647,14 +1846,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xb40) - { itype = CRISV32F_INSN_OR_M_B_M; goto extract_sfmt_and_m_b_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xf4f) - { itype = CRISV32F_INSN_ORCBR; goto extract_sfmt_andcbr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_OR_M_B_M; goto extract_sfmt_and_m_b_m; + case 15 : itype = CRISV32F_INSN_ORCBR; goto extract_sfmt_andcbr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2677,14 +1870,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xb50) - { itype = CRISV32F_INSN_OR_M_W_M; goto extract_sfmt_and_m_w_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xf5f) - { itype = CRISV32F_INSN_ORCWR; goto extract_sfmt_andcwr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_OR_M_W_M; goto extract_sfmt_and_m_w_m; + case 15 : itype = CRISV32F_INSN_ORCWR; goto extract_sfmt_andcwr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2707,21 +1894,12 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : /* fall through */ case 12 : /* fall through */ case 13 : /* fall through */ - case 14 : - if ((base_insn & 0xbf0) == 0xb60) - { itype = CRISV32F_INSN_OR_M_D_M; goto extract_sfmt_and_m_d_m; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; - case 15 : - if ((base_insn & 0xfff) == 0xf6f) - { itype = CRISV32F_INSN_ORCDR; goto extract_sfmt_andcdr; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : itype = CRISV32F_INSN_OR_M_D_M; goto extract_sfmt_and_m_d_m; + case 15 : itype = CRISV32F_INSN_ORCDR; goto extract_sfmt_andcdr; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } - case 247 : - if ((base_insn & 0xff0) == 0xf70) - { itype = CRISV32F_INSN_MOVE_SS_R; goto extract_sfmt_move_ss_r; } - itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; + case 247 : itype = CRISV32F_INSN_MOVE_SS_R; goto extract_sfmt_move_ss_r; default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2732,11 +1910,11 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_empty: { const IDESC *idesc = &crisv32f_insn_data[itype]; -#define FLD(f) abuf->fields.fmt_empty.f +#define FLD(f) abuf->fields.sfmt_empty.f /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0)); #undef FLD return idesc; @@ -2745,7 +1923,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_move_b_r: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addc_m.f UINT f_operand2; UINT f_operand1; @@ -2756,14 +1934,14 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_b_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_b_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_Rs) = f_operand1; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -2773,7 +1951,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_move_d_r: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addc_m.f UINT f_operand2; UINT f_operand1; @@ -2784,14 +1962,14 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_d_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_d_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_Rs) = f_operand1; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -2801,18 +1979,18 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_moveq: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_moveq.f UINT f_operand2; INT f_s6; f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); - f_s6 = EXTRACT_LSB0_INT (insn, 16, 5, 6); + f_s6 = EXTRACT_LSB0_SINT (insn, 16, 5, 6); /* Record the fields for the semantic handler. */ FLD (f_s6) = f_s6; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_moveq", "f_s6 0x%x", 'x', f_s6, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_moveq", "f_s6 0x%x", 'x', f_s6, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2828,7 +2006,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_movs_b_r: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_muls_b.f UINT f_operand2; UINT f_operand1; @@ -2839,7 +2017,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movs_b_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movs_b_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2856,7 +2034,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_movecbr: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addcbr.f INT f_indir_pc__byte; UINT f_operand2; @@ -2870,13 +2048,13 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movecbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movecbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -2886,7 +2064,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_movecwr: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addcwr.f INT f_indir_pc__word; UINT f_operand2; @@ -2900,13 +2078,13 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movecwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movecwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -2916,7 +2094,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_movecdr: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_bound_cd.f INT f_indir_pc__dword; UINT f_operand2; @@ -2930,7 +2108,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__dword) = f_indir_pc__dword; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movecdr", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movecdr", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2946,7 +2124,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_movscbr: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_bound_cb.f UINT f_operand2; INT f_indir_pc__byte; @@ -2960,7 +2138,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__byte) = f_indir_pc__byte; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movscbr", "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movscbr", "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2976,7 +2154,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_movscwr: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_bound_cw.f UINT f_operand2; INT f_indir_pc__word; @@ -2990,7 +2168,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__word) = f_indir_pc__word; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movscwr", "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movscwr", "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3006,7 +2184,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_movucbr: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_bound_cb.f UINT f_operand2; INT f_indir_pc__byte; @@ -3020,7 +2198,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__byte) = f_indir_pc__byte; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movucbr", "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movucbr", "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3036,7 +2214,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_movucwr: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_bound_cw.f UINT f_operand2; INT f_indir_pc__word; @@ -3050,7 +2228,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__word) = f_indir_pc__word; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movucwr", "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movucwr", "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3066,7 +2244,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_addq: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addq.f UINT f_operand2; UINT f_u6; @@ -3077,14 +2255,14 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_u6) = f_u6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addq", "f_operand2 0x%x", 'x', f_operand2, "f_u6 0x%x", 'x', f_u6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addq", "f_operand2 0x%x", 'x', f_operand2, "f_u6 0x%x", 'x', f_u6, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_Rd) = f_operand2; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -3094,7 +2272,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmp_r_b_r: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_muls_b.f UINT f_operand2; UINT f_operand1; @@ -3105,7 +2283,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_r_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_r_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3122,7 +2300,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmp_m_b_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addc_m.f UINT f_operand2; UINT f_memmode; @@ -3136,7 +2314,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3154,7 +2332,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmp_m_w_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addc_m.f UINT f_operand2; UINT f_memmode; @@ -3168,7 +2346,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3186,7 +2364,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmp_m_d_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addc_m.f UINT f_operand2; UINT f_memmode; @@ -3200,7 +2378,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3218,7 +2396,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmpcbr: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_bound_cb.f INT f_indir_pc__byte; UINT f_operand2; @@ -3232,7 +2410,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpcbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpcbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3248,7 +2426,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmpcwr: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_bound_cw.f INT f_indir_pc__word; UINT f_operand2; @@ -3262,7 +2440,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpcwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpcwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3278,7 +2456,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmpcdr: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_bound_cd.f INT f_indir_pc__dword; UINT f_operand2; @@ -3292,7 +2470,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__dword) = f_indir_pc__dword; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpcdr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpcdr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3308,18 +2486,18 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmpq: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_andq.f UINT f_operand2; INT f_s6; f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); - f_s6 = EXTRACT_LSB0_INT (insn, 16, 5, 6); + f_s6 = EXTRACT_LSB0_SINT (insn, 16, 5, 6); /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_s6) = f_s6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpq", "f_operand2 0x%x", 'x', f_operand2, "f_s6 0x%x", 'x', f_s6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpq", "f_operand2 0x%x", 'x', f_operand2, "f_s6 0x%x", 'x', f_s6, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3335,7 +2513,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmpucbr: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_bound_cb.f INT f_indir_pc__byte; UINT f_operand2; @@ -3349,7 +2527,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpucbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpucbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3365,7 +2543,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmpucwr: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_bound_cw.f INT f_indir_pc__word; UINT f_operand2; @@ -3379,7 +2557,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpucwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpucwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3395,7 +2573,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_move_m_b_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_add_m_b_m.f UINT f_operand2; UINT f_memmode; @@ -3409,7 +2587,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_b_m", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_b_m", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3417,7 +2595,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_Rs) = f_operand1; FLD (out_Rs) = f_operand1; - FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2))); + FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2))); } #endif #undef FLD @@ -3427,7 +2605,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_move_m_w_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_add_m_b_m.f UINT f_operand2; UINT f_memmode; @@ -3441,7 +2619,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_w_m", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_w_m", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3449,7 +2627,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_Rs) = f_operand1; FLD (out_Rs) = f_operand1; - FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2))); + FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2))); } #endif #undef FLD @@ -3459,7 +2637,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_move_m_d_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_add_m_b_m.f UINT f_operand2; UINT f_memmode; @@ -3473,7 +2651,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_d_m", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_d_m", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3481,7 +2659,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_Rs) = f_operand1; FLD (out_Rs) = f_operand1; - FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2))); + FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2))); } #endif #undef FLD @@ -3491,7 +2669,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_movs_m_b_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_movs_m_b_m.f UINT f_operand2; UINT f_memmode; @@ -3505,7 +2683,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movs_m_b_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movs_m_b_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3523,7 +2701,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_movs_m_w_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_movs_m_b_m.f UINT f_operand2; UINT f_memmode; @@ -3537,7 +2715,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movs_m_w_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movs_m_w_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3555,7 +2733,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_move_r_sprv32: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_move_m_sprv32.f UINT f_operand2; UINT f_operand1; @@ -3566,7 +2744,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_sprv32", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_sprv32", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3583,7 +2761,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_move_spr_rv32: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_mcp.f UINT f_operand2; UINT f_operand1; @@ -3594,14 +2772,14 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_spr_rv32", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_spr_rv32", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_Ps) = f_operand2; - FLD (out_h_gr_SI_index_of__DFLT_Rs) = FLD (f_operand1); + FLD (out_h_gr_SI_index_of__INT_Rs) = FLD (f_operand1); } #endif #undef FLD @@ -3611,7 +2789,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_move_m_sprv32: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_move_m_sprv32.f UINT f_operand2; UINT f_memmode; @@ -3625,7 +2803,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_sprv32", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_sprv32", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3640,11 +2818,11 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, return idesc; } - extract_sfmt_move_c_sprv32_p0: + extract_sfmt_move_c_sprv32_p2: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; -#define FLD(f) abuf->fields.sfmt_move_c_sprv32_p0.f + CGEN_INSN_WORD insn = base_insn; +#define FLD(f) abuf->fields.sfmt_move_c_sprv32_p2.f INT f_indir_pc__dword; UINT f_operand2; /* Contents of trailing part of insn. */ @@ -3657,7 +2835,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__dword) = f_indir_pc__dword; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_c_sprv32_p0", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_c_sprv32_p2", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3673,7 +2851,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_move_spr_mv32: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_move_spr_mv32.f UINT f_operand2; UINT f_memmode; @@ -3687,7 +2865,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_spr_mv32", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_spr_mv32", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3705,7 +2883,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_move_ss_r: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_move_spr_mv32.f UINT f_operand2; UINT f_operand1; @@ -3716,7 +2894,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_ss_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_ss_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3732,7 +2910,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_move_r_ss: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_mcp.f UINT f_operand2; UINT f_operand1; @@ -3743,7 +2921,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_ss", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_ss", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3759,7 +2937,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_movem_r_m_v32: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_movem_r_m_v32.f UINT f_operand2; UINT f_memmode; @@ -3773,7 +2951,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movem_r_m_v32", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movem_r_m_v32", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3807,7 +2985,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_movem_m_r_v32: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_movem_m_r_v32.f UINT f_operand2; UINT f_memmode; @@ -3821,7 +2999,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movem_m_r_v32", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movem_m_r_v32", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3855,7 +3033,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_add_b_r: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addc_m.f UINT f_operand2; UINT f_operand1; @@ -3866,7 +3044,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3874,7 +3052,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_Rd) = f_operand2; FLD (in_Rs) = f_operand1; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -3884,7 +3062,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_add_d_r: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addc_m.f UINT f_operand2; UINT f_operand1; @@ -3895,7 +3073,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_d_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_d_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3903,7 +3081,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_Rd) = f_operand2; FLD (in_Rs) = f_operand1; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -3913,7 +3091,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_add_m_b_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_add_m_b_m.f UINT f_operand2; UINT f_memmode; @@ -3927,7 +3105,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3936,7 +3114,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_Rd) = f_operand2; FLD (in_Rs) = f_operand1; FLD (out_Rs) = f_operand1; - FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2))); + FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2))); } #endif #undef FLD @@ -3946,7 +3124,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_add_m_w_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_add_m_b_m.f UINT f_operand2; UINT f_memmode; @@ -3960,7 +3138,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3969,7 +3147,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_Rd) = f_operand2; FLD (in_Rs) = f_operand1; FLD (out_Rs) = f_operand1; - FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2))); + FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2))); } #endif #undef FLD @@ -3979,7 +3157,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_add_m_d_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_add_m_b_m.f UINT f_operand2; UINT f_memmode; @@ -3993,7 +3171,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4002,7 +3180,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_Rd) = f_operand2; FLD (in_Rs) = f_operand1; FLD (out_Rs) = f_operand1; - FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2))); + FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2))); } #endif #undef FLD @@ -4012,7 +3190,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_addcbr: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addcbr.f INT f_indir_pc__byte; UINT f_operand2; @@ -4026,14 +3204,14 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_Rd) = f_operand2; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -4043,7 +3221,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_addcwr: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addcwr.f INT f_indir_pc__word; UINT f_operand2; @@ -4057,14 +3235,14 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_Rd) = f_operand2; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -4074,7 +3252,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_addcdr: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addcdr.f INT f_indir_pc__dword; UINT f_operand2; @@ -4088,14 +3266,14 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__dword) = f_indir_pc__dword; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcdr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcdr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_Rd) = f_operand2; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -4105,7 +3283,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_adds_m_b_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_add_m_b_m.f UINT f_operand2; UINT f_memmode; @@ -4119,7 +3297,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_adds_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_adds_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4128,7 +3306,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_Rd) = f_operand2; FLD (in_Rs) = f_operand1; FLD (out_Rs) = f_operand1; - FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2))); + FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2))); } #endif #undef FLD @@ -4138,7 +3316,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_adds_m_w_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_add_m_b_m.f UINT f_operand2; UINT f_memmode; @@ -4152,7 +3330,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_adds_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_adds_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4161,7 +3339,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_Rd) = f_operand2; FLD (in_Rs) = f_operand1; FLD (out_Rs) = f_operand1; - FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2))); + FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2))); } #endif #undef FLD @@ -4171,7 +3349,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_addscbr: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addcbr.f INT f_indir_pc__byte; UINT f_operand2; @@ -4185,14 +3363,14 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addscbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addscbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_Rd) = f_operand2; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -4202,7 +3380,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_addscwr: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addcwr.f INT f_indir_pc__word; UINT f_operand2; @@ -4216,14 +3394,14 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addscwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addscwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_Rd) = f_operand2; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -4233,7 +3411,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_addc_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addc_m.f UINT f_operand2; UINT f_memmode; @@ -4247,7 +3425,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addc_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addc_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4256,7 +3434,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_Rd) = f_operand2; FLD (in_Rs) = f_operand1; FLD (out_Rs) = f_operand1; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -4266,7 +3444,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_lapc_d: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_lapc_d.f SI f_indir_pc__dword_pcrel; UINT f_operand2; @@ -4280,7 +3458,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (i_const32_pcrel) = f_indir_pc__dword_pcrel; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lapc_d", "f_operand2 0x%x", 'x', f_operand2, "const32_pcrel 0x%x", 'x', f_indir_pc__dword_pcrel, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lapc_d", "f_operand2 0x%x", 'x', f_operand2, "const32_pcrel 0x%x", 'x', f_indir_pc__dword_pcrel, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4296,7 +3474,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_lapcq: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_lapcq.f UINT f_operand2; SI f_qo; @@ -4307,7 +3485,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (i_qo) = f_qo; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lapcq", "f_operand2 0x%x", 'x', f_operand2, "qo 0x%x", 'x', f_qo, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lapcq", "f_operand2 0x%x", 'x', f_operand2, "qo 0x%x", 'x', f_qo, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4323,7 +3501,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_addi_b_r: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addc_m.f UINT f_operand2; UINT f_operand1; @@ -4334,7 +3512,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4352,7 +3530,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_neg_b_r: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addc_m.f UINT f_operand2; UINT f_operand1; @@ -4363,14 +3541,14 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_neg_b_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_neg_b_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_Rs) = f_operand1; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -4380,7 +3558,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_neg_d_r: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addc_m.f UINT f_operand2; UINT f_operand1; @@ -4391,14 +3569,14 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_neg_d_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_neg_d_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_Rs) = f_operand1; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -4408,7 +3586,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_test_m_b_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_move_spr_mv32.f UINT f_memmode; UINT f_operand1; @@ -4419,7 +3597,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_test_m_b_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_test_m_b_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4436,7 +3614,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_test_m_w_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_move_spr_mv32.f UINT f_memmode; UINT f_operand1; @@ -4447,7 +3625,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_test_m_w_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_test_m_w_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4464,7 +3642,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_test_m_d_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_move_spr_mv32.f UINT f_memmode; UINT f_operand1; @@ -4475,7 +3653,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_test_m_d_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_test_m_d_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4492,7 +3670,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_move_r_m_b_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addc_m.f UINT f_operand2; UINT f_memmode; @@ -4506,7 +3684,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4524,7 +3702,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_move_r_m_w_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addc_m.f UINT f_operand2; UINT f_memmode; @@ -4538,7 +3716,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4556,7 +3734,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_move_r_m_d_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addc_m.f UINT f_operand2; UINT f_memmode; @@ -4570,7 +3748,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4588,7 +3766,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_muls_b: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_muls_b.f UINT f_operand2; UINT f_operand1; @@ -4599,7 +3777,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_muls_b", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_muls_b", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4618,7 +3796,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mcp: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_mcp.f UINT f_operand2; UINT f_operand1; @@ -4629,7 +3807,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcp", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcp", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4637,7 +3815,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_Ps) = f_operand2; FLD (in_Rs) = f_operand1; - FLD (out_h_gr_SI_index_of__DFLT_Rs) = FLD (f_operand1); + FLD (out_h_gr_SI_index_of__INT_Rs) = FLD (f_operand1); } #endif #undef FLD @@ -4647,7 +3825,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_dstep: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_muls_b.f UINT f_operand2; UINT f_operand1; @@ -4658,7 +3836,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_dstep", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_dstep", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4676,7 +3854,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_and_b_r: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addc_m.f UINT f_operand2; UINT f_operand1; @@ -4687,7 +3865,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4695,36 +3873,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_Rd) = f_operand2; FLD (in_Rs) = f_operand1; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); - } -#endif -#undef FLD - return idesc; - } - - extract_sfmt_and_w_r: - { - const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; -#define FLD(f) abuf->fields.sfmt_addc_m.f - UINT f_operand2; - UINT f_operand1; - - f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); - f_operand1 = EXTRACT_LSB0_UINT (insn, 16, 3, 4); - - /* Record the fields for the semantic handler. */ - FLD (f_operand2) = f_operand2; - FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_w_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); - -#if WITH_PROFILE_MODEL_P - /* Record the fields for profiling. */ - if (PROFILE_MODEL_P (current_cpu)) - { - FLD (in_Rd) = f_operand2; - FLD (in_Rs) = f_operand1; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -4734,7 +3883,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_and_d_r: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addc_m.f UINT f_operand2; UINT f_operand1; @@ -4745,7 +3894,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_d_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_d_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4753,7 +3902,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_Rd) = f_operand2; FLD (in_Rs) = f_operand1; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -4763,7 +3912,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_and_m_b_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_add_m_b_m.f UINT f_operand2; UINT f_memmode; @@ -4777,7 +3926,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4786,7 +3935,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_Rd) = f_operand2; FLD (in_Rs) = f_operand1; FLD (out_Rs) = f_operand1; - FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2))); + FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2))); } #endif #undef FLD @@ -4796,7 +3945,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_and_m_w_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_add_m_b_m.f UINT f_operand2; UINT f_memmode; @@ -4810,7 +3959,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4819,7 +3968,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_Rd) = f_operand2; FLD (in_Rs) = f_operand1; FLD (out_Rs) = f_operand1; - FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2))); + FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2))); } #endif #undef FLD @@ -4829,7 +3978,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_and_m_d_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_add_m_b_m.f UINT f_operand2; UINT f_memmode; @@ -4843,7 +3992,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4852,7 +4001,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_Rd) = f_operand2; FLD (in_Rs) = f_operand1; FLD (out_Rs) = f_operand1; - FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2))); + FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2))); } #endif #undef FLD @@ -4862,7 +4011,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_andcbr: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addcbr.f INT f_indir_pc__byte; UINT f_operand2; @@ -4876,14 +4025,14 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_Rd) = f_operand2; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -4893,7 +4042,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_andcwr: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addcwr.f INT f_indir_pc__word; UINT f_operand2; @@ -4907,14 +4056,14 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_Rd) = f_operand2; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -4924,7 +4073,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_andcdr: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addcdr.f INT f_indir_pc__dword; UINT f_operand2; @@ -4938,14 +4087,14 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__dword) = f_indir_pc__dword; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcdr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcdr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_Rd) = f_operand2; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -4955,25 +4104,25 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_andq: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_andq.f UINT f_operand2; INT f_s6; f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); - f_s6 = EXTRACT_LSB0_INT (insn, 16, 5, 6); + f_s6 = EXTRACT_LSB0_SINT (insn, 16, 5, 6); /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_s6) = f_s6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andq", "f_operand2 0x%x", 'x', f_operand2, "f_s6 0x%x", 'x', f_s6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andq", "f_operand2 0x%x", 'x', f_operand2, "f_s6 0x%x", 'x', f_s6, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_Rd) = f_operand2; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -4983,7 +4132,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_swap: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_move_spr_mv32.f UINT f_operand2; UINT f_operand1; @@ -4994,7 +4143,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_swap", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_swap", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5004,35 +4153,6 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (out_Rs) = f_operand1; } #endif -#undef FLD - return idesc; - } - - extract_sfmt_asrr_b_r: - { - const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; -#define FLD(f) abuf->fields.sfmt_addc_m.f - UINT f_operand2; - UINT f_operand1; - - f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); - f_operand1 = EXTRACT_LSB0_UINT (insn, 16, 3, 4); - - /* Record the fields for the semantic handler. */ - FLD (f_operand2) = f_operand2; - FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_asrr_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); - -#if WITH_PROFILE_MODEL_P - /* Record the fields for profiling. */ - if (PROFILE_MODEL_P (current_cpu)) - { - FLD (in_Rd) = f_operand2; - FLD (in_Rs) = f_operand1; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); - } -#endif #undef FLD return idesc; } @@ -5040,7 +4160,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_asrq: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_asrq.f UINT f_operand2; UINT f_u5; @@ -5051,7 +4171,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_u5) = f_u5; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_asrq", "f_operand2 0x%x", 'x', f_operand2, "f_u5 0x%x", 'x', f_u5, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_asrq", "f_operand2 0x%x", 'x', f_operand2, "f_u5 0x%x", 'x', f_u5, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5068,7 +4188,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_lsrr_b_r: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addc_m.f UINT f_operand2; UINT f_operand1; @@ -5079,7 +4199,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lsrr_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lsrr_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5087,7 +4207,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_Rd) = f_operand2; FLD (in_Rs) = f_operand1; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -5097,7 +4217,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_lsrr_d_r: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addc_m.f UINT f_operand2; UINT f_operand1; @@ -5108,7 +4228,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lsrr_d_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lsrr_d_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5116,7 +4236,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_Rd) = f_operand2; FLD (in_Rs) = f_operand1; - FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2); + FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2); } #endif #undef FLD @@ -5126,7 +4246,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_btst: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_muls_b.f UINT f_operand2; UINT f_operand1; @@ -5137,7 +4257,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_btst", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_btst", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5154,7 +4274,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_btstq: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_asrq.f UINT f_operand2; UINT f_u5; @@ -5165,7 +4285,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_u5) = f_u5; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_btstq", "f_operand2 0x%x", 'x', f_operand2, "f_u5 0x%x", 'x', f_u5, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_btstq", "f_operand2 0x%x", 'x', f_operand2, "f_u5 0x%x", 'x', f_u5, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5181,7 +4301,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_setf: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_setf.f UINT f_operand2; UINT f_operand1; @@ -5193,7 +4313,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_dstsrc) = f_dstsrc; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_setf", "f_dstsrc 0x%x", 'x', f_dstsrc, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_setf", "f_dstsrc 0x%x", 'x', f_dstsrc, (char *) 0)); #undef FLD return idesc; @@ -5206,7 +4326,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rfe", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rfe", (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5227,7 +4347,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sfe", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sfe", (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5244,11 +4364,11 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_rfg: { const IDESC *idesc = &crisv32f_insn_data[itype]; -#define FLD(f) abuf->fields.fmt_empty.f +#define FLD(f) abuf->fields.sfmt_empty.f /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rfg", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rfg", (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5267,7 +4387,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rfn", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rfn", (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5284,11 +4404,11 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_halt: { const IDESC *idesc = &crisv32f_insn_data[itype]; -#define FLD(f) abuf->fields.fmt_empty.f +#define FLD(f) abuf->fields.sfmt_empty.f /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_halt", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_halt", (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5303,7 +4423,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_bcc_b: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_bcc_b.f UINT f_operand2; UINT f_disp9_lo; @@ -5312,7 +4432,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); f_disp9_lo = EXTRACT_LSB0_UINT (insn, 16, 7, 7); - f_disp9_hi = EXTRACT_LSB0_INT (insn, 16, 0, 1); + f_disp9_hi = EXTRACT_LSB0_SINT (insn, 16, 0, 1); { SI tmp_abslo; SI tmp_absval; @@ -5324,7 +4444,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (i_o_pcrel) = f_disp9; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcc_b", "f_operand2 0x%x", 'x', f_operand2, "o_pcrel 0x%x", 'x', f_disp9, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcc_b", "f_operand2 0x%x", 'x', f_operand2, "o_pcrel 0x%x", 'x', f_disp9, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5339,14 +4459,14 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ba_b: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_bcc_b.f UINT f_disp9_lo; INT f_disp9_hi; INT f_disp9; f_disp9_lo = EXTRACT_LSB0_UINT (insn, 16, 7, 7); - f_disp9_hi = EXTRACT_LSB0_INT (insn, 16, 0, 1); + f_disp9_hi = EXTRACT_LSB0_SINT (insn, 16, 0, 1); { SI tmp_abslo; SI tmp_absval; @@ -5357,7 +4477,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_o_pcrel) = f_disp9; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ba_b", "o_pcrel 0x%x", 'x', f_disp9, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ba_b", "o_pcrel 0x%x", 'x', f_disp9, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5372,7 +4492,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_bcc_w: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_bcc_w.f SI f_indir_pc__word_pcrel; UINT f_operand2; @@ -5386,7 +4506,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (i_o_word_pcrel) = f_indir_pc__word_pcrel; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcc_w", "f_operand2 0x%x", 'x', f_operand2, "o_word_pcrel 0x%x", 'x', f_indir_pc__word_pcrel, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcc_w", "f_operand2 0x%x", 'x', f_operand2, "o_word_pcrel 0x%x", 'x', f_indir_pc__word_pcrel, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5401,7 +4521,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ba_w: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_bcc_w.f SI f_indir_pc__word_pcrel; /* Contents of trailing part of insn. */ @@ -5412,7 +4532,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_o_word_pcrel) = f_indir_pc__word_pcrel; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ba_w", "o_word_pcrel 0x%x", 'x', f_indir_pc__word_pcrel, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ba_w", "o_word_pcrel 0x%x", 'x', f_indir_pc__word_pcrel, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5427,7 +4547,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_jas_r: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_move_m_sprv32.f UINT f_operand2; UINT f_operand1; @@ -5438,7 +4558,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jas_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jas_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5455,8 +4575,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_jas_c: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; -#define FLD(f) abuf->fields.sfmt_move_c_sprv32_p0.f + CGEN_INSN_WORD insn = base_insn; +#define FLD(f) abuf->fields.sfmt_move_c_sprv32_p2.f INT f_indir_pc__dword; UINT f_operand2; /* Contents of trailing part of insn. */ @@ -5469,7 +4589,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__dword) = f_indir_pc__dword; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jas_c", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jas_c", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5485,7 +4605,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_jump_p: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_mcp.f UINT f_operand2; @@ -5493,7 +4613,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jump_p", "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jump_p", "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5509,7 +4629,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_bas_c: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_bas_c.f SI f_indir_pc__dword_pcrel; UINT f_operand2; @@ -5523,7 +4643,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (i_const32_pcrel) = f_indir_pc__dword_pcrel; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bas_c", "f_operand2 0x%x", 'x', f_operand2, "const32_pcrel 0x%x", 'x', f_indir_pc__dword_pcrel, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bas_c", "f_operand2 0x%x", 'x', f_operand2, "const32_pcrel 0x%x", 'x', f_indir_pc__dword_pcrel, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5539,7 +4659,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_jasc_r: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_move_m_sprv32.f UINT f_operand2; UINT f_operand1; @@ -5550,7 +4670,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jasc_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jasc_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5567,7 +4687,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_break: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_break.f UINT f_u4; @@ -5575,7 +4695,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_u4) = f_u4; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_break", "f_u4 0x%x", 'x', f_u4, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_break", "f_u4 0x%x", 'x', f_u4, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5590,7 +4710,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_bound_cb: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_bound_cb.f INT f_indir_pc__byte; UINT f_operand2; @@ -5604,7 +4724,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_cb", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_cb", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5621,7 +4741,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_bound_cw: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_bound_cw.f INT f_indir_pc__word; UINT f_operand2; @@ -5635,7 +4755,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_cw", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_cw", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5652,7 +4772,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_bound_cd: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_bound_cd.f INT f_indir_pc__dword; UINT f_operand2; @@ -5666,7 +4786,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__dword) = f_indir_pc__dword; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_cd", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_cd", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5683,7 +4803,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_scc: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_move_spr_mv32.f UINT f_operand2; UINT f_operand1; @@ -5694,7 +4814,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_scc", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_scc", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5710,18 +4830,18 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_addoq: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addoq.f UINT f_operand2; INT f_s8; f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); - f_s8 = EXTRACT_LSB0_INT (insn, 16, 7, 8); + f_s8 = EXTRACT_LSB0_SINT (insn, 16, 7, 8); /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_s8) = f_s8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addoq", "f_operand2 0x%x", 'x', f_operand2, "f_s8 0x%x", 'x', f_s8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addoq", "f_operand2 0x%x", 'x', f_operand2, "f_s8 0x%x", 'x', f_s8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5737,7 +4857,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_addo_m_b_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addc_m.f UINT f_operand2; UINT f_memmode; @@ -5751,7 +4871,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5769,7 +4889,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_addo_m_w_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addc_m.f UINT f_operand2; UINT f_memmode; @@ -5783,7 +4903,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5801,7 +4921,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_addo_m_d_m: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_addc_m.f UINT f_operand2; UINT f_memmode; @@ -5815,7 +4935,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5833,7 +4953,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_addo_cb: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_bound_cb.f INT f_indir_pc__byte; UINT f_operand2; @@ -5847,7 +4967,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_cb", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_cb", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5863,7 +4983,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_addo_cw: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_bound_cw.f INT f_indir_pc__word; UINT f_operand2; @@ -5877,7 +4997,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_cw", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_cw", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5893,7 +5013,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_addo_cd: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_bound_cd.f INT f_indir_pc__dword; UINT f_operand2; @@ -5907,7 +5027,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__dword) = f_indir_pc__dword; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_cd", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_cd", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5923,7 +5043,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_addi_acr_b_r: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_muls_b.f UINT f_operand2; UINT f_operand1; @@ -5934,7 +5054,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi_acr_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi_acr_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5951,7 +5071,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fidxi: { const IDESC *idesc = &crisv32f_insn_data[itype]; - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; #define FLD(f) abuf->fields.sfmt_mcp.f UINT f_operand1; @@ -5959,7 +5079,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fidxi", "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fidxi", "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */