diff options
Diffstat (limited to 'sim')
| -rw-r--r-- | sim/m32r/ChangeLog | 19 | ||||
| -rw-r--r-- | sim/m32r/arch.c | 2 | ||||
| -rw-r--r-- | sim/m32r/arch.h | 2 | ||||
| -rw-r--r-- | sim/m32r/cpu.c | 2 | ||||
| -rw-r--r-- | sim/m32r/cpu.h | 2 | ||||
| -rw-r--r-- | sim/m32r/cpuall.h | 2 | ||||
| -rw-r--r-- | sim/m32r/cpux.c | 2 | ||||
| -rw-r--r-- | sim/m32r/cpux.h | 2 | ||||
| -rw-r--r-- | sim/m32r/decode.c | 151 | ||||
| -rw-r--r-- | sim/m32r/decode.h | 2 | ||||
| -rw-r--r-- | sim/m32r/decodex.c | 222 | ||||
| -rw-r--r-- | sim/m32r/decodex.h | 2 | ||||
| -rw-r--r-- | sim/m32r/model.c | 2 | ||||
| -rw-r--r-- | sim/m32r/modelx.c | 2 | ||||
| -rw-r--r-- | sim/m32r/sem-switch.c | 148 | ||||
| -rw-r--r-- | sim/m32r/sem.c | 148 | ||||
| -rw-r--r-- | sim/m32r/semx-switch.c | 338 |
17 files changed, 413 insertions, 635 deletions
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index dca940e..ed2cb34 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/ChangeLog @@ -1,3 +1,22 @@ +2001-03-05 Dave Brolley <brolley@redhat.com> + + arch.c: Regenerate. + arch.h: Regenerate. + cpu.c: Regenerate. + cpu.h: Regenerate. + cpuall.h: Regenerate. + cpux.c: Regenerate. + cpux.h: Regenerate. + decode.c: Regenerate. + decode.h: Regenerate. + decodex.c: Regenerate. + decodex.h: Regenerate. + model.c: Regenerate. + modelx.c: Regenerate. + sem-switch.c: Regenerate. + sem.c: Regenerate. + semx-switch.c: Regenerate. + 2001-01-12 Frank Ch. Eigler <fche@redhat.com> * configure: Regenerated with sim_scache fix. diff --git a/sim/m32r/arch.c b/sim/m32r/arch.c index 00e1010..4bc51b0 100644 --- a/sim/m32r/arch.c +++ b/sim/m32r/arch.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU Simulators. diff --git a/sim/m32r/arch.h b/sim/m32r/arch.h index 8773b1a..11b386e 100644 --- a/sim/m32r/arch.h +++ b/sim/m32r/arch.h @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU Simulators. diff --git a/sim/m32r/cpu.c b/sim/m32r/cpu.c index f6474a0..f862899 100644 --- a/sim/m32r/cpu.c +++ b/sim/m32r/cpu.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU Simulators. diff --git a/sim/m32r/cpu.h b/sim/m32r/cpu.h index f3df6be..3b06978 100644 --- a/sim/m32r/cpu.h +++ b/sim/m32r/cpu.h @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU Simulators. diff --git a/sim/m32r/cpuall.h b/sim/m32r/cpuall.h index 81482ca..a180022 100644 --- a/sim/m32r/cpuall.h +++ b/sim/m32r/cpuall.h @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU Simulators. diff --git a/sim/m32r/cpux.c b/sim/m32r/cpux.c index 47aa0b7..95eb3a9 100644 --- a/sim/m32r/cpux.c +++ b/sim/m32r/cpux.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU Simulators. diff --git a/sim/m32r/cpux.h b/sim/m32r/cpux.h index 83545af..6385444 100644 --- a/sim/m32r/cpux.h +++ b/sim/m32r/cpux.h @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU Simulators. diff --git a/sim/m32r/decode.c b/sim/m32r/decode.c index 1ebfca1..52daa8b 100644 --- a/sim/m32r/decode.c +++ b/sim/m32r/decode.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU Simulators. @@ -224,60 +224,15 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 8) & (15 << 4)) | ((insn >> 4) & (15 << 0))); switch (val) { - case 0 : itype = M32RBF_INSN_SUBV; goto extract_sfmt_addv; - case 1 : itype = M32RBF_INSN_SUBX; goto extract_sfmt_addx; - case 2 : itype = M32RBF_INSN_SUB; goto extract_sfmt_add; - case 3 : itype = M32RBF_INSN_NEG; goto extract_sfmt_mv; - case 4 : itype = M32RBF_INSN_CMP; goto extract_sfmt_cmp; - case 5 : itype = M32RBF_INSN_CMPU; goto extract_sfmt_cmp; - case 8 : itype = M32RBF_INSN_ADDV; goto extract_sfmt_addv; - case 9 : itype = M32RBF_INSN_ADDX; goto extract_sfmt_addx; - case 10 : itype = M32RBF_INSN_ADD; goto extract_sfmt_add; - case 11 : itype = M32RBF_INSN_NOT; goto extract_sfmt_mv; - case 12 : itype = M32RBF_INSN_AND; goto extract_sfmt_add; - case 13 : itype = M32RBF_INSN_XOR; goto extract_sfmt_add; - case 14 : itype = M32RBF_INSN_OR; goto extract_sfmt_add; - case 16 : itype = M32RBF_INSN_SRL; goto extract_sfmt_add; - case 18 : itype = M32RBF_INSN_SRA; goto extract_sfmt_add; - case 20 : itype = M32RBF_INSN_SLL; goto extract_sfmt_add; - case 22 : itype = M32RBF_INSN_MUL; goto extract_sfmt_add; - case 24 : itype = M32RBF_INSN_MV; goto extract_sfmt_mv; - case 25 : itype = M32RBF_INSN_MVFC; goto extract_sfmt_mvfc; - case 26 : itype = M32RBF_INSN_MVTC; goto extract_sfmt_mvtc; - case 28 : + case 0 : itype = M32RBF_INSN_SUBV; goto extract_sfmt_addv; case 1 : itype = M32RBF_INSN_SUBX; goto extract_sfmt_addx; case 2 : itype = M32RBF_INSN_SUB; goto extract_sfmt_add; case 3 : itype = M32RBF_INSN_NEG; goto extract_sfmt_mv; case 4 : itype = M32RBF_INSN_CMP; goto extract_sfmt_cmp; case 5 : itype = M32RBF_INSN_CMPU; goto extract_sfmt_cmp; case 8 : itype = M32RBF_INSN_ADDV; goto extract_sfmt_addv; case 9 : itype = M32RBF_INSN_ADDX; goto extract_sfmt_addx; case 10 : itype = M32RBF_INSN_ADD; goto extract_sfmt_add; case 11 : itype = M32RBF_INSN_NOT; goto extract_sfmt_mv; case 12 : itype = M32RBF_INSN_AND; goto extract_sfmt_add; case 13 : itype = M32RBF_INSN_XOR; goto extract_sfmt_add; case 14 : itype = M32RBF_INSN_OR; goto extract_sfmt_add; case 16 : itype = M32RBF_INSN_SRL; goto extract_sfmt_add; case 18 : itype = M32RBF_INSN_SRA; goto extract_sfmt_add; case 20 : itype = M32RBF_INSN_SLL; goto extract_sfmt_add; case 22 : itype = M32RBF_INSN_MUL; goto extract_sfmt_add; case 24 : itype = M32RBF_INSN_MV; goto extract_sfmt_mv; case 25 : itype = M32RBF_INSN_MVFC; goto extract_sfmt_mvfc; case 26 : itype = M32RBF_INSN_MVTC; goto extract_sfmt_mvtc; case 28 : { - unsigned int val = (((insn >> 8) & (15 << 0))); + unsigned int val = (((insn >> 8) & (1 << 0))); switch (val) { - case 14 : itype = M32RBF_INSN_JL; goto extract_sfmt_jl; - case 15 : itype = M32RBF_INSN_JMP; goto extract_sfmt_jmp; - default : itype = M32RBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 0 : itype = M32RBF_INSN_JL; goto extract_sfmt_jl; case 1 : itype = M32RBF_INSN_JMP; goto extract_sfmt_jmp; default : itype = M32RBF_INSN_X_INVALID; goto extract_sfmt_empty; } } - case 29 : itype = M32RBF_INSN_RTE; goto extract_sfmt_rte; - case 31 : itype = M32RBF_INSN_TRAP; goto extract_sfmt_trap; - case 32 : itype = M32RBF_INSN_STB; goto extract_sfmt_stb; - case 34 : itype = M32RBF_INSN_STH; goto extract_sfmt_sth; - case 36 : itype = M32RBF_INSN_ST; goto extract_sfmt_st; - case 37 : itype = M32RBF_INSN_UNLOCK; goto extract_sfmt_unlock; - case 38 : itype = M32RBF_INSN_ST_PLUS; goto extract_sfmt_st_plus; - case 39 : itype = M32RBF_INSN_ST_MINUS; goto extract_sfmt_st_plus; - case 40 : itype = M32RBF_INSN_LDB; goto extract_sfmt_ld; - case 41 : itype = M32RBF_INSN_LDUB; goto extract_sfmt_ld; - case 42 : itype = M32RBF_INSN_LDH; goto extract_sfmt_ld; - case 43 : itype = M32RBF_INSN_LDUH; goto extract_sfmt_ld; - case 44 : itype = M32RBF_INSN_LD; goto extract_sfmt_ld; - case 45 : itype = M32RBF_INSN_LOCK; goto extract_sfmt_lock; - case 46 : itype = M32RBF_INSN_LD_PLUS; goto extract_sfmt_ld_plus; - case 48 : itype = M32RBF_INSN_MULHI; goto extract_sfmt_mulhi; - case 49 : itype = M32RBF_INSN_MULLO; goto extract_sfmt_mulhi; - case 50 : itype = M32RBF_INSN_MULWHI; goto extract_sfmt_mulhi; - case 51 : itype = M32RBF_INSN_MULWLO; goto extract_sfmt_mulhi; - case 52 : itype = M32RBF_INSN_MACHI; goto extract_sfmt_machi; - case 53 : itype = M32RBF_INSN_MACLO; goto extract_sfmt_machi; - case 54 : itype = M32RBF_INSN_MACWHI; goto extract_sfmt_machi; - case 55 : itype = M32RBF_INSN_MACWLO; goto extract_sfmt_machi; - case 64 : /* fall through */ + case 29 : itype = M32RBF_INSN_RTE; goto extract_sfmt_rte; case 31 : itype = M32RBF_INSN_TRAP; goto extract_sfmt_trap; case 32 : itype = M32RBF_INSN_STB; goto extract_sfmt_stb; case 34 : itype = M32RBF_INSN_STH; goto extract_sfmt_sth; case 36 : itype = M32RBF_INSN_ST; goto extract_sfmt_st; case 37 : itype = M32RBF_INSN_UNLOCK; goto extract_sfmt_unlock; case 38 : itype = M32RBF_INSN_ST_PLUS; goto extract_sfmt_st_plus; case 39 : itype = M32RBF_INSN_ST_MINUS; goto extract_sfmt_st_plus; case 40 : itype = M32RBF_INSN_LDB; goto extract_sfmt_ld; case 41 : itype = M32RBF_INSN_LDUB; goto extract_sfmt_ld; case 42 : itype = M32RBF_INSN_LDH; goto extract_sfmt_ld; case 43 : itype = M32RBF_INSN_LDUH; goto extract_sfmt_ld; case 44 : itype = M32RBF_INSN_LD; goto extract_sfmt_ld; case 45 : itype = M32RBF_INSN_LOCK; goto extract_sfmt_lock; case 46 : itype = M32RBF_INSN_LD_PLUS; goto extract_sfmt_ld_plus; case 48 : itype = M32RBF_INSN_MULHI; goto extract_sfmt_mulhi; case 49 : itype = M32RBF_INSN_MULLO; goto extract_sfmt_mulhi; case 50 : itype = M32RBF_INSN_MULWHI; goto extract_sfmt_mulhi; case 51 : itype = M32RBF_INSN_MULWLO; goto extract_sfmt_mulhi; case 52 : itype = M32RBF_INSN_MACHI; goto extract_sfmt_machi; case 53 : itype = M32RBF_INSN_MACLO; goto extract_sfmt_machi; case 54 : itype = M32RBF_INSN_MACWHI; goto extract_sfmt_machi; case 55 : itype = M32RBF_INSN_MACWLO; goto extract_sfmt_machi; case 64 : /* fall through */ case 65 : /* fall through */ case 66 : /* fall through */ case 67 : /* fall through */ @@ -292,34 +247,23 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, case 76 : /* fall through */ case 77 : /* fall through */ case 78 : /* fall through */ - case 79 : itype = M32RBF_INSN_ADDI; goto extract_sfmt_addi; - case 80 : /* fall through */ - case 81 : itype = M32RBF_INSN_SRLI; goto extract_sfmt_slli; - case 82 : /* fall through */ - case 83 : itype = M32RBF_INSN_SRAI; goto extract_sfmt_slli; - case 84 : /* fall through */ - case 85 : itype = M32RBF_INSN_SLLI; goto extract_sfmt_slli; - case 87 : + case 79 : itype = M32RBF_INSN_ADDI; goto extract_sfmt_addi; case 80 : /* fall through */ + case 81 : itype = M32RBF_INSN_SRLI; goto extract_sfmt_slli; case 82 : /* fall through */ + case 83 : itype = M32RBF_INSN_SRAI; goto extract_sfmt_slli; case 84 : /* fall through */ + case 85 : itype = M32RBF_INSN_SLLI; goto extract_sfmt_slli; case 87 : { - unsigned int val = (((insn >> 0) & (15 << 0))); + unsigned int val = (((insn >> 0) & (1 << 0))); switch (val) { - case 0 : itype = M32RBF_INSN_MVTACHI; goto extract_sfmt_mvtachi; - case 1 : itype = M32RBF_INSN_MVTACLO; goto extract_sfmt_mvtachi; - default : itype = M32RBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 0 : itype = M32RBF_INSN_MVTACHI; goto extract_sfmt_mvtachi; case 1 : itype = M32RBF_INSN_MVTACLO; goto extract_sfmt_mvtachi; default : itype = M32RBF_INSN_X_INVALID; goto extract_sfmt_empty; } } - case 88 : itype = M32RBF_INSN_RACH; goto extract_sfmt_rac; - case 89 : itype = M32RBF_INSN_RAC; goto extract_sfmt_rac; - case 95 : + case 88 : itype = M32RBF_INSN_RACH; goto extract_sfmt_rac; case 89 : itype = M32RBF_INSN_RAC; goto extract_sfmt_rac; case 95 : { - unsigned int val = (((insn >> 0) & (15 << 0))); + unsigned int val = (((insn >> 0) & (3 << 0))); switch (val) { - case 0 : itype = M32RBF_INSN_MVFACHI; goto extract_sfmt_mvfachi; - case 1 : itype = M32RBF_INSN_MVFACLO; goto extract_sfmt_mvfachi; - case 2 : itype = M32RBF_INSN_MVFACMI; goto extract_sfmt_mvfachi; - default : itype = M32RBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 0 : itype = M32RBF_INSN_MVFACHI; goto extract_sfmt_mvfachi; case 1 : itype = M32RBF_INSN_MVFACLO; goto extract_sfmt_mvfachi; case 2 : itype = M32RBF_INSN_MVFACMI; goto extract_sfmt_mvfachi; default : itype = M32RBF_INSN_X_INVALID; goto extract_sfmt_empty; } } case 96 : /* fall through */ @@ -337,18 +281,12 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, case 108 : /* fall through */ case 109 : /* fall through */ case 110 : /* fall through */ - case 111 : itype = M32RBF_INSN_LDI8; goto extract_sfmt_ldi8; - case 112 : + case 111 : itype = M32RBF_INSN_LDI8; goto extract_sfmt_ldi8; case 112 : { unsigned int val = (((insn >> 8) & (15 << 0))); switch (val) { - case 0 : itype = M32RBF_INSN_NOP; goto extract_sfmt_nop; - case 12 : itype = M32RBF_INSN_BC8; goto extract_sfmt_bc8; - case 13 : itype = M32RBF_INSN_BNC8; goto extract_sfmt_bc8; - case 14 : itype = M32RBF_INSN_BL8; goto extract_sfmt_bl8; - case 15 : itype = M32RBF_INSN_BRA8; goto extract_sfmt_bra8; - default : itype = M32RBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 0 : itype = M32RBF_INSN_NOP; goto extract_sfmt_nop; case 12 : itype = M32RBF_INSN_BC8; goto extract_sfmt_bc8; case 13 : itype = M32RBF_INSN_BNC8; goto extract_sfmt_bc8; case 14 : itype = M32RBF_INSN_BL8; goto extract_sfmt_bl8; case 15 : itype = M32RBF_INSN_BRA8; goto extract_sfmt_bra8; default : itype = M32RBF_INSN_X_INVALID; goto extract_sfmt_empty; } } case 113 : /* fall through */ @@ -367,49 +305,13 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, case 126 : /* fall through */ case 127 : { - unsigned int val = (((insn >> 8) & (15 << 0))); + unsigned int val = (((insn >> 8) & (3 << 0))); switch (val) { - case 12 : itype = M32RBF_INSN_BC8; goto extract_sfmt_bc8; - case 13 : itype = M32RBF_INSN_BNC8; goto extract_sfmt_bc8; - case 14 : itype = M32RBF_INSN_BL8; goto extract_sfmt_bl8; - case 15 : itype = M32RBF_INSN_BRA8; goto extract_sfmt_bra8; - default : itype = M32RBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 0 : itype = M32RBF_INSN_BC8; goto extract_sfmt_bc8; case 1 : itype = M32RBF_INSN_BNC8; goto extract_sfmt_bc8; case 2 : itype = M32RBF_INSN_BL8; goto extract_sfmt_bl8; case 3 : itype = M32RBF_INSN_BRA8; goto extract_sfmt_bra8; default : itype = M32RBF_INSN_X_INVALID; goto extract_sfmt_empty; } } - case 132 : itype = M32RBF_INSN_CMPI; goto extract_sfmt_cmpi; - case 133 : itype = M32RBF_INSN_CMPUI; goto extract_sfmt_cmpi; - case 136 : itype = M32RBF_INSN_ADDV3; goto extract_sfmt_addv3; - case 138 : itype = M32RBF_INSN_ADD3; goto extract_sfmt_add3; - case 140 : itype = M32RBF_INSN_AND3; goto extract_sfmt_and3; - case 141 : itype = M32RBF_INSN_XOR3; goto extract_sfmt_and3; - case 142 : itype = M32RBF_INSN_OR3; goto extract_sfmt_or3; - case 144 : itype = M32RBF_INSN_DIV; goto extract_sfmt_div; - case 145 : itype = M32RBF_INSN_DIVU; goto extract_sfmt_div; - case 146 : itype = M32RBF_INSN_REM; goto extract_sfmt_div; - case 147 : itype = M32RBF_INSN_REMU; goto extract_sfmt_div; - case 152 : itype = M32RBF_INSN_SRL3; goto extract_sfmt_sll3; - case 154 : itype = M32RBF_INSN_SRA3; goto extract_sfmt_sll3; - case 156 : itype = M32RBF_INSN_SLL3; goto extract_sfmt_sll3; - case 159 : itype = M32RBF_INSN_LDI16; goto extract_sfmt_ldi16; - case 160 : itype = M32RBF_INSN_STB_D; goto extract_sfmt_stb_d; - case 162 : itype = M32RBF_INSN_STH_D; goto extract_sfmt_sth_d; - case 164 : itype = M32RBF_INSN_ST_D; goto extract_sfmt_st_d; - case 168 : itype = M32RBF_INSN_LDB_D; goto extract_sfmt_ld_d; - case 169 : itype = M32RBF_INSN_LDUB_D; goto extract_sfmt_ld_d; - case 170 : itype = M32RBF_INSN_LDH_D; goto extract_sfmt_ld_d; - case 171 : itype = M32RBF_INSN_LDUH_D; goto extract_sfmt_ld_d; - case 172 : itype = M32RBF_INSN_LD_D; goto extract_sfmt_ld_d; - case 176 : itype = M32RBF_INSN_BEQ; goto extract_sfmt_beq; - case 177 : itype = M32RBF_INSN_BNE; goto extract_sfmt_beq; - case 184 : itype = M32RBF_INSN_BEQZ; goto extract_sfmt_beqz; - case 185 : itype = M32RBF_INSN_BNEZ; goto extract_sfmt_beqz; - case 186 : itype = M32RBF_INSN_BLTZ; goto extract_sfmt_beqz; - case 187 : itype = M32RBF_INSN_BGEZ; goto extract_sfmt_beqz; - case 188 : itype = M32RBF_INSN_BLEZ; goto extract_sfmt_beqz; - case 189 : itype = M32RBF_INSN_BGTZ; goto extract_sfmt_beqz; - case 220 : itype = M32RBF_INSN_SETH; goto extract_sfmt_seth; - case 224 : /* fall through */ + case 132 : itype = M32RBF_INSN_CMPI; goto extract_sfmt_cmpi; case 133 : itype = M32RBF_INSN_CMPUI; goto extract_sfmt_cmpi; case 136 : itype = M32RBF_INSN_ADDV3; goto extract_sfmt_addv3; case 138 : itype = M32RBF_INSN_ADD3; goto extract_sfmt_add3; case 140 : itype = M32RBF_INSN_AND3; goto extract_sfmt_and3; case 141 : itype = M32RBF_INSN_XOR3; goto extract_sfmt_and3; case 142 : itype = M32RBF_INSN_OR3; goto extract_sfmt_or3; case 144 : itype = M32RBF_INSN_DIV; goto extract_sfmt_div; case 145 : itype = M32RBF_INSN_DIVU; goto extract_sfmt_div; case 146 : itype = M32RBF_INSN_REM; goto extract_sfmt_div; case 147 : itype = M32RBF_INSN_REMU; goto extract_sfmt_div; case 152 : itype = M32RBF_INSN_SRL3; goto extract_sfmt_sll3; case 154 : itype = M32RBF_INSN_SRA3; goto extract_sfmt_sll3; case 156 : itype = M32RBF_INSN_SLL3; goto extract_sfmt_sll3; case 159 : itype = M32RBF_INSN_LDI16; goto extract_sfmt_ldi16; case 160 : itype = M32RBF_INSN_STB_D; goto extract_sfmt_stb_d; case 162 : itype = M32RBF_INSN_STH_D; goto extract_sfmt_sth_d; case 164 : itype = M32RBF_INSN_ST_D; goto extract_sfmt_st_d; case 168 : itype = M32RBF_INSN_LDB_D; goto extract_sfmt_ld_d; case 169 : itype = M32RBF_INSN_LDUB_D; goto extract_sfmt_ld_d; case 170 : itype = M32RBF_INSN_LDH_D; goto extract_sfmt_ld_d; case 171 : itype = M32RBF_INSN_LDUH_D; goto extract_sfmt_ld_d; case 172 : itype = M32RBF_INSN_LD_D; goto extract_sfmt_ld_d; case 176 : itype = M32RBF_INSN_BEQ; goto extract_sfmt_beq; case 177 : itype = M32RBF_INSN_BNE; goto extract_sfmt_beq; case 184 : itype = M32RBF_INSN_BEQZ; goto extract_sfmt_beqz; case 185 : itype = M32RBF_INSN_BNEZ; goto extract_sfmt_beqz; case 186 : itype = M32RBF_INSN_BLTZ; goto extract_sfmt_beqz; case 187 : itype = M32RBF_INSN_BGEZ; goto extract_sfmt_beqz; case 188 : itype = M32RBF_INSN_BLEZ; goto extract_sfmt_beqz; case 189 : itype = M32RBF_INSN_BGTZ; goto extract_sfmt_beqz; case 220 : itype = M32RBF_INSN_SETH; goto extract_sfmt_seth; case 224 : /* fall through */ case 225 : /* fall through */ case 226 : /* fall through */ case 227 : /* fall through */ @@ -424,8 +326,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, case 236 : /* fall through */ case 237 : /* fall through */ case 238 : /* fall through */ - case 239 : itype = M32RBF_INSN_LD24; goto extract_sfmt_ld24; - case 240 : /* fall through */ + case 239 : itype = M32RBF_INSN_LD24; goto extract_sfmt_ld24; case 240 : /* fall through */ case 241 : /* fall through */ case 242 : /* fall through */ case 243 : /* fall through */ @@ -442,14 +343,10 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, case 254 : /* fall through */ case 255 : { - unsigned int val = (((insn >> 8) & (15 << 0))); + unsigned int val = (((insn >> 8) & (3 << 0))); switch (val) { - case 12 : itype = M32RBF_INSN_BC24; goto extract_sfmt_bc24; - case 13 : itype = M32RBF_INSN_BNC24; goto extract_sfmt_bc24; - case 14 : itype = M32RBF_INSN_BL24; goto extract_sfmt_bl24; - case 15 : itype = M32RBF_INSN_BRA24; goto extract_sfmt_bra24; - default : itype = M32RBF_INSN_X_INVALID; goto extract_sfmt_empty; + case 0 : itype = M32RBF_INSN_BC24; goto extract_sfmt_bc24; case 1 : itype = M32RBF_INSN_BNC24; goto extract_sfmt_bc24; case 2 : itype = M32RBF_INSN_BL24; goto extract_sfmt_bl24; case 3 : itype = M32RBF_INSN_BRA24; goto extract_sfmt_bra24; default : itype = M32RBF_INSN_X_INVALID; goto extract_sfmt_empty; } } default : itype = M32RBF_INSN_X_INVALID; goto extract_sfmt_empty; @@ -462,7 +359,6 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_empty: { const IDESC *idesc = &m32rbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; #define FLD(f) abuf->fields.fmt_empty.f @@ -1475,7 +1371,6 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nop: { const IDESC *idesc = &m32rbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; #define FLD(f) abuf->fields.fmt_empty.f @@ -1489,7 +1384,6 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_rac: { const IDESC *idesc = &m32rbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; #define FLD(f) abuf->fields.fmt_empty.f @@ -1503,7 +1397,6 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_rte: { const IDESC *idesc = &m32rbf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; #define FLD(f) abuf->fields.fmt_empty.f diff --git a/sim/m32r/decode.h b/sim/m32r/decode.h index 9649acc..2289438 100644 --- a/sim/m32r/decode.h +++ b/sim/m32r/decode.h @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU Simulators. diff --git a/sim/m32r/decodex.c b/sim/m32r/decodex.c index a254fe8..46e3f0f 100644 --- a/sim/m32r/decodex.c +++ b/sim/m32r/decodex.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU Simulators. @@ -258,81 +258,31 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, unsigned int val = (((insn >> 8) & (15 << 4)) | ((insn >> 4) & (15 << 0))); switch (val) { - case 0 : itype = M32RXF_INSN_SUBV; goto extract_sfmt_addv; - case 1 : itype = M32RXF_INSN_SUBX; goto extract_sfmt_addx; - case 2 : itype = M32RXF_INSN_SUB; goto extract_sfmt_add; - case 3 : itype = M32RXF_INSN_NEG; goto extract_sfmt_mv; - case 4 : itype = M32RXF_INSN_CMP; goto extract_sfmt_cmp; - case 5 : itype = M32RXF_INSN_CMPU; goto extract_sfmt_cmp; - case 6 : itype = M32RXF_INSN_CMPEQ; goto extract_sfmt_cmp; - case 7 : + case 0 : itype = M32RXF_INSN_SUBV; goto extract_sfmt_addv; case 1 : itype = M32RXF_INSN_SUBX; goto extract_sfmt_addx; case 2 : itype = M32RXF_INSN_SUB; goto extract_sfmt_add; case 3 : itype = M32RXF_INSN_NEG; goto extract_sfmt_mv; case 4 : itype = M32RXF_INSN_CMP; goto extract_sfmt_cmp; case 5 : itype = M32RXF_INSN_CMPU; goto extract_sfmt_cmp; case 6 : itype = M32RXF_INSN_CMPEQ; goto extract_sfmt_cmp; case 7 : { - unsigned int val = (((insn >> 8) & (15 << 0))); + unsigned int val = (((insn >> 8) & (3 << 0))); switch (val) { - case 0 : itype = M32RXF_INSN_CMPZ; goto extract_sfmt_cmpz; - case 3 : itype = M32RXF_INSN_PCMPBZ; goto extract_sfmt_cmpz; - default : itype = M32RXF_INSN_X_INVALID; goto extract_sfmt_empty; + case 0 : itype = M32RXF_INSN_CMPZ; goto extract_sfmt_cmpz; case 3 : itype = M32RXF_INSN_PCMPBZ; goto extract_sfmt_cmpz; default : itype = M32RXF_INSN_X_INVALID; goto extract_sfmt_empty; } } - case 8 : itype = M32RXF_INSN_ADDV; goto extract_sfmt_addv; - case 9 : itype = M32RXF_INSN_ADDX; goto extract_sfmt_addx; - case 10 : itype = M32RXF_INSN_ADD; goto extract_sfmt_add; - case 11 : itype = M32RXF_INSN_NOT; goto extract_sfmt_mv; - case 12 : itype = M32RXF_INSN_AND; goto extract_sfmt_add; - case 13 : itype = M32RXF_INSN_XOR; goto extract_sfmt_add; - case 14 : itype = M32RXF_INSN_OR; goto extract_sfmt_add; - case 16 : itype = M32RXF_INSN_SRL; goto extract_sfmt_add; - case 18 : itype = M32RXF_INSN_SRA; goto extract_sfmt_add; - case 20 : itype = M32RXF_INSN_SLL; goto extract_sfmt_add; - case 22 : itype = M32RXF_INSN_MUL; goto extract_sfmt_add; - case 24 : itype = M32RXF_INSN_MV; goto extract_sfmt_mv; - case 25 : itype = M32RXF_INSN_MVFC; goto extract_sfmt_mvfc; - case 26 : itype = M32RXF_INSN_MVTC; goto extract_sfmt_mvtc; - case 28 : + case 8 : itype = M32RXF_INSN_ADDV; goto extract_sfmt_addv; case 9 : itype = M32RXF_INSN_ADDX; goto extract_sfmt_addx; case 10 : itype = M32RXF_INSN_ADD; goto extract_sfmt_add; case 11 : itype = M32RXF_INSN_NOT; goto extract_sfmt_mv; case 12 : itype = M32RXF_INSN_AND; goto extract_sfmt_add; case 13 : itype = M32RXF_INSN_XOR; goto extract_sfmt_add; case 14 : itype = M32RXF_INSN_OR; goto extract_sfmt_add; case 16 : itype = M32RXF_INSN_SRL; goto extract_sfmt_add; case 18 : itype = M32RXF_INSN_SRA; goto extract_sfmt_add; case 20 : itype = M32RXF_INSN_SLL; goto extract_sfmt_add; case 22 : itype = M32RXF_INSN_MUL; goto extract_sfmt_add; case 24 : itype = M32RXF_INSN_MV; goto extract_sfmt_mv; case 25 : itype = M32RXF_INSN_MVFC; goto extract_sfmt_mvfc; case 26 : itype = M32RXF_INSN_MVTC; goto extract_sfmt_mvtc; case 28 : { - unsigned int val = (((insn >> 8) & (15 << 0))); + unsigned int val = (((insn >> 8) & (3 << 0))); switch (val) { - case 12 : itype = M32RXF_INSN_JC; goto extract_sfmt_jc; - case 13 : itype = M32RXF_INSN_JNC; goto extract_sfmt_jc; - case 14 : itype = M32RXF_INSN_JL; goto extract_sfmt_jl; - case 15 : itype = M32RXF_INSN_JMP; goto extract_sfmt_jmp; - default : itype = M32RXF_INSN_X_INVALID; goto extract_sfmt_empty; + case 0 : itype = M32RXF_INSN_JC; goto extract_sfmt_jc; case 1 : itype = M32RXF_INSN_JNC; goto extract_sfmt_jc; case 2 : itype = M32RXF_INSN_JL; goto extract_sfmt_jl; case 3 : itype = M32RXF_INSN_JMP; goto extract_sfmt_jmp; default : itype = M32RXF_INSN_X_INVALID; goto extract_sfmt_empty; } } - case 29 : itype = M32RXF_INSN_RTE; goto extract_sfmt_rte; - case 31 : itype = M32RXF_INSN_TRAP; goto extract_sfmt_trap; - case 32 : itype = M32RXF_INSN_STB; goto extract_sfmt_stb; - case 34 : itype = M32RXF_INSN_STH; goto extract_sfmt_sth; - case 36 : itype = M32RXF_INSN_ST; goto extract_sfmt_st; - case 37 : itype = M32RXF_INSN_UNLOCK; goto extract_sfmt_unlock; - case 38 : itype = M32RXF_INSN_ST_PLUS; goto extract_sfmt_st_plus; - case 39 : itype = M32RXF_INSN_ST_MINUS; goto extract_sfmt_st_plus; - case 40 : itype = M32RXF_INSN_LDB; goto extract_sfmt_ld; - case 41 : itype = M32RXF_INSN_LDUB; goto extract_sfmt_ld; - case 42 : itype = M32RXF_INSN_LDH; goto extract_sfmt_ld; - case 43 : itype = M32RXF_INSN_LDUH; goto extract_sfmt_ld; - case 44 : itype = M32RXF_INSN_LD; goto extract_sfmt_ld; - case 45 : itype = M32RXF_INSN_LOCK; goto extract_sfmt_lock; - case 46 : itype = M32RXF_INSN_LD_PLUS; goto extract_sfmt_ld_plus; - case 48 : /* fall through */ - case 56 : itype = M32RXF_INSN_MULHI_A; goto extract_sfmt_mulhi_a; - case 49 : /* fall through */ - case 57 : itype = M32RXF_INSN_MULLO_A; goto extract_sfmt_mulhi_a; - case 50 : /* fall through */ - case 58 : itype = M32RXF_INSN_MULWHI_A; goto extract_sfmt_mulhi_a; - case 51 : /* fall through */ - case 59 : itype = M32RXF_INSN_MULWLO_A; goto extract_sfmt_mulhi_a; - case 52 : /* fall through */ - case 60 : itype = M32RXF_INSN_MACHI_A; goto extract_sfmt_machi_a; - case 53 : /* fall through */ - case 61 : itype = M32RXF_INSN_MACLO_A; goto extract_sfmt_machi_a; - case 54 : /* fall through */ - case 62 : itype = M32RXF_INSN_MACWHI_A; goto extract_sfmt_machi_a; - case 55 : /* fall through */ - case 63 : itype = M32RXF_INSN_MACWLO_A; goto extract_sfmt_machi_a; - case 64 : /* fall through */ + case 29 : itype = M32RXF_INSN_RTE; goto extract_sfmt_rte; case 31 : itype = M32RXF_INSN_TRAP; goto extract_sfmt_trap; case 32 : itype = M32RXF_INSN_STB; goto extract_sfmt_stb; case 34 : itype = M32RXF_INSN_STH; goto extract_sfmt_sth; case 36 : itype = M32RXF_INSN_ST; goto extract_sfmt_st; case 37 : itype = M32RXF_INSN_UNLOCK; goto extract_sfmt_unlock; case 38 : itype = M32RXF_INSN_ST_PLUS; goto extract_sfmt_st_plus; case 39 : itype = M32RXF_INSN_ST_MINUS; goto extract_sfmt_st_plus; case 40 : itype = M32RXF_INSN_LDB; goto extract_sfmt_ld; case 41 : itype = M32RXF_INSN_LDUB; goto extract_sfmt_ld; case 42 : itype = M32RXF_INSN_LDH; goto extract_sfmt_ld; case 43 : itype = M32RXF_INSN_LDUH; goto extract_sfmt_ld; case 44 : itype = M32RXF_INSN_LD; goto extract_sfmt_ld; case 45 : itype = M32RXF_INSN_LOCK; goto extract_sfmt_lock; case 46 : itype = M32RXF_INSN_LD_PLUS; goto extract_sfmt_ld_plus; case 48 : /* fall through */ + case 56 : itype = M32RXF_INSN_MULHI_A; goto extract_sfmt_mulhi_a; case 49 : /* fall through */ + case 57 : itype = M32RXF_INSN_MULLO_A; goto extract_sfmt_mulhi_a; case 50 : /* fall through */ + case 58 : itype = M32RXF_INSN_MULWHI_A; goto extract_sfmt_mulhi_a; case 51 : /* fall through */ + case 59 : itype = M32RXF_INSN_MULWLO_A; goto extract_sfmt_mulhi_a; case 52 : /* fall through */ + case 60 : itype = M32RXF_INSN_MACHI_A; goto extract_sfmt_machi_a; case 53 : /* fall through */ + case 61 : itype = M32RXF_INSN_MACLO_A; goto extract_sfmt_machi_a; case 54 : /* fall through */ + case 62 : itype = M32RXF_INSN_MACWHI_A; goto extract_sfmt_machi_a; case 55 : /* fall through */ + case 63 : itype = M32RXF_INSN_MACWLO_A; goto extract_sfmt_machi_a; case 64 : /* fall through */ case 65 : /* fall through */ case 66 : /* fall through */ case 67 : /* fall through */ @@ -347,39 +297,23 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, case 76 : /* fall through */ case 77 : /* fall through */ case 78 : /* fall through */ - case 79 : itype = M32RXF_INSN_ADDI; goto extract_sfmt_addi; - case 80 : /* fall through */ - case 81 : itype = M32RXF_INSN_SRLI; goto extract_sfmt_slli; - case 82 : /* fall through */ - case 83 : itype = M32RXF_INSN_SRAI; goto extract_sfmt_slli; - case 84 : /* fall through */ - case 85 : itype = M32RXF_INSN_SLLI; goto extract_sfmt_slli; - case 87 : + case 79 : itype = M32RXF_INSN_ADDI; goto extract_sfmt_addi; case 80 : /* fall through */ + case 81 : itype = M32RXF_INSN_SRLI; goto extract_sfmt_slli; case 82 : /* fall through */ + case 83 : itype = M32RXF_INSN_SRAI; goto extract_sfmt_slli; case 84 : /* fall through */ + case 85 : itype = M32RXF_INSN_SLLI; goto extract_sfmt_slli; case 87 : { - unsigned int val = (((insn >> 0) & (3 << 0))); + unsigned int val = (((insn >> 0) & (1 << 0))); switch (val) { - case 0 : itype = M32RXF_INSN_MVTACHI_A; goto extract_sfmt_mvtachi_a; - case 1 : itype = M32RXF_INSN_MVTACLO_A; goto extract_sfmt_mvtachi_a; - default : itype = M32RXF_INSN_X_INVALID; goto extract_sfmt_empty; + case 0 : itype = M32RXF_INSN_MVTACHI_A; goto extract_sfmt_mvtachi_a; case 1 : itype = M32RXF_INSN_MVTACLO_A; goto extract_sfmt_mvtachi_a; default : itype = M32RXF_INSN_X_INVALID; goto extract_sfmt_empty; } } - case 88 : itype = M32RXF_INSN_RACH_DSI; goto extract_sfmt_rac_dsi; - case 89 : itype = M32RXF_INSN_RAC_DSI; goto extract_sfmt_rac_dsi; - case 90 : itype = M32RXF_INSN_MULWU1; goto extract_sfmt_mulwu1; - case 91 : itype = M32RXF_INSN_MACWU1; goto extract_sfmt_macwu1; - case 92 : itype = M32RXF_INSN_MACLH1; goto extract_sfmt_macwu1; - case 93 : itype = M32RXF_INSN_MSBLO; goto extract_sfmt_msblo; - case 94 : itype = M32RXF_INSN_SADD; goto extract_sfmt_sadd; - case 95 : + case 88 : itype = M32RXF_INSN_RACH_DSI; goto extract_sfmt_rac_dsi; case 89 : itype = M32RXF_INSN_RAC_DSI; goto extract_sfmt_rac_dsi; case 90 : itype = M32RXF_INSN_MULWU1; goto extract_sfmt_mulwu1; case 91 : itype = M32RXF_INSN_MACWU1; goto extract_sfmt_macwu1; case 92 : itype = M32RXF_INSN_MACLH1; goto extract_sfmt_macwu1; case 93 : itype = M32RXF_INSN_MSBLO; goto extract_sfmt_msblo; case 94 : itype = M32RXF_INSN_SADD; goto extract_sfmt_sadd; case 95 : { unsigned int val = (((insn >> 0) & (3 << 0))); switch (val) { - case 0 : itype = M32RXF_INSN_MVFACHI_A; goto extract_sfmt_mvfachi_a; - case 1 : itype = M32RXF_INSN_MVFACLO_A; goto extract_sfmt_mvfachi_a; - case 2 : itype = M32RXF_INSN_MVFACMI_A; goto extract_sfmt_mvfachi_a; - default : itype = M32RXF_INSN_X_INVALID; goto extract_sfmt_empty; + case 0 : itype = M32RXF_INSN_MVFACHI_A; goto extract_sfmt_mvfachi_a; case 1 : itype = M32RXF_INSN_MVFACLO_A; goto extract_sfmt_mvfachi_a; case 2 : itype = M32RXF_INSN_MVFACMI_A; goto extract_sfmt_mvfachi_a; default : itype = M32RXF_INSN_X_INVALID; goto extract_sfmt_empty; } } case 96 : /* fall through */ @@ -397,22 +331,12 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, case 108 : /* fall through */ case 109 : /* fall through */ case 110 : /* fall through */ - case 111 : itype = M32RXF_INSN_LDI8; goto extract_sfmt_ldi8; - case 112 : + case 111 : itype = M32RXF_INSN_LDI8; goto extract_sfmt_ldi8; case 112 : { unsigned int val = (((insn >> 8) & (15 << 0))); switch (val) { - case 0 : itype = M32RXF_INSN_NOP; goto extract_sfmt_nop; - case 4 : itype = M32RXF_INSN_SC; goto extract_sfmt_sc; - case 5 : itype = M32RXF_INSN_SNC; goto extract_sfmt_sc; - case 8 : itype = M32RXF_INSN_BCL8; goto extract_sfmt_bcl8; - case 9 : itype = M32RXF_INSN_BNCL8; goto extract_sfmt_bcl8; - case 12 : itype = M32RXF_INSN_BC8; goto extract_sfmt_bc8; - case 13 : itype = M32RXF_INSN_BNC8; goto extract_sfmt_bc8; - case 14 : itype = M32RXF_INSN_BL8; goto extract_sfmt_bl8; - case 15 : itype = M32RXF_INSN_BRA8; goto extract_sfmt_bra8; - default : itype = M32RXF_INSN_X_INVALID; goto extract_sfmt_empty; + case 0 : itype = M32RXF_INSN_NOP; goto extract_sfmt_nop; case 4 : itype = M32RXF_INSN_SC; goto extract_sfmt_sc; case 5 : itype = M32RXF_INSN_SNC; goto extract_sfmt_sc; case 8 : itype = M32RXF_INSN_BCL8; goto extract_sfmt_bcl8; case 9 : itype = M32RXF_INSN_BNCL8; goto extract_sfmt_bcl8; case 12 : itype = M32RXF_INSN_BC8; goto extract_sfmt_bc8; case 13 : itype = M32RXF_INSN_BNC8; goto extract_sfmt_bc8; case 14 : itype = M32RXF_INSN_BL8; goto extract_sfmt_bl8; case 15 : itype = M32RXF_INSN_BRA8; goto extract_sfmt_bra8; default : itype = M32RXF_INSN_X_INVALID; goto extract_sfmt_empty; } } case 113 : /* fall through */ @@ -431,87 +355,29 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, case 126 : /* fall through */ case 127 : { - unsigned int val = (((insn >> 8) & (15 << 0))); + unsigned int val = (((insn >> 8) & (7 << 0))); switch (val) { - case 8 : itype = M32RXF_INSN_BCL8; goto extract_sfmt_bcl8; - case 9 : itype = M32RXF_INSN_BNCL8; goto extract_sfmt_bcl8; - case 12 : itype = M32RXF_INSN_BC8; goto extract_sfmt_bc8; - case 13 : itype = M32RXF_INSN_BNC8; goto extract_sfmt_bc8; - case 14 : itype = M32RXF_INSN_BL8; goto extract_sfmt_bl8; - case 15 : itype = M32RXF_INSN_BRA8; goto extract_sfmt_bra8; - default : itype = M32RXF_INSN_X_INVALID; goto extract_sfmt_empty; + case 0 : itype = M32RXF_INSN_BCL8; goto extract_sfmt_bcl8; case 1 : itype = M32RXF_INSN_BNCL8; goto extract_sfmt_bcl8; case 4 : itype = M32RXF_INSN_BC8; goto extract_sfmt_bc8; case 5 : itype = M32RXF_INSN_BNC8; goto extract_sfmt_bc8; case 6 : itype = M32RXF_INSN_BL8; goto extract_sfmt_bl8; case 7 : itype = M32RXF_INSN_BRA8; goto extract_sfmt_bra8; default : itype = M32RXF_INSN_X_INVALID; goto extract_sfmt_empty; } } - case 132 : itype = M32RXF_INSN_CMPI; goto extract_sfmt_cmpi; - case 133 : itype = M32RXF_INSN_CMPUI; goto extract_sfmt_cmpi; - case 134 : + case 132 : itype = M32RXF_INSN_CMPI; goto extract_sfmt_cmpi; case 133 : itype = M32RXF_INSN_CMPUI; goto extract_sfmt_cmpi; case 134 : { - unsigned int val = (((insn >> -6) & (63 << 0))); + unsigned int val = (((insn >> -8) & (3 << 0))); switch (val) { - case 0 : - { - unsigned int val = (((insn >> -12) & (63 << 0))); - switch (val) - { - case 0 : itype = M32RXF_INSN_SAT; goto extract_sfmt_sat; - case 32 : itype = M32RXF_INSN_SATH; goto extract_sfmt_satb; - case 48 : itype = M32RXF_INSN_SATB; goto extract_sfmt_satb; - default : itype = M32RXF_INSN_X_INVALID; goto extract_sfmt_empty; - } - } - default : itype = M32RXF_INSN_X_INVALID; goto extract_sfmt_empty; + case 0 : itype = M32RXF_INSN_SAT; goto extract_sfmt_sat; case 2 : itype = M32RXF_INSN_SATH; goto extract_sfmt_satb; case 3 : itype = M32RXF_INSN_SATB; goto extract_sfmt_satb; default : itype = M32RXF_INSN_X_INVALID; goto extract_sfmt_empty; } } - case 136 : itype = M32RXF_INSN_ADDV3; goto extract_sfmt_addv3; - case 138 : itype = M32RXF_INSN_ADD3; goto extract_sfmt_add3; - case 140 : itype = M32RXF_INSN_AND3; goto extract_sfmt_and3; - case 141 : itype = M32RXF_INSN_XOR3; goto extract_sfmt_and3; - case 142 : itype = M32RXF_INSN_OR3; goto extract_sfmt_or3; - case 144 : + case 136 : itype = M32RXF_INSN_ADDV3; goto extract_sfmt_addv3; case 138 : itype = M32RXF_INSN_ADD3; goto extract_sfmt_add3; case 140 : itype = M32RXF_INSN_AND3; goto extract_sfmt_and3; case 141 : itype = M32RXF_INSN_XOR3; goto extract_sfmt_and3; case 142 : itype = M32RXF_INSN_OR3; goto extract_sfmt_or3; case 144 : { - unsigned int val = (((insn >> -6) & (63 << 0))); + unsigned int val = (((insn >> -12) & (1 << 0))); switch (val) { - case 0 : - { - unsigned int val = (((insn >> -12) & (63 << 0))); - switch (val) - { - case 0 : itype = M32RXF_INSN_DIV; goto extract_sfmt_div; - case 1 : itype = M32RXF_INSN_DIVH; goto extract_sfmt_div; - default : itype = M32RXF_INSN_X_INVALID; goto extract_sfmt_empty; - } - } - default : itype = M32RXF_INSN_X_INVALID; goto extract_sfmt_empty; + case 0 : itype = M32RXF_INSN_DIV; goto extract_sfmt_div; case 1 : itype = M32RXF_INSN_DIVH; goto extract_sfmt_div; default : itype = M32RXF_INSN_X_INVALID; goto extract_sfmt_empty; } } - case 145 : itype = M32RXF_INSN_DIVU; goto extract_sfmt_div; - case 146 : itype = M32RXF_INSN_REM; goto extract_sfmt_div; - case 147 : itype = M32RXF_INSN_REMU; goto extract_sfmt_div; - case 152 : itype = M32RXF_INSN_SRL3; goto extract_sfmt_sll3; - case 154 : itype = M32RXF_INSN_SRA3; goto extract_sfmt_sll3; - case 156 : itype = M32RXF_INSN_SLL3; goto extract_sfmt_sll3; - case 159 : itype = M32RXF_INSN_LDI16; goto extract_sfmt_ldi16; - case 160 : itype = M32RXF_INSN_STB_D; goto extract_sfmt_stb_d; - case 162 : itype = M32RXF_INSN_STH_D; goto extract_sfmt_sth_d; - case 164 : itype = M32RXF_INSN_ST_D; goto extract_sfmt_st_d; - case 168 : itype = M32RXF_INSN_LDB_D; goto extract_sfmt_ld_d; - case 169 : itype = M32RXF_INSN_LDUB_D; goto extract_sfmt_ld_d; - case 170 : itype = M32RXF_INSN_LDH_D; goto extract_sfmt_ld_d; - case 171 : itype = M32RXF_INSN_LDUH_D; goto extract_sfmt_ld_d; - case 172 : itype = M32RXF_INSN_LD_D; goto extract_sfmt_ld_d; - case 176 : itype = M32RXF_INSN_BEQ; goto extract_sfmt_beq; - case 177 : itype = M32RXF_INSN_BNE; goto extract_sfmt_beq; - case 184 : itype = M32RXF_INSN_BEQZ; goto extract_sfmt_beqz; - case 185 : itype = M32RXF_INSN_BNEZ; goto extract_sfmt_beqz; - case 186 : itype = M32RXF_INSN_BLTZ; goto extract_sfmt_beqz; - case 187 : itype = M32RXF_INSN_BGEZ; goto extract_sfmt_beqz; - case 188 : itype = M32RXF_INSN_BLEZ; goto extract_sfmt_beqz; - case 189 : itype = M32RXF_INSN_BGTZ; goto extract_sfmt_beqz; - case 220 : itype = M32RXF_INSN_SETH; goto extract_sfmt_seth; - case 224 : /* fall through */ + case 145 : itype = M32RXF_INSN_DIVU; goto extract_sfmt_div; case 146 : itype = M32RXF_INSN_REM; goto extract_sfmt_div; case 147 : itype = M32RXF_INSN_REMU; goto extract_sfmt_div; case 152 : itype = M32RXF_INSN_SRL3; goto extract_sfmt_sll3; case 154 : itype = M32RXF_INSN_SRA3; goto extract_sfmt_sll3; case 156 : itype = M32RXF_INSN_SLL3; goto extract_sfmt_sll3; case 159 : itype = M32RXF_INSN_LDI16; goto extract_sfmt_ldi16; case 160 : itype = M32RXF_INSN_STB_D; goto extract_sfmt_stb_d; case 162 : itype = M32RXF_INSN_STH_D; goto extract_sfmt_sth_d; case 164 : itype = M32RXF_INSN_ST_D; goto extract_sfmt_st_d; case 168 : itype = M32RXF_INSN_LDB_D; goto extract_sfmt_ld_d; case 169 : itype = M32RXF_INSN_LDUB_D; goto extract_sfmt_ld_d; case 170 : itype = M32RXF_INSN_LDH_D; goto extract_sfmt_ld_d; case 171 : itype = M32RXF_INSN_LDUH_D; goto extract_sfmt_ld_d; case 172 : itype = M32RXF_INSN_LD_D; goto extract_sfmt_ld_d; case 176 : itype = M32RXF_INSN_BEQ; goto extract_sfmt_beq; case 177 : itype = M32RXF_INSN_BNE; goto extract_sfmt_beq; case 184 : itype = M32RXF_INSN_BEQZ; goto extract_sfmt_beqz; case 185 : itype = M32RXF_INSN_BNEZ; goto extract_sfmt_beqz; case 186 : itype = M32RXF_INSN_BLTZ; goto extract_sfmt_beqz; case 187 : itype = M32RXF_INSN_BGEZ; goto extract_sfmt_beqz; case 188 : itype = M32RXF_INSN_BLEZ; goto extract_sfmt_beqz; case 189 : itype = M32RXF_INSN_BGTZ; goto extract_sfmt_beqz; case 220 : itype = M32RXF_INSN_SETH; goto extract_sfmt_seth; case 224 : /* fall through */ case 225 : /* fall through */ case 226 : /* fall through */ case 227 : /* fall through */ @@ -526,8 +392,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, case 236 : /* fall through */ case 237 : /* fall through */ case 238 : /* fall through */ - case 239 : itype = M32RXF_INSN_LD24; goto extract_sfmt_ld24; - case 240 : /* fall through */ + case 239 : itype = M32RXF_INSN_LD24; goto extract_sfmt_ld24; case 240 : /* fall through */ case 241 : /* fall through */ case 242 : /* fall through */ case 243 : /* fall through */ @@ -544,16 +409,10 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, case 254 : /* fall through */ case 255 : { - unsigned int val = (((insn >> 8) & (15 << 0))); + unsigned int val = (((insn >> 8) & (7 << 0))); switch (val) { - case 8 : itype = M32RXF_INSN_BCL24; goto extract_sfmt_bcl24; - case 9 : itype = M32RXF_INSN_BNCL24; goto extract_sfmt_bcl24; - case 12 : itype = M32RXF_INSN_BC24; goto extract_sfmt_bc24; - case 13 : itype = M32RXF_INSN_BNC24; goto extract_sfmt_bc24; - case 14 : itype = M32RXF_INSN_BL24; goto extract_sfmt_bl24; - case 15 : itype = M32RXF_INSN_BRA24; goto extract_sfmt_bra24; - default : itype = M32RXF_INSN_X_INVALID; goto extract_sfmt_empty; + case 0 : itype = M32RXF_INSN_BCL24; goto extract_sfmt_bcl24; case 1 : itype = M32RXF_INSN_BNCL24; goto extract_sfmt_bcl24; case 4 : itype = M32RXF_INSN_BC24; goto extract_sfmt_bc24; case 5 : itype = M32RXF_INSN_BNC24; goto extract_sfmt_bc24; case 6 : itype = M32RXF_INSN_BL24; goto extract_sfmt_bl24; case 7 : itype = M32RXF_INSN_BRA24; goto extract_sfmt_bra24; default : itype = M32RXF_INSN_X_INVALID; goto extract_sfmt_empty; } } default : itype = M32RXF_INSN_X_INVALID; goto extract_sfmt_empty; @@ -566,7 +425,6 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_empty: { const IDESC *idesc = &m32rxf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; #define FLD(f) abuf->fields.fmt_empty.f @@ -1689,7 +1547,6 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_nop: { const IDESC *idesc = &m32rxf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; #define FLD(f) abuf->fields.fmt_empty.f @@ -1726,7 +1583,6 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_rte: { const IDESC *idesc = &m32rxf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; #define FLD(f) abuf->fields.fmt_empty.f @@ -2169,7 +2025,6 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_sadd: { const IDESC *idesc = &m32rxf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; #define FLD(f) abuf->fields.fmt_empty.f @@ -2273,7 +2128,6 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, extract_sfmt_sc: { const IDESC *idesc = &m32rxf_insn_data[itype]; - CGEN_INSN_INT insn = entire_insn; #define FLD(f) abuf->fields.fmt_empty.f diff --git a/sim/m32r/decodex.h b/sim/m32r/decodex.h index 7c6c218..5415e77 100644 --- a/sim/m32r/decodex.h +++ b/sim/m32r/decodex.h @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU Simulators. diff --git a/sim/m32r/model.c b/sim/m32r/model.c index b5998a2..87485ba 100644 --- a/sim/m32r/model.c +++ b/sim/m32r/model.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU Simulators. diff --git a/sim/m32r/modelx.c b/sim/m32r/modelx.c index 3ee95b3..464ab1f 100644 --- a/sim/m32r/modelx.c +++ b/sim/m32r/modelx.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU Simulators. diff --git a/sim/m32r/sem-switch.c b/sim/m32r/sem-switch.c index 94bb9a2..658d599 100644 --- a/sim/m32r/sem-switch.c +++ b/sim/m32r/sem-switch.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU Simulators. @@ -167,7 +167,11 @@ with this program; if not, write to the Free Software Foundation, Inc., #endif #undef GET_ATTR +#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE) #define GET_ATTR(cpu, num, attr) CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_##attr) +#else +#define GET_ATTR(cpu, num, attr) CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_/**/attr) +#endif { @@ -348,7 +352,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ADDSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -367,7 +371,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ADDSI (* FLD (i_sr), FLD (f_simm16)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -386,7 +390,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ANDSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -405,7 +409,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ANDSI (* FLD (i_sr), FLD (f_uimm16)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -424,7 +428,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ORSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -443,7 +447,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ORSI (* FLD (i_sr), FLD (f_uimm16)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -462,7 +466,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = XORSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -481,7 +485,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = XORSI (* FLD (i_sr), FLD (f_uimm16)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -500,7 +504,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ADDSI (* FLD (i_dr), FLD (f_simm8)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -523,12 +527,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -552,12 +556,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -581,12 +585,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -833,7 +837,7 @@ if (NESI (* FLD (i_src2), 0)) { { SI opval = ADDSI (ANDSI (pc, -4), 4); CPU (h_gr[((UINT) 14)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); @@ -861,7 +865,7 @@ if (NESI (* FLD (i_src2), 0)) { { SI opval = ADDSI (pc, 4); CPU (h_gr[((UINT) 14)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp24); @@ -1004,7 +1008,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) { { BI opval = LTSI (* FLD (i_src1), * FLD (i_src2)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1023,7 +1027,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) { { BI opval = LTSI (* FLD (i_src2), FLD (f_simm16)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1042,7 +1046,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) { { BI opval = LTUSI (* FLD (i_src1), * FLD (i_src2)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1061,7 +1065,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) { { BI opval = LTUSI (* FLD (i_src2), FLD (f_simm16)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1082,7 +1086,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = DIVSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1105,7 +1109,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = UDIVSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1128,7 +1132,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = MODSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1151,7 +1155,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = UMODSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1177,7 +1181,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = temp0; CPU (h_gr[((UINT) 14)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = temp1; @@ -1224,7 +1228,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1243,7 +1247,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = GETMEMSI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1262,7 +1266,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = EXTQISI (GETMEMQI (current_cpu, pc, * FLD (i_sr))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1281,7 +1285,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1300,7 +1304,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, * FLD (i_sr))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1319,7 +1323,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1338,7 +1342,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = ZEXTQISI (GETMEMQI (current_cpu, pc, * FLD (i_sr))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1357,7 +1361,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = ZEXTQISI (GETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1376,7 +1380,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = ZEXTHISI (GETMEMHI (current_cpu, pc, * FLD (i_sr))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1395,7 +1399,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = ZEXTHISI (GETMEMHI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1418,12 +1422,12 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = temp1; * FLD (i_sr) = opval; - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1443,7 +1447,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = FLD (i_uimm24); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1462,7 +1466,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = FLD (f_simm8); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1481,7 +1485,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = FLD (f_simm16); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1506,7 +1510,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1602,7 +1606,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = MULSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1697,7 +1701,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = * FLD (i_sr); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1716,7 +1720,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = TRUNCDISI (SRADI (GET_H_ACCUM (), 32)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1735,7 +1739,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = TRUNCDISI (GET_H_ACCUM ()); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1754,7 +1758,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = TRUNCDISI (SRADI (GET_H_ACCUM (), 16)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1773,7 +1777,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = GET_H_CR (FLD (f_r2)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1830,7 +1834,7 @@ if (NESI (* FLD (i_sr), 0)) { { USI opval = * FLD (i_sr); SET_H_CR (FLD (f_r1), opval); - TRACE_RESULT (current_cpu, abuf, "dcr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } #undef FLD @@ -1849,7 +1853,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = NEGSI (* FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1883,7 +1887,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = INVSI (* FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1966,7 +1970,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { USI opval = GET_H_CR (((UINT) 14)); SET_H_CR (((UINT) 6), opval); - TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { UQI opval = CPU (h_bpsw); @@ -1997,7 +2001,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { SI opval = SLLSI (FLD (f_hi16), 16); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2016,7 +2020,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { SI opval = SLLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2035,7 +2039,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { SI opval = SLLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2054,7 +2058,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { SI opval = SLLSI (* FLD (i_dr), FLD (f_uimm5)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2073,7 +2077,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { SI opval = SRASI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2092,7 +2096,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { SI opval = SRASI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2111,7 +2115,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { SI opval = SRASI (* FLD (i_dr), FLD (f_uimm5)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2130,7 +2134,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { SI opval = SRLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2149,7 +2153,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { SI opval = SRLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2168,7 +2172,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { SI opval = SRLSI (* FLD (i_dr), FLD (f_uimm5)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2309,7 +2313,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { SI opval = tmp_new_src2; * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2337,7 +2341,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { SI opval = tmp_new_src2; * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2357,7 +2361,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { SI opval = SUBSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2380,12 +2384,12 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -2409,12 +2413,12 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -2436,12 +2440,12 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { USI opval = GET_H_CR (((UINT) 6)); SET_H_CR (((UINT) 14), opval); - TRACE_RESULT (current_cpu, abuf, "cr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { USI opval = ADDSI (pc, 4); SET_H_CR (((UINT) 6), opval); - TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { UQI opval = CPU (h_bpsw); diff --git a/sim/m32r/sem.c b/sim/m32r/sem.c index cea7b58..3fa4f59 100644 --- a/sim/m32r/sem.c +++ b/sim/m32r/sem.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU Simulators. @@ -30,7 +30,11 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "cgen-ops.h" #undef GET_ATTR +#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE) #define GET_ATTR(cpu, num, attr) CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_##attr) +#else +#define GET_ATTR(cpu, num, attr) CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_/**/attr) +#endif /* This is used so that we can compile two copies of the semantic code, one with full feature support and one without that runs fast(er). @@ -211,7 +215,7 @@ SEM_FN_NAME (m32rbf,add) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -232,7 +236,7 @@ SEM_FN_NAME (m32rbf,add3) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (* FLD (i_sr), FLD (f_simm16)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -253,7 +257,7 @@ SEM_FN_NAME (m32rbf,and) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ANDSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -274,7 +278,7 @@ SEM_FN_NAME (m32rbf,and3) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ANDSI (* FLD (i_sr), FLD (f_uimm16)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -295,7 +299,7 @@ SEM_FN_NAME (m32rbf,or) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -316,7 +320,7 @@ SEM_FN_NAME (m32rbf,or3) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (* FLD (i_sr), FLD (f_uimm16)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -337,7 +341,7 @@ SEM_FN_NAME (m32rbf,xor) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = XORSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -358,7 +362,7 @@ SEM_FN_NAME (m32rbf,xor3) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = XORSI (* FLD (i_sr), FLD (f_uimm16)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -379,7 +383,7 @@ SEM_FN_NAME (m32rbf,addi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (* FLD (i_dr), FLD (f_simm8)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -404,12 +408,12 @@ SEM_FN_NAME (m32rbf,addv) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -435,12 +439,12 @@ SEM_FN_NAME (m32rbf,addv3) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -466,12 +470,12 @@ SEM_FN_NAME (m32rbf,addx) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -738,7 +742,7 @@ SEM_FN_NAME (m32rbf,bl8) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (ANDSI (pc, -4), 4); CPU (h_gr[((UINT) 14)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); @@ -768,7 +772,7 @@ SEM_FN_NAME (m32rbf,bl24) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (pc, 4); CPU (h_gr[((UINT) 14)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp24); @@ -923,7 +927,7 @@ SEM_FN_NAME (m32rbf,cmp) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = LTSI (* FLD (i_src1), * FLD (i_src2)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } return vpc; @@ -944,7 +948,7 @@ SEM_FN_NAME (m32rbf,cmpi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = LTSI (* FLD (i_src2), FLD (f_simm16)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } return vpc; @@ -965,7 +969,7 @@ SEM_FN_NAME (m32rbf,cmpu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = LTUSI (* FLD (i_src1), * FLD (i_src2)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } return vpc; @@ -986,7 +990,7 @@ SEM_FN_NAME (m32rbf,cmpui) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = LTUSI (* FLD (i_src2), FLD (f_simm16)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } return vpc; @@ -1009,7 +1013,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = DIVSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1034,7 +1038,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = UDIVSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1059,7 +1063,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = MODSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1084,7 +1088,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = UMODSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1112,7 +1116,7 @@ SEM_FN_NAME (m32rbf,jl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = temp0; CPU (h_gr[((UINT) 14)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = temp1; @@ -1163,7 +1167,7 @@ SEM_FN_NAME (m32rbf,ld) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1184,7 +1188,7 @@ SEM_FN_NAME (m32rbf,ld_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMSI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1205,7 +1209,7 @@ SEM_FN_NAME (m32rbf,ldb) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTQISI (GETMEMQI (current_cpu, pc, * FLD (i_sr))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1226,7 +1230,7 @@ SEM_FN_NAME (m32rbf,ldb_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1247,7 +1251,7 @@ SEM_FN_NAME (m32rbf,ldh) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, * FLD (i_sr))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1268,7 +1272,7 @@ SEM_FN_NAME (m32rbf,ldh_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1289,7 +1293,7 @@ SEM_FN_NAME (m32rbf,ldub) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ZEXTQISI (GETMEMQI (current_cpu, pc, * FLD (i_sr))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1310,7 +1314,7 @@ SEM_FN_NAME (m32rbf,ldub_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ZEXTQISI (GETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1331,7 +1335,7 @@ SEM_FN_NAME (m32rbf,lduh) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ZEXTHISI (GETMEMHI (current_cpu, pc, * FLD (i_sr))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1352,7 +1356,7 @@ SEM_FN_NAME (m32rbf,lduh_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ZEXTHISI (GETMEMHI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1377,12 +1381,12 @@ SEM_FN_NAME (m32rbf,ld_plus) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = temp1; * FLD (i_sr) = opval; - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1404,7 +1408,7 @@ SEM_FN_NAME (m32rbf,ld24) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = FLD (i_uimm24); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1425,7 +1429,7 @@ SEM_FN_NAME (m32rbf,ldi8) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = FLD (f_simm8); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1446,7 +1450,7 @@ SEM_FN_NAME (m32rbf,ldi16) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = FLD (f_simm16); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1473,7 +1477,7 @@ SEM_FN_NAME (m32rbf,lock) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1579,7 +1583,7 @@ SEM_FN_NAME (m32rbf,mul) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = MULSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1684,7 +1688,7 @@ SEM_FN_NAME (m32rbf,mv) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = * FLD (i_sr); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1705,7 +1709,7 @@ SEM_FN_NAME (m32rbf,mvfachi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = TRUNCDISI (SRADI (GET_H_ACCUM (), 32)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1726,7 +1730,7 @@ SEM_FN_NAME (m32rbf,mvfaclo) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = TRUNCDISI (GET_H_ACCUM ()); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1747,7 +1751,7 @@ SEM_FN_NAME (m32rbf,mvfacmi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = TRUNCDISI (SRADI (GET_H_ACCUM (), 16)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1768,7 +1772,7 @@ SEM_FN_NAME (m32rbf,mvfc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GET_H_CR (FLD (f_r2)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1831,7 +1835,7 @@ SEM_FN_NAME (m32rbf,mvtc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { USI opval = * FLD (i_sr); SET_H_CR (FLD (f_r1), opval); - TRACE_RESULT (current_cpu, abuf, "dcr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } return vpc; @@ -1852,7 +1856,7 @@ SEM_FN_NAME (m32rbf,neg) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = NEGSI (* FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1890,7 +1894,7 @@ SEM_FN_NAME (m32rbf,not) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = INVSI (* FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1979,7 +1983,7 @@ SEM_FN_NAME (m32rbf,rte) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { USI opval = GET_H_CR (((UINT) 14)); SET_H_CR (((UINT) 6), opval); - TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { UQI opval = CPU (h_bpsw); @@ -2012,7 +2016,7 @@ SEM_FN_NAME (m32rbf,seth) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SLLSI (FLD (f_hi16), 16); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2033,7 +2037,7 @@ SEM_FN_NAME (m32rbf,sll) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SLLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2054,7 +2058,7 @@ SEM_FN_NAME (m32rbf,sll3) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SLLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2075,7 +2079,7 @@ SEM_FN_NAME (m32rbf,slli) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SLLSI (* FLD (i_dr), FLD (f_uimm5)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2096,7 +2100,7 @@ SEM_FN_NAME (m32rbf,sra) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRASI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2117,7 +2121,7 @@ SEM_FN_NAME (m32rbf,sra3) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRASI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2138,7 +2142,7 @@ SEM_FN_NAME (m32rbf,srai) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRASI (* FLD (i_dr), FLD (f_uimm5)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2159,7 +2163,7 @@ SEM_FN_NAME (m32rbf,srl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2180,7 +2184,7 @@ SEM_FN_NAME (m32rbf,srl3) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2201,7 +2205,7 @@ SEM_FN_NAME (m32rbf,srli) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRLSI (* FLD (i_dr), FLD (f_uimm5)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2356,7 +2360,7 @@ SEM_FN_NAME (m32rbf,st_plus) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = tmp_new_src2; * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2386,7 +2390,7 @@ SEM_FN_NAME (m32rbf,st_minus) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = tmp_new_src2; * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2408,7 +2412,7 @@ SEM_FN_NAME (m32rbf,sub) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2433,12 +2437,12 @@ SEM_FN_NAME (m32rbf,subv) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -2464,12 +2468,12 @@ SEM_FN_NAME (m32rbf,subx) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -2493,12 +2497,12 @@ SEM_FN_NAME (m32rbf,trap) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { USI opval = GET_H_CR (((UINT) 6)); SET_H_CR (((UINT) 14), opval); - TRACE_RESULT (current_cpu, abuf, "cr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { USI opval = ADDSI (pc, 4); SET_H_CR (((UINT) 6), opval); - TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { UQI opval = CPU (h_bpsw); diff --git a/sim/m32r/semx-switch.c b/sim/m32r/semx-switch.c index 5f184c8..dff0aed 100644 --- a/sim/m32r/semx-switch.c +++ b/sim/m32r/semx-switch.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU Simulators. @@ -339,7 +339,11 @@ with this program; if not, write to the Free Software Foundation, Inc., #endif #undef GET_ATTR +#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE) #define GET_ATTR(cpu, num, attr) CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_##attr) +#else +#define GET_ATTR(cpu, num, attr) CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_/**/attr) +#endif { @@ -520,7 +524,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ADDSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -539,7 +543,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ADDSI (* FLD (i_sr), FLD (f_simm16)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -558,7 +562,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ANDSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -577,7 +581,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ANDSI (* FLD (i_sr), FLD (f_uimm16)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -596,7 +600,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ORSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -615,7 +619,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ORSI (* FLD (i_sr), FLD (f_uimm16)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -634,7 +638,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = XORSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -653,7 +657,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = XORSI (* FLD (i_sr), FLD (f_uimm16)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -672,7 +676,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ADDSI (* FLD (i_dr), FLD (f_simm8)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -695,12 +699,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -724,12 +728,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -753,12 +757,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -1005,7 +1009,7 @@ if (NESI (* FLD (i_src2), 0)) { { SI opval = ADDSI (ANDSI (pc, -4), 4); CPU (h_gr[((UINT) 14)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); @@ -1033,7 +1037,7 @@ if (NESI (* FLD (i_src2), 0)) { { SI opval = ADDSI (pc, 4); CPU (h_gr[((UINT) 14)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp24); @@ -1063,7 +1067,7 @@ if (CPU (h_cond)) { SI opval = ADDSI (ANDSI (pc, -4), 4); CPU (h_gr[((UINT) 14)]) = opval; written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); @@ -1096,7 +1100,7 @@ if (CPU (h_cond)) { SI opval = ADDSI (pc, 4); CPU (h_gr[((UINT) 14)]) = opval; written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp24); @@ -1246,7 +1250,7 @@ if (NOTBI (CPU (h_cond))) { SI opval = ADDSI (ANDSI (pc, -4), 4); CPU (h_gr[((UINT) 14)]) = opval; written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); @@ -1279,7 +1283,7 @@ if (NOTBI (CPU (h_cond))) { SI opval = ADDSI (pc, 4); CPU (h_gr[((UINT) 14)]) = opval; written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp24); @@ -1308,7 +1312,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = LTSI (* FLD (i_src1), * FLD (i_src2)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1327,7 +1331,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = LTSI (* FLD (i_src2), FLD (f_simm16)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1346,7 +1350,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = LTUSI (* FLD (i_src1), * FLD (i_src2)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1365,7 +1369,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = LTUSI (* FLD (i_src2), FLD (f_simm16)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1384,7 +1388,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = EQSI (* FLD (i_src1), * FLD (i_src2)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1403,7 +1407,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = EQSI (* FLD (i_src2), 0); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1424,7 +1428,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = DIVSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1447,7 +1451,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = UDIVSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1470,7 +1474,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = MODSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1493,7 +1497,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = UMODSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1516,7 +1520,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = DIVSI (EXTHISI (TRUNCSIHI (* FLD (i_dr))), * FLD (i_sr)); * FLD (i_dr) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1592,7 +1596,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = temp0; CPU (h_gr[((UINT) 14)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = temp1; @@ -1639,7 +1643,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1658,7 +1662,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = GETMEMSI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1677,7 +1681,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = EXTQISI (GETMEMQI (current_cpu, pc, * FLD (i_sr))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1696,7 +1700,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1715,7 +1719,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, * FLD (i_sr))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1734,7 +1738,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1753,7 +1757,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = ZEXTQISI (GETMEMQI (current_cpu, pc, * FLD (i_sr))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1772,7 +1776,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = ZEXTQISI (GETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1791,7 +1795,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = ZEXTHISI (GETMEMHI (current_cpu, pc, * FLD (i_sr))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1810,7 +1814,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = ZEXTHISI (GETMEMHI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1833,12 +1837,12 @@ if (NOTBI (CPU (h_cond))) { { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = temp1; * FLD (i_sr) = opval; - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1858,7 +1862,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = FLD (i_uimm24); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1877,7 +1881,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = FLD (f_simm8); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1896,7 +1900,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = FLD (f_simm16); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1921,7 +1925,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1941,7 +1945,7 @@ if (NOTBI (CPU (h_cond))) { { DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUMS (FLD (f_acc)), MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))))), 8), 8); SET_H_ACCUMS (FLD (f_acc), opval); - TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -1960,7 +1964,7 @@ if (NOTBI (CPU (h_cond))) { { DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUMS (FLD (f_acc)), MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))))), 8), 8); SET_H_ACCUMS (FLD (f_acc), opval); - TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -1979,7 +1983,7 @@ if (NOTBI (CPU (h_cond))) { { DI opval = ADDDI (GET_H_ACCUMS (FLD (f_acc)), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))))); SET_H_ACCUMS (FLD (f_acc), opval); - TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -1998,7 +2002,7 @@ if (NOTBI (CPU (h_cond))) { { DI opval = ADDDI (GET_H_ACCUMS (FLD (f_acc)), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))))); SET_H_ACCUMS (FLD (f_acc), opval); - TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2017,7 +2021,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = MULSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2036,7 +2040,7 @@ if (NOTBI (CPU (h_cond))) { { DI opval = SRADI (SLLDI (MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))), 16), 16); SET_H_ACCUMS (FLD (f_acc), opval); - TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2055,7 +2059,7 @@ if (NOTBI (CPU (h_cond))) { { DI opval = SRADI (SLLDI (MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 16), 16); SET_H_ACCUMS (FLD (f_acc), opval); - TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2074,7 +2078,7 @@ if (NOTBI (CPU (h_cond))) { { DI opval = MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))); SET_H_ACCUMS (FLD (f_acc), opval); - TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2093,7 +2097,7 @@ if (NOTBI (CPU (h_cond))) { { DI opval = MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))); SET_H_ACCUMS (FLD (f_acc), opval); - TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2112,7 +2116,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = * FLD (i_sr); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2131,7 +2135,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = TRUNCDISI (SRADI (GET_H_ACCUMS (FLD (f_accs)), 32)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2150,7 +2154,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = TRUNCDISI (GET_H_ACCUMS (FLD (f_accs))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2169,7 +2173,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = TRUNCDISI (SRADI (GET_H_ACCUMS (FLD (f_accs)), 16)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2188,7 +2192,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = GET_H_CR (FLD (f_r2)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2207,7 +2211,7 @@ if (NOTBI (CPU (h_cond))) { { DI opval = ORDI (ANDDI (GET_H_ACCUMS (FLD (f_accs)), MAKEDI (0, 0xffffffff)), SLLDI (EXTSIDI (* FLD (i_src1)), 32)); SET_H_ACCUMS (FLD (f_accs), opval); - TRACE_RESULT (current_cpu, abuf, "accs", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2226,7 +2230,7 @@ if (NOTBI (CPU (h_cond))) { { DI opval = ORDI (ANDDI (GET_H_ACCUMS (FLD (f_accs)), MAKEDI (0xffffffff, 0)), ZEXTSIDI (* FLD (i_src1))); SET_H_ACCUMS (FLD (f_accs), opval); - TRACE_RESULT (current_cpu, abuf, "accs", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2245,7 +2249,7 @@ if (NOTBI (CPU (h_cond))) { { USI opval = * FLD (i_sr); SET_H_CR (FLD (f_r1), opval); - TRACE_RESULT (current_cpu, abuf, "dcr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } #undef FLD @@ -2264,7 +2268,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = NEGSI (* FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2298,7 +2302,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = INVSI (* FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2321,7 +2325,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { DI opval = (GTDI (tmp_tmp1, MAKEDI (32767, 0xffff0000))) ? (MAKEDI (32767, 0xffff0000)) : (LTDI (tmp_tmp1, MAKEDI (0xffff8000, 0))) ? (MAKEDI (0xffff8000, 0)) : (ANDDI (tmp_tmp1, MAKEDI (0xffffffff, 0xffff0000))); SET_H_ACCUMS (FLD (f_accd), opval); - TRACE_RESULT (current_cpu, abuf, "accd", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } } @@ -2345,7 +2349,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { DI opval = (GTDI (tmp_tmp1, MAKEDI (32767, 0))) ? (MAKEDI (32767, 0)) : (LTDI (tmp_tmp1, MAKEDI (0xffff8000, 0))) ? (MAKEDI (0xffff8000, 0)) : (ANDDI (tmp_tmp1, MAKEDI (0xffffffff, 0))); SET_H_ACCUMS (FLD (f_accd), opval); - TRACE_RESULT (current_cpu, abuf, "accd", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } } @@ -2372,7 +2376,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { USI opval = GET_H_CR (((UINT) 14)); SET_H_CR (((UINT) 6), opval); - TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { UQI opval = CPU (h_bpsw); @@ -2403,7 +2407,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = SLLSI (FLD (f_hi16), 16); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2422,7 +2426,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = SLLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2441,7 +2445,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = SLLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2460,7 +2464,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = SLLSI (* FLD (i_dr), FLD (f_uimm5)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2479,7 +2483,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = SRASI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2498,7 +2502,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = SRASI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2517,7 +2521,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = SRASI (* FLD (i_dr), FLD (f_uimm5)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2536,7 +2540,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = SRLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2555,7 +2559,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = SRLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2574,7 +2578,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = SRLSI (* FLD (i_dr), FLD (f_uimm5)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2715,7 +2719,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = tmp_new_src2; * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2743,7 +2747,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = tmp_new_src2; * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2763,7 +2767,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = SUBSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2786,12 +2790,12 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -2815,12 +2819,12 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -2842,12 +2846,12 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { USI opval = GET_H_CR (((UINT) 6)); SET_H_CR (((UINT) 14), opval); - TRACE_RESULT (current_cpu, abuf, "cr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { USI opval = ADDSI (pc, 4); SET_H_CR (((UINT) 6), opval); - TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { UQI opval = CPU (h_bpsw); @@ -2918,7 +2922,7 @@ if (CPU (h_lock)) { { SI opval = (GESI (* FLD (i_sr), 127)) ? (127) : (LESI (* FLD (i_sr), -128)) ? (-128) : (* FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2937,7 +2941,7 @@ if (CPU (h_lock)) { { SI opval = (GESI (* FLD (i_sr), 32767)) ? (32767) : (LESI (* FLD (i_sr), -32768)) ? (-32768) : (* FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2956,7 +2960,7 @@ if (CPU (h_lock)) { { SI opval = ((CPU (h_cond)) ? (((LTSI (* FLD (i_sr), 0)) ? (2147483647) : (0x80000000))) : (* FLD (i_sr))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2975,7 +2979,7 @@ if (CPU (h_lock)) { { BI opval = (EQSI (ANDSI (* FLD (i_src2), 255), 0)) ? (1) : (EQSI (ANDSI (* FLD (i_src2), 65280), 0)) ? (1) : (EQSI (ANDSI (* FLD (i_src2), 16711680), 0)) ? (1) : (EQSI (ANDSI (* FLD (i_src2), 0xff000000), 0)) ? (1) : (0); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -2994,7 +2998,7 @@ if (CPU (h_lock)) { { DI opval = ADDDI (SRADI (GET_H_ACCUMS (((UINT) 1)), 16), GET_H_ACCUMS (((UINT) 0))); SET_H_ACCUMS (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "accums-0", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -3013,7 +3017,7 @@ if (CPU (h_lock)) { { DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUMS (((UINT) 1)), MULDI (EXTSIDI (* FLD (i_src1)), EXTSIDI (ANDSI (* FLD (i_src2), 65535)))), 8), 8); SET_H_ACCUMS (((UINT) 1), opval); - TRACE_RESULT (current_cpu, abuf, "accums-1", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -3051,7 +3055,7 @@ if (CPU (h_lock)) { { DI opval = SRADI (SLLDI (MULDI (EXTSIDI (* FLD (i_src1)), EXTSIDI (ANDSI (* FLD (i_src2), 65535))), 16), 16); SET_H_ACCUMS (((UINT) 1), opval); - TRACE_RESULT (current_cpu, abuf, "accums-1", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -3070,7 +3074,7 @@ if (CPU (h_lock)) { { DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUMS (((UINT) 1)), SLLDI (EXTSIDI (MULSI (EXTHISI (TRUNCSIHI (* FLD (i_src1))), SRASI (* FLD (i_src2), 16))), 16)), 8), 8); SET_H_ACCUMS (((UINT) 1), opval); - TRACE_RESULT (current_cpu, abuf, "accums-1", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -3122,7 +3126,7 @@ if (ZEXTBISI (NOTBI (CPU (h_cond)))) { SI opval = ADDSI (* FLD (i_dr), * FLD (i_sr)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -3160,7 +3164,7 @@ CASE (sem, INSN_WRITE_ADD) : /* add $dr,$sr */ { SI opval = ANDSI (* FLD (i_dr), * FLD (i_sr)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -3198,7 +3202,7 @@ CASE (sem, INSN_WRITE_AND) : /* and $dr,$sr */ { SI opval = ORSI (* FLD (i_dr), * FLD (i_sr)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -3236,7 +3240,7 @@ CASE (sem, INSN_WRITE_OR) : /* or $dr,$sr */ { SI opval = XORSI (* FLD (i_dr), * FLD (i_sr)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -3274,7 +3278,7 @@ CASE (sem, INSN_WRITE_XOR) : /* xor $dr,$sr */ { SI opval = ADDSI (* FLD (i_dr), FLD (f_simm8)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -3316,12 +3320,12 @@ CASE (sem, INSN_WRITE_ADDI) : /* addi $dr,$simm8 */ { SI opval = temp0; OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -3365,12 +3369,12 @@ CASE (sem, INSN_WRITE_ADDV) : /* addv $dr,$sr */ { SI opval = temp0; OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -3458,7 +3462,7 @@ CASE (sem, INSN_WRITE_BC8) : /* bc.s $disp8 */ { SI opval = ADDSI (ANDSI (pc, -4), 4); OPRND (h_gr_14) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); @@ -3508,7 +3512,7 @@ if (CPU (h_cond)) { SI opval = ADDSI (ANDSI (pc, -4), 4); OPRND (h_gr_14) = opval; written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); @@ -3654,7 +3658,7 @@ if (NOTBI (CPU (h_cond))) { SI opval = ADDSI (ANDSI (pc, -4), 4); OPRND (h_gr_14) = opval; written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); @@ -3710,7 +3714,7 @@ CASE (sem, INSN_WRITE_BNCL8) : /* bncl.s $disp8 */ { BI opval = LTSI (* FLD (i_src1), * FLD (i_src2)); OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef OPRND @@ -3748,7 +3752,7 @@ CASE (sem, INSN_WRITE_CMP) : /* cmp $src1,$src2 */ { BI opval = LTUSI (* FLD (i_src1), * FLD (i_src2)); OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef OPRND @@ -3786,7 +3790,7 @@ CASE (sem, INSN_WRITE_CMPU) : /* cmpu $src1,$src2 */ { BI opval = EQSI (* FLD (i_src1), * FLD (i_src2)); OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef OPRND @@ -3824,7 +3828,7 @@ CASE (sem, INSN_WRITE_CMPEQ) : /* cmpeq $src1,$src2 */ { BI opval = EQSI (* FLD (i_src2), 0); OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef OPRND @@ -3960,7 +3964,7 @@ CASE (sem, INSN_WRITE_JNC) : /* jnc $sr */ { SI opval = temp0; OPRND (h_gr_14) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = temp1; @@ -4047,7 +4051,7 @@ CASE (sem, INSN_WRITE_JMP) : /* jmp $sr */ { SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4085,7 +4089,7 @@ CASE (sem, INSN_WRITE_LD) : /* ld $dr,@$sr */ { SI opval = EXTQISI (GETMEMQI (current_cpu, pc, * FLD (i_sr))); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4123,7 +4127,7 @@ CASE (sem, INSN_WRITE_LDB) : /* ldb $dr,@$sr */ { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, * FLD (i_sr))); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4161,7 +4165,7 @@ CASE (sem, INSN_WRITE_LDH) : /* ldh $dr,@$sr */ { SI opval = ZEXTQISI (GETMEMQI (current_cpu, pc, * FLD (i_sr))); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4199,7 +4203,7 @@ CASE (sem, INSN_WRITE_LDUB) : /* ldub $dr,@$sr */ { SI opval = ZEXTHISI (GETMEMHI (current_cpu, pc, * FLD (i_sr))); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4241,12 +4245,12 @@ CASE (sem, INSN_WRITE_LDUH) : /* lduh $dr,@$sr */ { SI opval = temp0; OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = temp1; OPRND (sr) = opval; - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -4286,7 +4290,7 @@ CASE (sem, INSN_WRITE_LD_PLUS) : /* ld $dr,@$sr+ */ { SI opval = FLD (f_simm8); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4330,7 +4334,7 @@ CASE (sem, INSN_WRITE_LDI8) : /* ldi8 $dr,$simm8 */ { SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -4370,7 +4374,7 @@ CASE (sem, INSN_WRITE_LOCK) : /* lock $dr,@$sr */ { DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUMS (FLD (f_acc)), MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))))), 8), 8); OPRND (acc) = opval; - TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4408,7 +4412,7 @@ CASE (sem, INSN_WRITE_MACHI_A) : /* machi $src1,$src2,$acc */ { DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUMS (FLD (f_acc)), MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))))), 8), 8); OPRND (acc) = opval; - TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4446,7 +4450,7 @@ CASE (sem, INSN_WRITE_MACLO_A) : /* maclo $src1,$src2,$acc */ { DI opval = ADDDI (GET_H_ACCUMS (FLD (f_acc)), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))))); OPRND (acc) = opval; - TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4484,7 +4488,7 @@ CASE (sem, INSN_WRITE_MACWHI_A) : /* macwhi $src1,$src2,$acc */ { DI opval = ADDDI (GET_H_ACCUMS (FLD (f_acc)), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))))); OPRND (acc) = opval; - TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4522,7 +4526,7 @@ CASE (sem, INSN_WRITE_MACWLO_A) : /* macwlo $src1,$src2,$acc */ { SI opval = MULSI (* FLD (i_dr), * FLD (i_sr)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4560,7 +4564,7 @@ CASE (sem, INSN_WRITE_MUL) : /* mul $dr,$sr */ { DI opval = SRADI (SLLDI (MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))), 16), 16); OPRND (acc) = opval; - TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4598,7 +4602,7 @@ CASE (sem, INSN_WRITE_MULHI_A) : /* mulhi $src1,$src2,$acc */ { DI opval = SRADI (SLLDI (MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 16), 16); OPRND (acc) = opval; - TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4636,7 +4640,7 @@ CASE (sem, INSN_WRITE_MULLO_A) : /* mullo $src1,$src2,$acc */ { DI opval = MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))); OPRND (acc) = opval; - TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4674,7 +4678,7 @@ CASE (sem, INSN_WRITE_MULWHI_A) : /* mulwhi $src1,$src2,$acc */ { DI opval = MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))); OPRND (acc) = opval; - TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4712,7 +4716,7 @@ CASE (sem, INSN_WRITE_MULWLO_A) : /* mulwlo $src1,$src2,$acc */ { SI opval = * FLD (i_sr); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4750,7 +4754,7 @@ CASE (sem, INSN_WRITE_MV) : /* mv $dr,$sr */ { SI opval = TRUNCDISI (SRADI (GET_H_ACCUMS (FLD (f_accs)), 32)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4788,7 +4792,7 @@ CASE (sem, INSN_WRITE_MVFACHI_A) : /* mvfachi $dr,$accs */ { SI opval = TRUNCDISI (GET_H_ACCUMS (FLD (f_accs))); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4826,7 +4830,7 @@ CASE (sem, INSN_WRITE_MVFACLO_A) : /* mvfaclo $dr,$accs */ { SI opval = TRUNCDISI (SRADI (GET_H_ACCUMS (FLD (f_accs)), 16)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4864,7 +4868,7 @@ CASE (sem, INSN_WRITE_MVFACMI_A) : /* mvfacmi $dr,$accs */ { SI opval = GET_H_CR (FLD (f_r2)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4902,7 +4906,7 @@ CASE (sem, INSN_WRITE_MVFC) : /* mvfc $dr,$scr */ { DI opval = ORDI (ANDDI (GET_H_ACCUMS (FLD (f_accs)), MAKEDI (0, 0xffffffff)), SLLDI (EXTSIDI (* FLD (i_src1)), 32)); OPRND (accs) = opval; - TRACE_RESULT (current_cpu, abuf, "accs", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4940,7 +4944,7 @@ CASE (sem, INSN_WRITE_MVTACHI_A) : /* mvtachi $src1,$accs */ { DI opval = ORDI (ANDDI (GET_H_ACCUMS (FLD (f_accs)), MAKEDI (0xffffffff, 0)), ZEXTSIDI (* FLD (i_src1))); OPRND (accs) = opval; - TRACE_RESULT (current_cpu, abuf, "accs", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4978,7 +4982,7 @@ CASE (sem, INSN_WRITE_MVTACLO_A) : /* mvtaclo $src1,$accs */ { USI opval = * FLD (i_sr); OPRND (dcr) = opval; - TRACE_RESULT (current_cpu, abuf, "dcr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } #undef OPRND @@ -5016,7 +5020,7 @@ CASE (sem, INSN_WRITE_MVTC) : /* mvtc $sr,$dcr */ { SI opval = NEGSI (* FLD (i_sr)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5087,7 +5091,7 @@ CASE (sem, INSN_WRITE_NOP) : /* nop */ { SI opval = INVSI (* FLD (i_sr)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5129,7 +5133,7 @@ CASE (sem, INSN_WRITE_NOT) : /* not $dr,$sr */ { DI opval = (GTDI (tmp_tmp1, MAKEDI (32767, 0xffff0000))) ? (MAKEDI (32767, 0xffff0000)) : (LTDI (tmp_tmp1, MAKEDI (0xffff8000, 0))) ? (MAKEDI (0xffff8000, 0)) : (ANDDI (tmp_tmp1, MAKEDI (0xffffffff, 0xffff0000))); OPRND (accd) = opval; - TRACE_RESULT (current_cpu, abuf, "accd", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } } @@ -5172,7 +5176,7 @@ CASE (sem, INSN_WRITE_RAC_DSI) : /* rac $accd,$accs,$imm1 */ { DI opval = (GTDI (tmp_tmp1, MAKEDI (32767, 0))) ? (MAKEDI (32767, 0)) : (LTDI (tmp_tmp1, MAKEDI (0xffff8000, 0))) ? (MAKEDI (0xffff8000, 0)) : (ANDDI (tmp_tmp1, MAKEDI (0xffffffff, 0))); OPRND (accd) = opval; - TRACE_RESULT (current_cpu, abuf, "accd", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } } @@ -5217,7 +5221,7 @@ CASE (sem, INSN_WRITE_RACH_DSI) : /* rach $accd,$accs,$imm1 */ { USI opval = GET_H_CR (((UINT) 14)); OPRND (h_cr_6) = opval; - TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { UQI opval = CPU (h_bpsw); @@ -5271,7 +5275,7 @@ CASE (sem, INSN_WRITE_RTE) : /* rte */ { SI opval = SLLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5309,7 +5313,7 @@ CASE (sem, INSN_WRITE_SLL) : /* sll $dr,$sr */ { SI opval = SLLSI (* FLD (i_dr), FLD (f_uimm5)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5347,7 +5351,7 @@ CASE (sem, INSN_WRITE_SLLI) : /* slli $dr,$uimm5 */ { SI opval = SRASI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5385,7 +5389,7 @@ CASE (sem, INSN_WRITE_SRA) : /* sra $dr,$sr */ { SI opval = SRASI (* FLD (i_dr), FLD (f_uimm5)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5423,7 +5427,7 @@ CASE (sem, INSN_WRITE_SRAI) : /* srai $dr,$uimm5 */ { SI opval = SRLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5461,7 +5465,7 @@ CASE (sem, INSN_WRITE_SRL) : /* srl $dr,$sr */ { SI opval = SRLSI (* FLD (i_dr), FLD (f_uimm5)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5625,7 +5629,7 @@ CASE (sem, INSN_WRITE_STH) : /* sth $src1,@$src2 */ { SI opval = tmp_new_src2; OPRND (src2) = opval; - TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -5674,7 +5678,7 @@ CASE (sem, INSN_WRITE_ST_PLUS) : /* st $src1,@+$src2 */ { SI opval = tmp_new_src2; OPRND (src2) = opval; - TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -5714,7 +5718,7 @@ CASE (sem, INSN_WRITE_ST_MINUS) : /* st $src1,@-$src2 */ { SI opval = SUBSI (* FLD (i_dr), * FLD (i_sr)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5756,12 +5760,12 @@ CASE (sem, INSN_WRITE_SUB) : /* sub $dr,$sr */ { SI opval = temp0; OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -5805,12 +5809,12 @@ CASE (sem, INSN_WRITE_SUBV) : /* subv $dr,$sr */ { SI opval = temp0; OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -5851,12 +5855,12 @@ CASE (sem, INSN_WRITE_SUBX) : /* subx $dr,$sr */ { USI opval = GET_H_CR (((UINT) 6)); OPRND (h_cr_14) = opval; - TRACE_RESULT (current_cpu, abuf, "cr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { USI opval = ADDSI (pc, 4); OPRND (h_cr_6) = opval; - TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { UQI opval = CPU (h_bpsw); @@ -5976,7 +5980,7 @@ CASE (sem, INSN_WRITE_UNLOCK) : /* unlock $src1,@$src2 */ { BI opval = (EQSI (ANDSI (* FLD (i_src2), 255), 0)) ? (1) : (EQSI (ANDSI (* FLD (i_src2), 65280), 0)) ? (1) : (EQSI (ANDSI (* FLD (i_src2), 16711680), 0)) ? (1) : (EQSI (ANDSI (* FLD (i_src2), 0xff000000), 0)) ? (1) : (0); OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef OPRND @@ -6014,7 +6018,7 @@ CASE (sem, INSN_WRITE_PCMPBZ) : /* pcmpbz $src2 */ { DI opval = ADDDI (SRADI (GET_H_ACCUMS (((UINT) 1)), 16), GET_H_ACCUMS (((UINT) 0))); OPRND (h_accums_0) = opval; - TRACE_RESULT (current_cpu, abuf, "accums-0", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -6052,7 +6056,7 @@ CASE (sem, INSN_WRITE_SADD) : /* sadd */ { DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUMS (((UINT) 1)), MULDI (EXTSIDI (* FLD (i_src1)), EXTSIDI (ANDSI (* FLD (i_src2), 65535)))), 8), 8); OPRND (h_accums_1) = opval; - TRACE_RESULT (current_cpu, abuf, "accums-1", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -6128,7 +6132,7 @@ CASE (sem, INSN_WRITE_MSBLO) : /* msblo $src1,$src2 */ { DI opval = SRADI (SLLDI (MULDI (EXTSIDI (* FLD (i_src1)), EXTSIDI (ANDSI (* FLD (i_src2), 65535))), 16), 16); OPRND (h_accums_1) = opval; - TRACE_RESULT (current_cpu, abuf, "accums-1", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -6166,7 +6170,7 @@ CASE (sem, INSN_WRITE_MULWU1) : /* mulwu1 $src1,$src2 */ { DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUMS (((UINT) 1)), SLLDI (EXTSIDI (MULSI (EXTHISI (TRUNCSIHI (* FLD (i_src1))), SRASI (* FLD (i_src2), 16))), 16)), 8), 8); OPRND (h_accums_1) = opval; - TRACE_RESULT (current_cpu, abuf, "accums-1", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND |