X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=sim%2Ffrv%2Fdecode.c;h=d97d3a6ab44ce8263163eff7c542c63e64a369b5;hb=46f900c065f65013ae58a97f3b991a7e0c5ab669;hp=620cbdfc766c6f97058b6c697195d129c8c93411;hpb=676a64f422161303f6d57fca0d244400a1cdd576;p=binutils-gdb.git diff --git a/sim/frv/decode.c b/sim/frv/decode.c index 620cbdfc766..d97d3a6ab44 100644 --- a/sim/frv/decode.c +++ b/sim/frv/decode.c @@ -2,23 +2,22 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +Copyright 1996-2021 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., -59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + You should have received a copy of the GNU General Public License along + with this program; if not, see . */ @@ -64,7 +63,7 @@ static const struct insn_sem frvbf_insn_sem[] = { FRV_INSN_SLL, FRVBF_INSN_SLL, FRVBF_SFMT_ADD }, { FRV_INSN_SRL, FRVBF_INSN_SRL, FRVBF_SFMT_ADD }, { FRV_INSN_SRA, FRVBF_INSN_SRA, FRVBF_SFMT_ADD }, - { FRV_INSN_SLASS, FRVBF_INSN_SLASS, FRVBF_SFMT_ADD }, + { FRV_INSN_SLASS, FRVBF_INSN_SLASS, FRVBF_SFMT_SLASS }, { FRV_INSN_SCUTSS, FRVBF_INSN_SCUTSS, FRVBF_SFMT_SCUTSS }, { FRV_INSN_SCAN, FRVBF_INSN_SCAN, FRVBF_SFMT_ADD }, { FRV_INSN_CADD, FRVBF_INSN_CADD, FRVBF_SFMT_CADD }, @@ -103,8 +102,8 @@ static const struct insn_sem frvbf_insn_sem[] = { FRV_INSN_SUBX, FRVBF_INSN_SUBX, FRVBF_SFMT_ADDX }, { FRV_INSN_ADDXCC, FRVBF_INSN_ADDXCC, FRVBF_SFMT_ADDCC }, { FRV_INSN_SUBXCC, FRVBF_INSN_SUBXCC, FRVBF_SFMT_ADDCC }, - { FRV_INSN_ADDSS, FRVBF_INSN_ADDSS, FRVBF_SFMT_ADD }, - { FRV_INSN_SUBSS, FRVBF_INSN_SUBSS, FRVBF_SFMT_ADD }, + { FRV_INSN_ADDSS, FRVBF_INSN_ADDSS, FRVBF_SFMT_SLASS }, + { FRV_INSN_SUBSS, FRVBF_INSN_SUBSS, FRVBF_SFMT_SLASS }, { FRV_INSN_ADDI, FRVBF_INSN_ADDI, FRVBF_SFMT_ADDI }, { FRV_INSN_SUBI, FRVBF_INSN_SUBI, FRVBF_SFMT_ADDI }, { FRV_INSN_ANDI, FRVBF_INSN_ANDI, FRVBF_SFMT_ADDI }, @@ -322,8 +321,8 @@ static const struct insn_sem frvbf_insn_sem[] = { FRV_INSN_BP, FRVBF_INSN_BP, FRVBF_SFMT_BEQ }, { FRV_INSN_BV, FRVBF_INSN_BV, FRVBF_SFMT_BEQ }, { FRV_INSN_BNV, FRVBF_INSN_BNV, FRVBF_SFMT_BEQ }, - { FRV_INSN_FBRA, FRVBF_INSN_FBRA, FRVBF_SFMT_BRA }, - { FRV_INSN_FBNO, FRVBF_INSN_FBNO, FRVBF_SFMT_BNO }, + { FRV_INSN_FBRA, FRVBF_INSN_FBRA, FRVBF_SFMT_FBRA }, + { FRV_INSN_FBNO, FRVBF_INSN_FBNO, FRVBF_SFMT_FBNO }, { FRV_INSN_FBNE, FRVBF_INSN_FBNE, FRVBF_SFMT_FBNE }, { FRV_INSN_FBEQ, FRVBF_INSN_FBEQ, FRVBF_SFMT_FBNE }, { FRV_INSN_FBLG, FRVBF_INSN_FBLG, FRVBF_SFMT_FBNE }, @@ -355,8 +354,8 @@ static const struct insn_sem frvbf_insn_sem[] = { FRV_INSN_BPLR, FRVBF_INSN_BPLR, FRVBF_SFMT_BEQLR }, { FRV_INSN_BVLR, FRVBF_INSN_BVLR, FRVBF_SFMT_BEQLR }, { FRV_INSN_BNVLR, FRVBF_INSN_BNVLR, FRVBF_SFMT_BEQLR }, - { FRV_INSN_FBRALR, FRVBF_INSN_FBRALR, FRVBF_SFMT_BRALR }, - { FRV_INSN_FBNOLR, FRVBF_INSN_FBNOLR, FRVBF_SFMT_BNOLR }, + { FRV_INSN_FBRALR, FRVBF_INSN_FBRALR, FRVBF_SFMT_FBRALR }, + { FRV_INSN_FBNOLR, FRVBF_INSN_FBNOLR, FRVBF_SFMT_FBNOLR }, { FRV_INSN_FBEQLR, FRVBF_INSN_FBEQLR, FRVBF_SFMT_FBEQLR }, { FRV_INSN_FBNELR, FRVBF_INSN_FBNELR, FRVBF_SFMT_FBEQLR }, { FRV_INSN_FBLGLR, FRVBF_INSN_FBLGLR, FRVBF_SFMT_FBEQLR }, @@ -387,8 +386,8 @@ static const struct insn_sem frvbf_insn_sem[] = { FRV_INSN_BCPLR, FRVBF_INSN_BCPLR, FRVBF_SFMT_BCEQLR }, { FRV_INSN_BCVLR, FRVBF_INSN_BCVLR, FRVBF_SFMT_BCEQLR }, { FRV_INSN_BCNVLR, FRVBF_INSN_BCNVLR, FRVBF_SFMT_BCEQLR }, - { FRV_INSN_FCBRALR, FRVBF_INSN_FCBRALR, FRVBF_SFMT_BCRALR }, - { FRV_INSN_FCBNOLR, FRVBF_INSN_FCBNOLR, FRVBF_SFMT_BCNOLR }, + { FRV_INSN_FCBRALR, FRVBF_INSN_FCBRALR, FRVBF_SFMT_FCBRALR }, + { FRV_INSN_FCBNOLR, FRVBF_INSN_FCBNOLR, FRVBF_SFMT_FCBNOLR }, { FRV_INSN_FCBEQLR, FRVBF_INSN_FCBEQLR, FRVBF_SFMT_FCBEQLR }, { FRV_INSN_FCBNELR, FRVBF_INSN_FCBNELR, FRVBF_SFMT_FCBEQLR }, { FRV_INSN_FCBLGLR, FRVBF_INSN_FCBLGLR, FRVBF_SFMT_FCBEQLR }, @@ -404,9 +403,9 @@ static const struct insn_sem frvbf_insn_sem[] = { FRV_INSN_FCBULR, FRVBF_INSN_FCBULR, FRVBF_SFMT_FCBEQLR }, { FRV_INSN_FCBOLR, FRVBF_INSN_FCBOLR, FRVBF_SFMT_FCBEQLR }, { FRV_INSN_JMPL, FRVBF_INSN_JMPL, FRVBF_SFMT_JMPL }, - { FRV_INSN_CALLL, FRVBF_INSN_CALLL, FRVBF_SFMT_JMPL }, + { FRV_INSN_CALLL, FRVBF_INSN_CALLL, FRVBF_SFMT_CALLL }, { FRV_INSN_JMPIL, FRVBF_INSN_JMPIL, FRVBF_SFMT_JMPIL }, - { FRV_INSN_CALLIL, FRVBF_INSN_CALLIL, FRVBF_SFMT_JMPIL }, + { FRV_INSN_CALLIL, FRVBF_INSN_CALLIL, FRVBF_SFMT_CALLIL }, { FRV_INSN_CALL, FRVBF_INSN_CALL, FRVBF_SFMT_CALL }, { FRV_INSN_RETT, FRVBF_INSN_RETT, FRVBF_SFMT_RETT }, { FRV_INSN_REI, FRVBF_INSN_REI, FRVBF_SFMT_REI }, @@ -426,7 +425,7 @@ static const struct insn_sem frvbf_insn_sem[] = { FRV_INSN_TP, FRVBF_INSN_TP, FRVBF_SFMT_TEQ }, { FRV_INSN_TV, FRVBF_INSN_TV, FRVBF_SFMT_TEQ }, { FRV_INSN_TNV, FRVBF_INSN_TNV, FRVBF_SFMT_TEQ }, - { FRV_INSN_FTRA, FRVBF_INSN_FTRA, FRVBF_SFMT_TRA }, + { FRV_INSN_FTRA, FRVBF_INSN_FTRA, FRVBF_SFMT_FTRA }, { FRV_INSN_FTNO, FRVBF_INSN_FTNO, FRVBF_SFMT_REI }, { FRV_INSN_FTNE, FRVBF_INSN_FTNE, FRVBF_SFMT_FTNE }, { FRV_INSN_FTEQ, FRVBF_INSN_FTEQ, FRVBF_SFMT_FTNE }, @@ -458,7 +457,7 @@ static const struct insn_sem frvbf_insn_sem[] = { FRV_INSN_TIP, FRVBF_INSN_TIP, FRVBF_SFMT_TIEQ }, { FRV_INSN_TIV, FRVBF_INSN_TIV, FRVBF_SFMT_TIEQ }, { FRV_INSN_TINV, FRVBF_INSN_TINV, FRVBF_SFMT_TIEQ }, - { FRV_INSN_FTIRA, FRVBF_INSN_FTIRA, FRVBF_SFMT_TIRA }, + { FRV_INSN_FTIRA, FRVBF_INSN_FTIRA, FRVBF_SFMT_FTIRA }, { FRV_INSN_FTINO, FRVBF_INSN_FTINO, FRVBF_SFMT_REI }, { FRV_INSN_FTINE, FRVBF_INSN_FTINE, FRVBF_SFMT_FTINE }, { FRV_INSN_FTIEQ, FRVBF_INSN_FTIEQ, FRVBF_SFMT_FTINE }, @@ -551,7 +550,7 @@ static const struct insn_sem frvbf_insn_sem[] = { FRV_INSN_CFCKU, FRVBF_INSN_CFCKU, FRVBF_SFMT_CFCKNE }, { FRV_INSN_CFCKO, FRVBF_INSN_CFCKO, FRVBF_SFMT_CFCKNE }, { FRV_INSN_CJMPL, FRVBF_INSN_CJMPL, FRVBF_SFMT_CJMPL }, - { FRV_INSN_CCALLL, FRVBF_INSN_CCALLL, FRVBF_SFMT_CJMPL }, + { FRV_INSN_CCALLL, FRVBF_INSN_CCALLL, FRVBF_SFMT_CCALLL }, { FRV_INSN_ICI, FRVBF_INSN_ICI, FRVBF_SFMT_ICI }, { FRV_INSN_DCI, FRVBF_INSN_DCI, FRVBF_SFMT_ICI }, { FRV_INSN_ICEI, FRVBF_INSN_ICEI, FRVBF_SFMT_ICEI }, @@ -791,7 +790,8 @@ static const struct insn_sem frvbf_insn_sem[] = { FRV_INSN_FNOP, FRVBF_INSN_FNOP, FRVBF_SFMT_REI }, }; -static const struct insn_sem frvbf_insn_sem_invalid = { +static const struct insn_sem frvbf_insn_sem_invalid = +{ VIRTUAL_INSN_X_INVALID, FRVBF_INSN_X_INVALID, FRVBF_SFMT_EMPTY }; @@ -841,7 +841,7 @@ frvbf_init_idesc_table (SIM_CPU *cpu) init_idesc (cpu, id, t); /* Now fill in the values for the chosen cpu. */ - for (t = frvbf_insn_sem, tend = t + sizeof (frvbf_insn_sem) / sizeof (*t); + for (t = frvbf_insn_sem, tend = t + ARRAY_SIZE (frvbf_insn_sem); t != tend; ++t) { init_idesc (cpu, & table[t->index], t); @@ -855,14 +855,14 @@ frvbf_init_idesc_table (SIM_CPU *cpu) const IDESC * frvbf_decode (SIM_CPU *current_cpu, IADDR pc, - CGEN_INSN_INT base_insn, CGEN_INSN_INT entire_insn, + CGEN_INSN_WORD base_insn, CGEN_INSN_WORD entire_insn, ARGBUF *abuf) { /* Result of decoder. */ FRVBF_INSN_TYPE itype; { - CGEN_INSN_INT insn = base_insn; + CGEN_INSN_WORD insn = base_insn; { unsigned int val = (((insn >> 18) & (127 << 0))); @@ -873,22 +873,46 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 6) & (15 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_ADD; goto extract_sfmt_add; + case 0 : + if ((entire_insn & 0x1fc0fc0) == 0x0) + { itype = FRVBF_INSN_ADD; goto extract_sfmt_add; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 1 : itype = FRVBF_INSN_ADDCC; goto extract_sfmt_addcc; case 2 : itype = FRVBF_INSN_ADDX; goto extract_sfmt_addx; case 3 : itype = FRVBF_INSN_ADDXCC; goto extract_sfmt_addcc; - case 4 : itype = FRVBF_INSN_SUB; goto extract_sfmt_add; + case 4 : + if ((entire_insn & 0x1fc0fc0) == 0x100) + { itype = FRVBF_INSN_SUB; goto extract_sfmt_add; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 5 : itype = FRVBF_INSN_SUBCC; goto extract_sfmt_addcc; case 6 : itype = FRVBF_INSN_SUBX; goto extract_sfmt_addx; case 7 : itype = FRVBF_INSN_SUBXCC; goto extract_sfmt_addcc; - case 8 : itype = FRVBF_INSN_SMUL; goto extract_sfmt_smul; + case 8 : + if ((entire_insn & 0x1fc0fc0) == 0x200) + { itype = FRVBF_INSN_SMUL; goto extract_sfmt_smul; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 9 : itype = FRVBF_INSN_SMULCC; goto extract_sfmt_smulcc; - case 10 : itype = FRVBF_INSN_UMUL; goto extract_sfmt_smul; + case 10 : + if ((entire_insn & 0x1fc0fc0) == 0x280) + { itype = FRVBF_INSN_UMUL; goto extract_sfmt_smul; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 11 : itype = FRVBF_INSN_UMULCC; goto extract_sfmt_smulcc; - case 12 : itype = FRVBF_INSN_CMPB; goto extract_sfmt_cmpb; - case 13 : itype = FRVBF_INSN_CMPBA; goto extract_sfmt_cmpb; - case 14 : itype = FRVBF_INSN_SDIV; goto extract_sfmt_sdiv; - case 15 : itype = FRVBF_INSN_UDIV; goto extract_sfmt_sdiv; + case 12 : + if ((entire_insn & 0x7ffc03c0) == 0x300) + { itype = FRVBF_INSN_CMPB; goto extract_sfmt_cmpb; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 13 : + if ((entire_insn & 0x7ffc03c0) == 0x340) + { itype = FRVBF_INSN_CMPBA; goto extract_sfmt_cmpb; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : + if ((entire_insn & 0x1fc0fc0) == 0x380) + { itype = FRVBF_INSN_SDIV; goto extract_sfmt_sdiv; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 15 : + if ((entire_insn & 0x1fc0fc0) == 0x3c0) + { itype = FRVBF_INSN_UDIV; goto extract_sfmt_sdiv; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -897,21 +921,48 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 6) & (15 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_AND; goto extract_sfmt_add; + case 0 : + if ((entire_insn & 0x1fc0fc0) == 0x40000) + { itype = FRVBF_INSN_AND; goto extract_sfmt_add; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 1 : itype = FRVBF_INSN_ANDCC; goto extract_sfmt_andcc; - case 2 : itype = FRVBF_INSN_OR; goto extract_sfmt_add; + case 2 : + if ((entire_insn & 0x1fc0fc0) == 0x40080) + { itype = FRVBF_INSN_OR; goto extract_sfmt_add; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 3 : itype = FRVBF_INSN_ORCC; goto extract_sfmt_andcc; - case 4 : itype = FRVBF_INSN_XOR; goto extract_sfmt_add; + case 4 : + if ((entire_insn & 0x1fc0fc0) == 0x40100) + { itype = FRVBF_INSN_XOR; goto extract_sfmt_add; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 5 : itype = FRVBF_INSN_XORCC; goto extract_sfmt_andcc; - case 6 : itype = FRVBF_INSN_NOT; goto extract_sfmt_not; - case 8 : itype = FRVBF_INSN_SLL; goto extract_sfmt_add; + case 6 : + if ((entire_insn & 0x1ffffc0) == 0x40180) + { itype = FRVBF_INSN_NOT; goto extract_sfmt_not; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 8 : + if ((entire_insn & 0x1fc0fc0) == 0x40200) + { itype = FRVBF_INSN_SLL; goto extract_sfmt_add; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 9 : itype = FRVBF_INSN_SLLCC; goto extract_sfmt_addcc; - case 10 : itype = FRVBF_INSN_SRL; goto extract_sfmt_add; + case 10 : + if ((entire_insn & 0x1fc0fc0) == 0x40280) + { itype = FRVBF_INSN_SRL; goto extract_sfmt_add; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 11 : itype = FRVBF_INSN_SRLCC; goto extract_sfmt_addcc; - case 12 : itype = FRVBF_INSN_SRA; goto extract_sfmt_add; + case 12 : + if ((entire_insn & 0x1fc0fc0) == 0x40300) + { itype = FRVBF_INSN_SRA; goto extract_sfmt_add; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 13 : itype = FRVBF_INSN_SRACC; goto extract_sfmt_addcc; - case 14 : itype = FRVBF_INSN_NSDIV; goto extract_sfmt_sdiv; - case 15 : itype = FRVBF_INSN_NUDIV; goto extract_sfmt_sdiv; + case 14 : + if ((entire_insn & 0x1fc0fc0) == 0x40380) + { itype = FRVBF_INSN_NSDIV; goto extract_sfmt_sdiv; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 15 : + if ((entire_insn & 0x1fc0fc0) == 0x403c0) + { itype = FRVBF_INSN_NUDIV; goto extract_sfmt_sdiv; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -995,47 +1046,116 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, case 10 : itype = FRVBF_INSN_STF; goto extract_sfmt_stbf; case 11 : itype = FRVBF_INSN_STDF; goto extract_sfmt_stdf; case 12 : itype = FRVBF_INSN_STQF; goto extract_sfmt_ldqf; - case 13 : itype = FRVBF_INSN_MOVFG; goto extract_sfmt_movfg; - case 14 : itype = FRVBF_INSN_MOVFGD; goto extract_sfmt_movfgd; - case 15 : itype = FRVBF_INSN_MOVFGQ; goto extract_sfmt_movfgq; + case 13 : + if ((entire_insn & 0x1ffffc0) == 0xc0340) + { itype = FRVBF_INSN_MOVFG; goto extract_sfmt_movfg; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : + if ((entire_insn & 0x1ffffc0) == 0xc0380) + { itype = FRVBF_INSN_MOVFGD; goto extract_sfmt_movfgd; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 15 : + if ((entire_insn & 0x1ffffc0) == 0xc03c0) + { itype = FRVBF_INSN_MOVFGQ; goto extract_sfmt_movfgq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 16 : itype = FRVBF_INSN_STBU; goto extract_sfmt_stbu; case 17 : itype = FRVBF_INSN_STHU; goto extract_sfmt_stbu; case 18 : itype = FRVBF_INSN_STU; goto extract_sfmt_stbu; case 19 : itype = FRVBF_INSN_STDU; goto extract_sfmt_stdu; case 20 : itype = FRVBF_INSN_STQU; goto extract_sfmt_stqu; - case 21 : itype = FRVBF_INSN_MOVGF; goto extract_sfmt_movgf; - case 22 : itype = FRVBF_INSN_MOVGFD; goto extract_sfmt_movgfd; - case 23 : itype = FRVBF_INSN_MOVGFQ; goto extract_sfmt_movgfq; + case 21 : + if ((entire_insn & 0x1ffffc0) == 0xc0540) + { itype = FRVBF_INSN_MOVGF; goto extract_sfmt_movgf; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 22 : + if ((entire_insn & 0x1ffffc0) == 0xc0580) + { itype = FRVBF_INSN_MOVGFD; goto extract_sfmt_movgfd; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 23 : + if ((entire_insn & 0x1ffffc0) == 0xc05c0) + { itype = FRVBF_INSN_MOVGFQ; goto extract_sfmt_movgfq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 24 : itype = FRVBF_INSN_STBFU; goto extract_sfmt_stbfu; case 25 : itype = FRVBF_INSN_STHFU; goto extract_sfmt_stbfu; case 26 : itype = FRVBF_INSN_STFU; goto extract_sfmt_stbfu; case 27 : itype = FRVBF_INSN_STDFU; goto extract_sfmt_stdfu; case 28 : itype = FRVBF_INSN_STQFU; goto extract_sfmt_ldqfu; - case 32 : itype = FRVBF_INSN_LRAI; goto extract_sfmt_rei; - case 33 : itype = FRVBF_INSN_LRAD; goto extract_sfmt_rei; - case 36 : itype = FRVBF_INSN_TLBPR; goto extract_sfmt_rei; + case 32 : + if ((entire_insn & 0x1fc0fc7) == 0xc0800) + { itype = FRVBF_INSN_LRAI; goto extract_sfmt_rei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 33 : + if ((entire_insn & 0x1fc0fc7) == 0xc0840) + { itype = FRVBF_INSN_LRAD; goto extract_sfmt_rei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 36 : + if ((entire_insn & 0x61fc0fc0) == 0xc0900) + { itype = FRVBF_INSN_TLBPR; goto extract_sfmt_rei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 37 : itype = FRVBF_INSN_STC; goto extract_sfmt_stc; case 38 : itype = FRVBF_INSN_STDC; goto extract_sfmt_stdc; case 39 : itype = FRVBF_INSN_STQC; goto extract_sfmt_ldqc; case 45 : itype = FRVBF_INSN_STCU; goto extract_sfmt_stcu; case 46 : itype = FRVBF_INSN_STDCU; goto extract_sfmt_stdcu; case 47 : itype = FRVBF_INSN_STQCU; goto extract_sfmt_ldqcu; - case 48 : itype = FRVBF_INSN_ICPL; goto extract_sfmt_icpl; - case 49 : itype = FRVBF_INSN_ICUL; goto extract_sfmt_icul; + case 48 : + if ((entire_insn & 0x7dfc0fc0) == 0xc0c00) + { itype = FRVBF_INSN_ICPL; goto extract_sfmt_icpl; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 49 : + if ((entire_insn & 0x7ffc0fff) == 0xc0c40) + { itype = FRVBF_INSN_ICUL; goto extract_sfmt_icul; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 50 : itype = FRVBF_INSN_WITLB; goto extract_sfmt_rei; - case 51 : itype = FRVBF_INSN_ITLBI; goto extract_sfmt_rei; - case 52 : itype = FRVBF_INSN_DCPL; goto extract_sfmt_icpl; - case 53 : itype = FRVBF_INSN_DCUL; goto extract_sfmt_icul; + case 51 : + if ((entire_insn & 0x7ffc0fc0) == 0xc0cc0) + { itype = FRVBF_INSN_ITLBI; goto extract_sfmt_rei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 52 : + if ((entire_insn & 0x7dfc0fc0) == 0xc0d00) + { itype = FRVBF_INSN_DCPL; goto extract_sfmt_icpl; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 53 : + if ((entire_insn & 0x7ffc0fff) == 0xc0d40) + { itype = FRVBF_INSN_DCUL; goto extract_sfmt_icul; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 54 : itype = FRVBF_INSN_WDTLB; goto extract_sfmt_rei; - case 55 : itype = FRVBF_INSN_DTLBI; goto extract_sfmt_rei; - case 56 : itype = FRVBF_INSN_ICI; goto extract_sfmt_ici; - case 57 : itype = FRVBF_INSN_ICEI; goto extract_sfmt_icei; - case 58 : itype = FRVBF_INSN_DCEI; goto extract_sfmt_icei; - case 59 : itype = FRVBF_INSN_DCEF; goto extract_sfmt_icei; - case 60 : itype = FRVBF_INSN_DCI; goto extract_sfmt_ici; - case 61 : itype = FRVBF_INSN_DCF; goto extract_sfmt_ici; - case 62 : itype = FRVBF_INSN_BAR; goto extract_sfmt_rei; - case 63 : itype = FRVBF_INSN_MEMBAR; goto extract_sfmt_rei; + case 55 : + if ((entire_insn & 0x7ffc0fc0) == 0xc0dc0) + { itype = FRVBF_INSN_DTLBI; goto extract_sfmt_rei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 56 : + if ((entire_insn & 0x7ffc0fc0) == 0xc0e00) + { itype = FRVBF_INSN_ICI; goto extract_sfmt_ici; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 57 : + if ((entire_insn & 0x7dfc0fc0) == 0xc0e40) + { itype = FRVBF_INSN_ICEI; goto extract_sfmt_icei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 58 : + if ((entire_insn & 0x7dfc0fc0) == 0xc0e80) + { itype = FRVBF_INSN_DCEI; goto extract_sfmt_icei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 59 : + if ((entire_insn & 0x7dfc0fc0) == 0xc0ec0) + { itype = FRVBF_INSN_DCEF; goto extract_sfmt_icei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 60 : + if ((entire_insn & 0x7ffc0fc0) == 0xc0f00) + { itype = FRVBF_INSN_DCI; goto extract_sfmt_ici; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 61 : + if ((entire_insn & 0x7ffc0fc0) == 0xc0f40) + { itype = FRVBF_INSN_DCF; goto extract_sfmt_ici; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 62 : + if ((entire_insn & 0x7fffffff) == 0xc0f80) + { itype = FRVBF_INSN_BAR; goto extract_sfmt_rei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 63 : + if ((entire_insn & 0x7fffffff) == 0xc0fc0) + { itype = FRVBF_INSN_MEMBAR; goto extract_sfmt_rei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1044,50 +1164,158 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 25) & (15 << 2)) | ((insn >> 6) & (3 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_TNO; goto extract_sfmt_rei; - case 1 : itype = FRVBF_INSN_FTNO; goto extract_sfmt_rei; - case 2 : itype = FRVBF_INSN_MTRAP; goto extract_sfmt_rei; - case 3 : itype = FRVBF_INSN_BREAK; goto extract_sfmt_break; - case 4 : itype = FRVBF_INSN_TC; goto extract_sfmt_teq; - case 5 : itype = FRVBF_INSN_FTU; goto extract_sfmt_ftne; - case 8 : itype = FRVBF_INSN_TV; goto extract_sfmt_teq; - case 9 : itype = FRVBF_INSN_FTGT; goto extract_sfmt_ftne; - case 12 : itype = FRVBF_INSN_TLT; goto extract_sfmt_teq; - case 13 : itype = FRVBF_INSN_FTUG; goto extract_sfmt_ftne; - case 16 : itype = FRVBF_INSN_TEQ; goto extract_sfmt_teq; - case 17 : itype = FRVBF_INSN_FTLT; goto extract_sfmt_ftne; - case 20 : itype = FRVBF_INSN_TLS; goto extract_sfmt_teq; - case 21 : itype = FRVBF_INSN_FTUL; goto extract_sfmt_ftne; - case 24 : itype = FRVBF_INSN_TN; goto extract_sfmt_teq; - case 25 : itype = FRVBF_INSN_FTLG; goto extract_sfmt_ftne; - case 28 : itype = FRVBF_INSN_TLE; goto extract_sfmt_teq; - case 29 : itype = FRVBF_INSN_FTNE; goto extract_sfmt_ftne; - case 32 : itype = FRVBF_INSN_TRA; goto extract_sfmt_tra; - case 33 : itype = FRVBF_INSN_FTEQ; goto extract_sfmt_ftne; - case 36 : itype = FRVBF_INSN_TNC; goto extract_sfmt_teq; - case 37 : itype = FRVBF_INSN_FTUE; goto extract_sfmt_ftne; - case 40 : itype = FRVBF_INSN_TNV; goto extract_sfmt_teq; - case 41 : itype = FRVBF_INSN_FTGE; goto extract_sfmt_ftne; - case 44 : itype = FRVBF_INSN_TGE; goto extract_sfmt_teq; - case 45 : itype = FRVBF_INSN_FTUGE; goto extract_sfmt_ftne; - case 48 : itype = FRVBF_INSN_TNE; goto extract_sfmt_teq; - case 49 : itype = FRVBF_INSN_FTLE; goto extract_sfmt_ftne; - case 52 : itype = FRVBF_INSN_THI; goto extract_sfmt_teq; - case 53 : itype = FRVBF_INSN_FTULE; goto extract_sfmt_ftne; - case 56 : itype = FRVBF_INSN_TP; goto extract_sfmt_teq; - case 57 : itype = FRVBF_INSN_FTO; goto extract_sfmt_ftne; - case 60 : itype = FRVBF_INSN_TGT; goto extract_sfmt_teq; - case 61 : itype = FRVBF_INSN_FTRA; goto extract_sfmt_tra; + case 0 : + if ((entire_insn & 0x7fffffff) == 0x100000) + { itype = FRVBF_INSN_TNO; goto extract_sfmt_rei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 1 : + if ((entire_insn & 0x7fffffff) == 0x100040) + { itype = FRVBF_INSN_FTNO; goto extract_sfmt_rei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 2 : + if ((entire_insn & 0x7fffffff) == 0x100080) + { itype = FRVBF_INSN_MTRAP; goto extract_sfmt_rei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 3 : + if ((entire_insn & 0x7fffffff) == 0x1000c0) + { itype = FRVBF_INSN_BREAK; goto extract_sfmt_break; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 4 : + if ((entire_insn & 0x79fc0fc0) == 0x8100000) + { itype = FRVBF_INSN_TC; goto extract_sfmt_teq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 5 : + if ((entire_insn & 0x79fc0fc0) == 0x8100040) + { itype = FRVBF_INSN_FTU; goto extract_sfmt_ftne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 8 : + if ((entire_insn & 0x79fc0fc0) == 0x10100000) + { itype = FRVBF_INSN_TV; goto extract_sfmt_teq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 9 : + if ((entire_insn & 0x79fc0fc0) == 0x10100040) + { itype = FRVBF_INSN_FTGT; goto extract_sfmt_ftne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 12 : + if ((entire_insn & 0x79fc0fc0) == 0x18100000) + { itype = FRVBF_INSN_TLT; goto extract_sfmt_teq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 13 : + if ((entire_insn & 0x79fc0fc0) == 0x18100040) + { itype = FRVBF_INSN_FTUG; goto extract_sfmt_ftne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 16 : + if ((entire_insn & 0x79fc0fc0) == 0x20100000) + { itype = FRVBF_INSN_TEQ; goto extract_sfmt_teq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 17 : + if ((entire_insn & 0x79fc0fc0) == 0x20100040) + { itype = FRVBF_INSN_FTLT; goto extract_sfmt_ftne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 20 : + if ((entire_insn & 0x79fc0fc0) == 0x28100000) + { itype = FRVBF_INSN_TLS; goto extract_sfmt_teq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 21 : + if ((entire_insn & 0x79fc0fc0) == 0x28100040) + { itype = FRVBF_INSN_FTUL; goto extract_sfmt_ftne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 24 : + if ((entire_insn & 0x79fc0fc0) == 0x30100000) + { itype = FRVBF_INSN_TN; goto extract_sfmt_teq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 25 : + if ((entire_insn & 0x79fc0fc0) == 0x30100040) + { itype = FRVBF_INSN_FTLG; goto extract_sfmt_ftne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 28 : + if ((entire_insn & 0x79fc0fc0) == 0x38100000) + { itype = FRVBF_INSN_TLE; goto extract_sfmt_teq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 29 : + if ((entire_insn & 0x79fc0fc0) == 0x38100040) + { itype = FRVBF_INSN_FTNE; goto extract_sfmt_ftne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 32 : + if ((entire_insn & 0x7ffc0fc0) == 0x40100000) + { itype = FRVBF_INSN_TRA; goto extract_sfmt_tra; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 33 : + if ((entire_insn & 0x79fc0fc0) == 0x40100040) + { itype = FRVBF_INSN_FTEQ; goto extract_sfmt_ftne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 36 : + if ((entire_insn & 0x79fc0fc0) == 0x48100000) + { itype = FRVBF_INSN_TNC; goto extract_sfmt_teq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 37 : + if ((entire_insn & 0x79fc0fc0) == 0x48100040) + { itype = FRVBF_INSN_FTUE; goto extract_sfmt_ftne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 40 : + if ((entire_insn & 0x79fc0fc0) == 0x50100000) + { itype = FRVBF_INSN_TNV; goto extract_sfmt_teq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 41 : + if ((entire_insn & 0x79fc0fc0) == 0x50100040) + { itype = FRVBF_INSN_FTGE; goto extract_sfmt_ftne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 44 : + if ((entire_insn & 0x79fc0fc0) == 0x58100000) + { itype = FRVBF_INSN_TGE; goto extract_sfmt_teq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 45 : + if ((entire_insn & 0x79fc0fc0) == 0x58100040) + { itype = FRVBF_INSN_FTUGE; goto extract_sfmt_ftne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 48 : + if ((entire_insn & 0x79fc0fc0) == 0x60100000) + { itype = FRVBF_INSN_TNE; goto extract_sfmt_teq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 49 : + if ((entire_insn & 0x79fc0fc0) == 0x60100040) + { itype = FRVBF_INSN_FTLE; goto extract_sfmt_ftne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 52 : + if ((entire_insn & 0x79fc0fc0) == 0x68100000) + { itype = FRVBF_INSN_THI; goto extract_sfmt_teq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 53 : + if ((entire_insn & 0x79fc0fc0) == 0x68100040) + { itype = FRVBF_INSN_FTULE; goto extract_sfmt_ftne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 56 : + if ((entire_insn & 0x79fc0fc0) == 0x70100000) + { itype = FRVBF_INSN_TP; goto extract_sfmt_teq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 57 : + if ((entire_insn & 0x79fc0fc0) == 0x70100040) + { itype = FRVBF_INSN_FTO; goto extract_sfmt_ftne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 60 : + if ((entire_insn & 0x79fc0fc0) == 0x78100000) + { itype = FRVBF_INSN_TGT; goto extract_sfmt_teq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 61 : + if ((entire_insn & 0x7ffc0fc0) == 0x78100040) + { itype = FRVBF_INSN_FTRA; goto extract_sfmt_ftra; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } - case 5 : itype = FRVBF_INSN_RETT; goto extract_sfmt_rett; + case 5 : + if ((entire_insn & 0x7dffffff) == 0x140000) + { itype = FRVBF_INSN_RETT; goto extract_sfmt_rett; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 6 : { unsigned int val = (((insn >> 27) & (15 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_BNO; goto extract_sfmt_bno; + case 0 : + if ((entire_insn & 0x7ffcffff) == 0x180000) + { itype = FRVBF_INSN_BNO; goto extract_sfmt_bno; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 1 : itype = FRVBF_INSN_BC; goto extract_sfmt_beq; case 2 : itype = FRVBF_INSN_BV; goto extract_sfmt_beq; case 3 : itype = FRVBF_INSN_BLT; goto extract_sfmt_beq; @@ -1095,7 +1323,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, case 5 : itype = FRVBF_INSN_BLS; goto extract_sfmt_beq; case 6 : itype = FRVBF_INSN_BN; goto extract_sfmt_beq; case 7 : itype = FRVBF_INSN_BLE; goto extract_sfmt_beq; - case 8 : itype = FRVBF_INSN_BRA; goto extract_sfmt_bra; + case 8 : + if ((entire_insn & 0x7ffc0000) == 0x40180000) + { itype = FRVBF_INSN_BRA; goto extract_sfmt_bra; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 9 : itype = FRVBF_INSN_BNC; goto extract_sfmt_beq; case 10 : itype = FRVBF_INSN_BNV; goto extract_sfmt_beq; case 11 : itype = FRVBF_INSN_BGE; goto extract_sfmt_beq; @@ -1111,7 +1342,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 27) & (15 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_FBNO; goto extract_sfmt_bno; + case 0 : + if ((entire_insn & 0x7ffcffff) == 0x1c0000) + { itype = FRVBF_INSN_FBNO; goto extract_sfmt_fbno; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 1 : itype = FRVBF_INSN_FBU; goto extract_sfmt_fbne; case 2 : itype = FRVBF_INSN_FBGT; goto extract_sfmt_fbne; case 3 : itype = FRVBF_INSN_FBUG; goto extract_sfmt_fbne; @@ -1126,7 +1360,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, case 12 : itype = FRVBF_INSN_FBLE; goto extract_sfmt_fbne; case 13 : itype = FRVBF_INSN_FBULE; goto extract_sfmt_fbne; case 14 : itype = FRVBF_INSN_FBO; goto extract_sfmt_fbne; - case 15 : itype = FRVBF_INSN_FBRA; goto extract_sfmt_bra; + case 15 : + if ((entire_insn & 0x7ffc0000) == 0x781c0000) + { itype = FRVBF_INSN_FBRA; goto extract_sfmt_fbra; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1135,22 +1372,70 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 27) & (15 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_CKNO; goto extract_sfmt_ckra; - case 1 : itype = FRVBF_INSN_CKC; goto extract_sfmt_ckeq; - case 2 : itype = FRVBF_INSN_CKV; goto extract_sfmt_ckeq; - case 3 : itype = FRVBF_INSN_CKLT; goto extract_sfmt_ckeq; - case 4 : itype = FRVBF_INSN_CKEQ; goto extract_sfmt_ckeq; - case 5 : itype = FRVBF_INSN_CKLS; goto extract_sfmt_ckeq; - case 6 : itype = FRVBF_INSN_CKN; goto extract_sfmt_ckeq; - case 7 : itype = FRVBF_INSN_CKLE; goto extract_sfmt_ckeq; - case 8 : itype = FRVBF_INSN_CKRA; goto extract_sfmt_ckra; - case 9 : itype = FRVBF_INSN_CKNC; goto extract_sfmt_ckeq; - case 10 : itype = FRVBF_INSN_CKNV; goto extract_sfmt_ckeq; - case 11 : itype = FRVBF_INSN_CKGE; goto extract_sfmt_ckeq; - case 12 : itype = FRVBF_INSN_CKNE; goto extract_sfmt_ckeq; - case 13 : itype = FRVBF_INSN_CKHI; goto extract_sfmt_ckeq; - case 14 : itype = FRVBF_INSN_CKP; goto extract_sfmt_ckeq; - case 15 : itype = FRVBF_INSN_CKGT; goto extract_sfmt_ckeq; + case 0 : + if ((entire_insn & 0x79ffffff) == 0x200000) + { itype = FRVBF_INSN_CKNO; goto extract_sfmt_ckra; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 1 : + if ((entire_insn & 0x79fffffc) == 0x8200000) + { itype = FRVBF_INSN_CKC; goto extract_sfmt_ckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 2 : + if ((entire_insn & 0x79fffffc) == 0x10200000) + { itype = FRVBF_INSN_CKV; goto extract_sfmt_ckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 3 : + if ((entire_insn & 0x79fffffc) == 0x18200000) + { itype = FRVBF_INSN_CKLT; goto extract_sfmt_ckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 4 : + if ((entire_insn & 0x79fffffc) == 0x20200000) + { itype = FRVBF_INSN_CKEQ; goto extract_sfmt_ckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 5 : + if ((entire_insn & 0x79fffffc) == 0x28200000) + { itype = FRVBF_INSN_CKLS; goto extract_sfmt_ckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 6 : + if ((entire_insn & 0x79fffffc) == 0x30200000) + { itype = FRVBF_INSN_CKN; goto extract_sfmt_ckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 7 : + if ((entire_insn & 0x79fffffc) == 0x38200000) + { itype = FRVBF_INSN_CKLE; goto extract_sfmt_ckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 8 : + if ((entire_insn & 0x79ffffff) == 0x40200000) + { itype = FRVBF_INSN_CKRA; goto extract_sfmt_ckra; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 9 : + if ((entire_insn & 0x79fffffc) == 0x48200000) + { itype = FRVBF_INSN_CKNC; goto extract_sfmt_ckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 10 : + if ((entire_insn & 0x79fffffc) == 0x50200000) + { itype = FRVBF_INSN_CKNV; goto extract_sfmt_ckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 11 : + if ((entire_insn & 0x79fffffc) == 0x58200000) + { itype = FRVBF_INSN_CKGE; goto extract_sfmt_ckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 12 : + if ((entire_insn & 0x79fffffc) == 0x60200000) + { itype = FRVBF_INSN_CKNE; goto extract_sfmt_ckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 13 : + if ((entire_insn & 0x79fffffc) == 0x68200000) + { itype = FRVBF_INSN_CKHI; goto extract_sfmt_ckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : + if ((entire_insn & 0x79fffffc) == 0x70200000) + { itype = FRVBF_INSN_CKP; goto extract_sfmt_ckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 15 : + if ((entire_insn & 0x79fffffc) == 0x78200000) + { itype = FRVBF_INSN_CKGT; goto extract_sfmt_ckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1159,22 +1444,70 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 27) & (15 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_FCKNO; goto extract_sfmt_fckra; - case 1 : itype = FRVBF_INSN_FCKU; goto extract_sfmt_fckne; - case 2 : itype = FRVBF_INSN_FCKGT; goto extract_sfmt_fckne; - case 3 : itype = FRVBF_INSN_FCKUG; goto extract_sfmt_fckne; - case 4 : itype = FRVBF_INSN_FCKLT; goto extract_sfmt_fckne; - case 5 : itype = FRVBF_INSN_FCKUL; goto extract_sfmt_fckne; - case 6 : itype = FRVBF_INSN_FCKLG; goto extract_sfmt_fckne; - case 7 : itype = FRVBF_INSN_FCKNE; goto extract_sfmt_fckne; - case 8 : itype = FRVBF_INSN_FCKEQ; goto extract_sfmt_fckne; - case 9 : itype = FRVBF_INSN_FCKUE; goto extract_sfmt_fckne; - case 10 : itype = FRVBF_INSN_FCKGE; goto extract_sfmt_fckne; - case 11 : itype = FRVBF_INSN_FCKUGE; goto extract_sfmt_fckne; - case 12 : itype = FRVBF_INSN_FCKLE; goto extract_sfmt_fckne; - case 13 : itype = FRVBF_INSN_FCKULE; goto extract_sfmt_fckne; - case 14 : itype = FRVBF_INSN_FCKO; goto extract_sfmt_fckne; - case 15 : itype = FRVBF_INSN_FCKRA; goto extract_sfmt_fckra; + case 0 : + if ((entire_insn & 0x79fffffc) == 0x240000) + { itype = FRVBF_INSN_FCKNO; goto extract_sfmt_fckra; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 1 : + if ((entire_insn & 0x79fffffc) == 0x8240000) + { itype = FRVBF_INSN_FCKU; goto extract_sfmt_fckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 2 : + if ((entire_insn & 0x79fffffc) == 0x10240000) + { itype = FRVBF_INSN_FCKGT; goto extract_sfmt_fckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 3 : + if ((entire_insn & 0x79fffffc) == 0x18240000) + { itype = FRVBF_INSN_FCKUG; goto extract_sfmt_fckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 4 : + if ((entire_insn & 0x79fffffc) == 0x20240000) + { itype = FRVBF_INSN_FCKLT; goto extract_sfmt_fckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 5 : + if ((entire_insn & 0x79fffffc) == 0x28240000) + { itype = FRVBF_INSN_FCKUL; goto extract_sfmt_fckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 6 : + if ((entire_insn & 0x79fffffc) == 0x30240000) + { itype = FRVBF_INSN_FCKLG; goto extract_sfmt_fckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 7 : + if ((entire_insn & 0x79fffffc) == 0x38240000) + { itype = FRVBF_INSN_FCKNE; goto extract_sfmt_fckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 8 : + if ((entire_insn & 0x79fffffc) == 0x40240000) + { itype = FRVBF_INSN_FCKEQ; goto extract_sfmt_fckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 9 : + if ((entire_insn & 0x79fffffc) == 0x48240000) + { itype = FRVBF_INSN_FCKUE; goto extract_sfmt_fckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 10 : + if ((entire_insn & 0x79fffffc) == 0x50240000) + { itype = FRVBF_INSN_FCKGE; goto extract_sfmt_fckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 11 : + if ((entire_insn & 0x79fffffc) == 0x58240000) + { itype = FRVBF_INSN_FCKUGE; goto extract_sfmt_fckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 12 : + if ((entire_insn & 0x79fffffc) == 0x60240000) + { itype = FRVBF_INSN_FCKLE; goto extract_sfmt_fckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 13 : + if ((entire_insn & 0x79fffffc) == 0x68240000) + { itype = FRVBF_INSN_FCKULE; goto extract_sfmt_fckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : + if ((entire_insn & 0x79fffffc) == 0x70240000) + { itype = FRVBF_INSN_FCKO; goto extract_sfmt_fckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 15 : + if ((entire_insn & 0x79fffffc) == 0x78240000) + { itype = FRVBF_INSN_FCKRA; goto extract_sfmt_fckra; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1183,35 +1516,98 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 6) & (31 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_CLRGR; goto extract_sfmt_clrgr; - case 1 : itype = FRVBF_INSN_CLRGA; goto extract_sfmt_rei; - case 2 : itype = FRVBF_INSN_CLRFR; goto extract_sfmt_clrfr; - case 3 : itype = FRVBF_INSN_CLRFA; goto extract_sfmt_rei; - case 4 : itype = FRVBF_INSN_COMMITGR; goto extract_sfmt_commitgr; - case 5 : itype = FRVBF_INSN_COMMITGA; goto extract_sfmt_rei; - case 6 : itype = FRVBF_INSN_COMMITFR; goto extract_sfmt_commitfr; - case 7 : itype = FRVBF_INSN_COMMITFA; goto extract_sfmt_rei; - case 8 : itype = FRVBF_INSN_ANDCR; goto extract_sfmt_andcr; - case 9 : itype = FRVBF_INSN_ORCR; goto extract_sfmt_andcr; - case 10 : itype = FRVBF_INSN_XORCR; goto extract_sfmt_andcr; - case 11 : itype = FRVBF_INSN_NOTCR; goto extract_sfmt_notcr; - case 12 : itype = FRVBF_INSN_NANDCR; goto extract_sfmt_andcr; - case 13 : itype = FRVBF_INSN_NORCR; goto extract_sfmt_andcr; - case 16 : itype = FRVBF_INSN_ANDNCR; goto extract_sfmt_andcr; - case 17 : itype = FRVBF_INSN_ORNCR; goto extract_sfmt_andcr; - case 20 : itype = FRVBF_INSN_NANDNCR; goto extract_sfmt_andcr; - case 21 : itype = FRVBF_INSN_NORNCR; goto extract_sfmt_andcr; + case 0 : + if ((entire_insn & 0x1ffffff) == 0x280000) + { itype = FRVBF_INSN_CLRGR; goto extract_sfmt_clrgr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 1 : + if ((entire_insn & 0x7fffffff) == 0x280040) + { itype = FRVBF_INSN_CLRGA; goto extract_sfmt_rei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 2 : + if ((entire_insn & 0x1ffffff) == 0x280080) + { itype = FRVBF_INSN_CLRFR; goto extract_sfmt_clrfr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 3 : + if ((entire_insn & 0x7fffffff) == 0x2800c0) + { itype = FRVBF_INSN_CLRFA; goto extract_sfmt_rei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 4 : + if ((entire_insn & 0x1ffffff) == 0x280100) + { itype = FRVBF_INSN_COMMITGR; goto extract_sfmt_commitgr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 5 : + if ((entire_insn & 0x7fffffff) == 0x280140) + { itype = FRVBF_INSN_COMMITGA; goto extract_sfmt_rei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 6 : + if ((entire_insn & 0x1ffffff) == 0x280180) + { itype = FRVBF_INSN_COMMITFR; goto extract_sfmt_commitfr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 7 : + if ((entire_insn & 0x7fffffff) == 0x2801c0) + { itype = FRVBF_INSN_COMMITFA; goto extract_sfmt_rei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 8 : + if ((entire_insn & 0x71ff8ff8) == 0x280200) + { itype = FRVBF_INSN_ANDCR; goto extract_sfmt_andcr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 9 : + if ((entire_insn & 0x71ff8ff8) == 0x280240) + { itype = FRVBF_INSN_ORCR; goto extract_sfmt_andcr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 10 : + if ((entire_insn & 0x71ff8ff8) == 0x280280) + { itype = FRVBF_INSN_XORCR; goto extract_sfmt_andcr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 11 : + if ((entire_insn & 0x71fffff8) == 0x2802c0) + { itype = FRVBF_INSN_NOTCR; goto extract_sfmt_notcr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 12 : + if ((entire_insn & 0x71ff8ff8) == 0x280300) + { itype = FRVBF_INSN_NANDCR; goto extract_sfmt_andcr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 13 : + if ((entire_insn & 0x71ff8ff8) == 0x280340) + { itype = FRVBF_INSN_NORCR; goto extract_sfmt_andcr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 16 : + if ((entire_insn & 0x71ff8ff8) == 0x280400) + { itype = FRVBF_INSN_ANDNCR; goto extract_sfmt_andcr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 17 : + if ((entire_insn & 0x71ff8ff8) == 0x280440) + { itype = FRVBF_INSN_ORNCR; goto extract_sfmt_andcr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 20 : + if ((entire_insn & 0x71ff8ff8) == 0x280500) + { itype = FRVBF_INSN_NANDNCR; goto extract_sfmt_andcr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 21 : + if ((entire_insn & 0x71ff8ff8) == 0x280540) + { itype = FRVBF_INSN_NORNCR; goto extract_sfmt_andcr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } - case 11 : itype = FRVBF_INSN_SCAN; goto extract_sfmt_add; + case 11 : + if ((entire_insn & 0x1fc0fc0) == 0x2c0000) + { itype = FRVBF_INSN_SCAN; goto extract_sfmt_add; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 12 : { unsigned int val = (((insn >> 25) & (1 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_JMPL; goto extract_sfmt_jmpl; - case 1 : itype = FRVBF_INSN_CALLL; goto extract_sfmt_jmpl; + case 0 : + if ((entire_insn & 0x7ffc0fc0) == 0x300000) + { itype = FRVBF_INSN_JMPL; goto extract_sfmt_jmpl; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 1 : + if ((entire_insn & 0x7ffc0fc0) == 0x2300000) + { itype = FRVBF_INSN_CALLL; goto extract_sfmt_calll; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1220,8 +1616,14 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 25) & (1 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_JMPIL; goto extract_sfmt_jmpil; - case 1 : itype = FRVBF_INSN_CALLIL; goto extract_sfmt_jmpil; + case 0 : + if ((entire_insn & 0x7ffc0000) == 0x340000) + { itype = FRVBF_INSN_JMPIL; goto extract_sfmt_jmpil; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 1 : + if ((entire_insn & 0x7ffc0000) == 0x2340000) + { itype = FRVBF_INSN_CALLIL; goto extract_sfmt_callil; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1230,79 +1632,274 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 25) & (15 << 2)) | ((insn >> 14) & (1 << 1)) | ((insn >> 13) & (1 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_BNOLR; goto extract_sfmt_bnolr; + case 0 : + if ((entire_insn & 0x7ffcffff) == 0x384000) + { itype = FRVBF_INSN_BNOLR; goto extract_sfmt_bnolr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 1 : { unsigned int val = (((insn >> 14) & (1 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_BCTRLR; goto extract_sfmt_bctrlr; - case 1 : itype = FRVBF_INSN_BCNOLR; goto extract_sfmt_bcnolr; + case 0 : + if ((entire_insn & 0x7ffcefff) == 0x382000) + { itype = FRVBF_INSN_BCTRLR; goto extract_sfmt_bctrlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 1 : + if ((entire_insn & 0x7ffcffff) == 0x386000) + { itype = FRVBF_INSN_BCNOLR; goto extract_sfmt_bcnolr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } - case 2 : itype = FRVBF_INSN_FBNOLR; goto extract_sfmt_bnolr; - case 3 : itype = FRVBF_INSN_FCBNOLR; goto extract_sfmt_bcnolr; - case 4 : itype = FRVBF_INSN_BCLR; goto extract_sfmt_beqlr; - case 5 : itype = FRVBF_INSN_BCCLR; goto extract_sfmt_bceqlr; - case 6 : itype = FRVBF_INSN_FBULR; goto extract_sfmt_fbeqlr; - case 7 : itype = FRVBF_INSN_FCBULR; goto extract_sfmt_fcbeqlr; - case 8 : itype = FRVBF_INSN_BVLR; goto extract_sfmt_beqlr; - case 9 : itype = FRVBF_INSN_BCVLR; goto extract_sfmt_bceqlr; - case 10 : itype = FRVBF_INSN_FBGTLR; goto extract_sfmt_fbeqlr; - case 11 : itype = FRVBF_INSN_FCBGTLR; goto extract_sfmt_fcbeqlr; - case 12 : itype = FRVBF_INSN_BLTLR; goto extract_sfmt_beqlr; - case 13 : itype = FRVBF_INSN_BCLTLR; goto extract_sfmt_bceqlr; - case 14 : itype = FRVBF_INSN_FBUGLR; goto extract_sfmt_fbeqlr; - case 15 : itype = FRVBF_INSN_FCBUGLR; goto extract_sfmt_fcbeqlr; - case 16 : itype = FRVBF_INSN_BEQLR; goto extract_sfmt_beqlr; - case 17 : itype = FRVBF_INSN_BCEQLR; goto extract_sfmt_bceqlr; - case 18 : itype = FRVBF_INSN_FBLTLR; goto extract_sfmt_fbeqlr; - case 19 : itype = FRVBF_INSN_FCBLTLR; goto extract_sfmt_fcbeqlr; - case 20 : itype = FRVBF_INSN_BLSLR; goto extract_sfmt_beqlr; - case 21 : itype = FRVBF_INSN_BCLSLR; goto extract_sfmt_bceqlr; - case 22 : itype = FRVBF_INSN_FBULLR; goto extract_sfmt_fbeqlr; - case 23 : itype = FRVBF_INSN_FCBULLR; goto extract_sfmt_fcbeqlr; - case 24 : itype = FRVBF_INSN_BNLR; goto extract_sfmt_beqlr; - case 25 : itype = FRVBF_INSN_BCNLR; goto extract_sfmt_bceqlr; - case 26 : itype = FRVBF_INSN_FBLGLR; goto extract_sfmt_fbeqlr; - case 27 : itype = FRVBF_INSN_FCBLGLR; goto extract_sfmt_fcbeqlr; - case 28 : itype = FRVBF_INSN_BLELR; goto extract_sfmt_beqlr; - case 29 : itype = FRVBF_INSN_BCLELR; goto extract_sfmt_bceqlr; - case 30 : itype = FRVBF_INSN_FBNELR; goto extract_sfmt_fbeqlr; - case 31 : itype = FRVBF_INSN_FCBNELR; goto extract_sfmt_fcbeqlr; - case 32 : itype = FRVBF_INSN_BRALR; goto extract_sfmt_bralr; - case 33 : itype = FRVBF_INSN_BCRALR; goto extract_sfmt_bcralr; - case 34 : itype = FRVBF_INSN_FBEQLR; goto extract_sfmt_fbeqlr; - case 35 : itype = FRVBF_INSN_FCBEQLR; goto extract_sfmt_fcbeqlr; - case 36 : itype = FRVBF_INSN_BNCLR; goto extract_sfmt_beqlr; - case 37 : itype = FRVBF_INSN_BCNCLR; goto extract_sfmt_bceqlr; - case 38 : itype = FRVBF_INSN_FBUELR; goto extract_sfmt_fbeqlr; - case 39 : itype = FRVBF_INSN_FCBUELR; goto extract_sfmt_fcbeqlr; - case 40 : itype = FRVBF_INSN_BNVLR; goto extract_sfmt_beqlr; - case 41 : itype = FRVBF_INSN_BCNVLR; goto extract_sfmt_bceqlr; - case 42 : itype = FRVBF_INSN_FBGELR; goto extract_sfmt_fbeqlr; - case 43 : itype = FRVBF_INSN_FCBGELR; goto extract_sfmt_fcbeqlr; - case 44 : itype = FRVBF_INSN_BGELR; goto extract_sfmt_beqlr; - case 45 : itype = FRVBF_INSN_BCGELR; goto extract_sfmt_bceqlr; - case 46 : itype = FRVBF_INSN_FBUGELR; goto extract_sfmt_fbeqlr; - case 47 : itype = FRVBF_INSN_FCBUGELR; goto extract_sfmt_fcbeqlr; - case 48 : itype = FRVBF_INSN_BNELR; goto extract_sfmt_beqlr; - case 49 : itype = FRVBF_INSN_BCNELR; goto extract_sfmt_bceqlr; - case 50 : itype = FRVBF_INSN_FBLELR; goto extract_sfmt_fbeqlr; - case 51 : itype = FRVBF_INSN_FCBLELR; goto extract_sfmt_fcbeqlr; - case 52 : itype = FRVBF_INSN_BHILR; goto extract_sfmt_beqlr; - case 53 : itype = FRVBF_INSN_BCHILR; goto extract_sfmt_bceqlr; - case 54 : itype = FRVBF_INSN_FBULELR; goto extract_sfmt_fbeqlr; - case 55 : itype = FRVBF_INSN_FCBULELR; goto extract_sfmt_fcbeqlr; - case 56 : itype = FRVBF_INSN_BPLR; goto extract_sfmt_beqlr; - case 57 : itype = FRVBF_INSN_BCPLR; goto extract_sfmt_bceqlr; - case 58 : itype = FRVBF_INSN_FBOLR; goto extract_sfmt_fbeqlr; - case 59 : itype = FRVBF_INSN_FCBOLR; goto extract_sfmt_fcbeqlr; - case 60 : itype = FRVBF_INSN_BGTLR; goto extract_sfmt_beqlr; - case 61 : itype = FRVBF_INSN_BCGTLR; goto extract_sfmt_bceqlr; - case 62 : itype = FRVBF_INSN_FBRALR; goto extract_sfmt_bralr; - case 63 : itype = FRVBF_INSN_FCBRALR; goto extract_sfmt_bcralr; + case 2 : + if ((entire_insn & 0x7ffcffff) == 0x38c000) + { itype = FRVBF_INSN_FBNOLR; goto extract_sfmt_fbnolr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 3 : + if ((entire_insn & 0x7ffcffff) == 0x38e000) + { itype = FRVBF_INSN_FCBNOLR; goto extract_sfmt_fcbnolr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 4 : + if ((entire_insn & 0x79fcffff) == 0x8384000) + { itype = FRVBF_INSN_BCLR; goto extract_sfmt_beqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 5 : + if ((entire_insn & 0x79fcefff) == 0x8386000) + { itype = FRVBF_INSN_BCCLR; goto extract_sfmt_bceqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 6 : + if ((entire_insn & 0x79fcffff) == 0x838c000) + { itype = FRVBF_INSN_FBULR; goto extract_sfmt_fbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 7 : + if ((entire_insn & 0x79fcefff) == 0x838e000) + { itype = FRVBF_INSN_FCBULR; goto extract_sfmt_fcbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 8 : + if ((entire_insn & 0x79fcffff) == 0x10384000) + { itype = FRVBF_INSN_BVLR; goto extract_sfmt_beqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 9 : + if ((entire_insn & 0x79fcefff) == 0x10386000) + { itype = FRVBF_INSN_BCVLR; goto extract_sfmt_bceqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 10 : + if ((entire_insn & 0x79fcffff) == 0x1038c000) + { itype = FRVBF_INSN_FBGTLR; goto extract_sfmt_fbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 11 : + if ((entire_insn & 0x79fcefff) == 0x1038e000) + { itype = FRVBF_INSN_FCBGTLR; goto extract_sfmt_fcbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 12 : + if ((entire_insn & 0x79fcffff) == 0x18384000) + { itype = FRVBF_INSN_BLTLR; goto extract_sfmt_beqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 13 : + if ((entire_insn & 0x79fcefff) == 0x18386000) + { itype = FRVBF_INSN_BCLTLR; goto extract_sfmt_bceqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : + if ((entire_insn & 0x79fcffff) == 0x1838c000) + { itype = FRVBF_INSN_FBUGLR; goto extract_sfmt_fbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 15 : + if ((entire_insn & 0x79fcefff) == 0x1838e000) + { itype = FRVBF_INSN_FCBUGLR; goto extract_sfmt_fcbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 16 : + if ((entire_insn & 0x79fcffff) == 0x20384000) + { itype = FRVBF_INSN_BEQLR; goto extract_sfmt_beqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 17 : + if ((entire_insn & 0x79fcefff) == 0x20386000) + { itype = FRVBF_INSN_BCEQLR; goto extract_sfmt_bceqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 18 : + if ((entire_insn & 0x79fcffff) == 0x2038c000) + { itype = FRVBF_INSN_FBLTLR; goto extract_sfmt_fbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 19 : + if ((entire_insn & 0x79fcefff) == 0x2038e000) + { itype = FRVBF_INSN_FCBLTLR; goto extract_sfmt_fcbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 20 : + if ((entire_insn & 0x79fcffff) == 0x28384000) + { itype = FRVBF_INSN_BLSLR; goto extract_sfmt_beqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 21 : + if ((entire_insn & 0x79fcefff) == 0x28386000) + { itype = FRVBF_INSN_BCLSLR; goto extract_sfmt_bceqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 22 : + if ((entire_insn & 0x79fcffff) == 0x2838c000) + { itype = FRVBF_INSN_FBULLR; goto extract_sfmt_fbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 23 : + if ((entire_insn & 0x79fcefff) == 0x2838e000) + { itype = FRVBF_INSN_FCBULLR; goto extract_sfmt_fcbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 24 : + if ((entire_insn & 0x79fcffff) == 0x30384000) + { itype = FRVBF_INSN_BNLR; goto extract_sfmt_beqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 25 : + if ((entire_insn & 0x79fcefff) == 0x30386000) + { itype = FRVBF_INSN_BCNLR; goto extract_sfmt_bceqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 26 : + if ((entire_insn & 0x79fcffff) == 0x3038c000) + { itype = FRVBF_INSN_FBLGLR; goto extract_sfmt_fbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 27 : + if ((entire_insn & 0x79fcefff) == 0x3038e000) + { itype = FRVBF_INSN_FCBLGLR; goto extract_sfmt_fcbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 28 : + if ((entire_insn & 0x79fcffff) == 0x38384000) + { itype = FRVBF_INSN_BLELR; goto extract_sfmt_beqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 29 : + if ((entire_insn & 0x79fcefff) == 0x38386000) + { itype = FRVBF_INSN_BCLELR; goto extract_sfmt_bceqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 30 : + if ((entire_insn & 0x79fcffff) == 0x3838c000) + { itype = FRVBF_INSN_FBNELR; goto extract_sfmt_fbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 31 : + if ((entire_insn & 0x79fcefff) == 0x3838e000) + { itype = FRVBF_INSN_FCBNELR; goto extract_sfmt_fcbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 32 : + if ((entire_insn & 0x7ffcffff) == 0x40384000) + { itype = FRVBF_INSN_BRALR; goto extract_sfmt_bralr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 33 : + if ((entire_insn & 0x7ffcefff) == 0x40386000) + { itype = FRVBF_INSN_BCRALR; goto extract_sfmt_bcralr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 34 : + if ((entire_insn & 0x79fcffff) == 0x4038c000) + { itype = FRVBF_INSN_FBEQLR; goto extract_sfmt_fbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 35 : + if ((entire_insn & 0x79fcefff) == 0x4038e000) + { itype = FRVBF_INSN_FCBEQLR; goto extract_sfmt_fcbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 36 : + if ((entire_insn & 0x79fcffff) == 0x48384000) + { itype = FRVBF_INSN_BNCLR; goto extract_sfmt_beqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 37 : + if ((entire_insn & 0x79fcefff) == 0x48386000) + { itype = FRVBF_INSN_BCNCLR; goto extract_sfmt_bceqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 38 : + if ((entire_insn & 0x79fcffff) == 0x4838c000) + { itype = FRVBF_INSN_FBUELR; goto extract_sfmt_fbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 39 : + if ((entire_insn & 0x79fcefff) == 0x4838e000) + { itype = FRVBF_INSN_FCBUELR; goto extract_sfmt_fcbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 40 : + if ((entire_insn & 0x79fcffff) == 0x50384000) + { itype = FRVBF_INSN_BNVLR; goto extract_sfmt_beqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 41 : + if ((entire_insn & 0x79fcefff) == 0x50386000) + { itype = FRVBF_INSN_BCNVLR; goto extract_sfmt_bceqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 42 : + if ((entire_insn & 0x79fcffff) == 0x5038c000) + { itype = FRVBF_INSN_FBGELR; goto extract_sfmt_fbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 43 : + if ((entire_insn & 0x79fcefff) == 0x5038e000) + { itype = FRVBF_INSN_FCBGELR; goto extract_sfmt_fcbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 44 : + if ((entire_insn & 0x79fcffff) == 0x58384000) + { itype = FRVBF_INSN_BGELR; goto extract_sfmt_beqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 45 : + if ((entire_insn & 0x79fcefff) == 0x58386000) + { itype = FRVBF_INSN_BCGELR; goto extract_sfmt_bceqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 46 : + if ((entire_insn & 0x79fcffff) == 0x5838c000) + { itype = FRVBF_INSN_FBUGELR; goto extract_sfmt_fbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 47 : + if ((entire_insn & 0x79fcefff) == 0x5838e000) + { itype = FRVBF_INSN_FCBUGELR; goto extract_sfmt_fcbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 48 : + if ((entire_insn & 0x79fcffff) == 0x60384000) + { itype = FRVBF_INSN_BNELR; goto extract_sfmt_beqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 49 : + if ((entire_insn & 0x79fcefff) == 0x60386000) + { itype = FRVBF_INSN_BCNELR; goto extract_sfmt_bceqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 50 : + if ((entire_insn & 0x79fcffff) == 0x6038c000) + { itype = FRVBF_INSN_FBLELR; goto extract_sfmt_fbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 51 : + if ((entire_insn & 0x79fcefff) == 0x6038e000) + { itype = FRVBF_INSN_FCBLELR; goto extract_sfmt_fcbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 52 : + if ((entire_insn & 0x79fcffff) == 0x68384000) + { itype = FRVBF_INSN_BHILR; goto extract_sfmt_beqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 53 : + if ((entire_insn & 0x79fcefff) == 0x68386000) + { itype = FRVBF_INSN_BCHILR; goto extract_sfmt_bceqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 54 : + if ((entire_insn & 0x79fcffff) == 0x6838c000) + { itype = FRVBF_INSN_FBULELR; goto extract_sfmt_fbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 55 : + if ((entire_insn & 0x79fcefff) == 0x6838e000) + { itype = FRVBF_INSN_FCBULELR; goto extract_sfmt_fcbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 56 : + if ((entire_insn & 0x79fcffff) == 0x70384000) + { itype = FRVBF_INSN_BPLR; goto extract_sfmt_beqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 57 : + if ((entire_insn & 0x79fcefff) == 0x70386000) + { itype = FRVBF_INSN_BCPLR; goto extract_sfmt_bceqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 58 : + if ((entire_insn & 0x79fcffff) == 0x7038c000) + { itype = FRVBF_INSN_FBOLR; goto extract_sfmt_fbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 59 : + if ((entire_insn & 0x79fcefff) == 0x7038e000) + { itype = FRVBF_INSN_FCBOLR; goto extract_sfmt_fcbeqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 60 : + if ((entire_insn & 0x79fcffff) == 0x78384000) + { itype = FRVBF_INSN_BGTLR; goto extract_sfmt_beqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 61 : + if ((entire_insn & 0x79fcefff) == 0x78386000) + { itype = FRVBF_INSN_BCGTLR; goto extract_sfmt_bceqlr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 62 : + if ((entire_insn & 0x7ffcffff) == 0x7838c000) + { itype = FRVBF_INSN_FBRALR; goto extract_sfmt_fbralr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 63 : + if ((entire_insn & 0x7ffcefff) == 0x7838e000) + { itype = FRVBF_INSN_FCBRALR; goto extract_sfmt_fcbralr; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1324,7 +1921,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 27) & (15 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_TINO; goto extract_sfmt_rei; + case 0 : + if ((entire_insn & 0x7fffffff) == 0x700000) + { itype = FRVBF_INSN_TINO; goto extract_sfmt_rei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 1 : itype = FRVBF_INSN_TIC; goto extract_sfmt_tieq; case 2 : itype = FRVBF_INSN_TIV; goto extract_sfmt_tieq; case 3 : itype = FRVBF_INSN_TILT; goto extract_sfmt_tieq; @@ -1332,7 +1932,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, case 5 : itype = FRVBF_INSN_TILS; goto extract_sfmt_tieq; case 6 : itype = FRVBF_INSN_TIN; goto extract_sfmt_tieq; case 7 : itype = FRVBF_INSN_TILE; goto extract_sfmt_tieq; - case 8 : itype = FRVBF_INSN_TIRA; goto extract_sfmt_tira; + case 8 : + if ((entire_insn & 0x7ffc0000) == 0x40700000) + { itype = FRVBF_INSN_TIRA; goto extract_sfmt_tira; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 9 : itype = FRVBF_INSN_TINC; goto extract_sfmt_tieq; case 10 : itype = FRVBF_INSN_TINV; goto extract_sfmt_tieq; case 11 : itype = FRVBF_INSN_TIGE; goto extract_sfmt_tieq; @@ -1348,7 +1951,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 27) & (15 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_FTINO; goto extract_sfmt_rei; + case 0 : + if ((entire_insn & 0x7fffffff) == 0x740000) + { itype = FRVBF_INSN_FTINO; goto extract_sfmt_rei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 1 : itype = FRVBF_INSN_FTIU; goto extract_sfmt_ftine; case 2 : itype = FRVBF_INSN_FTIGT; goto extract_sfmt_ftine; case 3 : itype = FRVBF_INSN_FTIUG; goto extract_sfmt_ftine; @@ -1363,7 +1969,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, case 12 : itype = FRVBF_INSN_FTILE; goto extract_sfmt_ftine; case 13 : itype = FRVBF_INSN_FTIULE; goto extract_sfmt_ftine; case 14 : itype = FRVBF_INSN_FTIO; goto extract_sfmt_ftine; - case 15 : itype = FRVBF_INSN_FTIRA; goto extract_sfmt_tira; + case 15 : + if ((entire_insn & 0x7ffc0000) == 0x78740000) + { itype = FRVBF_INSN_FTIRA; goto extract_sfmt_ftira; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1390,15 +1999,27 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, case 52 : itype = FRVBF_INSN_LDQI; goto extract_sfmt_ldqi; case 53 : itype = FRVBF_INSN_LDUBI; goto extract_sfmt_ldsbi; case 54 : itype = FRVBF_INSN_LDUHI; goto extract_sfmt_ldsbi; - case 55 : itype = FRVBF_INSN_REI; goto extract_sfmt_rei; + case 55 : + if ((entire_insn & 0x7ffc0fff) == 0xdc0000) + { itype = FRVBF_INSN_REI; goto extract_sfmt_rei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 56 : itype = FRVBF_INSN_LDBFI; goto extract_sfmt_ldbfi; case 57 : itype = FRVBF_INSN_LDHFI; goto extract_sfmt_ldbfi; case 58 : itype = FRVBF_INSN_LDFI; goto extract_sfmt_ldbfi; case 59 : itype = FRVBF_INSN_LDDFI; goto extract_sfmt_lddfi; case 60 : itype = FRVBF_INSN_LDQFI; goto extract_sfmt_ldqfi; - case 61 : itype = FRVBF_INSN_SETLO; goto extract_sfmt_setlo; - case 62 : itype = FRVBF_INSN_SETHI; goto extract_sfmt_sethi; - case 63 : itype = FRVBF_INSN_SETLOS; goto extract_sfmt_setlos; + case 61 : + if ((entire_insn & 0x1ff0000) == 0xf40000) + { itype = FRVBF_INSN_SETLO; goto extract_sfmt_setlo; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 62 : + if ((entire_insn & 0x1ff0000) == 0xf80000) + { itype = FRVBF_INSN_SETHI; goto extract_sfmt_sethi; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 63 : + if ((entire_insn & 0x1ff0000) == 0xfc0000) + { itype = FRVBF_INSN_SETLOS; goto extract_sfmt_setlos; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 64 : itype = FRVBF_INSN_NLDSBI; goto extract_sfmt_nldsbi; case 65 : itype = FRVBF_INSN_NLDUBI; goto extract_sfmt_nldsbi; case 66 : itype = FRVBF_INSN_NLDSHI; goto extract_sfmt_nldsbi; @@ -1410,13 +2031,34 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 6) & (7 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_ADDSS; goto extract_sfmt_add; - case 1 : itype = FRVBF_INSN_SUBSS; goto extract_sfmt_add; - case 2 : itype = FRVBF_INSN_SLASS; goto extract_sfmt_add; - case 4 : itype = FRVBF_INSN_SCUTSS; goto extract_sfmt_scutss; - case 5 : itype = FRVBF_INSN_SMU; goto extract_sfmt_smu; - case 6 : itype = FRVBF_INSN_SMASS; goto extract_sfmt_smass; - case 7 : itype = FRVBF_INSN_SMSSS; goto extract_sfmt_smass; + case 0 : + if ((entire_insn & 0x1fc0fc0) == 0x1180000) + { itype = FRVBF_INSN_ADDSS; goto extract_sfmt_slass; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 1 : + if ((entire_insn & 0x1fc0fc0) == 0x1180040) + { itype = FRVBF_INSN_SUBSS; goto extract_sfmt_slass; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 2 : + if ((entire_insn & 0x1fc0fc0) == 0x1180080) + { itype = FRVBF_INSN_SLASS; goto extract_sfmt_slass; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 4 : + if ((entire_insn & 0x1ffffc0) == 0x1180100) + { itype = FRVBF_INSN_SCUTSS; goto extract_sfmt_scutss; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 5 : + if ((entire_insn & 0x7ffc0fc0) == 0x1180140) + { itype = FRVBF_INSN_SMU; goto extract_sfmt_smu; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 6 : + if ((entire_insn & 0x7ffc0fc0) == 0x1180180) + { itype = FRVBF_INSN_SMASS; goto extract_sfmt_smass; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 7 : + if ((entire_insn & 0x7ffc0fc0) == 0x11801c0) + { itype = FRVBF_INSN_SMSSS; goto extract_sfmt_smass; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1469,7 +2111,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, case 0 : itype = FRVBF_INSN_CAND; goto extract_sfmt_cadd; case 1 : itype = FRVBF_INSN_COR; goto extract_sfmt_cadd; case 2 : itype = FRVBF_INSN_CXOR; goto extract_sfmt_cadd; - case 3 : itype = FRVBF_INSN_CNOT; goto extract_sfmt_cnot; + case 3 : + if ((entire_insn & 0x1fff0c0) == 0x16800c0) + { itype = FRVBF_INSN_CNOT; goto extract_sfmt_cnot; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1640,10 +2285,22 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 6) & (3 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_CMOVGF; goto extract_sfmt_cmovgf; - case 1 : itype = FRVBF_INSN_CMOVGFD; goto extract_sfmt_cmovgfd; - case 2 : itype = FRVBF_INSN_CMOVFG; goto extract_sfmt_cmovfg; - case 3 : itype = FRVBF_INSN_CMOVFGD; goto extract_sfmt_cmovfgd; + case 0 : + if ((entire_insn & 0x1fff0c0) == 0x1a40000) + { itype = FRVBF_INSN_CMOVGF; goto extract_sfmt_cmovgf; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 1 : + if ((entire_insn & 0x1fff0c0) == 0x1a40040) + { itype = FRVBF_INSN_CMOVGFD; goto extract_sfmt_cmovgfd; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 2 : + if ((entire_insn & 0x1fff0c0) == 0x1a40080) + { itype = FRVBF_INSN_CMOVFG; goto extract_sfmt_cmovfg; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 3 : + if ((entire_insn & 0x1fff0c0) == 0x1a400c0) + { itype = FRVBF_INSN_CMOVFGD; goto extract_sfmt_cmovfgd; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1658,43 +2315,145 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, switch (val) { case 0 : /* fall through */ - case 2 : itype = FRVBF_INSN_CCKNO; goto extract_sfmt_cckra; - case 1 : itype = FRVBF_INSN_CJMPL; goto extract_sfmt_cjmpl; - case 3 : itype = FRVBF_INSN_CCALLL; goto extract_sfmt_cjmpl; + case 2 : + if ((entire_insn & 0x79fff0ff) == 0x1a80000) + { itype = FRVBF_INSN_CCKNO; goto extract_sfmt_cckra; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 1 : + if ((entire_insn & 0x7ffc00c0) == 0x1a80080) + { itype = FRVBF_INSN_CJMPL; goto extract_sfmt_cjmpl; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 3 : + if ((entire_insn & 0x7ffc00c0) == 0x3a80080) + { itype = FRVBF_INSN_CCALLL; goto extract_sfmt_ccalll; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } - case 1 : itype = FRVBF_INSN_CFCKNO; goto extract_sfmt_cfckra; - case 2 : itype = FRVBF_INSN_CCKC; goto extract_sfmt_cckeq; - case 3 : itype = FRVBF_INSN_CFCKU; goto extract_sfmt_cfckne; - case 4 : itype = FRVBF_INSN_CCKV; goto extract_sfmt_cckeq; - case 5 : itype = FRVBF_INSN_CFCKGT; goto extract_sfmt_cfckne; - case 6 : itype = FRVBF_INSN_CCKLT; goto extract_sfmt_cckeq; - case 7 : itype = FRVBF_INSN_CFCKUG; goto extract_sfmt_cfckne; - case 8 : itype = FRVBF_INSN_CCKEQ; goto extract_sfmt_cckeq; - case 9 : itype = FRVBF_INSN_CFCKLT; goto extract_sfmt_cfckne; - case 10 : itype = FRVBF_INSN_CCKLS; goto extract_sfmt_cckeq; - case 11 : itype = FRVBF_INSN_CFCKUL; goto extract_sfmt_cfckne; - case 12 : itype = FRVBF_INSN_CCKN; goto extract_sfmt_cckeq; - case 13 : itype = FRVBF_INSN_CFCKLG; goto extract_sfmt_cfckne; - case 14 : itype = FRVBF_INSN_CCKLE; goto extract_sfmt_cckeq; - case 15 : itype = FRVBF_INSN_CFCKNE; goto extract_sfmt_cfckne; - case 16 : itype = FRVBF_INSN_CCKRA; goto extract_sfmt_cckra; - case 17 : itype = FRVBF_INSN_CFCKEQ; goto extract_sfmt_cfckne; - case 18 : itype = FRVBF_INSN_CCKNC; goto extract_sfmt_cckeq; - case 19 : itype = FRVBF_INSN_CFCKUE; goto extract_sfmt_cfckne; - case 20 : itype = FRVBF_INSN_CCKNV; goto extract_sfmt_cckeq; - case 21 : itype = FRVBF_INSN_CFCKGE; goto extract_sfmt_cfckne; - case 22 : itype = FRVBF_INSN_CCKGE; goto extract_sfmt_cckeq; - case 23 : itype = FRVBF_INSN_CFCKUGE; goto extract_sfmt_cfckne; - case 24 : itype = FRVBF_INSN_CCKNE; goto extract_sfmt_cckeq; - case 25 : itype = FRVBF_INSN_CFCKLE; goto extract_sfmt_cfckne; - case 26 : itype = FRVBF_INSN_CCKHI; goto extract_sfmt_cckeq; - case 27 : itype = FRVBF_INSN_CFCKULE; goto extract_sfmt_cfckne; - case 28 : itype = FRVBF_INSN_CCKP; goto extract_sfmt_cckeq; - case 29 : itype = FRVBF_INSN_CFCKO; goto extract_sfmt_cfckne; - case 30 : itype = FRVBF_INSN_CCKGT; goto extract_sfmt_cckeq; - case 31 : itype = FRVBF_INSN_CFCKRA; goto extract_sfmt_cfckra; + case 1 : + if ((entire_insn & 0x79fff0ff) == 0x1a80040) + { itype = FRVBF_INSN_CFCKNO; goto extract_sfmt_cfckra; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 2 : + if ((entire_insn & 0x79fff0fc) == 0x9a80000) + { itype = FRVBF_INSN_CCKC; goto extract_sfmt_cckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 3 : + if ((entire_insn & 0x79fff0fc) == 0x9a80040) + { itype = FRVBF_INSN_CFCKU; goto extract_sfmt_cfckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 4 : + if ((entire_insn & 0x79fff0fc) == 0x11a80000) + { itype = FRVBF_INSN_CCKV; goto extract_sfmt_cckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 5 : + if ((entire_insn & 0x79fff0fc) == 0x11a80040) + { itype = FRVBF_INSN_CFCKGT; goto extract_sfmt_cfckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 6 : + if ((entire_insn & 0x79fff0fc) == 0x19a80000) + { itype = FRVBF_INSN_CCKLT; goto extract_sfmt_cckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 7 : + if ((entire_insn & 0x79fff0fc) == 0x19a80040) + { itype = FRVBF_INSN_CFCKUG; goto extract_sfmt_cfckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 8 : + if ((entire_insn & 0x79fff0fc) == 0x21a80000) + { itype = FRVBF_INSN_CCKEQ; goto extract_sfmt_cckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 9 : + if ((entire_insn & 0x79fff0fc) == 0x21a80040) + { itype = FRVBF_INSN_CFCKLT; goto extract_sfmt_cfckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 10 : + if ((entire_insn & 0x79fff0fc) == 0x29a80000) + { itype = FRVBF_INSN_CCKLS; goto extract_sfmt_cckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 11 : + if ((entire_insn & 0x79fff0fc) == 0x29a80040) + { itype = FRVBF_INSN_CFCKUL; goto extract_sfmt_cfckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 12 : + if ((entire_insn & 0x79fff0fc) == 0x31a80000) + { itype = FRVBF_INSN_CCKN; goto extract_sfmt_cckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 13 : + if ((entire_insn & 0x79fff0fc) == 0x31a80040) + { itype = FRVBF_INSN_CFCKLG; goto extract_sfmt_cfckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : + if ((entire_insn & 0x79fff0fc) == 0x39a80000) + { itype = FRVBF_INSN_CCKLE; goto extract_sfmt_cckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 15 : + if ((entire_insn & 0x79fff0fc) == 0x39a80040) + { itype = FRVBF_INSN_CFCKNE; goto extract_sfmt_cfckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 16 : + if ((entire_insn & 0x79fff0ff) == 0x41a80000) + { itype = FRVBF_INSN_CCKRA; goto extract_sfmt_cckra; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 17 : + if ((entire_insn & 0x79fff0fc) == 0x41a80040) + { itype = FRVBF_INSN_CFCKEQ; goto extract_sfmt_cfckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 18 : + if ((entire_insn & 0x79fff0fc) == 0x49a80000) + { itype = FRVBF_INSN_CCKNC; goto extract_sfmt_cckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 19 : + if ((entire_insn & 0x79fff0fc) == 0x49a80040) + { itype = FRVBF_INSN_CFCKUE; goto extract_sfmt_cfckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 20 : + if ((entire_insn & 0x79fff0fc) == 0x51a80000) + { itype = FRVBF_INSN_CCKNV; goto extract_sfmt_cckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 21 : + if ((entire_insn & 0x79fff0fc) == 0x51a80040) + { itype = FRVBF_INSN_CFCKGE; goto extract_sfmt_cfckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 22 : + if ((entire_insn & 0x79fff0fc) == 0x59a80000) + { itype = FRVBF_INSN_CCKGE; goto extract_sfmt_cckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 23 : + if ((entire_insn & 0x79fff0fc) == 0x59a80040) + { itype = FRVBF_INSN_CFCKUGE; goto extract_sfmt_cfckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 24 : + if ((entire_insn & 0x79fff0fc) == 0x61a80000) + { itype = FRVBF_INSN_CCKNE; goto extract_sfmt_cckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 25 : + if ((entire_insn & 0x79fff0fc) == 0x61a80040) + { itype = FRVBF_INSN_CFCKLE; goto extract_sfmt_cfckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 26 : + if ((entire_insn & 0x79fff0fc) == 0x69a80000) + { itype = FRVBF_INSN_CCKHI; goto extract_sfmt_cckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 27 : + if ((entire_insn & 0x79fff0fc) == 0x69a80040) + { itype = FRVBF_INSN_CFCKULE; goto extract_sfmt_cfckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 28 : + if ((entire_insn & 0x79fff0fc) == 0x71a80000) + { itype = FRVBF_INSN_CCKP; goto extract_sfmt_cckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 29 : + if ((entire_insn & 0x79fff0fc) == 0x71a80040) + { itype = FRVBF_INSN_CFCKO; goto extract_sfmt_cfckne; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 30 : + if ((entire_insn & 0x79fff0fc) == 0x79a80000) + { itype = FRVBF_INSN_CCKGT; goto extract_sfmt_cckeq; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 31 : + if ((entire_insn & 0x79fff0ff) == 0x79a80040) + { itype = FRVBF_INSN_CFCKRA; goto extract_sfmt_cfckra; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1703,8 +2462,14 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 6) & (1 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_CFITOS; goto extract_sfmt_cfitos; - case 1 : itype = FRVBF_INSN_CFSTOI; goto extract_sfmt_cfstoi; + case 0 : + if ((entire_insn & 0x1fff0c0) == 0x1ac0000) + { itype = FRVBF_INSN_CFITOS; goto extract_sfmt_cfitos; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 1 : + if ((entire_insn & 0x1fff0c0) == 0x1ac0040) + { itype = FRVBF_INSN_CFSTOI; goto extract_sfmt_cfstoi; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1713,9 +2478,18 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 6) & (3 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_CFMOVS; goto extract_sfmt_cfmovs; - case 1 : itype = FRVBF_INSN_CFNEGS; goto extract_sfmt_cfmovs; - case 2 : itype = FRVBF_INSN_CFABSS; goto extract_sfmt_cfmovs; + case 0 : + if ((entire_insn & 0x1fff0c0) == 0x1b00000) + { itype = FRVBF_INSN_CFMOVS; goto extract_sfmt_cfmovs; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 1 : + if ((entire_insn & 0x1fff0c0) == 0x1b00040) + { itype = FRVBF_INSN_CFNEGS; goto extract_sfmt_cfmovs; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 2 : + if ((entire_insn & 0x1fff0c0) == 0x1b00080) + { itype = FRVBF_INSN_CFABSS; goto extract_sfmt_cfmovs; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1726,7 +2500,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { case 0 : itype = FRVBF_INSN_CFADDS; goto extract_sfmt_cfadds; case 1 : itype = FRVBF_INSN_CFSUBS; goto extract_sfmt_cfadds; - case 2 : itype = FRVBF_INSN_CFCMPS; goto extract_sfmt_cfcmps; + case 2 : + if ((entire_insn & 0x79fc00c0) == 0x1b40080) + { itype = FRVBF_INSN_CFCMPS; goto extract_sfmt_cfcmps; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1737,7 +2514,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { case 0 : itype = FRVBF_INSN_CFMULS; goto extract_sfmt_cfadds; case 1 : itype = FRVBF_INSN_CFDIVS; goto extract_sfmt_cfadds; - case 2 : itype = FRVBF_INSN_CFSQRTS; goto extract_sfmt_cfmovs; + case 2 : + if ((entire_insn & 0x1fff0c0) == 0x1b80080) + { itype = FRVBF_INSN_CFSQRTS; goto extract_sfmt_cfmovs; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1761,7 +2541,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, case 0 : itype = FRVBF_INSN_CMAND; goto extract_sfmt_cmand; case 1 : itype = FRVBF_INSN_CMOR; goto extract_sfmt_cmand; case 2 : itype = FRVBF_INSN_CMXOR; goto extract_sfmt_cmand; - case 3 : itype = FRVBF_INSN_CMNOT; goto extract_sfmt_cmnot; + case 3 : + if ((entire_insn & 0x1fff0c0) == 0x1c000c0) + { itype = FRVBF_INSN_CMNOT; goto extract_sfmt_cmnot; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1830,8 +2613,14 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 6) & (1 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_CMEXPDHW; goto extract_sfmt_cmexpdhw; - case 1 : itype = FRVBF_INSN_CMEXPDHD; goto extract_sfmt_cmexpdhd; + case 0 : + if ((entire_insn & 0x1fc00c0) == 0x1d80080) + { itype = FRVBF_INSN_CMEXPDHW; goto extract_sfmt_cmexpdhw; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 1 : + if ((entire_insn & 0x1fc00c0) == 0x1d800c0) + { itype = FRVBF_INSN_CMEXPDHD; goto extract_sfmt_cmexpdhd; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1840,9 +2629,18 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 6) & (3 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_CMBTOH; goto extract_sfmt_cmbtoh; - case 1 : itype = FRVBF_INSN_CMHTOB; goto extract_sfmt_cmhtob; - case 2 : itype = FRVBF_INSN_CMBTOHE; goto extract_sfmt_cmbtohe; + case 0 : + if ((entire_insn & 0x1fff0c0) == 0x1dc0000) + { itype = FRVBF_INSN_CMBTOH; goto extract_sfmt_cmbtoh; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 1 : + if ((entire_insn & 0x1fff0c0) == 0x1dc0040) + { itype = FRVBF_INSN_CMHTOB; goto extract_sfmt_cmhtob; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 2 : + if ((entire_insn & 0x1fff0c0) == 0x1dc0080) + { itype = FRVBF_INSN_CMBTOHE; goto extract_sfmt_cmbtohe; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1854,13 +2652,34 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, case 0 : itype = FRVBF_INSN_MQXMACHS; goto extract_sfmt_mqmachs; case 1 : itype = FRVBF_INSN_MQXMACXHS; goto extract_sfmt_mqmachs; case 2 : itype = FRVBF_INSN_MQMACXHS; goto extract_sfmt_mqmachs; - case 4 : itype = FRVBF_INSN_MADDACCS; goto extract_sfmt_maddaccs; - case 5 : itype = FRVBF_INSN_MSUBACCS; goto extract_sfmt_maddaccs; - case 6 : itype = FRVBF_INSN_MDADDACCS; goto extract_sfmt_mdaddaccs; - case 7 : itype = FRVBF_INSN_MDSUBACCS; goto extract_sfmt_mdaddaccs; - case 8 : itype = FRVBF_INSN_MASACCS; goto extract_sfmt_masaccs; - case 9 : itype = FRVBF_INSN_MDASACCS; goto extract_sfmt_mdasaccs; - case 10 : itype = FRVBF_INSN_MABSHS; goto extract_sfmt_mabshs; + case 4 : + if ((entire_insn & 0x1fc0fff) == 0x1e00100) + { itype = FRVBF_INSN_MADDACCS; goto extract_sfmt_maddaccs; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 5 : + if ((entire_insn & 0x1fc0fff) == 0x1e00140) + { itype = FRVBF_INSN_MSUBACCS; goto extract_sfmt_maddaccs; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 6 : + if ((entire_insn & 0x1fc0fff) == 0x1e00180) + { itype = FRVBF_INSN_MDADDACCS; goto extract_sfmt_mdaddaccs; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 7 : + if ((entire_insn & 0x1fc0fff) == 0x1e001c0) + { itype = FRVBF_INSN_MDSUBACCS; goto extract_sfmt_mdaddaccs; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 8 : + if ((entire_insn & 0x1fc0fff) == 0x1e00200) + { itype = FRVBF_INSN_MASACCS; goto extract_sfmt_masaccs; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 9 : + if ((entire_insn & 0x1fc0fff) == 0x1e00240) + { itype = FRVBF_INSN_MDASACCS; goto extract_sfmt_mdasaccs; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 10 : + if ((entire_insn & 0x1ffffc0) == 0x1e00280) + { itype = FRVBF_INSN_MABSHS; goto extract_sfmt_mabshs; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 11 : itype = FRVBF_INSN_MDROTLI; goto extract_sfmt_mdrotli; case 12 : itype = FRVBF_INSN_MCPLHI; goto extract_sfmt_mcplhi; case 13 : itype = FRVBF_INSN_MCPLI; goto extract_sfmt_mcpli; @@ -1871,11 +2690,20 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, case 19 : itype = FRVBF_INSN_MQSRAHI; goto extract_sfmt_mqsllhi; case 20 : itype = FRVBF_INSN_MQLMTHS; goto extract_sfmt_mqsaths; case 32 : itype = FRVBF_INSN_MHSETLOS; goto extract_sfmt_mhsetlos; - case 33 : itype = FRVBF_INSN_MHSETLOH; goto extract_sfmt_mhsetloh; + case 33 : + if ((entire_insn & 0x1ffffe0) == 0x1e00840) + { itype = FRVBF_INSN_MHSETLOH; goto extract_sfmt_mhsetloh; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 34 : itype = FRVBF_INSN_MHSETHIS; goto extract_sfmt_mhsethis; - case 35 : itype = FRVBF_INSN_MHSETHIH; goto extract_sfmt_mhsethih; + case 35 : + if ((entire_insn & 0x1ffffe0) == 0x1e008c0) + { itype = FRVBF_INSN_MHSETHIH; goto extract_sfmt_mhsethih; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 36 : itype = FRVBF_INSN_MHDSETS; goto extract_sfmt_mhdsets; - case 37 : itype = FRVBF_INSN_MHDSETH; goto extract_sfmt_mhdseth; + case 37 : + if ((entire_insn & 0x1ffffe0) == 0x1e00940) + { itype = FRVBF_INSN_MHDSETH; goto extract_sfmt_mhdseth; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1889,9 +2717,15 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 10) & (1 << 1)) | ((insn >> 9) & (1 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_FITOS; goto extract_sfmt_fitos; + case 0 : + if ((entire_insn & 0x1ffffc0) == 0x1e40000) + { itype = FRVBF_INSN_FITOS; goto extract_sfmt_fitos; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 1 : itype = FRVBF_INSN_FMULS; goto extract_sfmt_fadds; - case 2 : itype = FRVBF_INSN_NFITOS; goto extract_sfmt_nfitos; + case 2 : + if ((entire_insn & 0x1ffffc0) == 0x1e40800) + { itype = FRVBF_INSN_NFITOS; goto extract_sfmt_nfitos; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 3 : itype = FRVBF_INSN_NFMULS; goto extract_sfmt_nfadds; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } @@ -1901,9 +2735,15 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 10) & (1 << 1)) | ((insn >> 9) & (1 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_FSTOI; goto extract_sfmt_fstoi; + case 0 : + if ((entire_insn & 0x1ffffc0) == 0x1e40040) + { itype = FRVBF_INSN_FSTOI; goto extract_sfmt_fstoi; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 1 : itype = FRVBF_INSN_FDIVS; goto extract_sfmt_fadds; - case 2 : itype = FRVBF_INSN_NFSTOI; goto extract_sfmt_nfstoi; + case 2 : + if ((entire_insn & 0x1ffffc0) == 0x1e40840) + { itype = FRVBF_INSN_NFSTOI; goto extract_sfmt_nfstoi; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 3 : itype = FRVBF_INSN_NFDIVS; goto extract_sfmt_nfadds; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } @@ -1913,8 +2753,14 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 9) & (1 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_FMOVS; goto extract_sfmt_fmovs; - case 1 : itype = FRVBF_INSN_FCMPS; goto extract_sfmt_fcmps; + case 0 : + if ((entire_insn & 0x1ffffc0) == 0x1e40080) + { itype = FRVBF_INSN_FMOVS; goto extract_sfmt_fmovs; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 1 : + if ((entire_insn & 0x79fc0fc0) == 0x1e40280) + { itype = FRVBF_INSN_FCMPS; goto extract_sfmt_fcmps; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1923,7 +2769,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 10) & (1 << 1)) | ((insn >> 9) & (1 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_FNEGS; goto extract_sfmt_fmovs; + case 0 : + if ((entire_insn & 0x1ffffc0) == 0x1e400c0) + { itype = FRVBF_INSN_FNEGS; goto extract_sfmt_fmovs; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 1 : itype = FRVBF_INSN_FMADDS; goto extract_sfmt_fmadds; case 3 : itype = FRVBF_INSN_NFMADDS; goto extract_sfmt_nfmadds; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; @@ -1934,7 +2783,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 10) & (1 << 1)) | ((insn >> 9) & (1 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_FABSS; goto extract_sfmt_fmovs; + case 0 : + if ((entire_insn & 0x1ffffc0) == 0x1e40100) + { itype = FRVBF_INSN_FABSS; goto extract_sfmt_fmovs; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 1 : itype = FRVBF_INSN_FMSUBS; goto extract_sfmt_fmadds; case 3 : itype = FRVBF_INSN_NFMSUBS; goto extract_sfmt_nfmadds; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; @@ -1945,9 +2797,18 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 10) & (1 << 1)) | ((insn >> 9) & (1 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_FSQRTS; goto extract_sfmt_fmovs; - case 1 : itype = FRVBF_INSN_FNOP; goto extract_sfmt_rei; - case 2 : itype = FRVBF_INSN_NFSQRTS; goto extract_sfmt_nfsqrts; + case 0 : + if ((entire_insn & 0x1ffffc0) == 0x1e40140) + { itype = FRVBF_INSN_FSQRTS; goto extract_sfmt_fmovs; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 1 : + if ((entire_insn & 0x7fffffff) == 0x1e40340) + { itype = FRVBF_INSN_FNOP; goto extract_sfmt_rei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 2 : + if ((entire_insn & 0x1ffffc0) == 0x1e40940) + { itype = FRVBF_INSN_NFSQRTS; goto extract_sfmt_nfsqrts; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -1980,9 +2841,15 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 10) & (1 << 1)) | ((insn >> 9) & (1 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_FDITOS; goto extract_sfmt_fditos; + case 0 : + if ((entire_insn & 0x1ffffc0) == 0x1e40400) + { itype = FRVBF_INSN_FDITOS; goto extract_sfmt_fditos; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 1 : itype = FRVBF_INSN_FDMULS; goto extract_sfmt_fmas; - case 2 : itype = FRVBF_INSN_NFDITOS; goto extract_sfmt_fditos; + case 2 : + if ((entire_insn & 0x1ffffc0) == 0x1e40c00) + { itype = FRVBF_INSN_NFDITOS; goto extract_sfmt_fditos; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 3 : itype = FRVBF_INSN_NFDMULS; goto extract_sfmt_fmas; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } @@ -1992,9 +2859,15 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 10) & (1 << 1)) | ((insn >> 9) & (1 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_FDSTOI; goto extract_sfmt_fdstoi; + case 0 : + if ((entire_insn & 0x1ffffc0) == 0x1e40440) + { itype = FRVBF_INSN_FDSTOI; goto extract_sfmt_fdstoi; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 1 : itype = FRVBF_INSN_FDDIVS; goto extract_sfmt_fmas; - case 2 : itype = FRVBF_INSN_NFDSTOI; goto extract_sfmt_fdstoi; + case 2 : + if ((entire_insn & 0x1ffffc0) == 0x1e40c40) + { itype = FRVBF_INSN_NFDSTOI; goto extract_sfmt_fdstoi; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 3 : itype = FRVBF_INSN_NFDDIVS; goto extract_sfmt_fmas; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } @@ -2004,9 +2877,18 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 10) & (1 << 1)) | ((insn >> 9) & (1 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_FDMOVS; goto extract_sfmt_fdmovs; - case 1 : itype = FRVBF_INSN_FDCMPS; goto extract_sfmt_fdcmps; - case 3 : itype = FRVBF_INSN_NFDCMPS; goto extract_sfmt_nfdcmps; + case 0 : + if ((entire_insn & 0x1ffffc0) == 0x1e40480) + { itype = FRVBF_INSN_FDMOVS; goto extract_sfmt_fdmovs; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 1 : + if ((entire_insn & 0x79fc0fc0) == 0x1e40680) + { itype = FRVBF_INSN_FDCMPS; goto extract_sfmt_fdcmps; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 3 : + if ((entire_insn & 0x79fc0fc0) == 0x1e40e80) + { itype = FRVBF_INSN_NFDCMPS; goto extract_sfmt_nfdcmps; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2015,7 +2897,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 10) & (1 << 1)) | ((insn >> 9) & (1 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_FDNEGS; goto extract_sfmt_fdmovs; + case 0 : + if ((entire_insn & 0x1ffffc0) == 0x1e404c0) + { itype = FRVBF_INSN_FDNEGS; goto extract_sfmt_fdmovs; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 1 : itype = FRVBF_INSN_FDMADDS; goto extract_sfmt_fdmadds; case 3 : itype = FRVBF_INSN_NFDMADDS; goto extract_sfmt_fdmadds; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; @@ -2026,7 +2911,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 10) & (1 << 1)) | ((insn >> 9) & (1 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_FDABSS; goto extract_sfmt_fdmovs; + case 0 : + if ((entire_insn & 0x1ffffc0) == 0x1e40500) + { itype = FRVBF_INSN_FDABSS; goto extract_sfmt_fdmovs; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 1 : itype = FRVBF_INSN_FDMAS; goto extract_sfmt_fdmas; case 3 : itype = FRVBF_INSN_NFDMAS; goto extract_sfmt_fdmas; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; @@ -2037,9 +2925,15 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 10) & (1 << 1)) | ((insn >> 9) & (1 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_FDSQRTS; goto extract_sfmt_fdmovs; + case 0 : + if ((entire_insn & 0x1ffffc0) == 0x1e40540) + { itype = FRVBF_INSN_FDSQRTS; goto extract_sfmt_fdmovs; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 1 : itype = FRVBF_INSN_FDMSS; goto extract_sfmt_fdmas; - case 2 : itype = FRVBF_INSN_NFDSQRTS; goto extract_sfmt_fdmovs; + case 2 : + if ((entire_insn & 0x1ffffc0) == 0x1e40d40) + { itype = FRVBF_INSN_NFDSQRTS; goto extract_sfmt_fdmovs; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 3 : itype = FRVBF_INSN_NFDMSS; goto extract_sfmt_fdmas; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } @@ -2076,21 +2970,66 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 6) & (15 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_FITOD; goto extract_sfmt_fitod; - case 1 : itype = FRVBF_INSN_FDTOI; goto extract_sfmt_fdtoi; - case 2 : itype = FRVBF_INSN_FMOVD; goto extract_sfmt_fmovd; - case 3 : itype = FRVBF_INSN_FNEGD; goto extract_sfmt_fmovd; - case 4 : itype = FRVBF_INSN_FABSD; goto extract_sfmt_fmovd; - case 5 : itype = FRVBF_INSN_FSQRTD; goto extract_sfmt_fmovd; - case 6 : itype = FRVBF_INSN_FADDD; goto extract_sfmt_faddd; - case 7 : itype = FRVBF_INSN_FSUBD; goto extract_sfmt_faddd; - case 8 : itype = FRVBF_INSN_FMULD; goto extract_sfmt_faddd; - case 9 : itype = FRVBF_INSN_FDIVD; goto extract_sfmt_faddd; - case 10 : itype = FRVBF_INSN_FCMPD; goto extract_sfmt_fcmpd; - case 11 : itype = FRVBF_INSN_FMADDD; goto extract_sfmt_fmaddd; - case 12 : itype = FRVBF_INSN_FMSUBD; goto extract_sfmt_fmaddd; - case 14 : itype = FRVBF_INSN_FMAD; goto extract_sfmt_fmas; - case 15 : itype = FRVBF_INSN_FMSD; goto extract_sfmt_fmas; + case 0 : + if ((entire_insn & 0x1ffffc0) == 0x1e80000) + { itype = FRVBF_INSN_FITOD; goto extract_sfmt_fitod; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 1 : + if ((entire_insn & 0x1ffffc0) == 0x1e80040) + { itype = FRVBF_INSN_FDTOI; goto extract_sfmt_fdtoi; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 2 : + if ((entire_insn & 0x1ffffc0) == 0x1e80080) + { itype = FRVBF_INSN_FMOVD; goto extract_sfmt_fmovd; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 3 : + if ((entire_insn & 0x1ffffc0) == 0x1e800c0) + { itype = FRVBF_INSN_FNEGD; goto extract_sfmt_fmovd; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 4 : + if ((entire_insn & 0x1ffffc0) == 0x1e80100) + { itype = FRVBF_INSN_FABSD; goto extract_sfmt_fmovd; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 5 : + if ((entire_insn & 0x1ffffc0) == 0x1e80140) + { itype = FRVBF_INSN_FSQRTD; goto extract_sfmt_fmovd; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 6 : + if ((entire_insn & 0x1fc0fc0) == 0x1e80180) + { itype = FRVBF_INSN_FADDD; goto extract_sfmt_faddd; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 7 : + if ((entire_insn & 0x1fc0fc0) == 0x1e801c0) + { itype = FRVBF_INSN_FSUBD; goto extract_sfmt_faddd; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 8 : + if ((entire_insn & 0x1fc0fc0) == 0x1e80200) + { itype = FRVBF_INSN_FMULD; goto extract_sfmt_faddd; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 9 : + if ((entire_insn & 0x1fc0fc0) == 0x1e80240) + { itype = FRVBF_INSN_FDIVD; goto extract_sfmt_faddd; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 10 : + if ((entire_insn & 0x79fc0fc0) == 0x1e80280) + { itype = FRVBF_INSN_FCMPD; goto extract_sfmt_fcmpd; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 11 : + if ((entire_insn & 0x1fc0fc0) == 0x1e802c0) + { itype = FRVBF_INSN_FMADDD; goto extract_sfmt_fmaddd; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 12 : + if ((entire_insn & 0x1fc0fc0) == 0x1e80300) + { itype = FRVBF_INSN_FMSUBD; goto extract_sfmt_fmaddd; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 14 : + if ((entire_insn & 0x1fc0fc0) == 0x1e80380) + { itype = FRVBF_INSN_FMAD; goto extract_sfmt_fmas; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 15 : + if ((entire_insn & 0x1fc0fc0) == 0x1e803c0) + { itype = FRVBF_INSN_FMSD; goto extract_sfmt_fmas; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } @@ -2102,7 +3041,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, case 0 : itype = FRVBF_INSN_MAND; goto extract_sfmt_mand; case 1 : itype = FRVBF_INSN_MOR; goto extract_sfmt_mand; case 2 : itype = FRVBF_INSN_MXOR; goto extract_sfmt_mand; - case 3 : itype = FRVBF_INSN_MNOT; goto extract_sfmt_mnot; + case 3 : + if ((entire_insn & 0x1ffffc0) == 0x1ec00c0) + { itype = FRVBF_INSN_MNOT; goto extract_sfmt_mnot; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 4 : itype = FRVBF_INSN_MROTLI; goto extract_sfmt_mrotli; case 5 : itype = FRVBF_INSN_MROTRI; goto extract_sfmt_mrotli; case 6 : itype = FRVBF_INSN_MWCUT; goto extract_sfmt_mwcut; @@ -2113,8 +3055,14 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, case 11 : itype = FRVBF_INSN_MSRAHI; goto extract_sfmt_msllhi; case 12 : itype = FRVBF_INSN_MSATHS; goto extract_sfmt_msaths; case 13 : itype = FRVBF_INSN_MSATHU; goto extract_sfmt_msaths; - case 14 : itype = FRVBF_INSN_MCMPSH; goto extract_sfmt_mcmpsh; - case 15 : itype = FRVBF_INSN_MCMPUH; goto extract_sfmt_mcmpsh; + case 14 : + if ((entire_insn & 0x79fc0fc0) == 0x1ec0380) + { itype = FRVBF_INSN_MCMPSH; goto extract_sfmt_mcmpsh; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 15 : + if ((entire_insn & 0x79fc0fc0) == 0x1ec03c0) + { itype = FRVBF_INSN_MCMPUH; goto extract_sfmt_mcmpsh; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 16 : itype = FRVBF_INSN_MADDHSS; goto extract_sfmt_msaths; case 17 : itype = FRVBF_INSN_MADDHUS; goto extract_sfmt_msaths; case 18 : itype = FRVBF_INSN_MSUBHSS; goto extract_sfmt_msaths; @@ -2152,18 +3100,36 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, case 50 : itype = FRVBF_INSN_MEXPDHW; goto extract_sfmt_mexpdhw; case 51 : itype = FRVBF_INSN_MEXPDHD; goto extract_sfmt_mexpdhd; case 52 : itype = FRVBF_INSN_MPACKH; goto extract_sfmt_mpackh; - case 53 : itype = FRVBF_INSN_MUNPACKH; goto extract_sfmt_munpackh; + case 53 : + if ((entire_insn & 0x1fc0fff) == 0x1ec0d40) + { itype = FRVBF_INSN_MUNPACKH; goto extract_sfmt_munpackh; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 54 : itype = FRVBF_INSN_MDPACKH; goto extract_sfmt_mdpackh; - case 55 : itype = FRVBF_INSN_MDUNPACKH; goto extract_sfmt_mdunpackh; - case 56 : itype = FRVBF_INSN_MBTOH; goto extract_sfmt_mbtoh; - case 57 : itype = FRVBF_INSN_MHTOB; goto extract_sfmt_mhtob; - case 58 : itype = FRVBF_INSN_MBTOHE; goto extract_sfmt_mbtohe; + case 55 : + if ((entire_insn & 0x1fc0fff) == 0x1ec0dc0) + { itype = FRVBF_INSN_MDUNPACKH; goto extract_sfmt_mdunpackh; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 56 : + if ((entire_insn & 0x1ffffc0) == 0x1ec0e00) + { itype = FRVBF_INSN_MBTOH; goto extract_sfmt_mbtoh; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 57 : + if ((entire_insn & 0x1ffffc0) == 0x1ec0e40) + { itype = FRVBF_INSN_MHTOB; goto extract_sfmt_mhtob; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 58 : + if ((entire_insn & 0x1ffffc0) == 0x1ec0e80) + { itype = FRVBF_INSN_MBTOHE; goto extract_sfmt_mbtohe; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 59 : { unsigned int val = (((insn >> 17) & (1 << 0))); switch (val) { - case 0 : itype = FRVBF_INSN_MCLRACC_0; goto extract_sfmt_mclracc_0; + case 0 : + if ((entire_insn & 0x1ffffff) == 0x1ec0ec0) + { itype = FRVBF_INSN_MCLRACC_0; goto extract_sfmt_mclracc_0; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 1 : { unsigned int val = (((insn >> 25) & (63 << 0))); @@ -2231,23 +3197,47 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, case 59 : /* fall through */ case 60 : /* fall through */ case 61 : /* fall through */ - case 62 : itype = FRVBF_INSN_MCLRACC_1; goto extract_sfmt_mclracc_0; - case 63 : itype = FRVBF_INSN_MNOP; goto extract_sfmt_rei; + case 62 : + if ((entire_insn & 0x1ffffff) == 0x1ee0ec0) + { itype = FRVBF_INSN_MCLRACC_1; goto extract_sfmt_mclracc_0; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 63 : + if ((entire_insn & 0x7fffffff) == 0x7fee0ec0) + { itype = FRVBF_INSN_MNOP; goto extract_sfmt_rei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } - case 60 : itype = FRVBF_INSN_MRDACC; goto extract_sfmt_mrdacc; - case 61 : itype = FRVBF_INSN_MWTACC; goto extract_sfmt_mwtacc; - case 62 : itype = FRVBF_INSN_MRDACCG; goto extract_sfmt_mrdaccg; - case 63 : itype = FRVBF_INSN_MWTACCG; goto extract_sfmt_mwtaccg; + case 60 : + if ((entire_insn & 0x1fc0fff) == 0x1ec0f00) + { itype = FRVBF_INSN_MRDACC; goto extract_sfmt_mrdacc; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 61 : + if ((entire_insn & 0x1fc0fff) == 0x1ec0f40) + { itype = FRVBF_INSN_MWTACC; goto extract_sfmt_mwtacc; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 62 : + if ((entire_insn & 0x1fc0fff) == 0x1ec0f80) + { itype = FRVBF_INSN_MRDACCG; goto extract_sfmt_mrdaccg; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 63 : + if ((entire_insn & 0x1fc0fff) == 0x1ec0fc0) + { itype = FRVBF_INSN_MWTACCG; goto extract_sfmt_mwtaccg; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; } } - case 124 : itype = FRVBF_INSN_MCOP1; goto extract_sfmt_rei; - case 125 : itype = FRVBF_INSN_MCOP2; goto extract_sfmt_rei; + case 124 : + if ((entire_insn & 0x1fc0fc0) == 0x1f00000) + { itype = FRVBF_INSN_MCOP1; goto extract_sfmt_rei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 125 : + if ((entire_insn & 0x1fc0fc0) == 0x1f40000) + { itype = FRVBF_INSN_MCOP2; goto extract_sfmt_rei; } + itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; case 126 : itype = FRVBF_INSN_COP1; goto extract_sfmt_rei; case 127 : itype = FRVBF_INSN_COP2; goto extract_sfmt_rei; default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty; @@ -2260,11 +3250,11 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_empty: { const IDESC *idesc = &frvbf_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; @@ -2273,7 +3263,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_add: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_addcc.f UINT f_GRk; UINT f_GRi; @@ -2287,7 +3277,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2305,7 +3295,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_not: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_scutss.f UINT f_GRk; UINT f_GRj; @@ -2316,7 +3306,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_not", "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_not", "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2333,7 +3323,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_sdiv: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_addcc.f UINT f_GRk; UINT f_GRi; @@ -2347,7 +3337,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sdiv", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sdiv", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2365,7 +3355,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_smul: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_smulcc.f UINT f_GRk; UINT f_GRi; @@ -2379,7 +3369,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smul", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smul", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2397,7 +3387,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_smu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_smass.f UINT f_GRi; UINT f_GRj; @@ -2408,7 +3398,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2426,7 +3416,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_smass: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_smass.f UINT f_GRi; UINT f_GRj; @@ -2437,7 +3427,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smass", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smass", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2449,6 +3439,38 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (out_h_iacc0_DI_0) = 0; } #endif +#undef FLD + return idesc; + } + + extract_sfmt_slass: + { + const IDESC *idesc = &frvbf_insn_data[itype]; + CGEN_INSN_WORD insn = entire_insn; +#define FLD(f) abuf->fields.sfmt_addcc.f + UINT f_GRk; + UINT f_GRi; + UINT f_GRj; + + f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); + f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); + f_GRj = EXTRACT_LSB0_UINT (insn, 32, 5, 6); + + /* Record the fields for the semantic handler. */ + FLD (f_GRi) = f_GRi; + FLD (f_GRj) = f_GRj; + FLD (f_GRk) = f_GRk; + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_slass", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + +#if WITH_PROFILE_MODEL_P + /* Record the fields for profiling. */ + if (PROFILE_MODEL_P (current_cpu)) + { + FLD (in_GRi) = f_GRi; + FLD (in_GRj) = f_GRj; + FLD (out_GRk) = f_GRk; + } +#endif #undef FLD return idesc; } @@ -2456,7 +3478,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_scutss: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_scutss.f UINT f_GRk; UINT f_GRj; @@ -2467,7 +3489,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_scutss", "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_scutss", "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2485,7 +3507,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cadd: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cswap.f UINT f_GRk; UINT f_GRi; @@ -2505,7 +3527,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cadd", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cadd", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2524,7 +3546,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cnot: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cswap.f UINT f_GRk; UINT f_CCi; @@ -2541,7 +3563,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cnot", "f_CCi 0x%x", 'x', f_CCi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cnot", "f_CCi 0x%x", 'x', f_CCi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2559,7 +3581,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_csmul: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_clddu.f UINT f_GRk; UINT f_GRi; @@ -2579,7 +3601,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_csmul", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_csmul", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2598,7 +3620,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_csdiv: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cswap.f UINT f_GRk; UINT f_GRi; @@ -2618,7 +3640,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_csdiv", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_csdiv", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2637,7 +3659,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_addcc: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_addcc.f UINT f_GRk; UINT f_GRi; @@ -2654,7 +3676,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_ICCi_1) = f_ICCi_1; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2674,7 +3696,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_andcc: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_addcc.f UINT f_GRk; UINT f_GRi; @@ -2691,7 +3713,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_ICCi_1) = f_ICCi_1; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2711,7 +3733,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_smulcc: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_smulcc.f UINT f_GRk; UINT f_GRi; @@ -2728,7 +3750,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_ICCi_1) = f_ICCi_1; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smulcc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smulcc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2748,7 +3770,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_caddcc: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_caddcc.f UINT f_GRk; UINT f_GRi; @@ -2768,7 +3790,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_caddcc", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_caddcc", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2777,9 +3799,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_CCi) = f_CCi; FLD (in_GRi) = f_GRi; FLD (in_GRj) = f_GRj; - FLD (in_h_iccr_UQI_and__DFLT_index_of__DFLT_CCi_3) = ((FLD (f_CCi)) & (3)); + FLD (in_h_iccr_UQI_and__INT_index_of__INT_CCi_3) = ((FLD (f_CCi)) & (3)); FLD (out_GRk) = f_GRk; - FLD (out_h_iccr_UQI_and__DFLT_index_of__DFLT_CCi_3) = ((FLD (f_CCi)) & (3)); + FLD (out_h_iccr_UQI_and__INT_index_of__INT_CCi_3) = ((FLD (f_CCi)) & (3)); } #endif #undef FLD @@ -2789,7 +3811,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_csmulcc: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_csmulcc.f UINT f_GRk; UINT f_GRi; @@ -2809,7 +3831,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_csmulcc", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_csmulcc", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2818,9 +3840,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_CCi) = f_CCi; FLD (in_GRi) = f_GRi; FLD (in_GRj) = f_GRj; - FLD (in_h_iccr_UQI_and__DFLT_index_of__DFLT_CCi_3) = ((FLD (f_CCi)) & (3)); + FLD (in_h_iccr_UQI_and__INT_index_of__INT_CCi_3) = ((FLD (f_CCi)) & (3)); FLD (out_GRdoublek) = f_GRk; - FLD (out_h_iccr_UQI_and__DFLT_index_of__DFLT_CCi_3) = ((FLD (f_CCi)) & (3)); + FLD (out_h_iccr_UQI_and__INT_index_of__INT_CCi_3) = ((FLD (f_CCi)) & (3)); } #endif #undef FLD @@ -2830,7 +3852,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_addx: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_addcc.f UINT f_GRk; UINT f_GRi; @@ -2847,7 +3869,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_ICCi_1) = f_ICCi_1; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addx", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addx", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2866,7 +3888,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_addi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_swapi.f UINT f_GRk; UINT f_GRi; @@ -2874,13 +3896,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2897,7 +3919,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_sdivi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_swapi.f UINT f_GRk; UINT f_GRi; @@ -2905,13 +3927,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_GRk) = f_GRk; FLD (f_d12) = f_d12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sdivi", "f_GRi 0x%x", 'x', f_GRi, "f_GRk 0x%x", 'x', f_GRk, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sdivi", "f_GRi 0x%x", 'x', f_GRi, "f_GRk 0x%x", 'x', f_GRk, "f_d12 0x%x", 'x', f_d12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2928,7 +3950,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_smuli: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_smuli.f UINT f_GRk; UINT f_GRi; @@ -2936,13 +3958,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smuli", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smuli", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2959,7 +3981,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_addicc: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_addicc.f UINT f_GRk; UINT f_GRi; @@ -2969,14 +3991,14 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); f_ICCi_1 = EXTRACT_LSB0_UINT (insn, 32, 11, 2); - f_s10 = EXTRACT_LSB0_INT (insn, 32, 9, 10); + f_s10 = EXTRACT_LSB0_SINT (insn, 32, 9, 10); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_ICCi_1) = f_ICCi_1; FLD (f_s10) = f_s10; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addicc", "f_GRi 0x%x", 'x', f_GRi, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_s10 0x%x", 'x', f_s10, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addicc", "f_GRi 0x%x", 'x', f_GRi, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_s10 0x%x", 'x', f_s10, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2995,7 +4017,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_andicc: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_addicc.f UINT f_GRk; UINT f_GRi; @@ -3005,14 +4027,14 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); f_ICCi_1 = EXTRACT_LSB0_UINT (insn, 32, 11, 2); - f_s10 = EXTRACT_LSB0_INT (insn, 32, 9, 10); + f_s10 = EXTRACT_LSB0_SINT (insn, 32, 9, 10); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_ICCi_1) = f_ICCi_1; FLD (f_s10) = f_s10; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andicc", "f_GRi 0x%x", 'x', f_GRi, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_s10 0x%x", 'x', f_s10, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andicc", "f_GRi 0x%x", 'x', f_GRi, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_s10 0x%x", 'x', f_s10, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3031,7 +4053,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_smulicc: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_smulicc.f UINT f_GRk; UINT f_GRi; @@ -3041,14 +4063,14 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); f_ICCi_1 = EXTRACT_LSB0_UINT (insn, 32, 11, 2); - f_s10 = EXTRACT_LSB0_INT (insn, 32, 9, 10); + f_s10 = EXTRACT_LSB0_SINT (insn, 32, 9, 10); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_ICCi_1) = f_ICCi_1; FLD (f_s10) = f_s10; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smulicc", "f_GRi 0x%x", 'x', f_GRi, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_s10 0x%x", 'x', f_s10, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smulicc", "f_GRi 0x%x", 'x', f_GRi, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_s10 0x%x", 'x', f_s10, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3067,7 +4089,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_addxi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_addicc.f UINT f_GRk; UINT f_GRi; @@ -3077,14 +4099,14 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); f_ICCi_1 = EXTRACT_LSB0_UINT (insn, 32, 11, 2); - f_s10 = EXTRACT_LSB0_INT (insn, 32, 9, 10); + f_s10 = EXTRACT_LSB0_SINT (insn, 32, 9, 10); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_ICCi_1) = f_ICCi_1; FLD (f_s10) = f_s10; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addxi", "f_GRi 0x%x", 'x', f_GRi, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_s10 0x%x", 'x', f_s10, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addxi", "f_GRi 0x%x", 'x', f_GRi, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_s10 0x%x", 'x', f_s10, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3102,7 +4124,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmpb: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_smulcc.f UINT f_GRi; UINT f_ICCi_1; @@ -3116,7 +4138,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_ICCi_1) = f_ICCi_1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpb", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_1 0x%x", 'x', f_ICCi_1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpb", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_1 0x%x", 'x', f_ICCi_1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3134,7 +4156,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_setlo: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_setlo.f UINT f_GRk; UINT f_u16; @@ -3145,7 +4167,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_u16) = f_u16; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_setlo", "f_u16 0x%x", 'x', f_u16, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_setlo", "f_u16 0x%x", 'x', f_u16, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3161,7 +4183,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_sethi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_sethi.f UINT f_GRk; UINT f_u16; @@ -3172,7 +4194,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_u16) = f_u16; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sethi", "f_u16 0x%x", 'x', f_u16, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sethi", "f_u16 0x%x", 'x', f_u16, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3188,18 +4210,18 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_setlos: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_setlos.f UINT f_GRk; INT f_s16; f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); - f_s16 = EXTRACT_LSB0_INT (insn, 32, 15, 16); + f_s16 = EXTRACT_LSB0_SINT (insn, 32, 15, 16); /* Record the fields for the semantic handler. */ FLD (f_s16) = f_s16; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_setlos", "f_s16 0x%x", 'x', f_s16, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_setlos", "f_s16 0x%x", 'x', f_s16, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3215,7 +4237,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ldsb: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_addcc.f UINT f_GRk; UINT f_GRi; @@ -3229,7 +4251,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsb", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsb", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3247,7 +4269,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ldbf: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cldbfu.f UINT f_FRk; UINT f_GRi; @@ -3261,7 +4283,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldbf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldbf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3279,7 +4301,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ldc: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_ldcu.f UINT f_CPRk; UINT f_GRi; @@ -3293,7 +4315,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_CPRk) = f_CPRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3311,7 +4333,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nldsb: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_addcc.f UINT f_GRk; UINT f_GRi; @@ -3325,7 +4347,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldsb", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldsb", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3343,7 +4365,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nldbf: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cldbfu.f UINT f_FRk; UINT f_GRi; @@ -3357,7 +4379,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldbf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldbf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3375,7 +4397,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ldd: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_smulcc.f UINT f_GRk; UINT f_GRi; @@ -3389,7 +4411,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldd", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldd", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3407,7 +4429,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_lddf: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_clddfu.f UINT f_FRk; UINT f_GRi; @@ -3421,7 +4443,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3439,7 +4461,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_lddc: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_lddcu.f UINT f_CPRk; UINT f_GRi; @@ -3453,7 +4475,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_CPRk) = f_CPRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3471,7 +4493,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nldd: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_smulcc.f UINT f_GRk; UINT f_GRi; @@ -3485,7 +4507,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldd", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldd", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3503,7 +4525,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nlddf: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_clddfu.f UINT f_FRk; UINT f_GRi; @@ -3517,7 +4539,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nlddf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nlddf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3535,7 +4557,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ldq: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_smulcc.f UINT f_GRk; UINT f_GRi; @@ -3549,7 +4571,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldq", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldq", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3566,7 +4588,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ldqf: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cstdfu.f UINT f_FRk; UINT f_GRi; @@ -3580,7 +4602,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3597,7 +4619,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ldqc: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_stdcu.f UINT f_CPRk; UINT f_GRi; @@ -3611,7 +4633,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_CPRk) = f_CPRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3628,7 +4650,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nldq: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_smulcc.f UINT f_GRk; UINT f_GRi; @@ -3642,7 +4664,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldq", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldq", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3659,7 +4681,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nldqf: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cstdfu.f UINT f_FRk; UINT f_GRi; @@ -3673,7 +4695,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldqf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldqf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3690,7 +4712,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ldsbu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cldsbu.f UINT f_GRk; UINT f_GRi; @@ -3704,7 +4726,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsbu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsbu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3723,7 +4745,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nldsbu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cldsbu.f UINT f_GRk; UINT f_GRi; @@ -3737,7 +4759,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldsbu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldsbu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3756,7 +4778,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ldbfu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cldbfu.f UINT f_FRk; UINT f_GRi; @@ -3770,7 +4792,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldbfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldbfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3789,7 +4811,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ldcu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_ldcu.f UINT f_CPRk; UINT f_GRi; @@ -3803,7 +4825,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_CPRk) = f_CPRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldcu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldcu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3822,7 +4844,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nldbfu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cldbfu.f UINT f_FRk; UINT f_GRi; @@ -3836,7 +4858,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldbfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldbfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3855,7 +4877,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_lddu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_clddu.f UINT f_GRk; UINT f_GRi; @@ -3869,7 +4891,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3888,7 +4910,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nlddu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_clddu.f UINT f_GRk; UINT f_GRi; @@ -3902,7 +4924,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nlddu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nlddu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3921,7 +4943,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_lddfu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_clddfu.f UINT f_FRk; UINT f_GRi; @@ -3935,7 +4957,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3954,7 +4976,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_lddcu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_lddcu.f UINT f_CPRk; UINT f_GRi; @@ -3968,7 +4990,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_CPRk) = f_CPRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddcu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddcu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3987,7 +5009,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nlddfu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_clddfu.f UINT f_FRk; UINT f_GRi; @@ -4001,7 +5023,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nlddfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nlddfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4020,7 +5042,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ldqu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cstdu.f UINT f_GRk; UINT f_GRi; @@ -4034,7 +5056,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4052,7 +5074,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nldqu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cstdu.f UINT f_GRk; UINT f_GRi; @@ -4066,7 +5088,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldqu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldqu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4084,7 +5106,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ldqfu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cstdfu.f UINT f_FRk; UINT f_GRi; @@ -4098,7 +5120,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4116,7 +5138,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ldqcu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_stdcu.f UINT f_CPRk; UINT f_GRi; @@ -4130,7 +5152,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_CPRk) = f_CPRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqcu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqcu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4148,7 +5170,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nldqfu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cstdfu.f UINT f_FRk; UINT f_GRi; @@ -4162,7 +5184,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldqfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldqfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4180,7 +5202,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ldsbi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_swapi.f UINT f_GRk; UINT f_GRi; @@ -4188,13 +5210,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsbi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsbi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4211,7 +5233,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ldbfi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_ldbfi.f UINT f_FRk; UINT f_GRi; @@ -4219,13 +5241,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldbfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldbfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4242,7 +5264,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nldsbi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_swapi.f UINT f_GRk; UINT f_GRi; @@ -4250,13 +5272,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldsbi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldsbi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4273,7 +5295,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nldbfi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_ldbfi.f UINT f_FRk; UINT f_GRi; @@ -4281,13 +5303,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldbfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldbfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4304,7 +5326,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_lddi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_smuli.f UINT f_GRk; UINT f_GRi; @@ -4312,13 +5334,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4335,7 +5357,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_lddfi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_lddfi.f UINT f_FRk; UINT f_GRi; @@ -4343,13 +5365,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4366,7 +5388,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nlddi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_smuli.f UINT f_GRk; UINT f_GRi; @@ -4374,13 +5396,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nlddi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nlddi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4397,7 +5419,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nlddfi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_lddfi.f UINT f_FRk; UINT f_GRi; @@ -4405,13 +5427,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nlddfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nlddfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4428,7 +5450,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ldqi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_stdi.f UINT f_GRk; UINT f_GRi; @@ -4436,13 +5458,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4458,7 +5480,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ldqfi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_stdfi.f UINT f_FRk; UINT f_GRi; @@ -4466,13 +5488,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4488,7 +5510,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nldqfi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_stdfi.f UINT f_FRk; UINT f_GRi; @@ -4496,13 +5518,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldqfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldqfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4518,7 +5540,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_stb: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cswap.f UINT f_GRk; UINT f_GRi; @@ -4532,7 +5554,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4550,7 +5572,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_stbf: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cstbfu.f UINT f_FRk; UINT f_GRi; @@ -4564,7 +5586,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRk) = f_FRk; FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stbf", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stbf", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4582,7 +5604,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_stc: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_stcu.f UINT f_CPRk; UINT f_GRi; @@ -4596,7 +5618,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_CPRk) = f_CPRk; FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stc", "f_CPRk 0x%x", 'x', f_CPRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stc", "f_CPRk 0x%x", 'x', f_CPRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4614,7 +5636,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_std: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cstdu.f UINT f_GRk; UINT f_GRi; @@ -4628,7 +5650,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRk) = f_GRk; FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_std", "f_GRk 0x%x", 'x', f_GRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_std", "f_GRk 0x%x", 'x', f_GRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4646,7 +5668,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_stdf: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cstdfu.f UINT f_FRk; UINT f_GRi; @@ -4660,7 +5682,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRk) = f_FRk; FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdf", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdf", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4678,7 +5700,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_stdc: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_stdcu.f UINT f_CPRk; UINT f_GRi; @@ -4692,7 +5714,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_CPRk) = f_CPRk; FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdc", "f_CPRk 0x%x", 'x', f_CPRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdc", "f_CPRk 0x%x", 'x', f_CPRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4710,7 +5732,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_stbu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cstbu.f UINT f_GRk; UINT f_GRi; @@ -4724,7 +5746,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stbu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stbu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4743,7 +5765,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_stbfu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cstbfu.f UINT f_FRk; UINT f_GRi; @@ -4757,7 +5779,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRk) = f_FRk; FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stbfu", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stbfu", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4776,7 +5798,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_stcu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_stcu.f UINT f_CPRk; UINT f_GRi; @@ -4790,7 +5812,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_CPRk) = f_CPRk; FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stcu", "f_CPRk 0x%x", 'x', f_CPRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stcu", "f_CPRk 0x%x", 'x', f_CPRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4809,7 +5831,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_stdu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cstdu.f UINT f_GRk; UINT f_GRi; @@ -4823,7 +5845,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRk) = f_GRk; FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdu", "f_GRk 0x%x", 'x', f_GRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdu", "f_GRk 0x%x", 'x', f_GRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4842,7 +5864,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_stdfu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cstdfu.f UINT f_FRk; UINT f_GRi; @@ -4856,7 +5878,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRk) = f_FRk; FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdfu", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdfu", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4875,7 +5897,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_stdcu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_stdcu.f UINT f_CPRk; UINT f_GRi; @@ -4889,7 +5911,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_CPRk) = f_CPRk; FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdcu", "f_CPRk 0x%x", 'x', f_CPRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdcu", "f_CPRk 0x%x", 'x', f_CPRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4908,7 +5930,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_stqu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cstdu.f UINT f_GRk; UINT f_GRi; @@ -4922,7 +5944,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stqu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stqu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4940,7 +5962,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cldsb: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cswap.f UINT f_GRk; UINT f_GRi; @@ -4960,7 +5982,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldsb", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldsb", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4979,7 +6001,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cldbf: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cldbfu.f UINT f_FRk; UINT f_GRi; @@ -4999,7 +6021,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldbf", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldbf", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5018,7 +6040,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cldd: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_clddu.f UINT f_GRk; UINT f_GRi; @@ -5038,7 +6060,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldd", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldd", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5057,7 +6079,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_clddf: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_clddfu.f UINT f_FRk; UINT f_GRi; @@ -5077,7 +6099,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clddf", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clddf", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5096,7 +6118,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cldq: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cswap.f UINT f_GRk; UINT f_GRi; @@ -5116,7 +6138,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldq", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldq", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5134,7 +6156,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cldsbu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cldsbu.f UINT f_GRk; UINT f_GRi; @@ -5154,7 +6176,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldsbu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldsbu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5174,7 +6196,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cldbfu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cldbfu.f UINT f_FRk; UINT f_GRi; @@ -5194,7 +6216,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldbfu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldbfu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5214,7 +6236,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_clddu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_clddu.f UINT f_GRk; UINT f_GRi; @@ -5234,7 +6256,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clddu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clddu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5254,7 +6276,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_clddfu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_clddfu.f UINT f_FRk; UINT f_GRi; @@ -5274,7 +6296,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clddfu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clddfu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5294,7 +6316,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cldqu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cstdu.f UINT f_GRk; UINT f_GRi; @@ -5314,7 +6336,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldqu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldqu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5333,7 +6355,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cstb: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cswap.f UINT f_GRk; UINT f_GRi; @@ -5353,7 +6375,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstb", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstb", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5372,7 +6394,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cstbf: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cstbfu.f UINT f_FRk; UINT f_GRi; @@ -5392,7 +6414,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstbf", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstbf", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5411,7 +6433,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cstd: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cstdu.f UINT f_GRk; UINT f_GRi; @@ -5431,7 +6453,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstd", "f_CCi 0x%x", 'x', f_CCi, "f_GRk 0x%x", 'x', f_GRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstd", "f_CCi 0x%x", 'x', f_CCi, "f_GRk 0x%x", 'x', f_GRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5450,7 +6472,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cstdf: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cstdfu.f UINT f_FRk; UINT f_GRi; @@ -5470,7 +6492,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstdf", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstdf", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5489,7 +6511,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cstbu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cstbu.f UINT f_GRk; UINT f_GRi; @@ -5509,7 +6531,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstbu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstbu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5529,7 +6551,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cstbfu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cstbfu.f UINT f_FRk; UINT f_GRi; @@ -5549,7 +6571,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstbfu", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstbfu", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5569,7 +6591,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cstdu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cstdu.f UINT f_GRk; UINT f_GRi; @@ -5589,7 +6611,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstdu", "f_CCi 0x%x", 'x', f_CCi, "f_GRk 0x%x", 'x', f_GRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstdu", "f_CCi 0x%x", 'x', f_CCi, "f_GRk 0x%x", 'x', f_GRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5609,7 +6631,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cstdfu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cstdfu.f UINT f_FRk; UINT f_GRi; @@ -5629,7 +6651,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstdfu", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstdfu", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5649,7 +6671,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_stbi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_swapi.f UINT f_GRk; UINT f_GRi; @@ -5657,13 +6679,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_GRk) = f_GRk; FLD (f_d12) = f_d12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stbi", "f_GRi 0x%x", 'x', f_GRi, "f_GRk 0x%x", 'x', f_GRk, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stbi", "f_GRi 0x%x", 'x', f_GRi, "f_GRk 0x%x", 'x', f_GRk, "f_d12 0x%x", 'x', f_d12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5680,7 +6702,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_stbfi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_stbfi.f UINT f_FRk; UINT f_GRi; @@ -5688,13 +6710,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_FRk) = f_FRk; FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stbfi", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stbfi", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5711,7 +6733,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_stdi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_stdi.f UINT f_GRk; UINT f_GRi; @@ -5719,13 +6741,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_GRk) = f_GRk; FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdi", "f_GRk 0x%x", 'x', f_GRk, "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdi", "f_GRk 0x%x", 'x', f_GRk, "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5742,7 +6764,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_stdfi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_stdfi.f UINT f_FRk; UINT f_GRi; @@ -5750,13 +6772,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_FRk) = f_FRk; FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdfi", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdfi", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5773,7 +6795,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_swap: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cswap.f UINT f_GRk; UINT f_GRi; @@ -5787,7 +6809,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_swap", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_swap", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5806,7 +6828,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_swapi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_swapi.f UINT f_GRk; UINT f_GRi; @@ -5814,13 +6836,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_GRk) = f_GRk; FLD (f_d12) = f_d12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_swapi", "f_GRi 0x%x", 'x', f_GRi, "f_GRk 0x%x", 'x', f_GRk, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_swapi", "f_GRi 0x%x", 'x', f_GRi, "f_GRk 0x%x", 'x', f_GRk, "f_d12 0x%x", 'x', f_d12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5838,7 +6860,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cswap: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cswap.f UINT f_GRk; UINT f_GRi; @@ -5858,7 +6880,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cswap", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cswap", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5878,7 +6900,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_movgf: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmovgfd.f UINT f_FRk; UINT f_GRj; @@ -5889,7 +6911,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movgf", "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movgf", "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5906,7 +6928,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_movfg: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmovfgd.f UINT f_FRk; UINT f_GRj; @@ -5917,7 +6939,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRk) = f_FRk; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movfg", "f_FRk 0x%x", 'x', f_FRk, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movfg", "f_FRk 0x%x", 'x', f_FRk, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5934,7 +6956,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_movgfd: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmovgfd.f UINT f_FRk; UINT f_GRj; @@ -5945,16 +6967,16 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movgfd", "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movgfd", "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_GRj) = f_GRj; - FLD (in_h_gr_USI_add__DFLT_index_of__DFLT_GRj_1) = ((FLD (f_GRj)) + (1)); + FLD (in_h_gr_USI_add__INT_index_of__INT_GRj_1) = ((FLD (f_GRj)) + (1)); FLD (out_FRintk) = f_FRk; - FLD (out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_int_USI_add__INT_index_of__INT_FRintk_1) = ((FLD (f_FRk)) + (1)); } #endif #undef FLD @@ -5964,7 +6986,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_movfgd: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmovfgd.f UINT f_FRk; UINT f_GRj; @@ -5975,16 +6997,16 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRk) = f_FRk; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movfgd", "f_FRk 0x%x", 'x', f_FRk, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movfgd", "f_FRk 0x%x", 'x', f_FRk, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_FRintk) = f_FRk; - FLD (in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_1) = ((FLD (f_FRk)) + (1)); + FLD (in_h_fr_int_USI_add__INT_index_of__INT_FRintk_1) = ((FLD (f_FRk)) + (1)); FLD (out_GRj) = f_GRj; - FLD (out_h_gr_USI_add__DFLT_index_of__DFLT_GRj_1) = ((FLD (f_GRj)) + (1)); + FLD (out_h_gr_USI_add__INT_index_of__INT_GRj_1) = ((FLD (f_GRj)) + (1)); } #endif #undef FLD @@ -5994,7 +7016,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_movgfq: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_movgfq.f UINT f_FRk; UINT f_GRj; @@ -6005,20 +7027,20 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movgfq", "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movgfq", "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_GRj) = f_GRj; - FLD (in_h_gr_USI_add__DFLT_index_of__DFLT_GRj_1) = ((FLD (f_GRj)) + (1)); - FLD (in_h_gr_USI_add__DFLT_index_of__DFLT_GRj_2) = ((FLD (f_GRj)) + (2)); - FLD (in_h_gr_USI_add__DFLT_index_of__DFLT_GRj_3) = ((FLD (f_GRj)) + (3)); + FLD (in_h_gr_USI_add__INT_index_of__INT_GRj_1) = ((FLD (f_GRj)) + (1)); + FLD (in_h_gr_USI_add__INT_index_of__INT_GRj_2) = ((FLD (f_GRj)) + (2)); + FLD (in_h_gr_USI_add__INT_index_of__INT_GRj_3) = ((FLD (f_GRj)) + (3)); FLD (out_FRintk) = f_FRk; - FLD (out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_1) = ((FLD (f_FRk)) + (1)); - FLD (out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_2) = ((FLD (f_FRk)) + (2)); - FLD (out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_3) = ((FLD (f_FRk)) + (3)); + FLD (out_h_fr_int_USI_add__INT_index_of__INT_FRintk_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_int_USI_add__INT_index_of__INT_FRintk_2) = ((FLD (f_FRk)) + (2)); + FLD (out_h_fr_int_USI_add__INT_index_of__INT_FRintk_3) = ((FLD (f_FRk)) + (3)); } #endif #undef FLD @@ -6028,7 +7050,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_movfgq: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_movfgq.f UINT f_FRk; UINT f_GRj; @@ -6039,20 +7061,20 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRk) = f_FRk; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movfgq", "f_FRk 0x%x", 'x', f_FRk, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movfgq", "f_FRk 0x%x", 'x', f_FRk, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_FRintk) = f_FRk; - FLD (in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_1) = ((FLD (f_FRk)) + (1)); - FLD (in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_2) = ((FLD (f_FRk)) + (2)); - FLD (in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_3) = ((FLD (f_FRk)) + (3)); + FLD (in_h_fr_int_USI_add__INT_index_of__INT_FRintk_1) = ((FLD (f_FRk)) + (1)); + FLD (in_h_fr_int_USI_add__INT_index_of__INT_FRintk_2) = ((FLD (f_FRk)) + (2)); + FLD (in_h_fr_int_USI_add__INT_index_of__INT_FRintk_3) = ((FLD (f_FRk)) + (3)); FLD (out_GRj) = f_GRj; - FLD (out_h_gr_USI_add__DFLT_index_of__DFLT_GRj_1) = ((FLD (f_GRj)) + (1)); - FLD (out_h_gr_USI_add__DFLT_index_of__DFLT_GRj_2) = ((FLD (f_GRj)) + (2)); - FLD (out_h_gr_USI_add__DFLT_index_of__DFLT_GRj_3) = ((FLD (f_GRj)) + (3)); + FLD (out_h_gr_USI_add__INT_index_of__INT_GRj_1) = ((FLD (f_GRj)) + (1)); + FLD (out_h_gr_USI_add__INT_index_of__INT_GRj_2) = ((FLD (f_GRj)) + (2)); + FLD (out_h_gr_USI_add__INT_index_of__INT_GRj_3) = ((FLD (f_GRj)) + (3)); } #endif #undef FLD @@ -6062,7 +7084,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmovgf: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmovgfd.f UINT f_FRk; UINT f_CCi; @@ -6079,7 +7101,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmovgf", "f_CCi 0x%x", 'x', f_CCi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmovgf", "f_CCi 0x%x", 'x', f_CCi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6097,7 +7119,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmovfg: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmovfgd.f UINT f_FRk; UINT f_CCi; @@ -6114,7 +7136,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRk) = f_FRk; FLD (f_cond) = f_cond; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmovfg", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmovfg", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6132,7 +7154,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmovgfd: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmovgfd.f UINT f_FRk; UINT f_CCi; @@ -6149,7 +7171,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmovgfd", "f_CCi 0x%x", 'x', f_CCi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmovgfd", "f_CCi 0x%x", 'x', f_CCi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6157,9 +7179,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_CCi) = f_CCi; FLD (in_GRj) = f_GRj; - FLD (in_h_gr_USI_add__DFLT_index_of__DFLT_GRj_1) = ((FLD (f_GRj)) + (1)); + FLD (in_h_gr_USI_add__INT_index_of__INT_GRj_1) = ((FLD (f_GRj)) + (1)); FLD (out_FRintk) = f_FRk; - FLD (out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_int_USI_add__INT_index_of__INT_FRintk_1) = ((FLD (f_FRk)) + (1)); } #endif #undef FLD @@ -6169,7 +7191,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmovfgd: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmovfgd.f UINT f_FRk; UINT f_CCi; @@ -6186,7 +7208,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRk) = f_FRk; FLD (f_cond) = f_cond; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmovfgd", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmovfgd", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6194,9 +7216,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_CCi) = f_CCi; FLD (in_FRintk) = f_FRk; - FLD (in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_1) = ((FLD (f_FRk)) + (1)); + FLD (in_h_fr_int_USI_add__INT_index_of__INT_FRintk_1) = ((FLD (f_FRk)) + (1)); FLD (out_GRj) = f_GRj; - FLD (out_h_gr_USI_add__DFLT_index_of__DFLT_GRj_1) = ((FLD (f_GRj)) + (1)); + FLD (out_h_gr_USI_add__INT_index_of__INT_GRj_1) = ((FLD (f_GRj)) + (1)); } #endif #undef FLD @@ -6206,7 +7228,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_movgs: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_movgs.f UINT f_spr_h; UINT f_spr_l; @@ -6223,7 +7245,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRj) = f_GRj; FLD (f_spr) = f_spr; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movgs", "f_GRj 0x%x", 'x', f_GRj, "f_spr 0x%x", 'x', f_spr, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movgs", "f_GRj 0x%x", 'x', f_GRj, "f_spr 0x%x", 'x', f_spr, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6240,7 +7262,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_movsg: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_movsg.f UINT f_spr_h; UINT f_spr_l; @@ -6257,7 +7279,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_spr) = f_spr; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movsg", "f_spr 0x%x", 'x', f_spr, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movsg", "f_spr 0x%x", 'x', f_spr, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6274,18 +7296,18 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_bra: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fbne.f UINT f_hint; SI f_label16; f_hint = EXTRACT_LSB0_UINT (insn, 32, 17, 2); - f_label16 = ((((EXTRACT_LSB0_INT (insn, 32, 15, 16)) << (2))) + (pc)); + f_label16 = ((((EXTRACT_LSB0_SINT (insn, 32, 15, 16)) << (2))) + (pc)); /* Record the fields for the semantic handler. */ FLD (f_hint) = f_hint; FLD (i_label16) = f_label16; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bra", "f_hint 0x%x", 'x', f_hint, "label16 0x%x", 'x', f_label16, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bra", "f_hint 0x%x", 'x', f_hint, "label16 0x%x", 'x', f_label16, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6300,18 +7322,18 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_bno: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fbne.f UINT f_hint; SI f_label16; f_hint = EXTRACT_LSB0_UINT (insn, 32, 17, 2); - f_label16 = ((((EXTRACT_LSB0_INT (insn, 32, 15, 16)) << (2))) + (pc)); + f_label16 = ((((EXTRACT_LSB0_SINT (insn, 32, 15, 16)) << (2))) + (pc)); /* Record the fields for the semantic handler. */ FLD (f_hint) = f_hint; FLD (i_label16) = f_label16; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bno", "f_hint 0x%x", 'x', f_hint, "label16 0x%x", 'x', f_label16, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bno", "f_hint 0x%x", 'x', f_hint, "label16 0x%x", 'x', f_label16, (char *) 0)); #undef FLD return idesc; @@ -6320,7 +7342,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_beq: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_beq.f UINT f_ICCi_2; UINT f_hint; @@ -6328,13 +7350,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_ICCi_2 = EXTRACT_LSB0_UINT (insn, 32, 26, 2); f_hint = EXTRACT_LSB0_UINT (insn, 32, 17, 2); - f_label16 = ((((EXTRACT_LSB0_INT (insn, 32, 15, 16)) << (2))) + (pc)); + f_label16 = ((((EXTRACT_LSB0_SINT (insn, 32, 15, 16)) << (2))) + (pc)); /* Record the fields for the semantic handler. */ FLD (f_ICCi_2) = f_ICCi_2; FLD (f_hint) = f_hint; FLD (i_label16) = f_label16; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beq", "f_ICCi_2 0x%x", 'x', f_ICCi_2, "f_hint 0x%x", 'x', f_hint, "label16 0x%x", 'x', f_label16, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beq", "f_ICCi_2 0x%x", 'x', f_ICCi_2, "f_hint 0x%x", 'x', f_hint, "label16 0x%x", 'x', f_label16, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6343,6 +7365,52 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_ICCi_2) = f_ICCi_2; } #endif +#undef FLD + return idesc; + } + + extract_sfmt_fbra: + { + const IDESC *idesc = &frvbf_insn_data[itype]; + CGEN_INSN_WORD insn = entire_insn; +#define FLD(f) abuf->fields.sfmt_fbne.f + UINT f_hint; + SI f_label16; + + f_hint = EXTRACT_LSB0_UINT (insn, 32, 17, 2); + f_label16 = ((((EXTRACT_LSB0_SINT (insn, 32, 15, 16)) << (2))) + (pc)); + + /* Record the fields for the semantic handler. */ + FLD (f_hint) = f_hint; + FLD (i_label16) = f_label16; + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fbra", "f_hint 0x%x", 'x', f_hint, "label16 0x%x", 'x', f_label16, (char *) 0)); + +#if WITH_PROFILE_MODEL_P + /* Record the fields for profiling. */ + if (PROFILE_MODEL_P (current_cpu)) + { + } +#endif +#undef FLD + return idesc; + } + + extract_sfmt_fbno: + { + const IDESC *idesc = &frvbf_insn_data[itype]; + CGEN_INSN_WORD insn = entire_insn; +#define FLD(f) abuf->fields.sfmt_fbne.f + UINT f_hint; + SI f_label16; + + f_hint = EXTRACT_LSB0_UINT (insn, 32, 17, 2); + f_label16 = ((((EXTRACT_LSB0_SINT (insn, 32, 15, 16)) << (2))) + (pc)); + + /* Record the fields for the semantic handler. */ + FLD (f_hint) = f_hint; + FLD (i_label16) = f_label16; + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fbno", "f_hint 0x%x", 'x', f_hint, "label16 0x%x", 'x', f_label16, (char *) 0)); + #undef FLD return idesc; } @@ -6350,7 +7418,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fbne: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fbne.f UINT f_FCCi_2; UINT f_hint; @@ -6358,13 +7426,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_FCCi_2 = EXTRACT_LSB0_UINT (insn, 32, 26, 2); f_hint = EXTRACT_LSB0_UINT (insn, 32, 17, 2); - f_label16 = ((((EXTRACT_LSB0_INT (insn, 32, 15, 16)) << (2))) + (pc)); + f_label16 = ((((EXTRACT_LSB0_SINT (insn, 32, 15, 16)) << (2))) + (pc)); /* Record the fields for the semantic handler. */ FLD (f_FCCi_2) = f_FCCi_2; FLD (f_hint) = f_hint; FLD (i_label16) = f_label16; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fbne", "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_hint 0x%x", 'x', f_hint, "label16 0x%x", 'x', f_label16, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fbne", "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_hint 0x%x", 'x', f_hint, "label16 0x%x", 'x', f_label16, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6380,7 +7448,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_bctrlr: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fcbeqlr.f UINT f_hint; UINT f_ccond; @@ -6391,7 +7459,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ccond) = f_ccond; FLD (f_hint) = f_hint; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bctrlr", "f_ccond 0x%x", 'x', f_ccond, "f_hint 0x%x", 'x', f_hint, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bctrlr", "f_ccond 0x%x", 'x', f_ccond, "f_hint 0x%x", 'x', f_hint, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6409,7 +7477,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_bralr: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fcbeqlr.f UINT f_hint; @@ -6417,7 +7485,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_hint) = f_hint; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bralr", "f_hint 0x%x", 'x', f_hint, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bralr", "f_hint 0x%x", 'x', f_hint, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6433,7 +7501,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_bnolr: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fcbeqlr.f UINT f_hint; @@ -6441,7 +7509,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_hint) = f_hint; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bnolr", "f_hint 0x%x", 'x', f_hint, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bnolr", "f_hint 0x%x", 'x', f_hint, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6457,7 +7525,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_beqlr: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_bceqlr.f UINT f_ICCi_2; UINT f_hint; @@ -6468,7 +7536,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ICCi_2) = f_ICCi_2; FLD (f_hint) = f_hint; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beqlr", "f_ICCi_2 0x%x", 'x', f_ICCi_2, "f_hint 0x%x", 'x', f_hint, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beqlr", "f_ICCi_2 0x%x", 'x', f_ICCi_2, "f_hint 0x%x", 'x', f_hint, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6478,6 +7546,54 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_h_spr_USI_272) = 272; } #endif +#undef FLD + return idesc; + } + + extract_sfmt_fbralr: + { + const IDESC *idesc = &frvbf_insn_data[itype]; + CGEN_INSN_WORD insn = entire_insn; +#define FLD(f) abuf->fields.sfmt_fcbeqlr.f + UINT f_hint; + + f_hint = EXTRACT_LSB0_UINT (insn, 32, 17, 2); + + /* Record the fields for the semantic handler. */ + FLD (f_hint) = f_hint; + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fbralr", "f_hint 0x%x", 'x', f_hint, (char *) 0)); + +#if WITH_PROFILE_MODEL_P + /* Record the fields for profiling. */ + if (PROFILE_MODEL_P (current_cpu)) + { + FLD (in_h_spr_USI_272) = 272; + } +#endif +#undef FLD + return idesc; + } + + extract_sfmt_fbnolr: + { + const IDESC *idesc = &frvbf_insn_data[itype]; + CGEN_INSN_WORD insn = entire_insn; +#define FLD(f) abuf->fields.sfmt_fcbeqlr.f + UINT f_hint; + + f_hint = EXTRACT_LSB0_UINT (insn, 32, 17, 2); + + /* Record the fields for the semantic handler. */ + FLD (f_hint) = f_hint; + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fbnolr", "f_hint 0x%x", 'x', f_hint, (char *) 0)); + +#if WITH_PROFILE_MODEL_P + /* Record the fields for profiling. */ + if (PROFILE_MODEL_P (current_cpu)) + { + FLD (in_h_spr_USI_272) = 272; + } +#endif #undef FLD return idesc; } @@ -6485,7 +7601,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fbeqlr: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fcbeqlr.f UINT f_FCCi_2; UINT f_hint; @@ -6496,7 +7612,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FCCi_2) = f_FCCi_2; FLD (f_hint) = f_hint; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fbeqlr", "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_hint 0x%x", 'x', f_hint, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fbeqlr", "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_hint 0x%x", 'x', f_hint, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6513,7 +7629,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_bcralr: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fcbeqlr.f UINT f_hint; UINT f_ccond; @@ -6524,7 +7640,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ccond) = f_ccond; FLD (f_hint) = f_hint; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcralr", "f_ccond 0x%x", 'x', f_ccond, "f_hint 0x%x", 'x', f_hint, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcralr", "f_ccond 0x%x", 'x', f_ccond, "f_hint 0x%x", 'x', f_hint, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6542,7 +7658,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_bcnolr: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fcbeqlr.f UINT f_hint; @@ -6550,7 +7666,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_hint) = f_hint; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcnolr", "f_hint 0x%x", 'x', f_hint, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcnolr", "f_hint 0x%x", 'x', f_hint, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6568,7 +7684,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_bceqlr: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_bceqlr.f UINT f_ICCi_2; UINT f_hint; @@ -6582,7 +7698,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_ICCi_2) = f_ICCi_2; FLD (f_ccond) = f_ccond; FLD (f_hint) = f_hint; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bceqlr", "f_ICCi_2 0x%x", 'x', f_ICCi_2, "f_ccond 0x%x", 'x', f_ccond, "f_hint 0x%x", 'x', f_hint, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bceqlr", "f_ICCi_2 0x%x", 'x', f_ICCi_2, "f_ccond 0x%x", 'x', f_ccond, "f_hint 0x%x", 'x', f_hint, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6594,6 +7710,61 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (out_h_spr_USI_273) = 273; } #endif +#undef FLD + return idesc; + } + + extract_sfmt_fcbralr: + { + const IDESC *idesc = &frvbf_insn_data[itype]; + CGEN_INSN_WORD insn = entire_insn; +#define FLD(f) abuf->fields.sfmt_fcbeqlr.f + UINT f_hint; + UINT f_ccond; + + f_hint = EXTRACT_LSB0_UINT (insn, 32, 17, 2); + f_ccond = EXTRACT_LSB0_UINT (insn, 32, 12, 1); + + /* Record the fields for the semantic handler. */ + FLD (f_ccond) = f_ccond; + FLD (f_hint) = f_hint; + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcbralr", "f_ccond 0x%x", 'x', f_ccond, "f_hint 0x%x", 'x', f_hint, (char *) 0)); + +#if WITH_PROFILE_MODEL_P + /* Record the fields for profiling. */ + if (PROFILE_MODEL_P (current_cpu)) + { + FLD (in_h_spr_USI_272) = 272; + FLD (in_h_spr_USI_273) = 273; + FLD (out_h_spr_USI_273) = 273; + } +#endif +#undef FLD + return idesc; + } + + extract_sfmt_fcbnolr: + { + const IDESC *idesc = &frvbf_insn_data[itype]; + CGEN_INSN_WORD insn = entire_insn; +#define FLD(f) abuf->fields.sfmt_fcbeqlr.f + UINT f_hint; + + f_hint = EXTRACT_LSB0_UINT (insn, 32, 17, 2); + + /* Record the fields for the semantic handler. */ + FLD (f_hint) = f_hint; + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcbnolr", "f_hint 0x%x", 'x', f_hint, (char *) 0)); + +#if WITH_PROFILE_MODEL_P + /* Record the fields for profiling. */ + if (PROFILE_MODEL_P (current_cpu)) + { + FLD (in_h_spr_USI_272) = 272; + FLD (in_h_spr_USI_273) = 273; + FLD (out_h_spr_USI_273) = 273; + } +#endif #undef FLD return idesc; } @@ -6601,7 +7772,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fcbeqlr: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fcbeqlr.f UINT f_FCCi_2; UINT f_hint; @@ -6615,7 +7786,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FCCi_2) = f_FCCi_2; FLD (f_ccond) = f_ccond; FLD (f_hint) = f_hint; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcbeqlr", "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_ccond 0x%x", 'x', f_ccond, "f_hint 0x%x", 'x', f_hint, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcbeqlr", "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_ccond 0x%x", 'x', f_ccond, "f_hint 0x%x", 'x', f_hint, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6634,7 +7805,38 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_jmpl: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; +#define FLD(f) abuf->fields.sfmt_cjmpl.f + UINT f_LI; + UINT f_GRi; + UINT f_GRj; + + f_LI = EXTRACT_LSB0_UINT (insn, 32, 25, 1); + f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); + f_GRj = EXTRACT_LSB0_UINT (insn, 32, 5, 6); + + /* Record the fields for the semantic handler. */ + FLD (f_GRi) = f_GRi; + FLD (f_GRj) = f_GRj; + FLD (f_LI) = f_LI; + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jmpl", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_LI 0x%x", 'x', f_LI, (char *) 0)); + +#if WITH_PROFILE_MODEL_P + /* Record the fields for profiling. */ + if (PROFILE_MODEL_P (current_cpu)) + { + FLD (in_GRi) = f_GRi; + FLD (in_GRj) = f_GRj; + } +#endif +#undef FLD + return idesc; + } + + extract_sfmt_calll: + { + const IDESC *idesc = &frvbf_insn_data[itype]; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cjmpl.f UINT f_LI; UINT f_GRi; @@ -6648,7 +7850,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_LI) = f_LI; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jmpl", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_LI 0x%x", 'x', f_LI, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_calll", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_LI 0x%x", 'x', f_LI, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6665,7 +7867,37 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_jmpil: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; +#define FLD(f) abuf->fields.sfmt_jmpil.f + UINT f_LI; + UINT f_GRi; + INT f_d12; + + f_LI = EXTRACT_LSB0_UINT (insn, 32, 25, 1); + f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); + + /* Record the fields for the semantic handler. */ + FLD (f_GRi) = f_GRi; + FLD (f_LI) = f_LI; + FLD (f_d12) = f_d12; + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jmpil", "f_GRi 0x%x", 'x', f_GRi, "f_LI 0x%x", 'x', f_LI, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + +#if WITH_PROFILE_MODEL_P + /* Record the fields for profiling. */ + if (PROFILE_MODEL_P (current_cpu)) + { + FLD (in_GRi) = f_GRi; + } +#endif +#undef FLD + return idesc; + } + + extract_sfmt_callil: + { + const IDESC *idesc = &frvbf_insn_data[itype]; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_jmpil.f UINT f_LI; UINT f_GRi; @@ -6673,13 +7905,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_LI = EXTRACT_LSB0_UINT (insn, 32, 25, 1); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_LI) = f_LI; FLD (f_d12) = f_d12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jmpil", "f_GRi 0x%x", 'x', f_GRi, "f_LI 0x%x", 'x', f_LI, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_callil", "f_GRi 0x%x", 'x', f_GRi, "f_LI 0x%x", 'x', f_LI, "f_d12 0x%x", 'x', f_d12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6695,13 +7927,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_call: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_call.f INT f_labelH6; UINT f_labelL18; INT f_label24; - f_labelH6 = EXTRACT_LSB0_INT (insn, 32, 30, 6); + f_labelH6 = EXTRACT_LSB0_SINT (insn, 32, 30, 6); f_labelL18 = EXTRACT_LSB0_UINT (insn, 32, 17, 18); { f_label24 = ((((((((f_labelH6) << (18))) | (f_labelL18))) << (2))) + (pc)); @@ -6709,7 +7941,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_label24) = f_label24; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_call", "label24 0x%x", 'x', f_label24, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_call", "label24 0x%x", 'x', f_label24, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6724,7 +7956,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_rett: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_rett.f UINT f_debug; @@ -6732,7 +7964,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_debug) = f_debug; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rett", "f_debug 0x%x", 'x', f_debug, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rett", "f_debug 0x%x", 'x', f_debug, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6747,11 +7979,11 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_rei: { const IDESC *idesc = &frvbf_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_rei", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rei", (char *) 0)); #undef FLD return idesc; @@ -6760,7 +7992,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_tra: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_ftne.f UINT f_GRi; UINT f_GRj; @@ -6771,7 +8003,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_tra", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_tra", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6793,7 +8025,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_teq: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_teq.f UINT f_ICCi_2; UINT f_GRi; @@ -6807,7 +8039,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_ICCi_2) = f_ICCi_2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_teq", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_2 0x%x", 'x', f_ICCi_2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_teq", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_2 0x%x", 'x', f_ICCi_2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6823,6 +8055,39 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (out_h_spr_USI_771) = 771; } #endif +#undef FLD + return idesc; + } + + extract_sfmt_ftra: + { + const IDESC *idesc = &frvbf_insn_data[itype]; + CGEN_INSN_WORD insn = entire_insn; +#define FLD(f) abuf->fields.sfmt_ftne.f + UINT f_GRi; + UINT f_GRj; + + f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); + f_GRj = EXTRACT_LSB0_UINT (insn, 32, 5, 6); + + /* Record the fields for the semantic handler. */ + FLD (f_GRi) = f_GRi; + FLD (f_GRj) = f_GRj; + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftra", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + +#if WITH_PROFILE_MODEL_P + /* Record the fields for profiling. */ + if (PROFILE_MODEL_P (current_cpu)) + { + FLD (in_GRi) = f_GRi; + FLD (in_GRj) = f_GRj; + FLD (out_h_spr_USI_1) = 1; + FLD (out_h_spr_USI_768) = 768; + FLD (out_h_spr_USI_769) = 769; + FLD (out_h_spr_USI_770) = 770; + FLD (out_h_spr_USI_771) = 771; + } +#endif #undef FLD return idesc; } @@ -6830,7 +8095,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ftne: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_ftne.f UINT f_FCCi_2; UINT f_GRi; @@ -6844,7 +8109,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FCCi_2) = f_FCCi_2; FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftne", "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftne", "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6867,18 +8132,18 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_tira: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_ftine.f UINT f_GRi; INT f_d12; f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_tira", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_tira", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6899,7 +8164,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_tieq: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_tieq.f UINT f_ICCi_2; UINT f_GRi; @@ -6907,13 +8172,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_ICCi_2 = EXTRACT_LSB0_UINT (insn, 32, 26, 2); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_ICCi_2) = f_ICCi_2; FLD (f_d12) = f_d12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_tieq", "f_GRi 0x%x", 'x', f_GRi, "f_ICCi_2 0x%x", 'x', f_ICCi_2, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_tieq", "f_GRi 0x%x", 'x', f_GRi, "f_ICCi_2 0x%x", 'x', f_ICCi_2, "f_d12 0x%x", 'x', f_d12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6928,6 +8193,38 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (out_h_spr_USI_771) = 771; } #endif +#undef FLD + return idesc; + } + + extract_sfmt_ftira: + { + const IDESC *idesc = &frvbf_insn_data[itype]; + CGEN_INSN_WORD insn = entire_insn; +#define FLD(f) abuf->fields.sfmt_ftine.f + UINT f_GRi; + INT f_d12; + + f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); + + /* Record the fields for the semantic handler. */ + FLD (f_GRi) = f_GRi; + FLD (f_d12) = f_d12; + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftira", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + +#if WITH_PROFILE_MODEL_P + /* Record the fields for profiling. */ + if (PROFILE_MODEL_P (current_cpu)) + { + FLD (in_GRi) = f_GRi; + FLD (out_h_spr_USI_1) = 1; + FLD (out_h_spr_USI_768) = 768; + FLD (out_h_spr_USI_769) = 769; + FLD (out_h_spr_USI_770) = 770; + FLD (out_h_spr_USI_771) = 771; + } +#endif #undef FLD return idesc; } @@ -6935,7 +8232,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ftine: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_ftine.f UINT f_FCCi_2; UINT f_GRi; @@ -6943,13 +8240,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_FCCi_2 = EXTRACT_LSB0_UINT (insn, 32, 26, 2); f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); + f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); /* Record the fields for the semantic handler. */ FLD (f_FCCi_2) = f_FCCi_2; FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftine", "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftine", "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6975,7 +8272,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_break", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_break", (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6991,7 +8288,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_andcr: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_andcr.f UINT f_CRk; UINT f_CRi; @@ -7005,7 +8302,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_CRi) = f_CRi; FLD (f_CRj) = f_CRj; FLD (f_CRk) = f_CRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcr", "f_CRi 0x%x", 'x', f_CRi, "f_CRj 0x%x", 'x', f_CRj, "f_CRk 0x%x", 'x', f_CRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcr", "f_CRi 0x%x", 'x', f_CRi, "f_CRj 0x%x", 'x', f_CRj, "f_CRk 0x%x", 'x', f_CRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7023,7 +8320,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_notcr: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_andcr.f UINT f_CRk; UINT f_CRj; @@ -7034,7 +8331,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_CRj) = f_CRj; FLD (f_CRk) = f_CRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_notcr", "f_CRj 0x%x", 'x', f_CRj, "f_CRk 0x%x", 'x', f_CRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_notcr", "f_CRj 0x%x", 'x', f_CRj, "f_CRk 0x%x", 'x', f_CRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7051,7 +8348,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ckra: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cckeq.f SI f_CRj_int; @@ -7059,7 +8356,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_CRj_int) = f_CRj_int; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ckra", "f_CRj_int 0x%x", 'x', f_CRj_int, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ckra", "f_CRj_int 0x%x", 'x', f_CRj_int, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7075,7 +8372,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ckeq: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cckeq.f SI f_CRj_int; UINT f_ICCi_3; @@ -7086,7 +8383,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ICCi_3) = f_ICCi_3; FLD (f_CRj_int) = f_CRj_int; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ckeq", "f_ICCi_3 0x%x", 'x', f_ICCi_3, "f_CRj_int 0x%x", 'x', f_CRj_int, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ckeq", "f_ICCi_3 0x%x", 'x', f_ICCi_3, "f_CRj_int 0x%x", 'x', f_CRj_int, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7103,7 +8400,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fckra: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cfckne.f UINT f_CRj_float; @@ -7111,7 +8408,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_CRj_float) = f_CRj_float; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fckra", "f_CRj_float 0x%x", 'x', f_CRj_float, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fckra", "f_CRj_float 0x%x", 'x', f_CRj_float, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7127,7 +8424,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fckne: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cfckne.f UINT f_CRj_float; UINT f_FCCi_3; @@ -7138,7 +8435,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FCCi_3) = f_FCCi_3; FLD (f_CRj_float) = f_CRj_float; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fckne", "f_FCCi_3 0x%x", 'x', f_FCCi_3, "f_CRj_float 0x%x", 'x', f_CRj_float, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fckne", "f_FCCi_3 0x%x", 'x', f_FCCi_3, "f_CRj_float 0x%x", 'x', f_CRj_float, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7155,7 +8452,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cckra: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cckeq.f SI f_CRj_int; UINT f_CCi; @@ -7169,7 +8466,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_CCi) = f_CCi; FLD (f_cond) = f_cond; FLD (f_CRj_int) = f_CRj_int; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cckra", "f_CCi 0x%x", 'x', f_CCi, "f_cond 0x%x", 'x', f_cond, "f_CRj_int 0x%x", 'x', f_CRj_int, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cckra", "f_CCi 0x%x", 'x', f_CCi, "f_cond 0x%x", 'x', f_cond, "f_CRj_int 0x%x", 'x', f_CRj_int, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7186,7 +8483,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cckeq: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cckeq.f SI f_CRj_int; UINT f_CCi; @@ -7203,7 +8500,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_ICCi_3) = f_ICCi_3; FLD (f_cond) = f_cond; FLD (f_CRj_int) = f_CRj_int; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cckeq", "f_CCi 0x%x", 'x', f_CCi, "f_ICCi_3 0x%x", 'x', f_ICCi_3, "f_cond 0x%x", 'x', f_cond, "f_CRj_int 0x%x", 'x', f_CRj_int, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cckeq", "f_CCi 0x%x", 'x', f_CCi, "f_ICCi_3 0x%x", 'x', f_ICCi_3, "f_cond 0x%x", 'x', f_cond, "f_CRj_int 0x%x", 'x', f_CRj_int, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7221,7 +8518,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cfckra: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cfckne.f UINT f_CRj_float; UINT f_CCi; @@ -7235,7 +8532,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_CCi) = f_CCi; FLD (f_cond) = f_cond; FLD (f_CRj_float) = f_CRj_float; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfckra", "f_CCi 0x%x", 'x', f_CCi, "f_cond 0x%x", 'x', f_cond, "f_CRj_float 0x%x", 'x', f_CRj_float, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfckra", "f_CCi 0x%x", 'x', f_CCi, "f_cond 0x%x", 'x', f_cond, "f_CRj_float 0x%x", 'x', f_CRj_float, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7252,7 +8549,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cfckne: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cfckne.f UINT f_CRj_float; UINT f_CCi; @@ -7269,7 +8566,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FCCi_3) = f_FCCi_3; FLD (f_cond) = f_cond; FLD (f_CRj_float) = f_CRj_float; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfckne", "f_CCi 0x%x", 'x', f_CCi, "f_FCCi_3 0x%x", 'x', f_FCCi_3, "f_cond 0x%x", 'x', f_cond, "f_CRj_float 0x%x", 'x', f_CRj_float, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfckne", "f_CCi 0x%x", 'x', f_CCi, "f_FCCi_3 0x%x", 'x', f_FCCi_3, "f_cond 0x%x", 'x', f_cond, "f_CRj_float 0x%x", 'x', f_CRj_float, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7287,7 +8584,45 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cjmpl: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; +#define FLD(f) abuf->fields.sfmt_cjmpl.f + UINT f_LI; + UINT f_GRi; + UINT f_CCi; + UINT f_cond; + UINT f_GRj; + + f_LI = EXTRACT_LSB0_UINT (insn, 32, 25, 1); + f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); + f_CCi = EXTRACT_LSB0_UINT (insn, 32, 11, 3); + f_cond = EXTRACT_LSB0_UINT (insn, 32, 8, 1); + f_GRj = EXTRACT_LSB0_UINT (insn, 32, 5, 6); + + /* Record the fields for the semantic handler. */ + FLD (f_CCi) = f_CCi; + FLD (f_GRi) = f_GRi; + FLD (f_GRj) = f_GRj; + FLD (f_LI) = f_LI; + FLD (f_cond) = f_cond; + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cjmpl", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_LI 0x%x", 'x', f_LI, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + +#if WITH_PROFILE_MODEL_P + /* Record the fields for profiling. */ + if (PROFILE_MODEL_P (current_cpu)) + { + FLD (in_CCi) = f_CCi; + FLD (in_GRi) = f_GRi; + FLD (in_GRj) = f_GRj; + } +#endif +#undef FLD + return idesc; + } + + extract_sfmt_ccalll: + { + const IDESC *idesc = &frvbf_insn_data[itype]; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cjmpl.f UINT f_LI; UINT f_GRi; @@ -7307,7 +8642,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_LI) = f_LI; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cjmpl", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_LI 0x%x", 'x', f_LI, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ccalll", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_LI 0x%x", 'x', f_LI, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7325,7 +8660,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_ici: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_icpl.f UINT f_GRi; UINT f_GRj; @@ -7336,7 +8671,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ici", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ici", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7353,7 +8688,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_icei: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_icei.f UINT f_ae; UINT f_GRi; @@ -7367,7 +8702,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_ae) = f_ae; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_icei", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ae 0x%x", 'x', f_ae, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_icei", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ae 0x%x", 'x', f_ae, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7384,7 +8719,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_icpl: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_icpl.f UINT f_lock; UINT f_GRi; @@ -7398,7 +8733,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_lock) = f_lock; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_icpl", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_lock 0x%x", 'x', f_lock, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_icpl", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_lock 0x%x", 'x', f_lock, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7415,7 +8750,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_icul: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_jmpil.f UINT f_GRi; @@ -7423,7 +8758,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_icul", "f_GRi 0x%x", 'x', f_GRi, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_icul", "f_GRi 0x%x", 'x', f_GRi, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7439,7 +8774,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_clrgr: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_swapi.f UINT f_GRk; @@ -7447,7 +8782,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrgr", "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrgr", "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7463,7 +8798,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_clrfr: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cfmadds.f UINT f_FRk; @@ -7471,7 +8806,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrfr", "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrfr", "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7487,7 +8822,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_commitgr: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_setlos.f UINT f_GRk; @@ -7495,7 +8830,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_commitgr", "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_commitgr", "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #undef FLD return idesc; @@ -7504,7 +8839,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_commitfr: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mhsethis.f UINT f_FRk; @@ -7512,7 +8847,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_commitfr", "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_commitfr", "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #undef FLD return idesc; @@ -7521,7 +8856,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fitos: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fditos.f UINT f_FRk; UINT f_FRj; @@ -7532,7 +8867,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fitos", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fitos", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7549,7 +8884,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fstoi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fdstoi.f UINT f_FRk; UINT f_FRj; @@ -7560,7 +8895,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fstoi", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fstoi", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7577,7 +8912,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fitod: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fitod.f UINT f_FRk; UINT f_FRj; @@ -7588,7 +8923,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fitod", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fitod", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7605,7 +8940,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fdtoi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fdtoi.f UINT f_FRk; UINT f_FRj; @@ -7616,7 +8951,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdtoi", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdtoi", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7633,7 +8968,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fditos: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fditos.f UINT f_FRk; UINT f_FRj; @@ -7644,16 +8979,16 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fditos", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fditos", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_FRintj) = f_FRj; - FLD (in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintj_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_int_USI_add__INT_index_of__INT_FRintj_1) = ((FLD (f_FRj)) + (1)); FLD (out_FRk) = f_FRk; - FLD (out_h_fr_SF_add__DFLT_index_of__DFLT_FRk_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_SF_add__INT_index_of__INT_FRk_1) = ((FLD (f_FRk)) + (1)); } #endif #undef FLD @@ -7663,7 +8998,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fdstoi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fdstoi.f UINT f_FRk; UINT f_FRj; @@ -7674,16 +9009,16 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdstoi", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdstoi", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_FRj) = f_FRj; - FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_SF_add__INT_index_of__INT_FRj_1) = ((FLD (f_FRj)) + (1)); FLD (out_FRintk) = f_FRk; - FLD (out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_int_USI_add__INT_index_of__INT_FRintk_1) = ((FLD (f_FRk)) + (1)); } #endif #undef FLD @@ -7693,7 +9028,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cfitos: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cfitos.f UINT f_FRk; UINT f_CCi; @@ -7710,7 +9045,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfitos", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfitos", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7728,7 +9063,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cfstoi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cfstoi.f UINT f_FRk; UINT f_CCi; @@ -7745,7 +9080,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfstoi", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfstoi", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7763,7 +9098,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nfitos: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fditos.f UINT f_FRk; UINT f_FRj; @@ -7774,7 +9109,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfitos", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfitos", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7791,7 +9126,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nfstoi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fdstoi.f UINT f_FRk; UINT f_FRj; @@ -7802,7 +9137,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfstoi", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfstoi", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7819,7 +9154,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fmovs: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cfmadds.f UINT f_FRk; UINT f_FRj; @@ -7830,7 +9165,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmovs", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmovs", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7847,7 +9182,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fmovd: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fmaddd.f UINT f_FRk; UINT f_FRj; @@ -7858,7 +9193,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmovd", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmovd", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7875,7 +9210,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fdmovs: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fdmadds.f UINT f_FRk; UINT f_FRj; @@ -7886,16 +9221,16 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdmovs", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdmovs", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_FRj) = f_FRj; - FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_SF_add__INT_index_of__INT_FRj_1) = ((FLD (f_FRj)) + (1)); FLD (out_FRk) = f_FRk; - FLD (out_h_fr_SF_add__DFLT_index_of__DFLT_FRk_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_SF_add__INT_index_of__INT_FRk_1) = ((FLD (f_FRk)) + (1)); } #endif #undef FLD @@ -7905,7 +9240,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cfmovs: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cfmadds.f UINT f_FRk; UINT f_CCi; @@ -7922,7 +9257,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfmovs", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfmovs", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7940,7 +9275,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nfsqrts: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cfmadds.f UINT f_FRk; UINT f_FRj; @@ -7951,7 +9286,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfsqrts", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfsqrts", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7968,7 +9303,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fadds: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cfmadds.f UINT f_FRk; UINT f_FRi; @@ -7982,7 +9317,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fadds", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fadds", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8000,7 +9335,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_faddd: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fmaddd.f UINT f_FRk; UINT f_FRi; @@ -8014,7 +9349,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_faddd", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_faddd", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8032,7 +9367,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cfadds: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cfmadds.f UINT f_FRk; UINT f_FRi; @@ -8052,7 +9387,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfadds", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfadds", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8071,7 +9406,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nfadds: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cfmadds.f UINT f_FRk; UINT f_FRi; @@ -8085,7 +9420,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfadds", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfadds", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8103,7 +9438,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fcmps: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cfcmps.f UINT f_FCCi_2; UINT f_FRi; @@ -8117,7 +9452,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FCCi_2) = f_FCCi_2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcmps", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FCCi_2 0x%x", 'x', f_FCCi_2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcmps", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FCCi_2 0x%x", 'x', f_FCCi_2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8135,7 +9470,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fcmpd: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fcmpd.f UINT f_FCCi_2; UINT f_FRi; @@ -8149,7 +9484,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FCCi_2) = f_FCCi_2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcmpd", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FCCi_2 0x%x", 'x', f_FCCi_2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcmpd", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FCCi_2 0x%x", 'x', f_FCCi_2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8167,7 +9502,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cfcmps: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cfcmps.f UINT f_FCCi_2; UINT f_FRi; @@ -8187,7 +9522,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_FCCi_2) = f_FCCi_2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfcmps", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FCCi_2 0x%x", 'x', f_FCCi_2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfcmps", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FCCi_2 0x%x", 'x', f_FCCi_2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8206,7 +9541,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fdcmps: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_nfdcmps.f UINT f_FCCi_2; UINT f_FRi; @@ -8220,7 +9555,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FCCi_2) = f_FCCi_2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdcmps", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FCCi_2 0x%x", 'x', f_FCCi_2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdcmps", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FCCi_2 0x%x", 'x', f_FCCi_2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8228,10 +9563,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_FRi) = f_FRi; FLD (in_FRj) = f_FRj; - FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRi_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_SF_add__INT_index_of__INT_FRi_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_SF_add__INT_index_of__INT_FRj_1) = ((FLD (f_FRj)) + (1)); FLD (out_FCCi_2) = f_FCCi_2; - FLD (out_h_fccr_UQI_add__DFLT_index_of__DFLT_FCCi_2_1) = ((FLD (f_FCCi_2)) + (1)); + FLD (out_h_fccr_UQI_add__INT_index_of__INT_FCCi_2_1) = ((FLD (f_FCCi_2)) + (1)); } #endif #undef FLD @@ -8241,7 +9576,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fmadds: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cfmadds.f UINT f_FRk; UINT f_FRi; @@ -8255,7 +9590,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmadds", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmadds", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8274,7 +9609,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fmaddd: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fmaddd.f UINT f_FRk; UINT f_FRi; @@ -8288,7 +9623,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmaddd", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmaddd", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8307,7 +9642,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fdmadds: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fdmadds.f UINT f_FRk; UINT f_FRi; @@ -8321,7 +9656,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdmadds", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdmadds", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8330,11 +9665,11 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_FRi) = f_FRi; FLD (in_FRj) = f_FRj; FLD (in_FRk) = f_FRk; - FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRi_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_1) = ((FLD (f_FRj)) + (1)); - FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRk_1) = ((FLD (f_FRk)) + (1)); + FLD (in_h_fr_SF_add__INT_index_of__INT_FRi_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_SF_add__INT_index_of__INT_FRj_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_SF_add__INT_index_of__INT_FRk_1) = ((FLD (f_FRk)) + (1)); FLD (out_FRk) = f_FRk; - FLD (out_h_fr_SF_add__DFLT_index_of__DFLT_FRk_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_SF_add__INT_index_of__INT_FRk_1) = ((FLD (f_FRk)) + (1)); } #endif #undef FLD @@ -8344,7 +9679,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cfmadds: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cfmadds.f UINT f_FRk; UINT f_FRi; @@ -8364,7 +9699,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfmadds", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfmadds", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8384,7 +9719,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nfmadds: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cfmadds.f UINT f_FRk; UINT f_FRi; @@ -8398,7 +9733,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfmadds", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfmadds", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8417,7 +9752,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fmas: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fdmadds.f UINT f_FRk; UINT f_FRi; @@ -8431,7 +9766,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmas", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmas", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8439,10 +9774,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_FRi) = f_FRi; FLD (in_FRj) = f_FRj; - FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRi_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_SF_add__INT_index_of__INT_FRi_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_SF_add__INT_index_of__INT_FRj_1) = ((FLD (f_FRj)) + (1)); FLD (out_FRk) = f_FRk; - FLD (out_h_fr_SF_add__DFLT_index_of__DFLT_FRk_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_SF_add__INT_index_of__INT_FRk_1) = ((FLD (f_FRk)) + (1)); } #endif #undef FLD @@ -8452,7 +9787,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_fdmas: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_fdmas.f UINT f_FRk; UINT f_FRi; @@ -8466,7 +9801,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdmas", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdmas", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8474,16 +9809,16 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_FRi) = f_FRi; FLD (in_FRj) = f_FRj; - FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRi_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRi_2) = ((FLD (f_FRi)) + (2)); - FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRi_3) = ((FLD (f_FRi)) + (3)); - FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_1) = ((FLD (f_FRj)) + (1)); - FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_2) = ((FLD (f_FRj)) + (2)); - FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_3) = ((FLD (f_FRj)) + (3)); + FLD (in_h_fr_SF_add__INT_index_of__INT_FRi_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_SF_add__INT_index_of__INT_FRi_2) = ((FLD (f_FRi)) + (2)); + FLD (in_h_fr_SF_add__INT_index_of__INT_FRi_3) = ((FLD (f_FRi)) + (3)); + FLD (in_h_fr_SF_add__INT_index_of__INT_FRj_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_SF_add__INT_index_of__INT_FRj_2) = ((FLD (f_FRj)) + (2)); + FLD (in_h_fr_SF_add__INT_index_of__INT_FRj_3) = ((FLD (f_FRj)) + (3)); FLD (out_FRk) = f_FRk; - FLD (out_h_fr_SF_add__DFLT_index_of__DFLT_FRk_1) = ((FLD (f_FRk)) + (1)); - FLD (out_h_fr_SF_add__DFLT_index_of__DFLT_FRk_2) = ((FLD (f_FRk)) + (2)); - FLD (out_h_fr_SF_add__DFLT_index_of__DFLT_FRk_3) = ((FLD (f_FRk)) + (3)); + FLD (out_h_fr_SF_add__INT_index_of__INT_FRk_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_SF_add__INT_index_of__INT_FRk_2) = ((FLD (f_FRk)) + (2)); + FLD (out_h_fr_SF_add__INT_index_of__INT_FRk_3) = ((FLD (f_FRk)) + (3)); } #endif #undef FLD @@ -8493,7 +9828,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cfmas: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cfmas.f UINT f_FRk; UINT f_FRi; @@ -8513,7 +9848,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfmas", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfmas", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8522,10 +9857,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_CCi) = f_CCi; FLD (in_FRi) = f_FRi; FLD (in_FRj) = f_FRj; - FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRi_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_SF_add__INT_index_of__INT_FRi_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_SF_add__INT_index_of__INT_FRj_1) = ((FLD (f_FRj)) + (1)); FLD (out_FRk) = f_FRk; - FLD (out_h_fr_SF_add__DFLT_index_of__DFLT_FRk_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_SF_add__INT_index_of__INT_FRk_1) = ((FLD (f_FRk)) + (1)); } #endif #undef FLD @@ -8535,7 +9870,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nfdcmps: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_nfdcmps.f UINT f_FRk; UINT f_FCCi_2; @@ -8552,7 +9887,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_FCCi_2) = f_FCCi_2; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfdcmps", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfdcmps", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8560,10 +9895,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_FRi) = f_FRi; FLD (in_FRj) = f_FRj; - FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRi_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_SF_add__INT_index_of__INT_FRi_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_SF_add__INT_index_of__INT_FRj_1) = ((FLD (f_FRj)) + (1)); FLD (out_FCCi_2) = f_FCCi_2; - FLD (out_h_fccr_UQI_add__DFLT_index_of__DFLT_FCCi_2_1) = ((FLD (f_FCCi_2)) + (1)); + FLD (out_h_fccr_UQI_add__INT_index_of__INT_FCCi_2_1) = ((FLD (f_FCCi_2)) + (1)); } #endif #undef FLD @@ -8573,7 +9908,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mhsetlos: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mhsetlos.f UINT f_FRk; INT f_u12_h; @@ -8581,7 +9916,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, INT f_u12; f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); - f_u12_h = EXTRACT_LSB0_INT (insn, 32, 17, 6); + f_u12_h = EXTRACT_LSB0_SINT (insn, 32, 17, 6); f_u12_l = EXTRACT_LSB0_UINT (insn, 32, 5, 6); { f_u12 = ((((f_u12_h) << (6))) | (f_u12_l)); @@ -8590,7 +9925,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_u12) = f_u12; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhsetlos", "f_u12 0x%x", 'x', f_u12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhsetlos", "f_u12 0x%x", 'x', f_u12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8606,7 +9941,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mhsethis: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mhsethis.f UINT f_FRk; INT f_u12_h; @@ -8614,7 +9949,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, INT f_u12; f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); - f_u12_h = EXTRACT_LSB0_INT (insn, 32, 17, 6); + f_u12_h = EXTRACT_LSB0_SINT (insn, 32, 17, 6); f_u12_l = EXTRACT_LSB0_UINT (insn, 32, 5, 6); { f_u12 = ((((f_u12_h) << (6))) | (f_u12_l)); @@ -8623,7 +9958,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_u12) = f_u12; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhsethis", "f_u12 0x%x", 'x', f_u12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhsethis", "f_u12 0x%x", 'x', f_u12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8639,7 +9974,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mhdsets: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mhdsets.f UINT f_FRk; INT f_u12_h; @@ -8647,7 +9982,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, INT f_u12; f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); - f_u12_h = EXTRACT_LSB0_INT (insn, 32, 17, 6); + f_u12_h = EXTRACT_LSB0_SINT (insn, 32, 17, 6); f_u12_l = EXTRACT_LSB0_UINT (insn, 32, 5, 6); { f_u12 = ((((f_u12_h) << (6))) | (f_u12_l)); @@ -8656,7 +9991,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRk) = f_FRk; FLD (f_u12) = f_u12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhdsets", "f_FRk 0x%x", 'x', f_FRk, "f_u12 0x%x", 'x', f_u12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhdsets", "f_FRk 0x%x", 'x', f_FRk, "f_u12 0x%x", 'x', f_u12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8664,8 +9999,8 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_FRintk) = f_FRk; FLD (out_FRintk) = f_FRk; - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); } #endif #undef FLD @@ -8675,18 +10010,18 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mhsetloh: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mhsetloh.f UINT f_FRk; INT f_s5; f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); - f_s5 = EXTRACT_LSB0_INT (insn, 32, 4, 5); + f_s5 = EXTRACT_LSB0_SINT (insn, 32, 4, 5); /* Record the fields for the semantic handler. */ FLD (f_FRk) = f_FRk; FLD (f_s5) = f_s5; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhsetloh", "f_FRk 0x%x", 'x', f_FRk, "f_s5 0x%x", 'x', f_s5, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhsetloh", "f_FRk 0x%x", 'x', f_FRk, "f_s5 0x%x", 'x', f_s5, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8703,18 +10038,18 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mhsethih: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mhsethih.f UINT f_FRk; INT f_s5; f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); - f_s5 = EXTRACT_LSB0_INT (insn, 32, 4, 5); + f_s5 = EXTRACT_LSB0_SINT (insn, 32, 4, 5); /* Record the fields for the semantic handler. */ FLD (f_FRk) = f_FRk; FLD (f_s5) = f_s5; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhsethih", "f_FRk 0x%x", 'x', f_FRk, "f_s5 0x%x", 'x', f_s5, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhsethih", "f_FRk 0x%x", 'x', f_FRk, "f_s5 0x%x", 'x', f_s5, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8731,29 +10066,29 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mhdseth: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mhdseth.f UINT f_FRk; INT f_s5; f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); - f_s5 = EXTRACT_LSB0_INT (insn, 32, 4, 5); + f_s5 = EXTRACT_LSB0_SINT (insn, 32, 4, 5); /* Record the fields for the semantic handler. */ FLD (f_FRk) = f_FRk; FLD (f_s5) = f_s5; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhdseth", "f_FRk 0x%x", 'x', f_FRk, "f_s5 0x%x", 'x', f_s5, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhdseth", "f_FRk 0x%x", 'x', f_FRk, "f_s5 0x%x", 'x', f_s5, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_FRintk) = f_FRk; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); FLD (out_FRintk) = f_FRk; - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); } #endif #undef FLD @@ -8763,7 +10098,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mand: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mwcut.f UINT f_FRk; UINT f_FRi; @@ -8777,7 +10112,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mand", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mand", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8795,7 +10130,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmand: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmand.f UINT f_FRk; UINT f_FRi; @@ -8815,7 +10150,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmand", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmand", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8834,7 +10169,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mnot: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mcut.f UINT f_FRk; UINT f_FRj; @@ -8845,7 +10180,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mnot", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mnot", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8862,7 +10197,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmnot: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmand.f UINT f_FRk; UINT f_CCi; @@ -8879,7 +10214,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmnot", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmnot", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8897,7 +10232,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mrotli: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mwcuti.f UINT f_FRk; UINT f_FRi; @@ -8911,7 +10246,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_u6) = f_u6; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mrotli", "f_FRi 0x%x", 'x', f_FRi, "f_u6 0x%x", 'x', f_u6, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mrotli", "f_FRi 0x%x", 'x', f_FRi, "f_u6 0x%x", 'x', f_u6, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8928,7 +10263,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mwcut: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mwcut.f UINT f_FRk; UINT f_FRi; @@ -8942,7 +10277,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mwcut", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mwcut", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8950,7 +10285,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_FRinti) = f_FRi; FLD (in_FRintj) = f_FRj; - FLD (in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRinti_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_int_USI_add__INT_index_of__INT_FRinti_1) = ((FLD (f_FRi)) + (1)); FLD (out_FRintk) = f_FRk; } #endif @@ -8961,7 +10296,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mwcuti: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mwcuti.f UINT f_FRk; UINT f_FRi; @@ -8975,14 +10310,14 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_u6) = f_u6; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mwcuti", "f_FRi 0x%x", 'x', f_FRi, "f_u6 0x%x", 'x', f_u6, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mwcuti", "f_FRi 0x%x", 'x', f_FRi, "f_u6 0x%x", 'x', f_u6, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_FRinti) = f_FRi; - FLD (in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRinti_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_int_USI_add__INT_index_of__INT_FRinti_1) = ((FLD (f_FRi)) + (1)); FLD (out_FRintk) = f_FRk; } #endif @@ -8993,7 +10328,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mcut: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mcut.f UINT f_FRk; UINT f_ACC40Si; @@ -9007,7 +10342,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_ACC40Si) = f_ACC40Si; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcut", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcut", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9025,7 +10360,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mcuti: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mcuti.f UINT f_FRk; UINT f_ACC40Si; @@ -9033,13 +10368,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_ACC40Si = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_s6 = EXTRACT_LSB0_INT (insn, 32, 5, 6); + f_s6 = EXTRACT_LSB0_SINT (insn, 32, 5, 6); /* Record the fields for the semantic handler. */ FLD (f_ACC40Si) = f_ACC40Si; FLD (f_s6) = f_s6; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcuti", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_s6 0x%x", 'x', f_s6, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcuti", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_s6 0x%x", 'x', f_s6, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9056,7 +10391,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mdcutssi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mdcutssi.f UINT f_FRk; UINT f_ACC40Si; @@ -9064,22 +10399,22 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_ACC40Si = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_s6 = EXTRACT_LSB0_INT (insn, 32, 5, 6); + f_s6 = EXTRACT_LSB0_SINT (insn, 32, 5, 6); /* Record the fields for the semantic handler. */ FLD (f_ACC40Si) = f_ACC40Si; FLD (f_FRk) = f_FRk; FLD (f_s6) = f_s6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdcutssi", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_FRk 0x%x", 'x', f_FRk, "f_s6 0x%x", 'x', f_s6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdcutssi", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_FRk 0x%x", 'x', f_FRk, "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_ACC40Si) = f_ACC40Si; - FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Si_1) = ((FLD (f_ACC40Si)) + (1)); + FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Si_1) = ((FLD (f_ACC40Si)) + (1)); FLD (out_FRintkeven) = f_FRk; - FLD (out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_int_USI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); } #endif #undef FLD @@ -9089,7 +10424,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_msllhi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_msllhi.f UINT f_FRk; UINT f_FRi; @@ -9103,7 +10438,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRk) = f_FRk; FLD (f_u6) = f_u6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_msllhi", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "f_u6 0x%x", 'x', f_u6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_msllhi", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "f_u6 0x%x", 'x', f_u6, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9111,12 +10446,12 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_FRinti) = f_FRi; FLD (in_FRintk) = f_FRk; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); FLD (out_FRinti) = f_FRi; FLD (out_FRintk) = f_FRk; - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); } #endif #undef FLD @@ -9126,7 +10461,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mdrotli: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mdrotli.f UINT f_FRk; UINT f_FRi; @@ -9134,22 +10469,22 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); f_FRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); - f_s6 = EXTRACT_LSB0_INT (insn, 32, 5, 6); + f_s6 = EXTRACT_LSB0_SINT (insn, 32, 5, 6); /* Record the fields for the semantic handler. */ FLD (f_FRi) = f_FRi; FLD (f_FRk) = f_FRk; FLD (f_s6) = f_s6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdrotli", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "f_s6 0x%x", 'x', f_s6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdrotli", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "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_FRintieven) = f_FRi; - FLD (in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_int_USI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); FLD (out_FRintkeven) = f_FRk; - FLD (out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_int_USI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); } #endif #undef FLD @@ -9159,7 +10494,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mcplhi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mcplhi.f UINT f_FRk; UINT f_FRi; @@ -9173,7 +10508,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRk) = f_FRk; FLD (f_u6) = f_u6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcplhi", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "f_u6 0x%x", 'x', f_u6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcplhi", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "f_u6 0x%x", 'x', f_u6, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9181,11 +10516,11 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_FRinti) = f_FRi; FLD (in_FRintk) = f_FRk; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_1) = ((FLD (f_FRi)) + (1)); FLD (out_FRinti) = f_FRi; FLD (out_FRintk) = f_FRk; - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); } #endif #undef FLD @@ -9195,7 +10530,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mcpli: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mwcuti.f UINT f_FRk; UINT f_FRi; @@ -9209,14 +10544,14 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_u6) = f_u6; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcpli", "f_FRi 0x%x", 'x', f_FRi, "f_u6 0x%x", 'x', f_u6, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcpli", "f_FRi 0x%x", 'x', f_FRi, "f_u6 0x%x", 'x', f_u6, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_FRinti) = f_FRi; - FLD (in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRinti_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_int_USI_add__INT_index_of__INT_FRinti_1) = ((FLD (f_FRi)) + (1)); FLD (out_FRintk) = f_FRk; } #endif @@ -9227,7 +10562,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_msaths: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmaddhss.f UINT f_FRk; UINT f_FRi; @@ -9241,7 +10576,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_msaths", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_msaths", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9249,12 +10584,12 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_FRinti) = f_FRi; FLD (in_FRintj) = f_FRj; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); } #endif #undef FLD @@ -9264,7 +10599,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mqsaths: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmqaddhss.f UINT f_FRk; UINT f_FRi; @@ -9278,7 +10613,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqsaths", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqsaths", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9287,19 +10622,19 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_FRintieven) = f_FRi; FLD (in_FRintjeven) = f_FRj; FLD (in_FRintkeven) = f_FRk; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); FLD (out_FRintkeven) = f_FRk; - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); } #endif #undef FLD @@ -9309,7 +10644,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mcmpsh: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mcmpsh.f UINT f_FCCk; UINT f_FRi; @@ -9323,7 +10658,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FCCk) = f_FCCk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcmpsh", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FCCk 0x%x", 'x', f_FCCk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcmpsh", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FCCk 0x%x", 'x', f_FCCk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9331,12 +10666,12 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_FRinti) = f_FRi; FLD (in_FRintj) = f_FRj; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); FLD (out_FCCk) = f_FCCk; - FLD (out_h_fccr_UQI_add__DFLT_index_of__DFLT_FCCk_1) = ((FLD (f_FCCk)) + (1)); + FLD (out_h_fccr_UQI_add__INT_index_of__INT_FCCk_1) = ((FLD (f_FCCk)) + (1)); } #endif #undef FLD @@ -9346,7 +10681,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mabshs: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mabshs.f UINT f_FRk; UINT f_FRj; @@ -9357,7 +10692,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mabshs", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mabshs", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9365,12 +10700,12 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_FRintj) = f_FRj; FLD (in_FRintk) = f_FRk; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); FLD (out_FRintj) = f_FRj; FLD (out_FRintk) = f_FRk; - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); } #endif #undef FLD @@ -9380,7 +10715,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmaddhss: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmaddhss.f UINT f_FRk; UINT f_FRi; @@ -9400,7 +10735,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmaddhss", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmaddhss", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9409,12 +10744,12 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_CCi) = f_CCi; FLD (in_FRinti) = f_FRi; FLD (in_FRintj) = f_FRj; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); } #endif #undef FLD @@ -9424,7 +10759,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmqaddhss: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmqaddhss.f UINT f_FRk; UINT f_FRi; @@ -9444,7 +10779,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmqaddhss", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmqaddhss", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9454,19 +10789,19 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_FRintieven) = f_FRi; FLD (in_FRintjeven) = f_FRj; FLD (in_FRintkeven) = f_FRk; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); FLD (out_FRintkeven) = f_FRk; - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); } #endif #undef FLD @@ -9476,7 +10811,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mqsllhi: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mqsllhi.f UINT f_FRk; UINT f_FRi; @@ -9490,7 +10825,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRk) = f_FRk; FLD (f_u6) = f_u6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqsllhi", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "f_u6 0x%x", 'x', f_u6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqsllhi", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "f_u6 0x%x", 'x', f_u6, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9498,16 +10833,16 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_FRintieven) = f_FRi; FLD (in_FRintkeven) = f_FRk; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); FLD (out_FRintieven) = f_FRi; FLD (out_FRintkeven) = f_FRk; - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); } #endif #undef FLD @@ -9517,7 +10852,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_maddaccs: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mdasaccs.f UINT f_ACC40Sk; UINT f_ACC40Si; @@ -9528,14 +10863,14 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ACC40Si) = f_ACC40Si; FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_maddaccs", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_maddaccs", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_ACC40Si) = f_ACC40Si; - FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Si_1) = ((FLD (f_ACC40Si)) + (1)); + FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Si_1) = ((FLD (f_ACC40Si)) + (1)); FLD (out_ACC40Sk) = f_ACC40Sk; } #endif @@ -9546,7 +10881,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mdaddaccs: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mdasaccs.f UINT f_ACC40Sk; UINT f_ACC40Si; @@ -9557,18 +10892,18 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ACC40Si) = f_ACC40Si; FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdaddaccs", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdaddaccs", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_ACC40Si) = f_ACC40Si; - FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Si_1) = ((FLD (f_ACC40Si)) + (1)); - FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Si_2) = ((FLD (f_ACC40Si)) + (2)); - FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Si_3) = ((FLD (f_ACC40Si)) + (3)); + FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Si_1) = ((FLD (f_ACC40Si)) + (1)); + FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Si_2) = ((FLD (f_ACC40Si)) + (2)); + FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Si_3) = ((FLD (f_ACC40Si)) + (3)); FLD (out_ACC40Sk) = f_ACC40Sk; - FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); + FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); } #endif #undef FLD @@ -9578,7 +10913,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_masaccs: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mdasaccs.f UINT f_ACC40Sk; UINT f_ACC40Si; @@ -9589,16 +10924,16 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ACC40Si) = f_ACC40Si; FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_masaccs", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_masaccs", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_ACC40Si) = f_ACC40Si; - FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Si_1) = ((FLD (f_ACC40Si)) + (1)); + FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Si_1) = ((FLD (f_ACC40Si)) + (1)); FLD (out_ACC40Sk) = f_ACC40Sk; - FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); + FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); } #endif #undef FLD @@ -9608,7 +10943,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mdasaccs: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mdasaccs.f UINT f_ACC40Sk; UINT f_ACC40Si; @@ -9619,20 +10954,20 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ACC40Si) = f_ACC40Si; FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdasaccs", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdasaccs", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { FLD (in_ACC40Si) = f_ACC40Si; - FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Si_1) = ((FLD (f_ACC40Si)) + (1)); - FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Si_2) = ((FLD (f_ACC40Si)) + (2)); - FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Si_3) = ((FLD (f_ACC40Si)) + (3)); + FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Si_1) = ((FLD (f_ACC40Si)) + (1)); + FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Si_2) = ((FLD (f_ACC40Si)) + (2)); + FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Si_3) = ((FLD (f_ACC40Si)) + (3)); FLD (out_ACC40Sk) = f_ACC40Sk; - FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); - FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2)); - FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3)); + FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); + FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2)); + FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3)); } #endif #undef FLD @@ -9642,7 +10977,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mmulhs: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmmachs.f UINT f_ACC40Sk; UINT f_FRi; @@ -9656,7 +10991,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mmulhs", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mmulhs", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9664,12 +10999,12 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_FRinti) = f_FRi; FLD (in_FRintj) = f_FRj; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); FLD (out_ACC40Sk) = f_ACC40Sk; - FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); + FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); } #endif #undef FLD @@ -9679,7 +11014,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmmulhs: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmmachs.f UINT f_ACC40Sk; UINT f_FRi; @@ -9699,7 +11034,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmmulhs", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmmulhs", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9708,12 +11043,12 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_CCi) = f_CCi; FLD (in_FRinti) = f_FRi; FLD (in_FRintj) = f_FRj; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); FLD (out_ACC40Sk) = f_ACC40Sk; - FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); + FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); } #endif #undef FLD @@ -9723,7 +11058,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mqmulhs: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmqmachs.f UINT f_ACC40Sk; UINT f_FRi; @@ -9737,7 +11072,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqmulhs", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqmulhs", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9745,18 +11080,18 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_FRintieven) = f_FRi; FLD (in_FRintjeven) = f_FRj; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); FLD (out_ACC40Sk) = f_ACC40Sk; - FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); - FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2)); - FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3)); + FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); + FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2)); + FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3)); } #endif #undef FLD @@ -9766,7 +11101,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmqmulhs: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmqmachs.f UINT f_ACC40Sk; UINT f_FRi; @@ -9786,7 +11121,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmqmulhs", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmqmulhs", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9795,18 +11130,18 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_CCi) = f_CCi; FLD (in_FRintieven) = f_FRi; FLD (in_FRintjeven) = f_FRj; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); FLD (out_ACC40Sk) = f_ACC40Sk; - FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); - FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2)); - FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3)); + FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); + FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2)); + FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3)); } #endif #undef FLD @@ -9816,7 +11151,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mmachs: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmmachs.f UINT f_ACC40Sk; UINT f_FRi; @@ -9830,7 +11165,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_ACC40Sk) = f_ACC40Sk; FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mmachs", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mmachs", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9839,13 +11174,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_ACC40Sk) = f_ACC40Sk; FLD (in_FRinti) = f_FRi; FLD (in_FRintj) = f_FRj; - FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); FLD (out_ACC40Sk) = f_ACC40Sk; - FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); + FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); } #endif #undef FLD @@ -9855,7 +11190,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mmachu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmmachu.f UINT f_ACC40Uk; UINT f_FRi; @@ -9869,7 +11204,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_ACC40Uk) = f_ACC40Uk; FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mmachu", "f_ACC40Uk 0x%x", 'x', f_ACC40Uk, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mmachu", "f_ACC40Uk 0x%x", 'x', f_ACC40Uk, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9878,13 +11213,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_ACC40Uk) = f_ACC40Uk; FLD (in_FRinti) = f_FRi; FLD (in_FRintj) = f_FRj; - FLD (in_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); FLD (out_ACC40Uk) = f_ACC40Uk; - FLD (out_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1)); + FLD (out_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1)); } #endif #undef FLD @@ -9894,7 +11229,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmmachs: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmmachs.f UINT f_ACC40Sk; UINT f_FRi; @@ -9914,7 +11249,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmmachs", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmmachs", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9924,13 +11259,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_CCi) = f_CCi; FLD (in_FRinti) = f_FRi; FLD (in_FRintj) = f_FRj; - FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); FLD (out_ACC40Sk) = f_ACC40Sk; - FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); + FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); } #endif #undef FLD @@ -9940,7 +11275,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmmachu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmmachu.f UINT f_ACC40Uk; UINT f_FRi; @@ -9960,7 +11295,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmmachu", "f_ACC40Uk 0x%x", 'x', f_ACC40Uk, "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmmachu", "f_ACC40Uk 0x%x", 'x', f_ACC40Uk, "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9970,13 +11305,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_CCi) = f_CCi; FLD (in_FRinti) = f_FRi; FLD (in_FRintj) = f_FRj; - FLD (in_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); FLD (out_ACC40Uk) = f_ACC40Uk; - FLD (out_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1)); + FLD (out_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1)); } #endif #undef FLD @@ -9986,7 +11321,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mqmachs: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmqmachs.f UINT f_ACC40Sk; UINT f_FRi; @@ -10000,7 +11335,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_ACC40Sk) = f_ACC40Sk; FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqmachs", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqmachs", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10009,21 +11344,21 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_ACC40Sk) = f_ACC40Sk; FLD (in_FRintieven) = f_FRi; FLD (in_FRintjeven) = f_FRj; - FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); - FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2)); - FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); + FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2)); + FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); FLD (out_ACC40Sk) = f_ACC40Sk; - FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); - FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2)); - FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3)); + FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); + FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2)); + FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3)); } #endif #undef FLD @@ -10033,7 +11368,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mqmachu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmqmachu.f UINT f_ACC40Uk; UINT f_FRi; @@ -10047,7 +11382,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_ACC40Uk) = f_ACC40Uk; FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqmachu", "f_ACC40Uk 0x%x", 'x', f_ACC40Uk, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqmachu", "f_ACC40Uk 0x%x", 'x', f_ACC40Uk, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10056,21 +11391,21 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_ACC40Uk) = f_ACC40Uk; FLD (in_FRintieven) = f_FRi; FLD (in_FRintjeven) = f_FRj; - FLD (in_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1)); - FLD (in_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_2) = ((FLD (f_ACC40Uk)) + (2)); - FLD (in_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_3) = ((FLD (f_ACC40Uk)) + (3)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1)); + FLD (in_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_2) = ((FLD (f_ACC40Uk)) + (2)); + FLD (in_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_3) = ((FLD (f_ACC40Uk)) + (3)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); FLD (out_ACC40Uk) = f_ACC40Uk; - FLD (out_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1)); - FLD (out_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_2) = ((FLD (f_ACC40Uk)) + (2)); - FLD (out_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_3) = ((FLD (f_ACC40Uk)) + (3)); + FLD (out_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1)); + FLD (out_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_2) = ((FLD (f_ACC40Uk)) + (2)); + FLD (out_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_3) = ((FLD (f_ACC40Uk)) + (3)); } #endif #undef FLD @@ -10080,7 +11415,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmqmachs: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmqmachs.f UINT f_ACC40Sk; UINT f_FRi; @@ -10100,7 +11435,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmqmachs", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmqmachs", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10110,21 +11445,21 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_CCi) = f_CCi; FLD (in_FRintieven) = f_FRi; FLD (in_FRintjeven) = f_FRj; - FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); - FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2)); - FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); + FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2)); + FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); FLD (out_ACC40Sk) = f_ACC40Sk; - FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); - FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2)); - FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3)); + FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); + FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2)); + FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3)); } #endif #undef FLD @@ -10134,7 +11469,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmqmachu: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmqmachu.f UINT f_ACC40Uk; UINT f_FRi; @@ -10154,7 +11489,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmqmachu", "f_ACC40Uk 0x%x", 'x', f_ACC40Uk, "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmqmachu", "f_ACC40Uk 0x%x", 'x', f_ACC40Uk, "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10164,21 +11499,21 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_CCi) = f_CCi; FLD (in_FRintieven) = f_FRi; FLD (in_FRintjeven) = f_FRj; - FLD (in_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1)); - FLD (in_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_2) = ((FLD (f_ACC40Uk)) + (2)); - FLD (in_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_3) = ((FLD (f_ACC40Uk)) + (3)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1)); + FLD (in_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_2) = ((FLD (f_ACC40Uk)) + (2)); + FLD (in_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_3) = ((FLD (f_ACC40Uk)) + (3)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); FLD (out_ACC40Uk) = f_ACC40Uk; - FLD (out_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1)); - FLD (out_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_2) = ((FLD (f_ACC40Uk)) + (2)); - FLD (out_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_3) = ((FLD (f_ACC40Uk)) + (3)); + FLD (out_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1)); + FLD (out_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_2) = ((FLD (f_ACC40Uk)) + (2)); + FLD (out_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_3) = ((FLD (f_ACC40Uk)) + (3)); } #endif #undef FLD @@ -10188,7 +11523,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mcpxrs: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmmachs.f UINT f_ACC40Sk; UINT f_FRi; @@ -10202,7 +11537,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcpxrs", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcpxrs", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10210,10 +11545,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_FRinti) = f_FRi; FLD (in_FRintj) = f_FRj; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); FLD (out_ACC40Sk) = f_ACC40Sk; } #endif @@ -10224,7 +11559,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmcpxrs: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmmachs.f UINT f_ACC40Sk; UINT f_FRi; @@ -10244,7 +11579,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmcpxrs", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmcpxrs", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10253,10 +11588,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_CCi) = f_CCi; FLD (in_FRinti) = f_FRi; FLD (in_FRintj) = f_FRj; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); FLD (out_ACC40Sk) = f_ACC40Sk; } #endif @@ -10267,7 +11602,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mqcpxrs: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmqmachs.f UINT f_ACC40Sk; UINT f_FRi; @@ -10281,7 +11616,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqcpxrs", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqcpxrs", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10289,16 +11624,16 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_FRintieven) = f_FRi; FLD (in_FRintjeven) = f_FRj; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); FLD (out_ACC40Sk) = f_ACC40Sk; - FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); + FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1)); } #endif #undef FLD @@ -10308,7 +11643,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mexpdhw: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmexpdhw.f UINT f_FRk; UINT f_FRi; @@ -10322,16 +11657,16 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRk) = f_FRk; FLD (f_u6) = f_u6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mexpdhw", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "f_u6 0x%x", 'x', f_u6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mexpdhw", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "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_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); } #endif #undef FLD @@ -10341,7 +11676,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmexpdhw: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmexpdhw.f UINT f_FRk; UINT f_FRi; @@ -10361,17 +11696,17 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRk) = f_FRk; FLD (f_u6) = f_u6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmexpdhw", "f_CCi 0x%x", 'x', f_CCi, "f_cond 0x%x", 'x', f_cond, "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "f_u6 0x%x", 'x', f_u6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmexpdhw", "f_CCi 0x%x", 'x', f_CCi, "f_cond 0x%x", 'x', f_cond, "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "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_CCi) = f_CCi; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); } #endif #undef FLD @@ -10381,7 +11716,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mexpdhd: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmexpdhd.f UINT f_FRk; UINT f_FRi; @@ -10395,20 +11730,20 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRk) = f_FRk; FLD (f_FRi) = f_FRi; FLD (f_u6) = f_u6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mexpdhd", "f_FRk 0x%x", 'x', f_FRk, "f_FRi 0x%x", 'x', f_FRi, "f_u6 0x%x", 'x', f_u6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mexpdhd", "f_FRk 0x%x", 'x', f_FRk, "f_FRi 0x%x", 'x', f_FRi, "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_FRintkeven) = f_FRk; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); FLD (out_FRintkeven) = f_FRk; - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); } #endif #undef FLD @@ -10418,7 +11753,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmexpdhd: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmexpdhd.f UINT f_FRk; UINT f_FRi; @@ -10438,7 +11773,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_cond) = f_cond; FLD (f_FRi) = f_FRi; FLD (f_u6) = f_u6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmexpdhd", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, "f_FRi 0x%x", 'x', f_FRi, "f_u6 0x%x", 'x', f_u6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmexpdhd", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, "f_FRi 0x%x", 'x', f_FRi, "f_u6 0x%x", 'x', f_u6, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10446,13 +11781,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_CCi) = f_CCi; FLD (in_FRintkeven) = f_FRk; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); FLD (out_FRintkeven) = f_FRk; - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); } #endif #undef FLD @@ -10462,7 +11797,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mpackh: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmaddhss.f UINT f_FRk; UINT f_FRi; @@ -10476,16 +11811,16 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mpackh", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mpackh", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ if (PROFILE_MODEL_P (current_cpu)) { - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); } #endif #undef FLD @@ -10495,7 +11830,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mdpackh: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mdpackh.f UINT f_FRk; UINT f_FRi; @@ -10509,7 +11844,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdpackh", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdpackh", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10518,17 +11853,17 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_FRintieven) = f_FRi; FLD (in_FRintjeven) = f_FRj; FLD (in_FRintkeven) = f_FRk; - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); FLD (out_FRintieven) = f_FRi; FLD (out_FRintjeven) = f_FRj; FLD (out_FRintkeven) = f_FRk; - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); } #endif #undef FLD @@ -10538,7 +11873,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_munpackh: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_munpackh.f UINT f_FRk; UINT f_FRi; @@ -10549,7 +11884,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRi) = f_FRi; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_munpackh", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_munpackh", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10557,14 +11892,14 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_FRinti) = f_FRi; FLD (in_FRintkeven) = f_FRk; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0)); FLD (out_FRinti) = f_FRi; FLD (out_FRintkeven) = f_FRk; - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_add__DFLT_0_1) = ((FLD (f_FRk)) + (((0) + (1)))); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_add__DFLT_0_1) = ((FLD (f_FRk)) + (((0) + (1)))); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_add__INT_0_1) = ((FLD (f_FRk)) + (((0) + (1)))); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_add__INT_0_1) = ((FLD (f_FRk)) + (((0) + (1)))); } #endif #undef FLD @@ -10574,7 +11909,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mdunpackh: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mdunpackh.f UINT f_FRk; UINT f_FRi; @@ -10585,7 +11920,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRi) = f_FRi; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdunpackh", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdunpackh", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10593,20 +11928,20 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_FRintieven) = f_FRi; FLD (in_FRintk) = f_FRk; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1)); FLD (out_FRintieven) = f_FRi; FLD (out_FRintk) = f_FRk; - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_2) = ((FLD (f_FRk)) + (2)); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_add__DFLT_0_1) = ((FLD (f_FRk)) + (((0) + (1)))); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_add__DFLT_2_1) = ((FLD (f_FRk)) + (((2) + (1)))); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_2) = ((FLD (f_FRk)) + (2)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_add__DFLT_0_1) = ((FLD (f_FRk)) + (((0) + (1)))); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_add__DFLT_2_1) = ((FLD (f_FRk)) + (((2) + (1)))); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_2) = ((FLD (f_FRk)) + (2)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_add__INT_0_1) = ((FLD (f_FRk)) + (((0) + (1)))); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_add__INT_2_1) = ((FLD (f_FRk)) + (((2) + (1)))); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_2) = ((FLD (f_FRk)) + (2)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_add__INT_0_1) = ((FLD (f_FRk)) + (((0) + (1)))); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_add__INT_2_1) = ((FLD (f_FRk)) + (((2) + (1)))); } #endif #undef FLD @@ -10616,7 +11951,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mbtoh: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmbtoh.f UINT f_FRk; UINT f_FRj; @@ -10627,7 +11962,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mbtoh", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mbtoh", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10635,16 +11970,16 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_FRintj) = f_FRj; FLD (in_FRintkeven) = f_FRk; - FLD (in_h_fr_0_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_1_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_2_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_3_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_0_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_1_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_2_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_3_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); FLD (out_FRintj) = f_FRj; FLD (out_FRintkeven) = f_FRk; - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); } #endif #undef FLD @@ -10654,7 +11989,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmbtoh: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmbtoh.f UINT f_FRk; UINT f_CCi; @@ -10671,7 +12006,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmbtoh", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmbtoh", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10680,16 +12015,16 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_CCi) = f_CCi; FLD (in_FRintj) = f_FRj; FLD (in_FRintkeven) = f_FRk; - FLD (in_h_fr_0_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_1_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_2_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_3_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_0_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_1_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_2_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_3_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); FLD (out_FRintj) = f_FRj; FLD (out_FRintkeven) = f_FRk; - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1)); } #endif #undef FLD @@ -10699,7 +12034,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mhtob: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmhtob.f UINT f_FRk; UINT f_FRj; @@ -10710,7 +12045,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhtob", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhtob", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10718,16 +12053,16 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_FRintjeven) = f_FRj; FLD (in_FRintk) = f_FRk; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); FLD (out_FRintjeven) = f_FRj; FLD (out_FRintk) = f_FRk; - FLD (out_h_fr_0_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_1_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_2_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_3_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_0_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_1_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_2_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_3_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); } #endif #undef FLD @@ -10737,7 +12072,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmhtob: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmhtob.f UINT f_FRk; UINT f_CCi; @@ -10754,7 +12089,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmhtob", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmhtob", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10763,16 +12098,16 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_CCi) = f_CCi; FLD (in_FRintjeven) = f_FRj; FLD (in_FRintk) = f_FRk; - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1)); FLD (out_FRintjeven) = f_FRj; FLD (out_FRintk) = f_FRk; - FLD (out_h_fr_0_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_1_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_2_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_3_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_0_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_1_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_2_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_3_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); } #endif #undef FLD @@ -10782,7 +12117,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mbtohe: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmbtohe.f UINT f_FRk; UINT f_FRj; @@ -10793,7 +12128,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mbtohe", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mbtohe", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10801,20 +12136,20 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, { FLD (in_FRintj) = f_FRj; FLD (in_FRintk) = f_FRk; - FLD (in_h_fr_0_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_1_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_2_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_3_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_0_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_1_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_2_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_3_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); FLD (out_FRintj) = f_FRj; FLD (out_FRintk) = f_FRk; - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_1) = ((FLD (f_FRk)) + (1)); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_2) = ((FLD (f_FRk)) + (2)); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_3) = ((FLD (f_FRk)) + (3)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_1) = ((FLD (f_FRk)) + (1)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_2) = ((FLD (f_FRk)) + (2)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_3) = ((FLD (f_FRk)) + (3)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_2) = ((FLD (f_FRk)) + (2)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_3) = ((FLD (f_FRk)) + (3)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_2) = ((FLD (f_FRk)) + (2)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_3) = ((FLD (f_FRk)) + (3)); } #endif #undef FLD @@ -10824,7 +12159,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_cmbtohe: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmbtohe.f UINT f_FRk; UINT f_CCi; @@ -10841,7 +12176,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmbtohe", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmbtohe", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10850,20 +12185,20 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (in_CCi) = f_CCi; FLD (in_FRintj) = f_FRj; FLD (in_FRintk) = f_FRk; - FLD (in_h_fr_0_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_1_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_2_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); - FLD (in_h_fr_3_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_0_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_1_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_2_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); + FLD (in_h_fr_3_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0)); FLD (out_FRintj) = f_FRj; FLD (out_FRintk) = f_FRk; - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_1) = ((FLD (f_FRk)) + (1)); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_2) = ((FLD (f_FRk)) + (2)); - FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_3) = ((FLD (f_FRk)) + (3)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_1) = ((FLD (f_FRk)) + (1)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_2) = ((FLD (f_FRk)) + (2)); - FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_3) = ((FLD (f_FRk)) + (3)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_2) = ((FLD (f_FRk)) + (2)); + FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_3) = ((FLD (f_FRk)) + (3)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_1) = ((FLD (f_FRk)) + (1)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_2) = ((FLD (f_FRk)) + (2)); + FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_3) = ((FLD (f_FRk)) + (3)); } #endif #undef FLD @@ -10873,7 +12208,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mclracc_0: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mdasaccs.f UINT f_ACC40Sk; @@ -10881,7 +12216,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mclracc_0", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mclracc_0", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #undef FLD return idesc; @@ -10890,7 +12225,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mrdacc: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mcuti.f UINT f_FRk; UINT f_ACC40Si; @@ -10901,7 +12236,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ACC40Si) = f_ACC40Si; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mrdacc", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mrdacc", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10918,7 +12253,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mrdaccg: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mrdaccg.f UINT f_FRk; UINT f_ACCGi; @@ -10929,7 +12264,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ACCGi) = f_ACCGi; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mrdaccg", "f_ACCGi 0x%x", 'x', f_ACCGi, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mrdaccg", "f_ACCGi 0x%x", 'x', f_ACCGi, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10946,7 +12281,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mwtacc: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_cmmachs.f UINT f_ACC40Sk; UINT f_FRi; @@ -10957,7 +12292,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ACC40Sk) = f_ACC40Sk; FLD (f_FRi) = f_FRi; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mwtacc", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, "f_FRi 0x%x", 'x', f_FRi, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mwtacc", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, "f_FRi 0x%x", 'x', f_FRi, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10975,7 +12310,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_mwtaccg: { const IDESC *idesc = &frvbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; + CGEN_INSN_WORD insn = entire_insn; #define FLD(f) abuf->fields.sfmt_mwtaccg.f UINT f_ACCGk; UINT f_FRi; @@ -10986,7 +12321,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ACCGk) = f_ACCGk; FLD (f_FRi) = f_FRi; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mwtaccg", "f_ACCGk 0x%x", 'x', f_ACCGk, "f_FRi 0x%x", 'x', f_FRi, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mwtaccg", "f_ACCGk 0x%x", 'x', f_ACCGk, "f_FRi 0x%x", 'x', f_FRi, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */