diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-06-12 13:29:02 +0545 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-06-12 04:19:45 -0400 |
| commit | db7858e227f3951c665410314fca62c77349ac24 (patch) | |
| tree | 01fb8b93600bc89ef86a7e883ca17e3df8387174 /sim | |
| parent | 966f0aefa6a96df2c45ec36a7ecc02419e3842db (diff) | |
| download | gdb-db7858e227f3951c665410314fca62c77349ac24.zip gdb-db7858e227f3951c665410314fca62c77349ac24.tar.gz gdb-db7858e227f3951c665410314fca62c77349ac24.tar.bz2 | |
sim: cgen: namespace custom trace functions
The cgen code declares some macros/funcs using the trace_xxx prefix, but
the code isn't generic and only works with cgen targets. This is blocking
the creation of new common trace functions.
Let's blindly add cgen_xxx prefixes to all these symbols. Some already
use this convention to avoid conflicts, so it makes sense to align them.
In the future we might want to move some to the common trace core, but
one thing at a time.
Diffstat (limited to 'sim')
43 files changed, 7143 insertions, 7039 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index a20f92d7..1557449 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,44 @@ +2015-06-12 Mike Frysinger <vapier@gentoo.org> + + * cgen-run.c (sim_resume): Rename TRACE_INSN_FINI to + CGEN_TRACE_INSN_FINI. + * cgen-trace.c: Rename trace_insn to cgen_trace_insn, + trace_result to cgen_trace_result, trace_insn_fini to + cgen_trace_insn_fini, trace_insn_init to cgen_trace_insn_init, + and trace_extract to cgen_trace_extract. + * cgen-trace.h (trace_insn_init): Rename to ... + (cgen_trace_insn_init): ... this. + (trace_insn_fini): Rename to ... + (cgen_trace_insn_fini): ... this. + (trace_insn): Rename to ... + (cgen_trace_insn): ... this. + (trace_extract): Rename to ... + (cgen_trace_extract): ... this. + (trace_result): Rename to ... + (cgen_trace_result): ... this. + (TRACE_RESULT_P): Rename to ... + (CGEN_TRACE_RESULT_P): ... this. + (TRACE_INSN_INIT): Rename to ... + (CGEN_TRACE_INSN_INIT): ... this. Change trace_insn_init to + cgen_trace_insn_init. + (TRACE_INSN_FINI): Rename to ... + (CGEN_TRACE_INSN_FINI): ... this. Change trace_insn_fini to + cgen_trace_insn_fini. + (TRACE_PRINTF): Rename to ... + (CGEN_TRACE_PRINTF): ... this. + (TRACE_INSN): Rename to ... + (CGEN_TRACE_INSN): ... this. Change trace_insn to cgen_trace_insn. + (TRACE_EXTRACT): Rename to ... + (CGEN_TRACE_EXTRACT): ... this. Change trace_extract to + cgen_trace_extract. + (TRACE_RESULT): Rename to ... + (CGEN_TRACE_RESULT): ... this. Change TRACE_RESULT_P to + CGEN_TRACE_RESULT_P and trace_result to cgen_trace_result. + * genmloop.sh (@prefix@_pbb_before): Change TRACE_INSN_FINI to + CGEN_TRACE_INSN_FINI, TRACE_INSN_INIT to CGEN_TRACE_INSN_INIT, and + TRACE_INSN to CGEN_TRACE_INSN. + (@prefix@_pbb_after): Change TRACE_INSN_FINI to CGEN_TRACE_INSN_FINI. + 2015-06-11 Mike Frysinger <vapier@gentoo.org> * sim-events.c (ETRACE_P): Delete. diff --git a/sim/common/cgen-run.c b/sim/common/cgen-run.c index 5a25a50..96fe999 100644 --- a/sim/common/cgen-run.c +++ b/sim/common/cgen-run.c @@ -115,7 +115,7 @@ sim_resume (SIM_DESC sd, int step, int siggnal) /* Account for the last insn executed. */ SIM_CPU *cpu = STATE_CPU (sd, sim_engine_last_cpu_nr (sd)); ++ CPU_INSN_COUNT (cpu); - TRACE_INSN_FINI (cpu, NULL, 1); + CGEN_TRACE_INSN_FINI (cpu, NULL, 1); } #endif diff --git a/sim/common/cgen-trace.c b/sim/common/cgen-trace.c index 87aa3ce..566f2e6 100644 --- a/sim/common/cgen-trace.c +++ b/sim/common/cgen-trace.c @@ -66,29 +66,30 @@ static char *bufptr; /* Non-zero if this is the first insn in a set of parallel insns. */ static int first_insn_p; -/* For communication between trace_insn and trace_result. */ +/* For communication between cgen_trace_insn and cgen_trace_result. */ static int printed_result_p; /* Insn and its extracted fields. - Set by trace_insn, used by trace_insn_fini. + Set by cgen_trace_insn, used by cgen_trace_insn_fini. ??? Move to SIM_CPU to support heterogeneous multi-cpu case. */ static const struct cgen_insn *current_insn; static const struct argbuf *current_abuf; void -trace_insn_init (SIM_CPU *cpu, int first_p) +cgen_trace_insn_init (SIM_CPU *cpu, int first_p) { bufptr = trace_buf; *bufptr = 0; first_insn_p = first_p; - /* Set to NULL so trace_insn_fini can know if trace_insn was called. */ + /* Set to NULL so cgen_trace_insn_fini can know if cgen_trace_insn was + called. */ current_insn = NULL; current_abuf = NULL; } void -trace_insn_fini (SIM_CPU *cpu, const struct argbuf *abuf, int last_p) +cgen_trace_insn_fini (SIM_CPU *cpu, const struct argbuf *abuf, int last_p) { SIM_DESC sd = CPU_STATE (cpu); @@ -143,7 +144,7 @@ trace_insn_fini (SIM_CPU *cpu, const struct argbuf *abuf, int last_p) ++i, ++opinst) { if (CGEN_OPINST_TYPE (opinst) == CGEN_OPINST_OUTPUT) - trace_result (cpu, current_insn, opinst, indices[i]); + cgen_trace_result (cpu, current_insn, opinst, indices[i]); } } } @@ -158,8 +159,8 @@ trace_insn_fini (SIM_CPU *cpu, const struct argbuf *abuf, int last_p) } void -trace_insn (SIM_CPU *cpu, const struct cgen_insn *opcode, - const struct argbuf *abuf, IADDR pc) +cgen_trace_insn (SIM_CPU *cpu, const struct cgen_insn *opcode, + const struct argbuf *abuf, IADDR pc) { char disasm_buf[50]; @@ -183,7 +184,7 @@ trace_insn (SIM_CPU *cpu, const struct cgen_insn *opcode, } void -trace_extract (SIM_CPU *cpu, IADDR pc, char *name, ...) +cgen_trace_extract (SIM_CPU *cpu, IADDR pc, char *name, ...) { va_list args; int printed_one_p = 0; @@ -222,7 +223,7 @@ trace_extract (SIM_CPU *cpu, IADDR pc, char *name, ...) } void -trace_result (SIM_CPU *cpu, char *name, int type, ...) +cgen_trace_result (SIM_CPU *cpu, char *name, int type, ...) { va_list args; diff --git a/sim/common/cgen-trace.h b/sim/common/cgen-trace.h index ba62f6c..5cc08ae 100644 --- a/sim/common/cgen-trace.h +++ b/sim/common/cgen-trace.h @@ -20,46 +20,47 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #ifndef CGEN_TRACE_H #define CGEN_TRACE_H -void trace_insn_init (SIM_CPU *, int); -void trace_insn_fini (SIM_CPU *, const struct argbuf *, int); -void trace_insn (SIM_CPU *, const struct cgen_insn *, - const struct argbuf *, IADDR); -void trace_extract (SIM_CPU *, IADDR, char *, ...); -void trace_result (SIM_CPU *, char *, int, ...); +void cgen_trace_insn_init (SIM_CPU *, int); +void cgen_trace_insn_fini (SIM_CPU *, const struct argbuf *, int); +void cgen_trace_insn (SIM_CPU *, const struct cgen_insn *, + const struct argbuf *, IADDR); +void cgen_trace_extract (SIM_CPU *, IADDR, char *, ...); +void cgen_trace_result (SIM_CPU *, char *, int, ...); void cgen_trace_printf (SIM_CPU *, char *fmt, ...); /* Trace instruction results. */ -#define TRACE_RESULT_P(cpu, abuf) (TRACE_INSN_P (cpu) && ARGBUF_TRACE_P (abuf)) +#define CGEN_TRACE_RESULT_P(cpu, abuf) \ + (TRACE_INSN_P (cpu) && ARGBUF_TRACE_P (abuf)) -#define TRACE_INSN_INIT(cpu, abuf, first_p) \ +#define CGEN_TRACE_INSN_INIT(cpu, abuf, first_p) \ do { \ if (TRACE_INSN_P (cpu)) \ - trace_insn_init ((cpu), (first_p)); \ + cgen_trace_insn_init ((cpu), (first_p)); \ } while (0) -#define TRACE_INSN_FINI(cpu, abuf, last_p) \ +#define CGEN_TRACE_INSN_FINI(cpu, abuf, last_p) \ do { \ if (TRACE_INSN_P (cpu)) \ - trace_insn_fini ((cpu), (abuf), (last_p)); \ + cgen_trace_insn_fini ((cpu), (abuf), (last_p)); \ } while (0) -#define TRACE_PRINTF(cpu, what, args) \ +#define CGEN_TRACE_PRINTF(cpu, what, args) \ do { \ if (TRACE_P ((cpu), (what))) \ cgen_trace_printf args ; \ } while (0) -#define TRACE_INSN(cpu, insn, abuf, pc) \ +#define CGEN_TRACE_INSN(cpu, insn, abuf, pc) \ do { \ if (TRACE_INSN_P (cpu) && ARGBUF_TRACE_P (abuf)) \ - trace_insn ((cpu), (insn), (abuf), (pc)) ; \ + cgen_trace_insn ((cpu), (insn), (abuf), (pc)) ; \ } while (0) -#define TRACE_EXTRACT(cpu, abuf, args) \ +#define CGEN_TRACE_EXTRACT(cpu, abuf, args) \ do { \ if (TRACE_EXTRACT_P (cpu)) \ - trace_extract args ; \ + cgen_trace_extract args ; \ } while (0) -#define TRACE_RESULT(cpu, abuf, name, type, val) \ +#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val) \ do { \ - if (TRACE_RESULT_P ((cpu), (abuf))) \ - trace_result ((cpu), (name), (type), (val)) ; \ + if (CGEN_TRACE_RESULT_P ((cpu), (abuf))) \ + cgen_trace_result ((cpu), (name), (type), (val)) ; \ } while (0) /* Disassembly support. */ diff --git a/sim/common/genmloop.sh b/sim/common/genmloop.sh index 2006940..a6bd16b 100755 --- a/sim/common/genmloop.sh +++ b/sim/common/genmloop.sh @@ -1112,7 +1112,7 @@ void } } - TRACE_INSN_FINI (current_cpu, cur_abuf, 0 /*last_p*/); + CGEN_TRACE_INSN_FINI (current_cpu, cur_abuf, 0 /*last_p*/); } /* FIXME: Later make cover macros: PROFILE_INSN_{INIT,FINI}. */ @@ -1120,8 +1120,8 @@ void && ARGBUF_PROFILE_P (cur_abuf)) @prefix@_model_insn_before (current_cpu, first_p); - TRACE_INSN_INIT (current_cpu, cur_abuf, first_p); - TRACE_INSN (current_cpu, cur_idesc->idata, cur_abuf, pc); + CGEN_TRACE_INSN_INIT (current_cpu, cur_abuf, first_p); + CGEN_TRACE_INSN (current_cpu, cur_idesc->idata, cur_abuf, pc); } /* x-after handler. @@ -1146,7 +1146,7 @@ void cycles = (*prev_idesc->timing->model_fn) (current_cpu, prev_sem_arg); @prefix@_model_insn_after (current_cpu, 1 /*last_p*/, cycles); } - TRACE_INSN_FINI (current_cpu, prev_abuf, 1 /*last_p*/); + CGEN_TRACE_INSN_FINI (current_cpu, prev_abuf, 1 /*last_p*/); } #define FAST_P 0 diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index 23c739d..43380ef 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/ChangeLog @@ -1,3 +1,13 @@ +2015-06-12 Mike Frysinger <vapier@gentoo.org> + + * decodev10.c (crisv10f_decode): Change TRACE_EXTRACT to + CGEN_TRACE_EXTRACT. + * decodev32.c (crisv32f_decode): Likewise. + * mloop.in (execute): Change TRACE_INSN_INIT to CGEN_TRACE_INSN_INIT, + TRACE_INSN to CGEN_TRACE_INSN, and TRACE_INSN_FINI to CGEN_TRACE_INSN_FINI. + * semcrisv10f-switch.c: Change TRACE_RESULT to CGEN_TRACE_RESULT. + * semcrisv32f-switch.c: Likewise. + 2015-04-18 Mike Frysinger <vapier@gentoo.org> * sim-main.h (SIM_ENGINE_HALT_HOOK, SIM_ENGINE_RESTART_HOOK): Delete. diff --git a/sim/cris/decodev10.c b/sim/cris/decodev10.c index 7a1860c..67ac343 100644 --- a/sim/cris/decodev10.c +++ b/sim/cris/decodev10.c @@ -2391,7 +2391,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0)); #undef FLD return idesc; @@ -2404,7 +2404,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nop", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nop", (char *) 0)); #undef FLD return idesc; @@ -2424,7 +2424,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_b_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_b_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2452,7 +2452,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_d_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_d_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2477,7 +2477,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movepcr", "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movepcr", "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2504,7 +2504,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_s6) = f_s6; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_moveq", "f_s6 0x%x", 'x', f_s6, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_moveq", "f_s6 0x%x", 'x', f_s6, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2531,7 +2531,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movs_b_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movs_b_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2562,7 +2562,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movecbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movecbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2592,7 +2592,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movecwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movecwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2622,7 +2622,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__dword) = f_indir_pc__dword; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movecdr", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movecdr", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2652,7 +2652,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__byte) = f_indir_pc__byte; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movscbr", "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movscbr", "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2682,7 +2682,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__word) = f_indir_pc__word; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movscwr", "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movscwr", "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2712,7 +2712,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__byte) = f_indir_pc__byte; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movucbr", "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movucbr", "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2742,7 +2742,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__word) = f_indir_pc__word; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movucwr", "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movucwr", "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2769,7 +2769,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_u6) = f_u6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addq", "f_operand2 0x%x", 'x', f_operand2, "f_u6 0x%x", 'x', f_u6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addq", "f_operand2 0x%x", 'x', f_operand2, "f_u6 0x%x", 'x', f_u6, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2797,7 +2797,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_r_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_r_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2828,7 +2828,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2860,7 +2860,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2892,7 +2892,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2924,7 +2924,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpcbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpcbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2954,7 +2954,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpcwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpcwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2984,7 +2984,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__dword) = f_indir_pc__dword; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpcdr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpcdr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3011,7 +3011,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_s6) = f_s6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpq", "f_operand2 0x%x", 'x', f_operand2, "f_s6 0x%x", 'x', f_s6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpq", "f_operand2 0x%x", 'x', f_operand2, "f_s6 0x%x", 'x', f_s6, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3041,7 +3041,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpucbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpucbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3071,7 +3071,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpucwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpucwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3101,7 +3101,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_b_m", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_b_m", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3133,7 +3133,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_w_m", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_w_m", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3165,7 +3165,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_d_m", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_d_m", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3197,7 +3197,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movs_m_b_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movs_m_b_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3229,7 +3229,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movs_m_w_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movs_m_w_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3258,7 +3258,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_sprv10", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_sprv10", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3286,7 +3286,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_spr_rv10", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_spr_rv10", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3311,7 +3311,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ret_type", "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ret_type", "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3341,7 +3341,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_sprv10", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_sprv10", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3373,7 +3373,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__word) = f_indir_pc__word; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_c_sprv10_p5", "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_c_sprv10_p5", "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3403,7 +3403,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__dword) = f_indir_pc__dword; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_c_sprv10_p9", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_c_sprv10_p9", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3433,7 +3433,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_spr_mv10", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_spr_mv10", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3455,7 +3455,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sbfs", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sbfs", (char *) 0)); #undef FLD return idesc; @@ -3478,7 +3478,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movem_r_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movem_r_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3526,7 +3526,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movem_m_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movem_m_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3570,7 +3570,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movem_m_pc", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movem_m_pc", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3613,7 +3613,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3642,7 +3642,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_d_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_d_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3674,7 +3674,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3707,7 +3707,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3740,7 +3740,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3773,7 +3773,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3804,7 +3804,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3835,7 +3835,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__dword) = f_indir_pc__dword; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcdr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcdr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3863,7 +3863,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__dword) = f_indir_pc__dword; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcpc", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcpc", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3892,7 +3892,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_adds_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_adds_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3925,7 +3925,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_adds_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_adds_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3958,7 +3958,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addscbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addscbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3989,7 +3989,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addscwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addscwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4010,7 +4010,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addspcpc", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addspcpc", (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4036,7 +4036,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4065,7 +4065,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_neg_b_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_neg_b_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4093,7 +4093,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_neg_d_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_neg_d_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4121,7 +4121,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_test_m_b_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_test_m_b_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4149,7 +4149,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_test_m_w_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_test_m_w_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4177,7 +4177,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_test_m_d_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_test_m_d_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4208,7 +4208,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4240,7 +4240,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4272,7 +4272,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4301,7 +4301,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_muls_b", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_muls_b", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4331,7 +4331,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mstep", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mstep", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4360,7 +4360,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_dstep", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_dstep", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4389,7 +4389,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4418,7 +4418,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_d_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_d_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4450,7 +4450,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4483,7 +4483,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4516,7 +4516,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4549,7 +4549,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4580,7 +4580,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4611,7 +4611,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__dword) = f_indir_pc__dword; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcdr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcdr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4639,7 +4639,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_s6) = f_s6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andq", "f_operand2 0x%x", 'x', f_operand2, "f_s6 0x%x", 'x', f_s6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andq", "f_operand2 0x%x", 'x', f_operand2, "f_s6 0x%x", 'x', f_s6, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4667,7 +4667,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_swap", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_swap", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4695,7 +4695,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_u5) = f_u5; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_asrq", "f_operand2 0x%x", 'x', f_operand2, "f_u5 0x%x", 'x', f_u5, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_asrq", "f_operand2 0x%x", 'x', f_operand2, "f_u5 0x%x", 'x', f_u5, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4723,7 +4723,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lsrr_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lsrr_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4752,7 +4752,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lsrr_d_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lsrr_d_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4781,7 +4781,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_btst", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_btst", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4809,7 +4809,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_u5) = f_u5; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_btstq", "f_operand2 0x%x", 'x', f_operand2, "f_u5 0x%x", 'x', f_u5, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_btstq", "f_operand2 0x%x", 'x', f_operand2, "f_u5 0x%x", 'x', f_u5, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4837,7 +4837,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_dstsrc) = f_dstsrc; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_setf", "f_dstsrc 0x%x", 'x', f_dstsrc, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_setf", "f_dstsrc 0x%x", 'x', f_dstsrc, (char *) 0)); #undef FLD return idesc; @@ -4867,7 +4867,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (i_o_pcrel) = f_disp9; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcc_b", "f_operand2 0x%x", 'x', f_operand2, "o_pcrel 0x%x", 'x', f_disp9, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcc_b", "f_operand2 0x%x", 'x', f_operand2, "o_pcrel 0x%x", 'x', f_disp9, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4900,7 +4900,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_o_pcrel) = f_disp9; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ba_b", "o_pcrel 0x%x", 'x', f_disp9, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ba_b", "o_pcrel 0x%x", 'x', f_disp9, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4929,7 +4929,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (i_o_word_pcrel) = f_indir_pc__word_pcrel; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcc_w", "f_operand2 0x%x", 'x', f_operand2, "o_word_pcrel 0x%x", 'x', f_indir_pc__word_pcrel, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcc_w", "f_operand2 0x%x", 'x', f_operand2, "o_word_pcrel 0x%x", 'x', f_indir_pc__word_pcrel, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4955,7 +4955,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_o_word_pcrel) = f_indir_pc__word_pcrel; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ba_w", "o_word_pcrel 0x%x", 'x', f_indir_pc__word_pcrel, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ba_w", "o_word_pcrel 0x%x", 'x', f_indir_pc__word_pcrel, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4981,7 +4981,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jump_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jump_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5012,7 +5012,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jump_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jump_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5044,7 +5044,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__dword) = f_indir_pc__dword; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jump_c", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jump_c", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5068,7 +5068,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_u4) = f_u4; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_break", "f_u4 0x%x", 'x', f_u4, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_break", "f_u4 0x%x", 'x', f_u4, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5097,7 +5097,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5130,7 +5130,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5163,7 +5163,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5196,7 +5196,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_cb", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_cb", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5227,7 +5227,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_cw", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_cw", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5258,7 +5258,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__dword) = f_indir_pc__dword; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_cd", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_cd", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5286,7 +5286,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_scc", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_scc", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5313,7 +5313,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_s8) = f_s8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addoq", "f_operand2 0x%x", 'x', f_operand2, "f_s8 0x%x", 'x', f_s8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addoq", "f_operand2 0x%x", 'x', f_operand2, "f_s8 0x%x", 'x', f_s8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5337,7 +5337,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_s8) = f_s8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bdapqpc", "f_s8 0x%x", 'x', f_s8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bdapqpc", "f_s8 0x%x", 'x', f_s8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5363,7 +5363,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__dword) = f_indir_pc__dword; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bdap_32_pc", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bdap_32_pc", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5386,7 +5386,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_pcplus_p0", "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_pcplus_p0", "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5409,7 +5409,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_spplus_p8", "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_spplus_p8", "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5440,7 +5440,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5472,7 +5472,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5504,7 +5504,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5536,7 +5536,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_cb", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_cb", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5566,7 +5566,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_cw", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_cw", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5596,7 +5596,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__dword) = f_indir_pc__dword; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_cd", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_cd", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5623,7 +5623,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_dip_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_dip_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5651,7 +5651,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__dword) = f_indir_pc__dword; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_dip_c", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_dip_c", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); #undef FLD return idesc; @@ -5671,7 +5671,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi_acr_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi_acr_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5696,7 +5696,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_biap_pc_b_r", "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_biap_pc_b_r", "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ diff --git a/sim/cris/decodev32.c b/sim/cris/decodev32.c index aaabe03..51456f2 100644 --- a/sim/cris/decodev32.c +++ b/sim/cris/decodev32.c @@ -1914,7 +1914,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0)); #undef FLD return idesc; @@ -1934,7 +1934,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_b_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_b_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1962,7 +1962,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_d_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_d_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1990,7 +1990,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_s6) = f_s6; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_moveq", "f_s6 0x%x", 'x', f_s6, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_moveq", "f_s6 0x%x", 'x', f_s6, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2017,7 +2017,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movs_b_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movs_b_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2048,7 +2048,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movecbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movecbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2078,7 +2078,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movecwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movecwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2108,7 +2108,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__dword) = f_indir_pc__dword; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movecdr", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movecdr", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2138,7 +2138,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__byte) = f_indir_pc__byte; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movscbr", "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movscbr", "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2168,7 +2168,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__word) = f_indir_pc__word; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movscwr", "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movscwr", "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2198,7 +2198,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__byte) = f_indir_pc__byte; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movucbr", "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movucbr", "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2228,7 +2228,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__word) = f_indir_pc__word; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movucwr", "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movucwr", "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2255,7 +2255,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_u6) = f_u6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addq", "f_operand2 0x%x", 'x', f_operand2, "f_u6 0x%x", 'x', f_u6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addq", "f_operand2 0x%x", 'x', f_operand2, "f_u6 0x%x", 'x', f_u6, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2283,7 +2283,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_r_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_r_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2314,7 +2314,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2346,7 +2346,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2378,7 +2378,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2410,7 +2410,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpcbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpcbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2440,7 +2440,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpcwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpcwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2470,7 +2470,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__dword) = f_indir_pc__dword; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpcdr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpcdr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2497,7 +2497,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_s6) = f_s6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpq", "f_operand2 0x%x", 'x', f_operand2, "f_s6 0x%x", 'x', f_s6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpq", "f_operand2 0x%x", 'x', f_operand2, "f_s6 0x%x", 'x', f_s6, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2527,7 +2527,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpucbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpucbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2557,7 +2557,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpucwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpucwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2587,7 +2587,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_b_m", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_b_m", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2619,7 +2619,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_w_m", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_w_m", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2651,7 +2651,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_d_m", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_d_m", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2683,7 +2683,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movs_m_b_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movs_m_b_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2715,7 +2715,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movs_m_w_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movs_m_w_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2744,7 +2744,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_sprv32", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_sprv32", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2772,7 +2772,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_spr_rv32", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_spr_rv32", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2803,7 +2803,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_sprv32", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_m_sprv32", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2835,7 +2835,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__dword) = f_indir_pc__dword; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_c_sprv32_p2", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_c_sprv32_p2", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2865,7 +2865,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_spr_mv32", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_spr_mv32", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2894,7 +2894,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_ss_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_ss_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2921,7 +2921,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_ss", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_ss", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2951,7 +2951,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movem_r_m_v32", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movem_r_m_v32", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2999,7 +2999,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movem_m_r_v32", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movem_m_r_v32", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3044,7 +3044,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3073,7 +3073,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_d_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_d_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3105,7 +3105,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3138,7 +3138,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3171,7 +3171,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3204,7 +3204,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3235,7 +3235,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3266,7 +3266,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__dword) = f_indir_pc__dword; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcdr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcdr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3297,7 +3297,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_adds_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_adds_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3330,7 +3330,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_adds_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_adds_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3363,7 +3363,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addscbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addscbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3394,7 +3394,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addscwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addscwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3425,7 +3425,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addc_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addc_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3458,7 +3458,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (i_const32_pcrel) = f_indir_pc__dword_pcrel; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lapc_d", "f_operand2 0x%x", 'x', f_operand2, "const32_pcrel 0x%x", 'x', f_indir_pc__dword_pcrel, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lapc_d", "f_operand2 0x%x", 'x', f_operand2, "const32_pcrel 0x%x", 'x', f_indir_pc__dword_pcrel, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3485,7 +3485,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (i_qo) = f_qo; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lapcq", "f_operand2 0x%x", 'x', f_operand2, "qo 0x%x", 'x', f_qo, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lapcq", "f_operand2 0x%x", 'x', f_operand2, "qo 0x%x", 'x', f_qo, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3512,7 +3512,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3541,7 +3541,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_neg_b_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_neg_b_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3569,7 +3569,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_neg_d_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_neg_d_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3597,7 +3597,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_test_m_b_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_test_m_b_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3625,7 +3625,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_test_m_w_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_test_m_w_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3653,7 +3653,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_test_m_d_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_test_m_d_m", "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3684,7 +3684,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3716,7 +3716,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3748,7 +3748,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_move_r_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3777,7 +3777,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_muls_b", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_muls_b", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3807,7 +3807,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcp", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcp", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3836,7 +3836,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_dstep", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_dstep", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3865,7 +3865,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3894,7 +3894,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_d_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_d_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3926,7 +3926,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3959,7 +3959,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3992,7 +3992,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4025,7 +4025,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcbr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4056,7 +4056,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcwr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4087,7 +4087,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__dword) = f_indir_pc__dword; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcdr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcdr", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4115,7 +4115,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_s6) = f_s6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andq", "f_operand2 0x%x", 'x', f_operand2, "f_s6 0x%x", 'x', f_s6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andq", "f_operand2 0x%x", 'x', f_operand2, "f_s6 0x%x", 'x', f_s6, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4143,7 +4143,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_swap", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_swap", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4171,7 +4171,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_u5) = f_u5; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_asrq", "f_operand2 0x%x", 'x', f_operand2, "f_u5 0x%x", 'x', f_u5, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_asrq", "f_operand2 0x%x", 'x', f_operand2, "f_u5 0x%x", 'x', f_u5, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4199,7 +4199,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lsrr_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lsrr_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4228,7 +4228,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lsrr_d_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lsrr_d_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4257,7 +4257,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_btst", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_btst", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4285,7 +4285,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_u5) = f_u5; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_btstq", "f_operand2 0x%x", 'x', f_operand2, "f_u5 0x%x", 'x', f_u5, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_btstq", "f_operand2 0x%x", 'x', f_operand2, "f_u5 0x%x", 'x', f_u5, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4313,7 +4313,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_dstsrc) = f_dstsrc; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_setf", "f_dstsrc 0x%x", 'x', f_dstsrc, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_setf", "f_dstsrc 0x%x", 'x', f_dstsrc, (char *) 0)); #undef FLD return idesc; @@ -4326,7 +4326,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rfe", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rfe", (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4347,7 +4347,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sfe", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sfe", (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4368,7 +4368,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rfg", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rfg", (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4387,7 +4387,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rfn", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rfn", (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4408,7 +4408,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_halt", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_halt", (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4444,7 +4444,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (i_o_pcrel) = f_disp9; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcc_b", "f_operand2 0x%x", 'x', f_operand2, "o_pcrel 0x%x", 'x', f_disp9, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcc_b", "f_operand2 0x%x", 'x', f_operand2, "o_pcrel 0x%x", 'x', f_disp9, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4477,7 +4477,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_o_pcrel) = f_disp9; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ba_b", "o_pcrel 0x%x", 'x', f_disp9, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ba_b", "o_pcrel 0x%x", 'x', f_disp9, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4506,7 +4506,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (i_o_word_pcrel) = f_indir_pc__word_pcrel; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcc_w", "f_operand2 0x%x", 'x', f_operand2, "o_word_pcrel 0x%x", 'x', f_indir_pc__word_pcrel, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcc_w", "f_operand2 0x%x", 'x', f_operand2, "o_word_pcrel 0x%x", 'x', f_indir_pc__word_pcrel, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4532,7 +4532,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_o_word_pcrel) = f_indir_pc__word_pcrel; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ba_w", "o_word_pcrel 0x%x", 'x', f_indir_pc__word_pcrel, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ba_w", "o_word_pcrel 0x%x", 'x', f_indir_pc__word_pcrel, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4558,7 +4558,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jas_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jas_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4589,7 +4589,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_indir_pc__dword) = f_indir_pc__dword; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jas_c", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jas_c", "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4613,7 +4613,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jump_p", "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jump_p", "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4643,7 +4643,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (i_const32_pcrel) = f_indir_pc__dword_pcrel; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bas_c", "f_operand2 0x%x", 'x', f_operand2, "const32_pcrel 0x%x", 'x', f_indir_pc__dword_pcrel, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bas_c", "f_operand2 0x%x", 'x', f_operand2, "const32_pcrel 0x%x", 'x', f_indir_pc__dword_pcrel, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4670,7 +4670,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; FLD (f_operand2) = f_operand2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jasc_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jasc_r", "f_operand1 0x%x", 'x', f_operand1, "f_operand2 0x%x", 'x', f_operand2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4695,7 +4695,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_u4) = f_u4; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_break", "f_u4 0x%x", 'x', f_u4, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_break", "f_u4 0x%x", 'x', f_u4, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4724,7 +4724,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_cb", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_cb", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4755,7 +4755,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_cw", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_cw", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4786,7 +4786,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__dword) = f_indir_pc__dword; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_cd", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bound_cd", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4814,7 +4814,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_scc", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_scc", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4841,7 +4841,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_s8) = f_s8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addoq", "f_operand2 0x%x", 'x', f_operand2, "f_s8 0x%x", 'x', f_s8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addoq", "f_operand2 0x%x", 'x', f_operand2, "f_s8 0x%x", 'x', f_s8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4871,7 +4871,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_m_b_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4903,7 +4903,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_m_w_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4935,7 +4935,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; FLD (f_memmode) = f_memmode; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_m_d_m", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, "f_memmode 0x%x", 'x', f_memmode, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4967,7 +4967,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__byte) = f_indir_pc__byte; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_cb", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_cb", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__byte 0x%x", 'x', f_indir_pc__byte, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4997,7 +4997,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__word) = f_indir_pc__word; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_cw", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_cw", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__word 0x%x", 'x', f_indir_pc__word, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5027,7 +5027,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_indir_pc__dword) = f_indir_pc__dword; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_cd", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addo_cd", "f_operand2 0x%x", 'x', f_operand2, "f_indir_pc__dword 0x%x", 'x', f_indir_pc__dword, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5054,7 +5054,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi_acr_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi_acr_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5079,7 +5079,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_operand1) = f_operand1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fidxi", "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fidxi", "f_operand1 0x%x", 'x', f_operand1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ diff --git a/sim/cris/mloop.in b/sim/cris/mloop.in index d31d420..f8208d2 100644 --- a/sim/cris/mloop.in +++ b/sim/cris/mloop.in @@ -102,8 +102,8 @@ execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p) if (PROFILE_MODEL_P (current_cpu) && ARGBUF_PROFILE_P (abuf)) @cpu@_model_insn_before (current_cpu, 1 /*first_p*/); - TRACE_INSN_INIT (current_cpu, abuf, 1); - TRACE_INSN (current_cpu, idesc->idata, + CGEN_TRACE_INSN_INIT (current_cpu, abuf, 1); + CGEN_TRACE_INSN (current_cpu, idesc->idata, (const struct argbuf *) abuf, abuf->addr); } #if WITH_SCACHE @@ -122,7 +122,7 @@ execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p) cycles = (*idesc->timing->model_fn) (current_cpu, sc); @cpu@_model_insn_after (current_cpu, 1 /*last_p*/, cycles); } - TRACE_INSN_FINI (current_cpu, abuf, 1); + CGEN_TRACE_INSN_FINI (current_cpu, abuf, 1); } #else abort (); diff --git a/sim/cris/semcrisv10f-switch.c b/sim/cris/semcrisv10f-switch.c index e17ed64..001d69a 100644 --- a/sim/cris/semcrisv10f-switch.c +++ b/sim/cris/semcrisv10f-switch.c @@ -260,13 +260,13 @@ This file is part of the GNU simulators. /* If hyper-fast [well not unnecessarily slow] execution is selected, turn off frills like tracing and profiling. */ -/* FIXME: A better way would be to have TRACE_RESULT check for something +/* FIXME: A better way would be to have CGEN_TRACE_RESULT check for something that can cause it to be optimized out. Another way would be to emit special handlers into the instruction "stream". */ #if FAST_P -#undef TRACE_RESULT -#define TRACE_RESULT(cpu, abuf, name, type, val) +#undef CGEN_TRACE_RESULT +#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val) #endif #undef GET_ATTR @@ -452,12 +452,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -483,19 +483,19 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -503,12 +503,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -536,19 +536,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -556,12 +556,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -586,18 +586,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -605,12 +605,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -636,18 +636,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_pcval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_pcval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_pcval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -655,12 +655,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -686,7 +686,7 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SET_H_NBIT_MOVE (LTSI (tmp_newval, 0)); @@ -697,12 +697,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -729,18 +729,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -748,12 +748,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -780,18 +780,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -799,12 +799,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -831,18 +831,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -850,12 +850,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -882,18 +882,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -901,12 +901,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -934,19 +934,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -954,12 +954,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -987,19 +987,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -1007,12 +1007,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1037,18 +1037,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -1056,12 +1056,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1086,18 +1086,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -1105,12 +1105,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1135,18 +1135,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -1154,12 +1154,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1184,18 +1184,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -1203,12 +1203,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1233,18 +1233,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -1252,12 +1252,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1288,39 +1288,39 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1351,39 +1351,39 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1416,33 +1416,33 @@ SET_H_VBIT_MOVE (0); { BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1475,33 +1475,33 @@ SET_H_VBIT_MOVE (0); { BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1534,33 +1534,33 @@ SET_H_VBIT_MOVE (0); { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1599,7 +1599,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -1612,33 +1612,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1678,7 +1678,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -1691,33 +1691,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1757,7 +1757,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -1770,33 +1770,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1830,33 +1830,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1889,33 +1889,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1948,33 +1948,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2007,33 +2007,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2072,7 +2072,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -2085,33 +2085,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2151,7 +2151,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -2164,33 +2164,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2224,33 +2224,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2283,33 +2283,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2348,7 +2348,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -2361,33 +2361,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2427,7 +2427,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -2440,33 +2440,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2500,33 +2500,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2559,33 +2559,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2621,7 +2621,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -2632,19 +2632,19 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_tmp, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_tmp, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_tmp, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -2652,12 +2652,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2694,7 +2694,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -2705,19 +2705,19 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_tmp, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_tmp, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_tmp, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -2725,12 +2725,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2767,7 +2767,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -2775,18 +2775,18 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_tmp; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmp, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmp, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -2794,12 +2794,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2836,7 +2836,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -2846,26 +2846,26 @@ if (ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) { SI opval = tmp_tmp; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else { { SI opval = tmp_tmp; SET_H_GR (FLD (f_operand2), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTSI (tmp_tmp, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmp, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -2873,12 +2873,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2915,7 +2915,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -2925,26 +2925,26 @@ if (ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) { SI opval = tmp_tmp; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else { { SI opval = tmp_tmp; SET_H_GR (FLD (f_operand2), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTSI (tmp_tmp, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmp, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -2952,12 +2952,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2994,7 +2994,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3004,26 +3004,26 @@ if (ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) { SI opval = tmp_tmp; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else { { SI opval = tmp_tmp; SET_H_GR (FLD (f_operand2), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTSI (tmp_tmp, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmp, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -3031,12 +3031,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3073,7 +3073,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3083,26 +3083,26 @@ if (ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) { SI opval = tmp_tmp; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else { { SI opval = tmp_tmp; SET_H_GR (FLD (f_operand2), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTSI (tmp_tmp, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmp, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -3110,12 +3110,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3148,19 +3148,19 @@ cgen_rtx_error (current_cpu, "move-r-spr: trying to set a read-only special regi SI opval = tmp_tmp; SET_H_SR (FLD (f_operand2), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3193,7 +3193,7 @@ if (EQSI (tmp_prno, 5)) { SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3202,7 +3202,7 @@ if (EQSI (tmp_prno, 5)) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else if (EQSI (tmp_prno, 10)) { @@ -3210,7 +3210,7 @@ if (EQSI (tmp_prno, 5)) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else if (EQSI (tmp_prno, 11)) { @@ -3218,7 +3218,7 @@ if (EQSI (tmp_prno, 5)) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else if (EQSI (tmp_prno, 12)) { @@ -3226,7 +3226,7 @@ if (EQSI (tmp_prno, 5)) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else if (EQSI (tmp_prno, 13)) { @@ -3234,7 +3234,7 @@ if (EQSI (tmp_prno, 5)) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else if (EQSI (tmp_prno, 0)) { @@ -3245,7 +3245,7 @@ if (EQSI (tmp_prno, 5)) { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3257,7 +3257,7 @@ if (EQSI (tmp_prno, 5)) { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3269,7 +3269,7 @@ if (EQSI (tmp_prno, 5)) { SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3278,7 +3278,7 @@ if (EQSI (tmp_prno, 5)) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else if (EQSI (tmp_prno, 7)) { @@ -3286,7 +3286,7 @@ if (EQSI (tmp_prno, 5)) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else if (EQSI (tmp_prno, 14)) { @@ -3294,7 +3294,7 @@ if (EQSI (tmp_prno, 5)) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else if (EQSI (tmp_prno, 15)) { @@ -3302,7 +3302,7 @@ if (EQSI (tmp_prno, 5)) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else { @@ -3312,12 +3312,12 @@ cgen_rtx_error (current_cpu, "move-spr-r from unimplemented register"); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3344,19 +3344,19 @@ cgen_rtx_error (current_cpu, "move-spr-r from unimplemented register"); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } { { USI opval = tmp_retaddr; SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -3395,7 +3395,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3417,7 +3417,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3439,7 +3439,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3461,7 +3461,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3483,7 +3483,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3505,7 +3505,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3527,7 +3527,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3549,7 +3549,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3571,7 +3571,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3583,18 +3583,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = tmp_newval; SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3617,18 +3617,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = FLD (f_indir_pc__word); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3650,18 +3650,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = FLD (f_indir_pc__dword); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3683,18 +3683,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = FLD (f_indir_pc__dword); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3716,18 +3716,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = FLD (f_indir_pc__dword); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3749,18 +3749,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = FLD (f_indir_pc__dword); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3782,18 +3782,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = FLD (f_indir_pc__dword); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3815,18 +3815,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = FLD (f_indir_pc__dword); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3848,18 +3848,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = FLD (f_indir_pc__dword); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3881,18 +3881,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = FLD (f_indir_pc__dword); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3926,13 +3926,13 @@ if (EQBI (CPU (h_pbit), 0)) { HI opval = GET_H_SR (FLD (f_operand2)); SETMEMHI (current_cpu, pc, tmp_addr, opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -3940,7 +3940,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -3948,7 +3948,7 @@ if (EQBI (CPU (h_pbit), 0)) { HI opval = GET_H_SR (FLD (f_operand2)); SETMEMHI (current_cpu, pc, tmp_addr, opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -3960,7 +3960,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3979,13 +3979,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -3993,7 +3993,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4001,7 +4001,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4013,7 +4013,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4032,13 +4032,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4046,7 +4046,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4054,7 +4054,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4066,7 +4066,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4085,13 +4085,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4099,7 +4099,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4107,7 +4107,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4119,7 +4119,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4138,13 +4138,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4152,7 +4152,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4160,7 +4160,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4172,7 +4172,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4191,13 +4191,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4205,7 +4205,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4213,7 +4213,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4225,7 +4225,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4244,13 +4244,13 @@ if (EQBI (CPU (h_pbit), 0)) { QI opval = GET_H_SR (FLD (f_operand2)); SETMEMQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4258,7 +4258,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4266,7 +4266,7 @@ if (EQBI (CPU (h_pbit), 0)) { QI opval = GET_H_SR (FLD (f_operand2)); SETMEMQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4278,7 +4278,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4297,13 +4297,13 @@ if (EQBI (CPU (h_pbit), 0)) { QI opval = GET_H_SR (FLD (f_operand2)); SETMEMQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4311,7 +4311,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4319,7 +4319,7 @@ if (EQBI (CPU (h_pbit), 0)) { QI opval = GET_H_SR (FLD (f_operand2)); SETMEMQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4331,7 +4331,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4350,13 +4350,13 @@ if (EQBI (CPU (h_pbit), 0)) { HI opval = GET_H_SR (FLD (f_operand2)); SETMEMHI (current_cpu, pc, tmp_addr, opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4364,7 +4364,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4372,7 +4372,7 @@ if (EQBI (CPU (h_pbit), 0)) { HI opval = GET_H_SR (FLD (f_operand2)); SETMEMHI (current_cpu, pc, tmp_addr, opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4384,7 +4384,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4403,13 +4403,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4417,7 +4417,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4425,7 +4425,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4437,7 +4437,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4456,13 +4456,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4470,7 +4470,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4478,7 +4478,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4490,7 +4490,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4509,13 +4509,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4523,7 +4523,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4531,7 +4531,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4543,7 +4543,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4562,13 +4562,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4576,7 +4576,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4584,7 +4584,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4596,7 +4596,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4609,12 +4609,12 @@ cgen_rtx_error (current_cpu, "write from unimplemented special register"); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -4666,7 +4666,7 @@ if (GESI (FLD (f_operand2), 15)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 23); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4679,7 +4679,7 @@ if (GESI (FLD (f_operand2), 14)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 23); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4692,7 +4692,7 @@ if (GESI (FLD (f_operand2), 13)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 23); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4705,7 +4705,7 @@ if (GESI (FLD (f_operand2), 12)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 23); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4718,7 +4718,7 @@ if (GESI (FLD (f_operand2), 11)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 23); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4731,7 +4731,7 @@ if (GESI (FLD (f_operand2), 10)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 23); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4744,7 +4744,7 @@ if (GESI (FLD (f_operand2), 9)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 23); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4757,7 +4757,7 @@ if (GESI (FLD (f_operand2), 8)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 23); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4770,7 +4770,7 @@ if (GESI (FLD (f_operand2), 7)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 23); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4783,7 +4783,7 @@ if (GESI (FLD (f_operand2), 6)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 23); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4796,7 +4796,7 @@ if (GESI (FLD (f_operand2), 5)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 23); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4809,7 +4809,7 @@ if (GESI (FLD (f_operand2), 4)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 23); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4822,7 +4822,7 @@ if (GESI (FLD (f_operand2), 3)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 23); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4835,7 +4835,7 @@ if (GESI (FLD (f_operand2), 2)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 23); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4848,7 +4848,7 @@ if (GESI (FLD (f_operand2), 1)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 23); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4861,7 +4861,7 @@ if (GESI (FLD (f_operand2), 0)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 23); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4872,19 +4872,19 @@ if (NEBI (tmp_postinc, 0)) { SI opval = ((EQBI (GET_H_INSN_PREFIXED_P (), 0)) ? (tmp_addr) : (CPU (h_prefixreg_pre_v32))); SET_H_GR (FLD (f_operand1), opval); written |= (1 << 22); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -4921,7 +4921,7 @@ if (GESI (FLD (f_operand2), 14)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 14), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4934,7 +4934,7 @@ if (GESI (FLD (f_operand2), 13)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 13), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4947,7 +4947,7 @@ if (GESI (FLD (f_operand2), 12)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 12), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4960,7 +4960,7 @@ if (GESI (FLD (f_operand2), 11)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 11), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4973,7 +4973,7 @@ if (GESI (FLD (f_operand2), 10)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 10), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4986,7 +4986,7 @@ if (GESI (FLD (f_operand2), 9)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 9), opval); written |= (1 << 22); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4999,7 +4999,7 @@ if (GESI (FLD (f_operand2), 8)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 8), opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5012,7 +5012,7 @@ if (GESI (FLD (f_operand2), 7)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 7), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5025,7 +5025,7 @@ if (GESI (FLD (f_operand2), 6)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 6), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5038,7 +5038,7 @@ if (GESI (FLD (f_operand2), 5)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 5), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5051,7 +5051,7 @@ if (GESI (FLD (f_operand2), 4)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 4), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5064,7 +5064,7 @@ if (GESI (FLD (f_operand2), 3)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 3), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5077,7 +5077,7 @@ if (GESI (FLD (f_operand2), 2)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 2), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5090,7 +5090,7 @@ if (GESI (FLD (f_operand2), 1)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5103,7 +5103,7 @@ if (GESI (FLD (f_operand2), 0)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 0), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5114,19 +5114,19 @@ if (NEBI (tmp_postinc, 0)) { SI opval = ((EQBI (GET_H_INSN_PREFIXED_P (), 0)) ? (tmp_addr) : (CPU (h_prefixreg_pre_v32))); SET_H_GR (FLD (f_operand1), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -5155,7 +5155,7 @@ if (NEBI (tmp_postinc, 0)) { { USI opval = GETMEMSI (current_cpu, pc, tmp_addr); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); { @@ -5164,7 +5164,7 @@ if (NEBI (tmp_postinc, 0)) { { SI opval = tmp_tmp; SET_H_GR (((UINT) 14), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5174,7 +5174,7 @@ if (NEBI (tmp_postinc, 0)) { { SI opval = tmp_tmp; SET_H_GR (((UINT) 13), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5184,7 +5184,7 @@ if (NEBI (tmp_postinc, 0)) { { SI opval = tmp_tmp; SET_H_GR (((UINT) 12), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5194,7 +5194,7 @@ if (NEBI (tmp_postinc, 0)) { { SI opval = tmp_tmp; SET_H_GR (((UINT) 11), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5204,7 +5204,7 @@ if (NEBI (tmp_postinc, 0)) { { SI opval = tmp_tmp; SET_H_GR (((UINT) 10), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5214,7 +5214,7 @@ if (NEBI (tmp_postinc, 0)) { { SI opval = tmp_tmp; SET_H_GR (((UINT) 9), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5224,7 +5224,7 @@ if (NEBI (tmp_postinc, 0)) { { SI opval = tmp_tmp; SET_H_GR (((UINT) 8), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5234,7 +5234,7 @@ if (NEBI (tmp_postinc, 0)) { { SI opval = tmp_tmp; SET_H_GR (((UINT) 7), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5244,7 +5244,7 @@ if (NEBI (tmp_postinc, 0)) { { SI opval = tmp_tmp; SET_H_GR (((UINT) 6), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5254,7 +5254,7 @@ if (NEBI (tmp_postinc, 0)) { { SI opval = tmp_tmp; SET_H_GR (((UINT) 5), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5264,7 +5264,7 @@ if (NEBI (tmp_postinc, 0)) { { SI opval = tmp_tmp; SET_H_GR (((UINT) 4), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5274,7 +5274,7 @@ if (NEBI (tmp_postinc, 0)) { { SI opval = tmp_tmp; SET_H_GR (((UINT) 3), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5284,7 +5284,7 @@ if (NEBI (tmp_postinc, 0)) { { SI opval = tmp_tmp; SET_H_GR (((UINT) 2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5294,7 +5294,7 @@ if (NEBI (tmp_postinc, 0)) { { SI opval = tmp_tmp; SET_H_GR (((UINT) 1), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5304,7 +5304,7 @@ if (NEBI (tmp_postinc, 0)) { { SI opval = tmp_tmp; SET_H_GR (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5314,19 +5314,19 @@ if (NEBI (tmp_postinc, 0)) { SI opval = ((EQBI (GET_H_INSN_PREFIXED_P (), 0)) ? (tmp_addr) : (CPU (h_prefixreg_pre_v32))); SET_H_GR (FLD (f_operand1), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -5361,40 +5361,40 @@ if (NEBI (tmp_postinc, 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), ORIF (ANDIF (LTQI (tmp_tmpopd, 0), GEQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (GEQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -5428,40 +5428,40 @@ if (NEBI (tmp_postinc, 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), ORIF (ANDIF (LTHI (tmp_tmpopd, 0), GEHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (GEHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -5492,39 +5492,39 @@ if (NEBI (tmp_postinc, 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -5563,7 +5563,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -5577,40 +5577,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), ORIF (ANDIF (LTQI (tmp_tmpopd, 0), GEQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (GEQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -5650,7 +5650,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -5664,40 +5664,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), ORIF (ANDIF (LTHI (tmp_tmpopd, 0), GEHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (GEHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -5737,7 +5737,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -5748,39 +5748,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -5815,40 +5815,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), ORIF (ANDIF (LTQI (tmp_tmpopd, 0), GEQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (GEQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -5882,40 +5882,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), ORIF (ANDIF (LTHI (tmp_tmpopd, 0), GEHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (GEHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -5946,39 +5946,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6008,39 +6008,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { USI opval = tmp_newpc; SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_offs, 0), LTSI (tmp_oldpc, 0)), ORIF (ANDIF (LTSI (tmp_oldpc, 0), GESI (tmp_newpc, 0)), ANDIF (LTSI (tmp_offs, 0), GESI (tmp_newpc, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newpc, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newpc, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_offs, 0), LTSI (tmp_oldpc, 0)), GESI (tmp_newpc, 0)), ANDIF (ANDIF (GESI (tmp_offs, 0), GESI (tmp_oldpc, 0)), LTSI (tmp_newpc, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6072,39 +6072,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6135,39 +6135,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6206,7 +6206,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -6217,39 +6217,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6289,7 +6289,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -6300,39 +6300,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6364,39 +6364,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6427,39 +6427,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6492,39 +6492,39 @@ cgen_rtx_error (current_cpu, "Unexpected adds.w [PC],PC without prefix"); { USI opval = tmp_newpc; SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (EXTHISI (tmp_offs), 0), LTSI (tmp_oldpc, 0)), ORIF (ANDIF (LTSI (tmp_oldpc, 0), GESI (tmp_newpc, 0)), ANDIF (LTSI (EXTHISI (tmp_offs), 0), GESI (tmp_newpc, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newpc, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newpc, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (EXTHISI (tmp_offs), 0), LTSI (tmp_oldpc, 0)), GESI (tmp_newpc, 0)), ANDIF (ANDIF (GESI (EXTHISI (tmp_offs), 0), GESI (tmp_oldpc, 0)), LTSI (tmp_newpc, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6556,39 +6556,39 @@ cgen_rtx_error (current_cpu, "Unexpected adds.w [PC],PC without prefix"); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6619,39 +6619,39 @@ cgen_rtx_error (current_cpu, "Unexpected adds.w [PC],PC without prefix"); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6690,7 +6690,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -6701,39 +6701,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6773,7 +6773,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -6784,39 +6784,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6848,39 +6848,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6911,39 +6911,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6977,40 +6977,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7044,40 +7044,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7108,39 +7108,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7179,7 +7179,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -7193,40 +7193,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7266,7 +7266,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -7280,40 +7280,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7353,7 +7353,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -7364,39 +7364,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7431,40 +7431,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7498,40 +7498,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7562,39 +7562,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7625,39 +7625,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7688,39 +7688,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7759,7 +7759,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -7770,39 +7770,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7842,7 +7842,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -7853,39 +7853,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7917,39 +7917,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7980,39 +7980,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8043,39 +8043,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8106,39 +8106,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8177,7 +8177,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -8188,39 +8188,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8260,7 +8260,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -8271,39 +8271,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8335,39 +8335,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8398,39 +8398,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8453,18 +8453,18 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (GET_H_GR (FLD (f_operand1)), MULSI (GET_H_GR (FLD (f_operand2)), 1)); SET_H_GR (FLD (f_operand1), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8486,18 +8486,18 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (GET_H_GR (FLD (f_operand1)), MULSI (GET_H_GR (FLD (f_operand2)), 2)); SET_H_GR (FLD (f_operand1), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8519,18 +8519,18 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (GET_H_GR (FLD (f_operand1)), MULSI (GET_H_GR (FLD (f_operand2)), 4)); SET_H_GR (FLD (f_operand1), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8563,40 +8563,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8630,40 +8630,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8694,39 +8694,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8762,7 +8762,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -8781,33 +8781,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8845,7 +8845,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -8864,33 +8864,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8928,7 +8928,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -8947,33 +8947,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9009,13 +9009,13 @@ if (EQBI (CPU (h_pbit), 0)) { QI opval = tmp_tmpd; SETMEMQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -9023,7 +9023,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -9031,7 +9031,7 @@ if (EQBI (CPU (h_pbit), 0)) { QI opval = tmp_tmpd; SETMEMQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -9043,7 +9043,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -9052,12 +9052,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9091,13 +9091,13 @@ if (EQBI (CPU (h_pbit), 0)) { HI opval = tmp_tmpd; SETMEMHI (current_cpu, pc, tmp_addr, opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -9105,7 +9105,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -9113,7 +9113,7 @@ if (EQBI (CPU (h_pbit), 0)) { HI opval = tmp_tmpd; SETMEMHI (current_cpu, pc, tmp_addr, opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -9125,7 +9125,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -9134,12 +9134,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9173,13 +9173,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = tmp_tmpd; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -9187,7 +9187,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -9195,7 +9195,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = tmp_tmpd; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -9207,7 +9207,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -9216,12 +9216,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9250,44 +9250,44 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = TRUNCDISI (tmp_tmpr); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = TRUNCDISI (SRLDI (tmp_tmpr, 32)); SET_H_SR (((UINT) 7), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = ANDIF (GET_H_V32_NON_V32 (), CPU (h_cbit)); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTDI (tmp_tmpr, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQDI (tmp_tmpr, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = NEDI (tmp_tmpr, EXTSIDI (TRUNCDISI (tmp_tmpr))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9316,44 +9316,44 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = TRUNCDISI (tmp_tmpr); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = TRUNCDISI (SRLDI (tmp_tmpr, 32)); SET_H_SR (((UINT) 7), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = ANDIF (GET_H_V32_NON_V32 (), CPU (h_cbit)); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTDI (tmp_tmpr, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQDI (tmp_tmpr, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = NEDI (tmp_tmpr, EXTSIDI (TRUNCDISI (tmp_tmpr))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9382,44 +9382,44 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = TRUNCDISI (tmp_tmpr); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = TRUNCDISI (SRLDI (tmp_tmpr, 32)); SET_H_SR (((UINT) 7), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = ANDIF (GET_H_V32_NON_V32 (), CPU (h_cbit)); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTDI (tmp_tmpr, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQDI (tmp_tmpr, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = NEDI (tmp_tmpr, EXTSIDI (TRUNCDISI (tmp_tmpr))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9448,44 +9448,44 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = TRUNCDISI (tmp_tmpr); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = TRUNCDISI (SRLDI (tmp_tmpr, 32)); SET_H_SR (((UINT) 7), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = ANDIF (GET_H_V32_NON_V32 (), CPU (h_cbit)); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTDI (tmp_tmpr, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQDI (tmp_tmpr, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = NEDI (tmp_tmpr, ZEXTSIDI (TRUNCDISI (tmp_tmpr))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9514,44 +9514,44 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = TRUNCDISI (tmp_tmpr); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = TRUNCDISI (SRLDI (tmp_tmpr, 32)); SET_H_SR (((UINT) 7), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = ANDIF (GET_H_V32_NON_V32 (), CPU (h_cbit)); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTDI (tmp_tmpr, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQDI (tmp_tmpr, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = NEDI (tmp_tmpr, ZEXTSIDI (TRUNCDISI (tmp_tmpr))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9580,44 +9580,44 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = TRUNCDISI (tmp_tmpr); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = TRUNCDISI (SRLDI (tmp_tmpr, 32)); SET_H_SR (((UINT) 7), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = ANDIF (GET_H_V32_NON_V32 (), CPU (h_cbit)); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTDI (tmp_tmpr, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQDI (tmp_tmpr, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = NEDI (tmp_tmpr, ZEXTSIDI (TRUNCDISI (tmp_tmpr))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9644,18 +9644,18 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -9663,12 +9663,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9697,18 +9697,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -9716,12 +9716,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9746,18 +9746,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -9765,12 +9765,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9798,19 +9798,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -9818,12 +9818,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9851,19 +9851,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -9871,12 +9871,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9901,18 +9901,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -9920,12 +9920,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9961,7 +9961,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -9972,19 +9972,19 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -9992,12 +9992,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10034,7 +10034,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -10045,19 +10045,19 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10065,12 +10065,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10107,7 +10107,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -10115,18 +10115,18 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_tmpd; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10134,12 +10134,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10168,19 +10168,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10188,12 +10188,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10221,19 +10221,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10241,12 +10241,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10271,18 +10271,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10290,12 +10290,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10320,18 +10320,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10339,12 +10339,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10372,19 +10372,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10392,12 +10392,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10425,19 +10425,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10445,12 +10445,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10475,18 +10475,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10494,12 +10494,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10535,7 +10535,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -10546,19 +10546,19 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10566,12 +10566,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10608,7 +10608,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -10619,19 +10619,19 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10639,12 +10639,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10681,7 +10681,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -10689,18 +10689,18 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_tmpd; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10708,12 +10708,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10742,19 +10742,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10762,12 +10762,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10795,19 +10795,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10815,12 +10815,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10845,18 +10845,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10864,12 +10864,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10894,18 +10894,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10913,12 +10913,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10943,18 +10943,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10962,12 +10962,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11095,18 +11095,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand1), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11114,12 +11114,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11151,19 +11151,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11171,12 +11171,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11208,19 +11208,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11228,12 +11228,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11262,18 +11262,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11281,12 +11281,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11311,18 +11311,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11330,12 +11330,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11365,19 +11365,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11385,12 +11385,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11420,19 +11420,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11440,12 +11440,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11472,18 +11472,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11491,12 +11491,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11521,18 +11521,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11540,12 +11540,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11575,19 +11575,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11595,12 +11595,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11630,19 +11630,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11650,12 +11650,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11682,18 +11682,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11701,12 +11701,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11731,18 +11731,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11750,12 +11750,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11782,12 +11782,12 @@ SET_H_VBIT_MOVE (0); { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11795,12 +11795,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11826,12 +11826,12 @@ SET_H_VBIT_MOVE (0); { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11839,12 +11839,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11871,7 +11871,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 0)), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 1)), 0)) { @@ -11879,7 +11879,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 1)), 0)) { BI opval = 1; CPU (h_vbit) = opval; written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 2)), 0)) { @@ -11887,7 +11887,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 2)), 0)) { BI opval = 1; CPU (h_zbit) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 3)), 0)) { @@ -11895,7 +11895,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 3)), 0)) { BI opval = 1; CPU (h_nbit) = opval; written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 4)), 0)) { @@ -11903,7 +11903,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 4)), 0)) { BI opval = 1; CPU (h_xbit) = opval; written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 5)), 0)) { @@ -11911,7 +11911,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 5)), 0)) { BI opval = 1; SET_H_IBIT (opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "ibit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "ibit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 6)), 0)) { @@ -11919,7 +11919,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 6)), 0)) { BI opval = 1; SET_H_UBIT (opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "ubit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "ubit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 7)), 0)) { @@ -11927,20 +11927,20 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 7)), 0)) { BI opval = 1; CPU (h_pbit) = opval; written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pbit", 'x', opval); } } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } if (EQSI (ANDSI (tmp_tmp, SLLSI (1, 4)), 0)) { { BI opval = 0; CPU (h_xbit) = opval; written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } } } @@ -11967,7 +11967,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 0)), 0)) { BI opval = 0; CPU (h_cbit) = opval; written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 1)), 0)) { @@ -11975,7 +11975,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 1)), 0)) { BI opval = 0; CPU (h_vbit) = opval; written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 2)), 0)) { @@ -11983,7 +11983,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 2)), 0)) { BI opval = 0; CPU (h_zbit) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 3)), 0)) { @@ -11991,7 +11991,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 3)), 0)) { BI opval = 0; CPU (h_nbit) = opval; written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 4)), 0)) { @@ -11999,7 +11999,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 4)), 0)) { BI opval = 0; CPU (h_xbit) = opval; written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 5)), 0)) { @@ -12007,7 +12007,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 5)), 0)) { BI opval = 0; SET_H_IBIT (opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "ibit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "ibit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 6)), 0)) { @@ -12015,7 +12015,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 6)), 0)) { BI opval = 0; SET_H_UBIT (opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "ubit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "ubit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 7)), 0)) { @@ -12023,7 +12023,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 7)), 0)) { BI opval = 0; CPU (h_pbit) = opval; written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pbit", 'x', opval); } } { @@ -12031,12 +12031,12 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 7)), 0)) { BI opval = 0; CPU (h_xbit) = opval; written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -12115,12 +12115,12 @@ crisv10f_branch_taken (current_cpu, pc, FLD (i_o_pcrel), tmp_truthval); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } if (tmp_truthval) { @@ -12129,7 +12129,7 @@ if (tmp_truthval) { USI opval = FLD (i_o_pcrel); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -12156,19 +12156,19 @@ if (tmp_truthval) { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } { { USI opval = FLD (i_o_pcrel); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -12247,12 +12247,12 @@ crisv10f_branch_taken (current_cpu, pc, FLD (i_o_word_pcrel), tmp_truthval); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } if (tmp_truthval) { @@ -12261,7 +12261,7 @@ if (tmp_truthval) { USI opval = FLD (i_o_word_pcrel); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -12288,19 +12288,19 @@ if (tmp_truthval) { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } { { USI opval = FLD (i_o_word_pcrel); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -12324,23 +12324,23 @@ if (tmp_truthval) { { SI opval = ADDSI (pc, 2); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { USI opval = GET_H_GR (FLD (f_operand1)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -12364,7 +12364,7 @@ if (tmp_truthval) { { SI opval = ADDSI (pc, 2); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { USI opval = ({ SI tmp_addr; @@ -12382,24 +12382,24 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } ; tmp_tmp_mem; }); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -12424,23 +12424,23 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (pc, 6); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { USI opval = FLD (f_indir_pc__dword); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -12465,18 +12465,18 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } { USI opval = crisv10f_break_handler (current_cpu, FLD (f_u4), pc); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -12504,18 +12504,18 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -12523,12 +12523,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -12557,18 +12557,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -12576,12 +12576,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -12610,18 +12610,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -12629,12 +12629,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -12672,7 +12672,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -12684,26 +12684,26 @@ if (ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -12711,12 +12711,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -12755,7 +12755,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -12767,26 +12767,26 @@ if (ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -12794,12 +12794,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -12838,7 +12838,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -12850,26 +12850,26 @@ if (ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -12877,12 +12877,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -12912,18 +12912,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -12931,12 +12931,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -12965,18 +12965,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -12984,12 +12984,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -13018,18 +13018,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -13037,12 +13037,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -13118,18 +13118,18 @@ SET_H_VBIT_MOVE (0); { SI opval = ZEXTBISI (tmp_truthval); SET_H_GR (FLD (f_operand1), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -13349,18 +13349,18 @@ if (GESI (tmp_tmp, 0)) { { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -13368,12 +13368,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -13396,12 +13396,12 @@ SET_H_VBIT_MOVE (0); { SI opval = ADDSI (GET_H_GR (FLD (f_operand2)), FLD (f_s8)); CPU (h_prefixreg_pre_v32) = opval; - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -13423,12 +13423,12 @@ SET_H_VBIT_MOVE (0); { SI opval = ADDSI (ADDSI (pc, 2), FLD (f_s8)); CPU (h_prefixreg_pre_v32) = opval; - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } cris_flush_simulator_decode_cache (current_cpu, pc); } @@ -13457,12 +13457,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc); { SI opval = tmp_newpc; CPU (h_prefixreg_pre_v32) = opval; - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -13498,7 +13498,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { USI opval = tmp_addr; SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -13508,13 +13508,13 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { BI opval = 0; CPU (h_xbit) = opval; written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -13555,7 +13555,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (((UINT) 14), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -13565,13 +13565,13 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { BI opval = 0; CPU (h_xbit) = opval; written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -13610,7 +13610,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -13618,12 +13618,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (GET_H_GR (FLD (f_operand2)), EXTQISI (tmp_tmps)); CPU (h_prefixreg_pre_v32) = opval; - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -13658,7 +13658,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -13666,12 +13666,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (GET_H_GR (FLD (f_operand2)), EXTHISI (tmp_tmps)); CPU (h_prefixreg_pre_v32) = opval; - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -13706,7 +13706,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -13714,12 +13714,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (GET_H_GR (FLD (f_operand2)), tmp_tmps); CPU (h_prefixreg_pre_v32) = opval; - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -13741,12 +13741,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (GET_H_GR (FLD (f_operand2)), EXTQISI (TRUNCSIQI (FLD (f_indir_pc__byte)))); CPU (h_prefixreg_pre_v32) = opval; - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -13767,12 +13767,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (GET_H_GR (FLD (f_operand2)), EXTHISI (TRUNCSIHI (FLD (f_indir_pc__word)))); CPU (h_prefixreg_pre_v32) = opval; - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -13793,12 +13793,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (GET_H_GR (FLD (f_operand2)), FLD (f_indir_pc__dword)); CPU (h_prefixreg_pre_v32) = opval; - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -13832,7 +13832,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -13840,12 +13840,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_tmps; CPU (h_prefixreg_pre_v32) = opval; - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -13867,12 +13867,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = FLD (f_indir_pc__dword); CPU (h_prefixreg_pre_v32) = opval; - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -13893,12 +13893,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (GET_H_GR (FLD (f_operand1)), MULSI (GET_H_GR (FLD (f_operand2)), 1)); CPU (h_prefixreg_pre_v32) = opval; - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -13919,12 +13919,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (GET_H_GR (FLD (f_operand1)), MULSI (GET_H_GR (FLD (f_operand2)), 2)); CPU (h_prefixreg_pre_v32) = opval; - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -13945,12 +13945,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (GET_H_GR (FLD (f_operand1)), MULSI (GET_H_GR (FLD (f_operand2)), 4)); CPU (h_prefixreg_pre_v32) = opval; - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -13971,12 +13971,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (ADDSI (pc, 4), MULSI (GET_H_GR (FLD (f_operand2)), 1)); CPU (h_prefixreg_pre_v32) = opval; - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -13997,12 +13997,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (ADDSI (pc, 4), MULSI (GET_H_GR (FLD (f_operand2)), 2)); CPU (h_prefixreg_pre_v32) = opval; - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -14023,12 +14023,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (ADDSI (pc, 4), MULSI (GET_H_GR (FLD (f_operand2)), 4)); CPU (h_prefixreg_pre_v32) = opval; - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } diff --git a/sim/cris/semcrisv32f-switch.c b/sim/cris/semcrisv32f-switch.c index 70622b5..e145ef8 100644 --- a/sim/cris/semcrisv32f-switch.c +++ b/sim/cris/semcrisv32f-switch.c @@ -264,13 +264,13 @@ This file is part of the GNU simulators. /* If hyper-fast [well not unnecessarily slow] execution is selected, turn off frills like tracing and profiling. */ -/* FIXME: A better way would be to have TRACE_RESULT check for something +/* FIXME: A better way would be to have CGEN_TRACE_RESULT check for something that can cause it to be optimized out. Another way would be to emit special handlers into the instruction "stream". */ #if FAST_P -#undef TRACE_RESULT -#define TRACE_RESULT(cpu, abuf, name, type, val) +#undef CGEN_TRACE_RESULT +#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val) #endif #undef GET_ATTR @@ -461,19 +461,19 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -481,12 +481,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -514,19 +514,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -534,12 +534,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -564,18 +564,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -583,12 +583,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -613,7 +613,7 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SET_H_NBIT_MOVE (LTSI (tmp_newval, 0)); @@ -624,12 +624,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -656,18 +656,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -675,12 +675,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -707,18 +707,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -726,12 +726,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -758,18 +758,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -777,12 +777,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -809,18 +809,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -828,12 +828,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -861,19 +861,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -881,12 +881,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -914,19 +914,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -934,12 +934,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -964,18 +964,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -983,12 +983,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1013,18 +1013,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -1032,12 +1032,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1062,18 +1062,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -1081,12 +1081,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1111,18 +1111,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -1130,12 +1130,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1160,18 +1160,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -1179,12 +1179,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1215,39 +1215,39 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1278,39 +1278,39 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1343,33 +1343,33 @@ SET_H_VBIT_MOVE (0); { BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1402,33 +1402,33 @@ SET_H_VBIT_MOVE (0); { BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1461,33 +1461,33 @@ SET_H_VBIT_MOVE (0); { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1526,7 +1526,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -1539,33 +1539,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1605,7 +1605,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -1618,33 +1618,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1684,7 +1684,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -1697,33 +1697,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1757,33 +1757,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1816,33 +1816,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1875,33 +1875,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1934,33 +1934,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -1999,7 +1999,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -2012,33 +2012,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2078,7 +2078,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -2091,33 +2091,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2151,33 +2151,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2210,33 +2210,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2275,7 +2275,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -2288,33 +2288,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2354,7 +2354,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -2367,33 +2367,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2427,33 +2427,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2486,33 +2486,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2548,7 +2548,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -2559,19 +2559,19 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_tmp, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_tmp, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_tmp, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -2579,12 +2579,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2621,7 +2621,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -2632,19 +2632,19 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_tmp, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_tmp, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_tmp, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -2652,12 +2652,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2694,7 +2694,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -2702,18 +2702,18 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_tmp; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmp, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmp, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -2721,12 +2721,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2763,7 +2763,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -2773,26 +2773,26 @@ if (ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) { SI opval = tmp_tmp; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else { { SI opval = tmp_tmp; SET_H_GR (FLD (f_operand2), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTSI (tmp_tmp, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmp, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -2800,12 +2800,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2842,7 +2842,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -2852,26 +2852,26 @@ if (ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) { SI opval = tmp_tmp; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else { { SI opval = tmp_tmp; SET_H_GR (FLD (f_operand2), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTSI (tmp_tmp, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmp, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -2879,12 +2879,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -2921,7 +2921,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -2931,26 +2931,26 @@ if (ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) { SI opval = tmp_tmp; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else { { SI opval = tmp_tmp; SET_H_GR (FLD (f_operand2), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTSI (tmp_tmp, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmp, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -2958,12 +2958,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3000,7 +3000,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3010,26 +3010,26 @@ if (ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) { SI opval = tmp_tmp; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else { { SI opval = tmp_tmp; SET_H_GR (FLD (f_operand2), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTSI (tmp_tmp, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmp, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -3037,12 +3037,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3075,19 +3075,19 @@ cgen_rtx_error (current_cpu, "move-r-spr: trying to set a read-only special regi SI opval = tmp_tmp; SET_H_SR (FLD (f_operand2), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3117,7 +3117,7 @@ if (EQSI (tmp_prno, 2)) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else if (EQSI (tmp_prno, 3)) { @@ -3128,7 +3128,7 @@ if (EQSI (tmp_prno, 2)) { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3137,7 +3137,7 @@ if (EQSI (tmp_prno, 2)) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else if (EQSI (tmp_prno, 6)) { @@ -3145,7 +3145,7 @@ if (EQSI (tmp_prno, 2)) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else if (EQSI (tmp_prno, 7)) { @@ -3153,7 +3153,7 @@ if (EQSI (tmp_prno, 2)) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else if (EQSI (tmp_prno, 9)) { @@ -3161,7 +3161,7 @@ if (EQSI (tmp_prno, 2)) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else if (EQSI (tmp_prno, 10)) { @@ -3169,7 +3169,7 @@ if (EQSI (tmp_prno, 2)) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else if (EQSI (tmp_prno, 11)) { @@ -3177,7 +3177,7 @@ if (EQSI (tmp_prno, 2)) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else if (EQSI (tmp_prno, 12)) { @@ -3185,7 +3185,7 @@ if (EQSI (tmp_prno, 2)) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else if (EQSI (tmp_prno, 13)) { @@ -3193,7 +3193,7 @@ if (EQSI (tmp_prno, 2)) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else if (EQSI (tmp_prno, 14)) { @@ -3201,7 +3201,7 @@ if (EQSI (tmp_prno, 2)) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else if (EQSI (tmp_prno, 15)) { @@ -3209,7 +3209,7 @@ if (EQSI (tmp_prno, 2)) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else if (EQSI (tmp_prno, 0)) { @@ -3220,7 +3220,7 @@ if (EQSI (tmp_prno, 2)) { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3232,7 +3232,7 @@ if (EQSI (tmp_prno, 2)) { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3244,7 +3244,7 @@ if (EQSI (tmp_prno, 2)) { SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3253,7 +3253,7 @@ if (EQSI (tmp_prno, 2)) { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else { @@ -3263,12 +3263,12 @@ cgen_rtx_error (current_cpu, "move-spr-r from unimplemented register"); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3307,7 +3307,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3329,7 +3329,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3351,7 +3351,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3373,7 +3373,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3395,7 +3395,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3417,7 +3417,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3439,7 +3439,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3461,7 +3461,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3483,7 +3483,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3505,7 +3505,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3527,7 +3527,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3549,7 +3549,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3561,18 +3561,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = tmp_newval; SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3595,18 +3595,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = FLD (f_indir_pc__dword); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3628,18 +3628,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = FLD (f_indir_pc__dword); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3661,18 +3661,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = FLD (f_indir_pc__dword); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3694,18 +3694,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = FLD (f_indir_pc__dword); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3727,18 +3727,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = FLD (f_indir_pc__dword); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3760,18 +3760,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = FLD (f_indir_pc__dword); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3793,18 +3793,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = FLD (f_indir_pc__dword); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3826,18 +3826,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = FLD (f_indir_pc__dword); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3859,18 +3859,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = FLD (f_indir_pc__dword); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3892,18 +3892,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = FLD (f_indir_pc__dword); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3925,18 +3925,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = FLD (f_indir_pc__dword); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -3958,18 +3958,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register"); { SI opval = FLD (f_indir_pc__dword); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -4003,13 +4003,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4017,7 +4017,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4025,7 +4025,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4037,7 +4037,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4056,13 +4056,13 @@ if (EQBI (CPU (h_pbit), 0)) { QI opval = GET_H_SR (FLD (f_operand2)); SETMEMQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4070,7 +4070,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4078,7 +4078,7 @@ if (EQBI (CPU (h_pbit), 0)) { QI opval = GET_H_SR (FLD (f_operand2)); SETMEMQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4090,7 +4090,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4109,13 +4109,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4123,7 +4123,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4131,7 +4131,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4143,7 +4143,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4162,13 +4162,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4176,7 +4176,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4184,7 +4184,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4196,7 +4196,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4215,13 +4215,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4229,7 +4229,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4237,7 +4237,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4249,7 +4249,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4268,13 +4268,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4282,7 +4282,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4290,7 +4290,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4302,7 +4302,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4321,13 +4321,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4335,7 +4335,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4343,7 +4343,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4355,7 +4355,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4374,13 +4374,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4388,7 +4388,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4396,7 +4396,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4408,7 +4408,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4427,13 +4427,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4441,7 +4441,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4449,7 +4449,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4461,7 +4461,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4480,13 +4480,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4494,7 +4494,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4502,7 +4502,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4514,7 +4514,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4533,13 +4533,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4547,7 +4547,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4555,7 +4555,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4567,7 +4567,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4586,13 +4586,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4600,7 +4600,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4608,7 +4608,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4620,7 +4620,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4639,13 +4639,13 @@ if (EQBI (CPU (h_pbit), 0)) { QI opval = GET_H_SR (FLD (f_operand2)); SETMEMQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4653,7 +4653,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4661,7 +4661,7 @@ if (EQBI (CPU (h_pbit), 0)) { QI opval = GET_H_SR (FLD (f_operand2)); SETMEMQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4673,7 +4673,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4692,13 +4692,13 @@ if (EQBI (CPU (h_pbit), 0)) { QI opval = GET_H_SR (FLD (f_operand2)); SETMEMQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4706,7 +4706,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4714,7 +4714,7 @@ if (EQBI (CPU (h_pbit), 0)) { QI opval = GET_H_SR (FLD (f_operand2)); SETMEMQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4726,7 +4726,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4745,13 +4745,13 @@ if (EQBI (CPU (h_pbit), 0)) { HI opval = GET_H_SR (FLD (f_operand2)); SETMEMHI (current_cpu, pc, tmp_addr, opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4759,7 +4759,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4767,7 +4767,7 @@ if (EQBI (CPU (h_pbit), 0)) { HI opval = GET_H_SR (FLD (f_operand2)); SETMEMHI (current_cpu, pc, tmp_addr, opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4779,7 +4779,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4798,13 +4798,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4812,7 +4812,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -4820,7 +4820,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = GET_H_SR (FLD (f_operand2)); SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -4832,7 +4832,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4845,12 +4845,12 @@ cgen_rtx_error (current_cpu, "write from unimplemented special register"); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -4873,18 +4873,18 @@ cgen_rtx_error (current_cpu, "write from unimplemented special register"); { SI opval = GET_H_SUPR (FLD (f_operand2)); SET_H_GR (FLD (f_operand1), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -4906,18 +4906,18 @@ cgen_rtx_error (current_cpu, "write from unimplemented special register"); { SI opval = GET_H_GR (FLD (f_operand1)); SET_H_SUPR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "supr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "supr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -4953,7 +4953,7 @@ if (GESI (FLD (f_operand2), 0)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4966,7 +4966,7 @@ if (GESI (FLD (f_operand2), 1)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4979,7 +4979,7 @@ if (GESI (FLD (f_operand2), 2)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -4992,7 +4992,7 @@ if (GESI (FLD (f_operand2), 3)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5005,7 +5005,7 @@ if (GESI (FLD (f_operand2), 4)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5018,7 +5018,7 @@ if (GESI (FLD (f_operand2), 5)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5031,7 +5031,7 @@ if (GESI (FLD (f_operand2), 6)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5044,7 +5044,7 @@ if (GESI (FLD (f_operand2), 7)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5057,7 +5057,7 @@ if (GESI (FLD (f_operand2), 8)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5070,7 +5070,7 @@ if (GESI (FLD (f_operand2), 9)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5083,7 +5083,7 @@ if (GESI (FLD (f_operand2), 10)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5096,7 +5096,7 @@ if (GESI (FLD (f_operand2), 11)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5109,7 +5109,7 @@ if (GESI (FLD (f_operand2), 12)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5122,7 +5122,7 @@ if (GESI (FLD (f_operand2), 13)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5135,7 +5135,7 @@ if (GESI (FLD (f_operand2), 14)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5148,7 +5148,7 @@ if (GESI (FLD (f_operand2), 15)) { SI opval = tmp_tmp; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5159,19 +5159,19 @@ if (NEBI (tmp_postinc, 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -5208,7 +5208,7 @@ if (GESI (FLD (f_operand2), 0)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 0), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5221,7 +5221,7 @@ if (GESI (FLD (f_operand2), 1)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 1), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5234,7 +5234,7 @@ if (GESI (FLD (f_operand2), 2)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 2), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5247,7 +5247,7 @@ if (GESI (FLD (f_operand2), 3)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 3), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5260,7 +5260,7 @@ if (GESI (FLD (f_operand2), 4)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 4), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5273,7 +5273,7 @@ if (GESI (FLD (f_operand2), 5)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 5), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5286,7 +5286,7 @@ if (GESI (FLD (f_operand2), 6)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 6), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5299,7 +5299,7 @@ if (GESI (FLD (f_operand2), 7)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 7), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5312,7 +5312,7 @@ if (GESI (FLD (f_operand2), 8)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 8), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5325,7 +5325,7 @@ if (GESI (FLD (f_operand2), 9)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 9), opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5338,7 +5338,7 @@ if (GESI (FLD (f_operand2), 10)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 10), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5351,7 +5351,7 @@ if (GESI (FLD (f_operand2), 11)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 11), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5364,7 +5364,7 @@ if (GESI (FLD (f_operand2), 12)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 12), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5377,7 +5377,7 @@ if (GESI (FLD (f_operand2), 13)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 13), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5390,7 +5390,7 @@ if (GESI (FLD (f_operand2), 14)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 14), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5403,7 +5403,7 @@ if (GESI (FLD (f_operand2), 15)) { SI opval = tmp_tmp; SET_H_GR (((UINT) 15), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } tmp_addr = ADDSI (tmp_addr, 4); } @@ -5414,19 +5414,19 @@ if (NEBI (tmp_postinc, 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -5460,40 +5460,40 @@ if (NEBI (tmp_postinc, 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), ORIF (ANDIF (LTQI (tmp_tmpopd, 0), GEQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (GEQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -5527,40 +5527,40 @@ if (NEBI (tmp_postinc, 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), ORIF (ANDIF (LTHI (tmp_tmpopd, 0), GEHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (GEHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -5591,39 +5591,39 @@ if (NEBI (tmp_postinc, 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -5662,7 +5662,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -5676,40 +5676,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), ORIF (ANDIF (LTQI (tmp_tmpopd, 0), GEQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (GEQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -5749,7 +5749,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -5763,40 +5763,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), ORIF (ANDIF (LTHI (tmp_tmpopd, 0), GEHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (GEHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -5836,7 +5836,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -5847,39 +5847,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -5914,40 +5914,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), ORIF (ANDIF (LTQI (tmp_tmpopd, 0), GEQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (GEQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -5981,40 +5981,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), ORIF (ANDIF (LTHI (tmp_tmpopd, 0), GEHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (GEHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6045,39 +6045,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6108,39 +6108,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6171,39 +6171,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6242,7 +6242,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -6253,39 +6253,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6325,7 +6325,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -6336,39 +6336,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6400,39 +6400,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6463,39 +6463,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6526,39 +6526,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6589,39 +6589,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6660,7 +6660,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -6671,39 +6671,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6743,7 +6743,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -6754,39 +6754,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6818,39 +6818,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6881,39 +6881,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -6947,40 +6947,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7014,40 +7014,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7078,39 +7078,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7149,7 +7149,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -7163,40 +7163,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7236,7 +7236,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -7250,40 +7250,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7323,7 +7323,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -7334,39 +7334,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7401,40 +7401,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7468,40 +7468,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7532,39 +7532,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7595,39 +7595,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7658,39 +7658,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7729,7 +7729,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -7740,39 +7740,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7812,7 +7812,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -7823,39 +7823,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7887,39 +7887,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -7950,39 +7950,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8013,39 +8013,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8076,39 +8076,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8147,7 +8147,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -8158,39 +8158,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8230,7 +8230,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -8241,39 +8241,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8305,39 +8305,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8368,39 +8368,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8433,39 +8433,39 @@ CPU (h_xbit) = 1; { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8507,7 +8507,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -8518,39 +8518,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8585,39 +8585,39 @@ CPU (h_xbit) = 1; { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8641,18 +8641,18 @@ CPU (h_xbit) = 1; { SI opval = FLD (i_const32_pcrel); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8674,18 +8674,18 @@ CPU (h_xbit) = 1; { SI opval = FLD (i_qo); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8707,18 +8707,18 @@ CPU (h_xbit) = 1; { SI opval = ADDSI (GET_H_GR (FLD (f_operand1)), MULSI (GET_H_GR (FLD (f_operand2)), 1)); SET_H_GR (FLD (f_operand1), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8740,18 +8740,18 @@ CPU (h_xbit) = 1; { SI opval = ADDSI (GET_H_GR (FLD (f_operand1)), MULSI (GET_H_GR (FLD (f_operand2)), 2)); SET_H_GR (FLD (f_operand1), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8773,18 +8773,18 @@ CPU (h_xbit) = 1; { SI opval = ADDSI (GET_H_GR (FLD (f_operand1)), MULSI (GET_H_GR (FLD (f_operand2)), 4)); SET_H_GR (FLD (f_operand1), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8817,40 +8817,40 @@ CPU (h_xbit) = 1; { SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8884,40 +8884,40 @@ CPU (h_xbit) = 1; { SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -8948,39 +8948,39 @@ CPU (h_xbit) = 1; { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9016,7 +9016,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -9035,33 +9035,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTQI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9099,7 +9099,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -9118,33 +9118,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTHI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9182,7 +9182,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -9201,33 +9201,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0)))); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9263,13 +9263,13 @@ if (EQBI (CPU (h_pbit), 0)) { QI opval = tmp_tmpd; SETMEMQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -9277,7 +9277,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -9285,7 +9285,7 @@ if (EQBI (CPU (h_pbit), 0)) { QI opval = tmp_tmpd; SETMEMQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -9297,7 +9297,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -9306,12 +9306,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9345,13 +9345,13 @@ if (EQBI (CPU (h_pbit), 0)) { HI opval = tmp_tmpd; SETMEMHI (current_cpu, pc, tmp_addr, opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -9359,7 +9359,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -9367,7 +9367,7 @@ if (EQBI (CPU (h_pbit), 0)) { HI opval = tmp_tmpd; SETMEMHI (current_cpu, pc, tmp_addr, opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -9379,7 +9379,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -9388,12 +9388,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9427,13 +9427,13 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = tmp_tmpd; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { BI opval = CPU (h_pbit); CPU (h_cbit) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -9441,7 +9441,7 @@ if (EQBI (CPU (h_pbit), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } } else { @@ -9449,7 +9449,7 @@ if (EQBI (CPU (h_pbit), 0)) { SI opval = tmp_tmpd; SETMEMSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } if (NEBI (tmp_postinc, 0)) { @@ -9461,7 +9461,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -9470,12 +9470,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9504,44 +9504,44 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = TRUNCDISI (tmp_tmpr); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = TRUNCDISI (SRLDI (tmp_tmpr, 32)); SET_H_SR (((UINT) 7), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = ANDIF (GET_H_V32_V32 (), CPU (h_cbit)); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTDI (tmp_tmpr, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQDI (tmp_tmpr, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = NEDI (tmp_tmpr, EXTSIDI (TRUNCDISI (tmp_tmpr))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9570,44 +9570,44 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = TRUNCDISI (tmp_tmpr); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = TRUNCDISI (SRLDI (tmp_tmpr, 32)); SET_H_SR (((UINT) 7), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = ANDIF (GET_H_V32_V32 (), CPU (h_cbit)); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTDI (tmp_tmpr, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQDI (tmp_tmpr, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = NEDI (tmp_tmpr, EXTSIDI (TRUNCDISI (tmp_tmpr))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9636,44 +9636,44 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = TRUNCDISI (tmp_tmpr); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = TRUNCDISI (SRLDI (tmp_tmpr, 32)); SET_H_SR (((UINT) 7), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = ANDIF (GET_H_V32_V32 (), CPU (h_cbit)); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTDI (tmp_tmpr, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQDI (tmp_tmpr, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = NEDI (tmp_tmpr, EXTSIDI (TRUNCDISI (tmp_tmpr))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9702,44 +9702,44 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = TRUNCDISI (tmp_tmpr); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = TRUNCDISI (SRLDI (tmp_tmpr, 32)); SET_H_SR (((UINT) 7), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = ANDIF (GET_H_V32_V32 (), CPU (h_cbit)); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTDI (tmp_tmpr, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQDI (tmp_tmpr, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = NEDI (tmp_tmpr, ZEXTSIDI (TRUNCDISI (tmp_tmpr))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9768,44 +9768,44 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = TRUNCDISI (tmp_tmpr); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = TRUNCDISI (SRLDI (tmp_tmpr, 32)); SET_H_SR (((UINT) 7), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = ANDIF (GET_H_V32_V32 (), CPU (h_cbit)); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTDI (tmp_tmpr, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQDI (tmp_tmpr, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = NEDI (tmp_tmpr, ZEXTSIDI (TRUNCDISI (tmp_tmpr))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9834,44 +9834,44 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = TRUNCDISI (tmp_tmpr); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = TRUNCDISI (SRLDI (tmp_tmpr, 32)); SET_H_SR (((UINT) 7), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { { BI opval = ANDIF (GET_H_V32_V32 (), CPU (h_cbit)); CPU (h_cbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } { BI opval = LTDI (tmp_tmpr, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQDI (tmp_tmpr, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = NEDI (tmp_tmpr, ZEXTSIDI (TRUNCDISI (tmp_tmpr))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9905,39 +9905,39 @@ CPU (h_zbit) = 1; { SI opval = tmp_newval; SET_H_GR (FLD (f_operand1), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0)))); CPU (h_rbit) = opval; - TRACE_RESULT (current_cpu, abuf, "rbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "rbit", 'x', opval); } { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit)))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } { BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0))); CPU (h_vbit) = opval; - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -9967,18 +9967,18 @@ CPU (h_zbit) = 1; { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -9986,12 +9986,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10016,18 +10016,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10035,12 +10035,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10068,19 +10068,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10088,12 +10088,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10121,19 +10121,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10141,12 +10141,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10171,18 +10171,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10190,12 +10190,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10231,7 +10231,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -10242,19 +10242,19 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10262,12 +10262,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10304,7 +10304,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -10315,19 +10315,19 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10335,12 +10335,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10377,7 +10377,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -10385,18 +10385,18 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_tmpd; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10404,12 +10404,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10438,19 +10438,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10458,12 +10458,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10491,19 +10491,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10511,12 +10511,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10541,18 +10541,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10560,12 +10560,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10590,18 +10590,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10609,12 +10609,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10642,19 +10642,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10662,12 +10662,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10695,19 +10695,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10715,12 +10715,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10745,18 +10745,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10764,12 +10764,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10805,7 +10805,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -10816,19 +10816,19 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10836,12 +10836,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10878,7 +10878,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -10889,19 +10889,19 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10909,12 +10909,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -10951,7 +10951,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -10959,18 +10959,18 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = tmp_tmpd; SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -10978,12 +10978,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11012,19 +11012,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11032,12 +11032,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11065,19 +11065,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11085,12 +11085,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11115,18 +11115,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11134,12 +11134,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11164,18 +11164,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11183,12 +11183,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11213,18 +11213,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11232,12 +11232,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11365,18 +11365,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand1), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11384,12 +11384,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11421,19 +11421,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11441,12 +11441,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11478,19 +11478,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11498,12 +11498,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11532,18 +11532,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11551,12 +11551,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11581,18 +11581,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11600,12 +11600,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11635,19 +11635,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11655,12 +11655,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11690,19 +11690,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11710,12 +11710,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11742,18 +11742,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11761,12 +11761,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11791,18 +11791,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11810,12 +11810,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11845,19 +11845,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTQI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11865,12 +11865,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11900,19 +11900,19 @@ SET_H_VBIT_MOVE (0); { SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000)); SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } { { BI opval = LTHI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11920,12 +11920,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -11952,18 +11952,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -11971,12 +11971,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -12001,18 +12001,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -12020,12 +12020,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -12052,12 +12052,12 @@ SET_H_VBIT_MOVE (0); { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -12065,12 +12065,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -12096,12 +12096,12 @@ SET_H_VBIT_MOVE (0); { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -12109,12 +12109,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -12141,7 +12141,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 0)), 0)) { BI opval = 1; CPU (h_cbit) = opval; written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 1)), 0)) { @@ -12149,7 +12149,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 1)), 0)) { BI opval = 1; CPU (h_vbit) = opval; written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 2)), 0)) { @@ -12157,7 +12157,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 2)), 0)) { BI opval = 1; CPU (h_zbit) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 3)), 0)) { @@ -12165,7 +12165,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 3)), 0)) { BI opval = 1; CPU (h_nbit) = opval; written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 4)), 0)) { @@ -12173,7 +12173,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 4)), 0)) { BI opval = 1; CPU (h_xbit) = opval; written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 5)), 0)) { @@ -12181,7 +12181,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 5)), 0)) { BI opval = 1; SET_H_IBIT (opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "ibit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "ibit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 6)), 0)) { @@ -12189,7 +12189,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 6)), 0)) { BI opval = 1; SET_H_UBIT (opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "ubit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "ubit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 7)), 0)) { @@ -12197,20 +12197,20 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 7)), 0)) { BI opval = 1; CPU (h_pbit) = opval; written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pbit", 'x', opval); } } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } if (EQSI (ANDSI (tmp_tmp, SLLSI (1, 4)), 0)) { { BI opval = 0; CPU (h_xbit) = opval; written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } } } @@ -12237,7 +12237,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 0)), 0)) { BI opval = 0; CPU (h_cbit) = opval; written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 1)), 0)) { @@ -12245,7 +12245,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 1)), 0)) { BI opval = 0; CPU (h_vbit) = opval; written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 2)), 0)) { @@ -12253,7 +12253,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 2)), 0)) { BI opval = 0; CPU (h_zbit) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 3)), 0)) { @@ -12261,7 +12261,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 3)), 0)) { BI opval = 0; CPU (h_nbit) = opval; written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 4)), 0)) { @@ -12269,7 +12269,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 4)), 0)) { BI opval = 0; CPU (h_xbit) = opval; written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 5)), 0)) { @@ -12277,7 +12277,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 5)), 0)) { BI opval = 0; SET_H_IBIT (opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "ibit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "ibit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 6)), 0)) { @@ -12285,7 +12285,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 6)), 0)) { BI opval = 0; SET_H_UBIT (opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "ubit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "ubit", 'x', opval); } } if (NESI (ANDSI (tmp_tmp, SLLSI (1, 7)), 0)) { @@ -12293,7 +12293,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 7)), 0)) { BI opval = 0; CPU (h_pbit) = opval; written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pbit", 'x', opval); } } { @@ -12301,12 +12301,12 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 7)), 0)) { BI opval = 0; CPU (h_xbit) = opval; written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -12339,7 +12339,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 7)), 0)) { { SI opval = ORSI (ORSI (tmp_samebits, tmp_shiftbits), ((ANDBI (CPU (h_rbit), NOTBI (tmp_p1))) ? (0) : (128))); SET_H_SR (((UINT) 13), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } } @@ -12364,7 +12364,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 7)), 0)) { { SI opval = ORSI (ANDSI (tmp_savemask, tmp_oldccs), ANDSI (INVSI (tmp_savemask), SLLSI (tmp_oldccs, 10))); SET_H_SR (((UINT) 13), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } } @@ -12411,13 +12411,13 @@ crisv32f_rfg_handler (current_cpu, pc); { SI opval = ORSI (ORSI (tmp_samebits, tmp_shiftbits), ((ANDBI (CPU (h_rbit), NOTBI (tmp_p1))) ? (0) : (128))); SET_H_SR (((UINT) 13), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } } { BI opval = 1; SET_H_MBIT (opval); - TRACE_RESULT (current_cpu, abuf, "mbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "mbit", 'x', opval); } } @@ -12438,7 +12438,7 @@ crisv32f_rfg_handler (current_cpu, pc); { USI opval = crisv32f_halt_handler (current_cpu, pc); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -12515,12 +12515,12 @@ crisv32f_branch_taken (current_cpu, pc, FLD (i_o_pcrel), tmp_truthval); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } if (tmp_truthval) { @@ -12529,7 +12529,7 @@ if (tmp_truthval) { USI opval = FLD (i_o_pcrel); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -12556,19 +12556,19 @@ if (tmp_truthval) { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } { { USI opval = FLD (i_o_pcrel); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -12647,12 +12647,12 @@ crisv32f_branch_taken (current_cpu, pc, FLD (i_o_word_pcrel), tmp_truthval); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } if (tmp_truthval) { @@ -12661,7 +12661,7 @@ if (tmp_truthval) { USI opval = FLD (i_o_word_pcrel); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -12688,19 +12688,19 @@ if (tmp_truthval) { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } { { USI opval = FLD (i_o_word_pcrel); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -12725,12 +12725,12 @@ if (tmp_truthval) { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } if (ANDIF (EQSI (FLD (f_operand1), 1), EQSI (FLD (f_operand2), 11))) { @@ -12741,12 +12741,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc); { SI opval = ADDSI (pc, 4); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { USI opval = GET_H_GR (FLD (f_operand1)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -12772,12 +12772,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } { @@ -12785,12 +12785,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc); { SI opval = ADDSI (pc, 8); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { USI opval = FLD (f_indir_pc__dword); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -12816,19 +12816,19 @@ cris_flush_simulator_decode_cache (current_cpu, pc); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } { { USI opval = GET_H_SR (FLD (f_operand2)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -12853,12 +12853,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } { @@ -12866,12 +12866,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc); { SI opval = ADDSI (pc, 8); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { USI opval = FLD (i_const32_pcrel); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -12897,12 +12897,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } { @@ -12910,12 +12910,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc); { SI opval = ADDSI (pc, 8); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { USI opval = GET_H_GR (FLD (f_operand1)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -12941,12 +12941,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } { @@ -12954,12 +12954,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc); { SI opval = ADDSI (pc, 12); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { USI opval = FLD (f_indir_pc__dword); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -12985,12 +12985,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } { @@ -12998,12 +12998,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc); { SI opval = ADDSI (pc, 12); SET_H_SR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } { USI opval = FLD (i_const32_pcrel); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -13029,18 +13029,18 @@ cris_flush_simulator_decode_cache (current_cpu, pc); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } { USI opval = crisv32f_break_handler (current_cpu, FLD (f_u4), pc); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -13068,18 +13068,18 @@ cris_flush_simulator_decode_cache (current_cpu, pc); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -13087,12 +13087,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -13121,18 +13121,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -13140,12 +13140,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -13174,18 +13174,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -13193,12 +13193,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -13227,18 +13227,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -13246,12 +13246,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -13280,18 +13280,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -13299,12 +13299,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -13333,18 +13333,18 @@ SET_H_VBIT_MOVE (0); { SI opval = tmp_newval; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_newval, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -13352,12 +13352,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -13433,18 +13433,18 @@ SET_H_VBIT_MOVE (0); { SI opval = ZEXTBISI (tmp_truthval); SET_H_GR (FLD (f_operand1), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -13664,18 +13664,18 @@ if (GESI (tmp_tmp, 0)) { { SI opval = tmp_tmpd; SET_H_GR (FLD (f_operand2), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { BI opval = LTSI (tmp_tmpd, 0); CPU (h_nbit) = opval; - TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval); } { BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1))); CPU (h_zbit) = opval; - TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval); } SET_H_CBIT_MOVE (0); SET_H_VBIT_MOVE (0); @@ -13683,12 +13683,12 @@ SET_H_VBIT_MOVE (0); { BI opval = 0; CPU (h_xbit) = opval; - TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval); } { BI opval = 0; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } } @@ -13711,12 +13711,12 @@ SET_H_VBIT_MOVE (0); { SI opval = ADDSI (GET_H_GR (FLD (f_operand2)), FLD (f_s8)); SET_H_PREFIXREG_V32 (opval); - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -13750,7 +13750,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -13758,12 +13758,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (GET_H_GR (FLD (f_operand2)), EXTQISI (tmp_tmps)); SET_H_PREFIXREG_V32 (opval); - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -13798,7 +13798,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -13806,12 +13806,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (GET_H_GR (FLD (f_operand2)), EXTHISI (tmp_tmps)); SET_H_PREFIXREG_V32 (opval); - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -13846,7 +13846,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { SI opval = tmp_addr; SET_H_GR (FLD (f_operand1), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -13854,12 +13854,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (GET_H_GR (FLD (f_operand2)), tmp_tmps); SET_H_PREFIXREG_V32 (opval); - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -13881,12 +13881,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (GET_H_GR (FLD (f_operand2)), EXTQISI (TRUNCSIQI (FLD (f_indir_pc__byte)))); SET_H_PREFIXREG_V32 (opval); - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -13907,12 +13907,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (GET_H_GR (FLD (f_operand2)), EXTHISI (TRUNCSIHI (FLD (f_indir_pc__word)))); SET_H_PREFIXREG_V32 (opval); - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -13933,12 +13933,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (GET_H_GR (FLD (f_operand2)), FLD (f_indir_pc__dword)); SET_H_PREFIXREG_V32 (opval); - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -13959,12 +13959,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (GET_H_GR (FLD (f_operand1)), MULSI (GET_H_GR (FLD (f_operand2)), 1)); SET_H_PREFIXREG_V32 (opval); - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -13985,12 +13985,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (GET_H_GR (FLD (f_operand1)), MULSI (GET_H_GR (FLD (f_operand2)), 2)); SET_H_PREFIXREG_V32 (opval); - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -14011,12 +14011,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { SI opval = ADDSI (GET_H_GR (FLD (f_operand1)), MULSI (GET_H_GR (FLD (f_operand2)), 4)); SET_H_PREFIXREG_V32 (opval); - TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval); } { BI opval = 1; SET_H_INSN_PREFIXED_P (opval); - TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval); } } @@ -14037,7 +14037,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { USI opval = crisv32f_fidxi_handler (current_cpu, pc, GET_H_GR (FLD (f_operand1))); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -14058,7 +14058,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { USI opval = crisv32f_ftagi_handler (current_cpu, pc, GET_H_GR (FLD (f_operand1))); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -14079,7 +14079,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { USI opval = crisv32f_fidxd_handler (current_cpu, pc, GET_H_GR (FLD (f_operand1))); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -14100,7 +14100,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) { { USI opval = crisv32f_ftagd_handler (current_cpu, pc, GET_H_GR (FLD (f_operand1))); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog index 53edf96..818c3c2 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/ChangeLog @@ -1,3 +1,10 @@ +2015-06-12 Mike Frysinger <vapier@gentoo.org> + + * decode.c (frvbf_decode): Change TRACE_EXTRACT to CGEN_TRACE_EXTRACT. + * mloop.in (execute): Change TRACE_INSN_INIT to CGEN_TRACE_INSN_INIT, + TRACE_INSN to CGEN_TRACE_INSN, and TRACE_INSN_FINI to CGEN_TRACE_INSN_FINI. + * sem.c: Rename TRACE_RESULT to CGEN_TRACE_RESULT. + 2015-06-11 Mike Frysinger <vapier@gentoo.org> * sim-main.h (WITH_TRACE): Delete. diff --git a/sim/frv/decode.c b/sim/frv/decode.c index bca4a63..4668170 100644 --- a/sim/frv/decode.c +++ b/sim/frv/decode.c @@ -3254,7 +3254,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0)); #undef FLD return idesc; @@ -3277,7 +3277,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3306,7 +3306,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_not", "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_not", "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3337,7 +3337,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sdiv", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sdiv", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3369,7 +3369,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smul", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smul", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3398,7 +3398,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3427,7 +3427,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smass", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smass", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3460,7 +3460,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_slass", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_slass", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3489,7 +3489,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_scutss", "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_scutss", "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3527,7 +3527,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cadd", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cadd", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3563,7 +3563,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cnot", "f_CCi 0x%x", 'x', f_CCi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cnot", "f_CCi 0x%x", 'x', f_CCi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3601,7 +3601,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_csmul", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_csmul", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3640,7 +3640,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_csdiv", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_csdiv", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3676,7 +3676,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_ICCi_1) = f_ICCi_1; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addcc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3713,7 +3713,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_ICCi_1) = f_ICCi_1; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3750,7 +3750,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_ICCi_1) = f_ICCi_1; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smulcc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smulcc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3790,7 +3790,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_caddcc", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_caddcc", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3831,7 +3831,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_csmulcc", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_csmulcc", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3869,7 +3869,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_ICCi_1) = f_ICCi_1; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addx", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addx", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3902,7 +3902,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3933,7 +3933,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRk) = f_GRk; FLD (f_d12) = f_d12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sdivi", "f_GRi 0x%x", 'x', f_GRi, "f_GRk 0x%x", 'x', f_GRk, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sdivi", "f_GRi 0x%x", 'x', f_GRi, "f_GRk 0x%x", 'x', f_GRk, "f_d12 0x%x", 'x', f_d12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3964,7 +3964,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smuli", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smuli", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3998,7 +3998,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_ICCi_1) = f_ICCi_1; FLD (f_s10) = f_s10; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addicc", "f_GRi 0x%x", 'x', f_GRi, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_s10 0x%x", 'x', f_s10, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addicc", "f_GRi 0x%x", 'x', f_GRi, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_s10 0x%x", 'x', f_s10, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4034,7 +4034,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_ICCi_1) = f_ICCi_1; FLD (f_s10) = f_s10; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andicc", "f_GRi 0x%x", 'x', f_GRi, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_s10 0x%x", 'x', f_s10, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andicc", "f_GRi 0x%x", 'x', f_GRi, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_s10 0x%x", 'x', f_s10, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4070,7 +4070,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_ICCi_1) = f_ICCi_1; FLD (f_s10) = f_s10; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smulicc", "f_GRi 0x%x", 'x', f_GRi, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_s10 0x%x", 'x', f_s10, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_smulicc", "f_GRi 0x%x", 'x', f_GRi, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_s10 0x%x", 'x', f_s10, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4106,7 +4106,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_ICCi_1) = f_ICCi_1; FLD (f_s10) = f_s10; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addxi", "f_GRi 0x%x", 'x', f_GRi, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_s10 0x%x", 'x', f_s10, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addxi", "f_GRi 0x%x", 'x', f_GRi, "f_ICCi_1 0x%x", 'x', f_ICCi_1, "f_s10 0x%x", 'x', f_s10, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4138,7 +4138,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_ICCi_1) = f_ICCi_1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpb", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_1 0x%x", 'x', f_ICCi_1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpb", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_1 0x%x", 'x', f_ICCi_1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4167,7 +4167,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_u16) = f_u16; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_setlo", "f_u16 0x%x", 'x', f_u16, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_setlo", "f_u16 0x%x", 'x', f_u16, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4194,7 +4194,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_u16) = f_u16; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sethi", "f_u16 0x%x", 'x', f_u16, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sethi", "f_u16 0x%x", 'x', f_u16, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4221,7 +4221,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_s16) = f_s16; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_setlos", "f_s16 0x%x", 'x', f_s16, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_setlos", "f_s16 0x%x", 'x', f_s16, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4251,7 +4251,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsb", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsb", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4283,7 +4283,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldbf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldbf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4315,7 +4315,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_CPRk) = f_CPRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4347,7 +4347,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldsb", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldsb", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4379,7 +4379,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldbf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldbf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4411,7 +4411,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldd", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldd", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4443,7 +4443,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4475,7 +4475,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_CPRk) = f_CPRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4507,7 +4507,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldd", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldd", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4539,7 +4539,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nlddf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nlddf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4571,7 +4571,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldq", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldq", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4602,7 +4602,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4633,7 +4633,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_CPRk) = f_CPRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqc", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4664,7 +4664,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldq", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldq", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4695,7 +4695,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldqf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldqf", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4726,7 +4726,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsbu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsbu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4759,7 +4759,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldsbu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldsbu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4792,7 +4792,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldbfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldbfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4825,7 +4825,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_CPRk) = f_CPRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldcu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldcu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4858,7 +4858,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldbfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldbfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4891,7 +4891,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4924,7 +4924,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nlddu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nlddu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4957,7 +4957,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4990,7 +4990,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_CPRk) = f_CPRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddcu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddcu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5023,7 +5023,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nlddfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nlddfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5056,7 +5056,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5088,7 +5088,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldqu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldqu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5120,7 +5120,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5152,7 +5152,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_CPRk) = f_CPRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqcu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqcu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_CPRk 0x%x", 'x', f_CPRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5184,7 +5184,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldqfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldqfu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5216,7 +5216,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsbi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsbi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5247,7 +5247,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldbfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldbfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5278,7 +5278,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldsbi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldsbi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5309,7 +5309,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldbfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldbfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5340,7 +5340,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5371,7 +5371,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lddfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5402,7 +5402,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nlddi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nlddi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5433,7 +5433,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nlddfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nlddfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5464,7 +5464,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5494,7 +5494,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldqfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5524,7 +5524,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldqfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nldqfi", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5554,7 +5554,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5586,7 +5586,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRk) = f_FRk; FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stbf", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stbf", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5618,7 +5618,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_CPRk) = f_CPRk; FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stc", "f_CPRk 0x%x", 'x', f_CPRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stc", "f_CPRk 0x%x", 'x', f_CPRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5650,7 +5650,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRk) = f_GRk; FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_std", "f_GRk 0x%x", 'x', f_GRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_std", "f_GRk 0x%x", 'x', f_GRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5682,7 +5682,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRk) = f_FRk; FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdf", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdf", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5714,7 +5714,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_CPRk) = f_CPRk; FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdc", "f_CPRk 0x%x", 'x', f_CPRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdc", "f_CPRk 0x%x", 'x', f_CPRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5746,7 +5746,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stbu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stbu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5779,7 +5779,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRk) = f_FRk; FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stbfu", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stbfu", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5812,7 +5812,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_CPRk) = f_CPRk; FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stcu", "f_CPRk 0x%x", 'x', f_CPRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stcu", "f_CPRk 0x%x", 'x', f_CPRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5845,7 +5845,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRk) = f_GRk; FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdu", "f_GRk 0x%x", 'x', f_GRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdu", "f_GRk 0x%x", 'x', f_GRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5878,7 +5878,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRk) = f_FRk; FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdfu", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdfu", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5911,7 +5911,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_CPRk) = f_CPRk; FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdcu", "f_CPRk 0x%x", 'x', f_CPRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdcu", "f_CPRk 0x%x", 'x', f_CPRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5944,7 +5944,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stqu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stqu", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5982,7 +5982,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldsb", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldsb", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6021,7 +6021,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldbf", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldbf", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6060,7 +6060,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldd", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldd", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6099,7 +6099,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clddf", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clddf", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6138,7 +6138,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldq", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldq", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6176,7 +6176,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldsbu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldsbu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6216,7 +6216,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldbfu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldbfu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6256,7 +6256,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clddu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clddu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6296,7 +6296,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clddfu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clddfu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6336,7 +6336,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldqu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cldqu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6375,7 +6375,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstb", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstb", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6414,7 +6414,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstbf", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstbf", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6453,7 +6453,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstd", "f_CCi 0x%x", 'x', f_CCi, "f_GRk 0x%x", 'x', f_GRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstd", "f_CCi 0x%x", 'x', f_CCi, "f_GRk 0x%x", 'x', f_GRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6492,7 +6492,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstdf", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstdf", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6531,7 +6531,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstbu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstbu", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6571,7 +6571,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstbfu", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstbfu", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6611,7 +6611,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstdu", "f_CCi 0x%x", 'x', f_CCi, "f_GRk 0x%x", 'x', f_GRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstdu", "f_CCi 0x%x", 'x', f_CCi, "f_GRk 0x%x", 'x', f_GRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6651,7 +6651,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstdfu", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cstdfu", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6685,7 +6685,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRk) = f_GRk; FLD (f_d12) = f_d12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stbi", "f_GRi 0x%x", 'x', f_GRi, "f_GRk 0x%x", 'x', f_GRk, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stbi", "f_GRi 0x%x", 'x', f_GRi, "f_GRk 0x%x", 'x', f_GRk, "f_d12 0x%x", 'x', f_d12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6716,7 +6716,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRk) = f_FRk; FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stbfi", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stbfi", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6747,7 +6747,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRk) = f_GRk; FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdi", "f_GRk 0x%x", 'x', f_GRk, "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdi", "f_GRk 0x%x", 'x', f_GRk, "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6778,7 +6778,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRk) = f_FRk; FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdfi", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stdfi", "f_FRk 0x%x", 'x', f_FRk, "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6809,7 +6809,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_swap", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_swap", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6842,7 +6842,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRk) = f_GRk; FLD (f_d12) = f_d12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_swapi", "f_GRi 0x%x", 'x', f_GRi, "f_GRk 0x%x", 'x', f_GRk, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_swapi", "f_GRi 0x%x", 'x', f_GRi, "f_GRk 0x%x", 'x', f_GRk, "f_d12 0x%x", 'x', f_d12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6880,7 +6880,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_GRk) = f_GRk; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cswap", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cswap", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_GRk 0x%x", 'x', f_GRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6911,7 +6911,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movgf", "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movgf", "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6939,7 +6939,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRk) = f_FRk; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movfg", "f_FRk 0x%x", 'x', f_FRk, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movfg", "f_FRk 0x%x", 'x', f_FRk, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6967,7 +6967,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movgfd", "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movgfd", "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6997,7 +6997,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRk) = f_FRk; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movfgd", "f_FRk 0x%x", 'x', f_FRk, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movfgd", "f_FRk 0x%x", 'x', f_FRk, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7027,7 +7027,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRj) = f_GRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movgfq", "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movgfq", "f_GRj 0x%x", 'x', f_GRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7061,7 +7061,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRk) = f_FRk; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movfgq", "f_FRk 0x%x", 'x', f_FRk, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movfgq", "f_FRk 0x%x", 'x', f_FRk, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7101,7 +7101,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmovgf", "f_CCi 0x%x", 'x', f_CCi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmovgf", "f_CCi 0x%x", 'x', f_CCi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7136,7 +7136,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRk) = f_FRk; FLD (f_cond) = f_cond; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmovfg", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmovfg", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7171,7 +7171,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmovgfd", "f_CCi 0x%x", 'x', f_CCi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmovgfd", "f_CCi 0x%x", 'x', f_CCi, "f_GRj 0x%x", 'x', f_GRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7208,7 +7208,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRk) = f_FRk; FLD (f_cond) = f_cond; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmovfgd", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmovfgd", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7245,7 +7245,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRj) = f_GRj; FLD (f_spr) = f_spr; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movgs", "f_GRj 0x%x", 'x', f_GRj, "f_spr 0x%x", 'x', f_spr, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movgs", "f_GRj 0x%x", 'x', f_GRj, "f_spr 0x%x", 'x', f_spr, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7279,7 +7279,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_spr) = f_spr; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movsg", "f_spr 0x%x", 'x', f_spr, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movsg", "f_spr 0x%x", 'x', f_spr, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7307,7 +7307,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_hint) = f_hint; FLD (i_label16) = f_label16; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bra", "f_hint 0x%x", 'x', f_hint, "label16 0x%x", 'x', f_label16, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bra", "f_hint 0x%x", 'x', f_hint, "label16 0x%x", 'x', f_label16, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7333,7 +7333,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_hint) = f_hint; FLD (i_label16) = f_label16; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bno", "f_hint 0x%x", 'x', f_hint, "label16 0x%x", 'x', f_label16, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bno", "f_hint 0x%x", 'x', f_hint, "label16 0x%x", 'x', f_label16, (char *) 0)); #undef FLD return idesc; @@ -7356,7 +7356,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_ICCi_2) = f_ICCi_2; FLD (f_hint) = f_hint; FLD (i_label16) = f_label16; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beq", "f_ICCi_2 0x%x", 'x', f_ICCi_2, "f_hint 0x%x", 'x', f_hint, "label16 0x%x", 'x', f_label16, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beq", "f_ICCi_2 0x%x", 'x', f_ICCi_2, "f_hint 0x%x", 'x', f_hint, "label16 0x%x", 'x', f_label16, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7383,7 +7383,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_hint) = f_hint; FLD (i_label16) = f_label16; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fbra", "f_hint 0x%x", 'x', f_hint, "label16 0x%x", 'x', f_label16, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fbra", "f_hint 0x%x", 'x', f_hint, "label16 0x%x", 'x', f_label16, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7409,7 +7409,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_hint) = f_hint; FLD (i_label16) = f_label16; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fbno", "f_hint 0x%x", 'x', f_hint, "label16 0x%x", 'x', f_label16, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fbno", "f_hint 0x%x", 'x', f_hint, "label16 0x%x", 'x', f_label16, (char *) 0)); #undef FLD return idesc; @@ -7432,7 +7432,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FCCi_2) = f_FCCi_2; FLD (f_hint) = f_hint; FLD (i_label16) = f_label16; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fbne", "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_hint 0x%x", 'x', f_hint, "label16 0x%x", 'x', f_label16, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fbne", "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_hint 0x%x", 'x', f_hint, "label16 0x%x", 'x', f_label16, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7459,7 +7459,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ccond) = f_ccond; FLD (f_hint) = f_hint; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bctrlr", "f_ccond 0x%x", 'x', f_ccond, "f_hint 0x%x", 'x', f_hint, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bctrlr", "f_ccond 0x%x", 'x', f_ccond, "f_hint 0x%x", 'x', f_hint, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7485,7 +7485,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_hint) = f_hint; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bralr", "f_hint 0x%x", 'x', f_hint, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bralr", "f_hint 0x%x", 'x', f_hint, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7509,7 +7509,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_hint) = f_hint; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bnolr", "f_hint 0x%x", 'x', f_hint, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bnolr", "f_hint 0x%x", 'x', f_hint, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7536,7 +7536,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ICCi_2) = f_ICCi_2; FLD (f_hint) = f_hint; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beqlr", "f_ICCi_2 0x%x", 'x', f_ICCi_2, "f_hint 0x%x", 'x', f_hint, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beqlr", "f_ICCi_2 0x%x", 'x', f_ICCi_2, "f_hint 0x%x", 'x', f_hint, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7561,7 +7561,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_hint) = f_hint; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fbralr", "f_hint 0x%x", 'x', f_hint, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fbralr", "f_hint 0x%x", 'x', f_hint, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7585,7 +7585,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_hint) = f_hint; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fbnolr", "f_hint 0x%x", 'x', f_hint, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fbnolr", "f_hint 0x%x", 'x', f_hint, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7612,7 +7612,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FCCi_2) = f_FCCi_2; FLD (f_hint) = f_hint; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fbeqlr", "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_hint 0x%x", 'x', f_hint, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fbeqlr", "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_hint 0x%x", 'x', f_hint, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7640,7 +7640,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ccond) = f_ccond; FLD (f_hint) = f_hint; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcralr", "f_ccond 0x%x", 'x', f_ccond, "f_hint 0x%x", 'x', f_hint, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcralr", "f_ccond 0x%x", 'x', f_ccond, "f_hint 0x%x", 'x', f_hint, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7666,7 +7666,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_hint) = f_hint; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcnolr", "f_hint 0x%x", 'x', f_hint, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcnolr", "f_hint 0x%x", 'x', f_hint, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7698,7 +7698,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_ICCi_2) = f_ICCi_2; FLD (f_ccond) = f_ccond; FLD (f_hint) = f_hint; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bceqlr", "f_ICCi_2 0x%x", 'x', f_ICCi_2, "f_ccond 0x%x", 'x', f_ccond, "f_hint 0x%x", 'x', f_hint, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bceqlr", "f_ICCi_2 0x%x", 'x', f_ICCi_2, "f_ccond 0x%x", 'x', f_ccond, "f_hint 0x%x", 'x', f_hint, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7728,7 +7728,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ccond) = f_ccond; FLD (f_hint) = f_hint; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcbralr", "f_ccond 0x%x", 'x', f_ccond, "f_hint 0x%x", 'x', f_hint, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcbralr", "f_ccond 0x%x", 'x', f_ccond, "f_hint 0x%x", 'x', f_hint, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7754,7 +7754,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_hint) = f_hint; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcbnolr", "f_hint 0x%x", 'x', f_hint, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcbnolr", "f_hint 0x%x", 'x', f_hint, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7786,7 +7786,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FCCi_2) = f_FCCi_2; FLD (f_ccond) = f_ccond; FLD (f_hint) = f_hint; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcbeqlr", "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_ccond 0x%x", 'x', f_ccond, "f_hint 0x%x", 'x', f_hint, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcbeqlr", "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_ccond 0x%x", 'x', f_ccond, "f_hint 0x%x", 'x', f_hint, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7819,7 +7819,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_LI) = f_LI; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jmpl", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_LI 0x%x", 'x', f_LI, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jmpl", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_LI 0x%x", 'x', f_LI, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7850,7 +7850,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_LI) = f_LI; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_calll", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_LI 0x%x", 'x', f_LI, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_calll", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_LI 0x%x", 'x', f_LI, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7881,7 +7881,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_LI) = f_LI; FLD (f_d12) = f_d12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jmpil", "f_GRi 0x%x", 'x', f_GRi, "f_LI 0x%x", 'x', f_LI, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jmpil", "f_GRi 0x%x", 'x', f_GRi, "f_LI 0x%x", 'x', f_LI, "f_d12 0x%x", 'x', f_d12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7911,7 +7911,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_LI) = f_LI; FLD (f_d12) = f_d12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_callil", "f_GRi 0x%x", 'x', f_GRi, "f_LI 0x%x", 'x', f_LI, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_callil", "f_GRi 0x%x", 'x', f_GRi, "f_LI 0x%x", 'x', f_LI, "f_d12 0x%x", 'x', f_d12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7941,7 +7941,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_label24) = f_label24; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_call", "label24 0x%x", 'x', f_label24, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_call", "label24 0x%x", 'x', f_label24, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7964,7 +7964,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_debug) = f_debug; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rett", "f_debug 0x%x", 'x', f_debug, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rett", "f_debug 0x%x", 'x', f_debug, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -7983,7 +7983,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rei", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rei", (char *) 0)); #undef FLD return idesc; @@ -8003,7 +8003,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_tra", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_tra", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8039,7 +8039,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_ICCi_2) = f_ICCi_2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_teq", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_2 0x%x", 'x', f_ICCi_2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_teq", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ICCi_2 0x%x", 'x', f_ICCi_2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8073,7 +8073,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftra", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftra", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8109,7 +8109,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FCCi_2) = f_FCCi_2; FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftne", "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftne", "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8143,7 +8143,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_tira", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_tira", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8178,7 +8178,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_ICCi_2) = f_ICCi_2; FLD (f_d12) = f_d12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_tieq", "f_GRi 0x%x", 'x', f_GRi, "f_ICCi_2 0x%x", 'x', f_ICCi_2, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_tieq", "f_GRi 0x%x", 'x', f_GRi, "f_ICCi_2 0x%x", 'x', f_ICCi_2, "f_d12 0x%x", 'x', f_d12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8211,7 +8211,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftira", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftira", "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8246,7 +8246,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FCCi_2) = f_FCCi_2; FLD (f_GRi) = f_GRi; FLD (f_d12) = f_d12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftine", "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftine", "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_GRi 0x%x", 'x', f_GRi, "f_d12 0x%x", 'x', f_d12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8272,7 +8272,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_break", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_break", (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8302,7 +8302,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_CRi) = f_CRi; FLD (f_CRj) = f_CRj; FLD (f_CRk) = f_CRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcr", "f_CRi 0x%x", 'x', f_CRi, "f_CRj 0x%x", 'x', f_CRj, "f_CRk 0x%x", 'x', f_CRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andcr", "f_CRi 0x%x", 'x', f_CRi, "f_CRj 0x%x", 'x', f_CRj, "f_CRk 0x%x", 'x', f_CRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8331,7 +8331,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_CRj) = f_CRj; FLD (f_CRk) = f_CRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_notcr", "f_CRj 0x%x", 'x', f_CRj, "f_CRk 0x%x", 'x', f_CRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_notcr", "f_CRj 0x%x", 'x', f_CRj, "f_CRk 0x%x", 'x', f_CRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8356,7 +8356,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_CRj_int) = f_CRj_int; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ckra", "f_CRj_int 0x%x", 'x', f_CRj_int, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ckra", "f_CRj_int 0x%x", 'x', f_CRj_int, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8383,7 +8383,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ICCi_3) = f_ICCi_3; FLD (f_CRj_int) = f_CRj_int; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ckeq", "f_ICCi_3 0x%x", 'x', f_ICCi_3, "f_CRj_int 0x%x", 'x', f_CRj_int, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ckeq", "f_ICCi_3 0x%x", 'x', f_ICCi_3, "f_CRj_int 0x%x", 'x', f_CRj_int, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8408,7 +8408,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_CRj_float) = f_CRj_float; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fckra", "f_CRj_float 0x%x", 'x', f_CRj_float, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fckra", "f_CRj_float 0x%x", 'x', f_CRj_float, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8435,7 +8435,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FCCi_3) = f_FCCi_3; FLD (f_CRj_float) = f_CRj_float; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fckne", "f_FCCi_3 0x%x", 'x', f_FCCi_3, "f_CRj_float 0x%x", 'x', f_CRj_float, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fckne", "f_FCCi_3 0x%x", 'x', f_FCCi_3, "f_CRj_float 0x%x", 'x', f_CRj_float, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8466,7 +8466,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_CCi) = f_CCi; FLD (f_cond) = f_cond; FLD (f_CRj_int) = f_CRj_int; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cckra", "f_CCi 0x%x", 'x', f_CCi, "f_cond 0x%x", 'x', f_cond, "f_CRj_int 0x%x", 'x', f_CRj_int, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cckra", "f_CCi 0x%x", 'x', f_CCi, "f_cond 0x%x", 'x', f_cond, "f_CRj_int 0x%x", 'x', f_CRj_int, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8500,7 +8500,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_ICCi_3) = f_ICCi_3; FLD (f_cond) = f_cond; FLD (f_CRj_int) = f_CRj_int; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cckeq", "f_CCi 0x%x", 'x', f_CCi, "f_ICCi_3 0x%x", 'x', f_ICCi_3, "f_cond 0x%x", 'x', f_cond, "f_CRj_int 0x%x", 'x', f_CRj_int, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cckeq", "f_CCi 0x%x", 'x', f_CCi, "f_ICCi_3 0x%x", 'x', f_ICCi_3, "f_cond 0x%x", 'x', f_cond, "f_CRj_int 0x%x", 'x', f_CRj_int, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8532,7 +8532,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_CCi) = f_CCi; FLD (f_cond) = f_cond; FLD (f_CRj_float) = f_CRj_float; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfckra", "f_CCi 0x%x", 'x', f_CCi, "f_cond 0x%x", 'x', f_cond, "f_CRj_float 0x%x", 'x', f_CRj_float, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfckra", "f_CCi 0x%x", 'x', f_CCi, "f_cond 0x%x", 'x', f_cond, "f_CRj_float 0x%x", 'x', f_CRj_float, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8566,7 +8566,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FCCi_3) = f_FCCi_3; FLD (f_cond) = f_cond; FLD (f_CRj_float) = f_CRj_float; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfckne", "f_CCi 0x%x", 'x', f_CCi, "f_FCCi_3 0x%x", 'x', f_FCCi_3, "f_cond 0x%x", 'x', f_cond, "f_CRj_float 0x%x", 'x', f_CRj_float, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfckne", "f_CCi 0x%x", 'x', f_CCi, "f_FCCi_3 0x%x", 'x', f_FCCi_3, "f_cond 0x%x", 'x', f_cond, "f_CRj_float 0x%x", 'x', f_CRj_float, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8604,7 +8604,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_LI) = f_LI; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cjmpl", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_LI 0x%x", 'x', f_LI, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cjmpl", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_LI 0x%x", 'x', f_LI, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8642,7 +8642,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRj) = f_GRj; FLD (f_LI) = f_LI; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ccalll", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_LI 0x%x", 'x', f_LI, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ccalll", "f_CCi 0x%x", 'x', f_CCi, "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_LI 0x%x", 'x', f_LI, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8671,7 +8671,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ici", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ici", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8702,7 +8702,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_ae) = f_ae; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_icei", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ae 0x%x", 'x', f_ae, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_icei", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_ae 0x%x", 'x', f_ae, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8733,7 +8733,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_GRi) = f_GRi; FLD (f_GRj) = f_GRj; FLD (f_lock) = f_lock; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_icpl", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_lock 0x%x", 'x', f_lock, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_icpl", "f_GRi 0x%x", 'x', f_GRi, "f_GRj 0x%x", 'x', f_GRj, "f_lock 0x%x", 'x', f_lock, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8758,7 +8758,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRi) = f_GRi; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_icul", "f_GRi 0x%x", 'x', f_GRi, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_icul", "f_GRi 0x%x", 'x', f_GRi, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8782,7 +8782,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrgr", "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrgr", "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8806,7 +8806,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrfr", "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrfr", "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8830,7 +8830,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_GRk) = f_GRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_commitgr", "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_commitgr", "f_GRk 0x%x", 'x', f_GRk, (char *) 0)); #undef FLD return idesc; @@ -8847,7 +8847,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_commitfr", "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_commitfr", "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #undef FLD return idesc; @@ -8867,7 +8867,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fitos", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fitos", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8895,7 +8895,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fstoi", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fstoi", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8923,7 +8923,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fitod", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fitod", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8951,7 +8951,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdtoi", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdtoi", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -8979,7 +8979,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fditos", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fditos", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9009,7 +9009,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdstoi", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdstoi", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9045,7 +9045,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfitos", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfitos", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9080,7 +9080,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfstoi", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfstoi", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9109,7 +9109,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfitos", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfitos", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9137,7 +9137,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfstoi", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfstoi", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9165,7 +9165,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmovs", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmovs", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9193,7 +9193,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmovd", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmovd", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9221,7 +9221,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdmovs", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdmovs", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9257,7 +9257,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfmovs", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfmovs", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9286,7 +9286,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfsqrts", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfsqrts", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9317,7 +9317,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fadds", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fadds", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9349,7 +9349,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_faddd", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_faddd", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9387,7 +9387,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfadds", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfadds", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9420,7 +9420,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfadds", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfadds", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9452,7 +9452,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FCCi_2) = f_FCCi_2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcmps", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FCCi_2 0x%x", 'x', f_FCCi_2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcmps", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FCCi_2 0x%x", 'x', f_FCCi_2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9484,7 +9484,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FCCi_2) = f_FCCi_2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcmpd", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FCCi_2 0x%x", 'x', f_FCCi_2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcmpd", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FCCi_2 0x%x", 'x', f_FCCi_2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9522,7 +9522,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_FCCi_2) = f_FCCi_2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfcmps", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FCCi_2 0x%x", 'x', f_FCCi_2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfcmps", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FCCi_2 0x%x", 'x', f_FCCi_2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9555,7 +9555,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FCCi_2) = f_FCCi_2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdcmps", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FCCi_2 0x%x", 'x', f_FCCi_2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdcmps", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FCCi_2 0x%x", 'x', f_FCCi_2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9590,7 +9590,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmadds", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmadds", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9623,7 +9623,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmaddd", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmaddd", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9656,7 +9656,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdmadds", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdmadds", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9699,7 +9699,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfmadds", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfmadds", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9733,7 +9733,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfmadds", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfmadds", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9766,7 +9766,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmas", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmas", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9801,7 +9801,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdmas", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fdmas", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9848,7 +9848,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfmas", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cfmas", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9887,7 +9887,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_FCCi_2) = f_FCCi_2; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfdcmps", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nfdcmps", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FCCi_2 0x%x", 'x', f_FCCi_2, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9925,7 +9925,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_u12) = f_u12; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhsetlos", "f_u12 0x%x", 'x', f_u12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhsetlos", "f_u12 0x%x", 'x', f_u12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9958,7 +9958,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_u12) = f_u12; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhsethis", "f_u12 0x%x", 'x', f_u12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhsethis", "f_u12 0x%x", 'x', f_u12, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -9991,7 +9991,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRk) = f_FRk; FLD (f_u12) = f_u12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhdsets", "f_FRk 0x%x", 'x', f_FRk, "f_u12 0x%x", 'x', f_u12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhdsets", "f_FRk 0x%x", 'x', f_FRk, "f_u12 0x%x", 'x', f_u12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10021,7 +10021,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRk) = f_FRk; FLD (f_s5) = f_s5; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhsetloh", "f_FRk 0x%x", 'x', f_FRk, "f_s5 0x%x", 'x', f_s5, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhsetloh", "f_FRk 0x%x", 'x', f_FRk, "f_s5 0x%x", 'x', f_s5, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10049,7 +10049,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRk) = f_FRk; FLD (f_s5) = f_s5; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhsethih", "f_FRk 0x%x", 'x', f_FRk, "f_s5 0x%x", 'x', f_s5, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhsethih", "f_FRk 0x%x", 'x', f_FRk, "f_s5 0x%x", 'x', f_s5, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10077,7 +10077,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRk) = f_FRk; FLD (f_s5) = f_s5; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhdseth", "f_FRk 0x%x", 'x', f_FRk, "f_s5 0x%x", 'x', f_s5, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhdseth", "f_FRk 0x%x", 'x', f_FRk, "f_s5 0x%x", 'x', f_s5, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10112,7 +10112,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mand", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mand", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10150,7 +10150,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmand", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmand", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10180,7 +10180,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mnot", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mnot", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10214,7 +10214,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmnot", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmnot", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10246,7 +10246,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_u6) = f_u6; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mrotli", "f_FRi 0x%x", 'x', f_FRi, "f_u6 0x%x", 'x', f_u6, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mrotli", "f_FRi 0x%x", 'x', f_FRi, "f_u6 0x%x", 'x', f_u6, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10277,7 +10277,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mwcut", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mwcut", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10310,7 +10310,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_u6) = f_u6; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mwcuti", "f_FRi 0x%x", 'x', f_FRi, "f_u6 0x%x", 'x', f_u6, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mwcuti", "f_FRi 0x%x", 'x', f_FRi, "f_u6 0x%x", 'x', f_u6, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10342,7 +10342,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_ACC40Si) = f_ACC40Si; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcut", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcut", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10374,7 +10374,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_ACC40Si) = f_ACC40Si; FLD (f_s6) = f_s6; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcuti", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_s6 0x%x", 'x', f_s6, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcuti", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_s6 0x%x", 'x', f_s6, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10405,7 +10405,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_ACC40Si) = f_ACC40Si; FLD (f_FRk) = f_FRk; FLD (f_s6) = f_s6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdcutssi", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_FRk 0x%x", 'x', f_FRk, "f_s6 0x%x", 'x', f_s6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdcutssi", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_FRk 0x%x", 'x', f_FRk, "f_s6 0x%x", 'x', f_s6, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10438,7 +10438,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRk) = f_FRk; FLD (f_u6) = f_u6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_msllhi", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "f_u6 0x%x", 'x', f_u6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_msllhi", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "f_u6 0x%x", 'x', f_u6, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10475,7 +10475,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRk) = f_FRk; FLD (f_s6) = f_s6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdrotli", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "f_s6 0x%x", 'x', f_s6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdrotli", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "f_s6 0x%x", 'x', f_s6, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10508,7 +10508,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRk) = f_FRk; FLD (f_u6) = f_u6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcplhi", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "f_u6 0x%x", 'x', f_u6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcplhi", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "f_u6 0x%x", 'x', f_u6, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10544,7 +10544,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_u6) = f_u6; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcpli", "f_FRi 0x%x", 'x', f_FRi, "f_u6 0x%x", 'x', f_u6, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcpli", "f_FRi 0x%x", 'x', f_FRi, "f_u6 0x%x", 'x', f_u6, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10576,7 +10576,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_msaths", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_msaths", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10613,7 +10613,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqsaths", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqsaths", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10658,7 +10658,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FCCk) = f_FCCk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcmpsh", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FCCk 0x%x", 'x', f_FCCk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcmpsh", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FCCk 0x%x", 'x', f_FCCk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10692,7 +10692,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mabshs", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mabshs", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10735,7 +10735,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmaddhss", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmaddhss", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10779,7 +10779,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmqaddhss", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmqaddhss", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10825,7 +10825,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRk) = f_FRk; FLD (f_u6) = f_u6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqsllhi", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "f_u6 0x%x", 'x', f_u6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqsllhi", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "f_u6 0x%x", 'x', f_u6, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10863,7 +10863,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ACC40Si) = f_ACC40Si; FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_maddaccs", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_maddaccs", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10892,7 +10892,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ACC40Si) = f_ACC40Si; FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdaddaccs", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdaddaccs", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10924,7 +10924,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ACC40Si) = f_ACC40Si; FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_masaccs", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_masaccs", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10954,7 +10954,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ACC40Si) = f_ACC40Si; FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdasaccs", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdasaccs", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -10991,7 +10991,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mmulhs", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mmulhs", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11034,7 +11034,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmmulhs", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmmulhs", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11072,7 +11072,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqmulhs", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqmulhs", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11121,7 +11121,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmqmulhs", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmqmulhs", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11165,7 +11165,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_ACC40Sk) = f_ACC40Sk; FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mmachs", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mmachs", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11204,7 +11204,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_ACC40Uk) = f_ACC40Uk; FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mmachu", "f_ACC40Uk 0x%x", 'x', f_ACC40Uk, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mmachu", "f_ACC40Uk 0x%x", 'x', f_ACC40Uk, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11249,7 +11249,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmmachs", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmmachs", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11295,7 +11295,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmmachu", "f_ACC40Uk 0x%x", 'x', f_ACC40Uk, "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmmachu", "f_ACC40Uk 0x%x", 'x', f_ACC40Uk, "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11335,7 +11335,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_ACC40Sk) = f_ACC40Sk; FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqmachs", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqmachs", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11382,7 +11382,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_ACC40Uk) = f_ACC40Uk; FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqmachu", "f_ACC40Uk 0x%x", 'x', f_ACC40Uk, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqmachu", "f_ACC40Uk 0x%x", 'x', f_ACC40Uk, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11435,7 +11435,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmqmachs", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmqmachs", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11489,7 +11489,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmqmachu", "f_ACC40Uk 0x%x", 'x', f_ACC40Uk, "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmqmachu", "f_ACC40Uk 0x%x", 'x', f_ACC40Uk, "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11537,7 +11537,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcpxrs", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcpxrs", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11579,7 +11579,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_cond) = f_cond; FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmcpxrs", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmcpxrs", "f_CCi 0x%x", 'x', f_CCi, "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_cond 0x%x", 'x', f_cond, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11616,7 +11616,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqcpxrs", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mqcpxrs", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11657,7 +11657,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRk) = f_FRk; FLD (f_u6) = f_u6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mexpdhw", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "f_u6 0x%x", 'x', f_u6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mexpdhw", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "f_u6 0x%x", 'x', f_u6, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11696,7 +11696,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRk) = f_FRk; FLD (f_u6) = f_u6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmexpdhw", "f_CCi 0x%x", 'x', f_CCi, "f_cond 0x%x", 'x', f_cond, "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "f_u6 0x%x", 'x', f_u6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmexpdhw", "f_CCi 0x%x", 'x', f_CCi, "f_cond 0x%x", 'x', f_cond, "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, "f_u6 0x%x", 'x', f_u6, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11730,7 +11730,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRk) = f_FRk; FLD (f_FRi) = f_FRi; FLD (f_u6) = f_u6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mexpdhd", "f_FRk 0x%x", 'x', f_FRk, "f_FRi 0x%x", 'x', f_FRi, "f_u6 0x%x", 'x', f_u6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mexpdhd", "f_FRk 0x%x", 'x', f_FRk, "f_FRi 0x%x", 'x', f_FRi, "f_u6 0x%x", 'x', f_u6, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11773,7 +11773,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_cond) = f_cond; FLD (f_FRi) = f_FRi; FLD (f_u6) = f_u6; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmexpdhd", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, "f_FRi 0x%x", 'x', f_FRi, "f_u6 0x%x", 'x', f_u6, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmexpdhd", "f_CCi 0x%x", 'x', f_CCi, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, "f_FRi 0x%x", 'x', f_FRi, "f_u6 0x%x", 'x', f_u6, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11811,7 +11811,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mpackh", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mpackh", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11844,7 +11844,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRi) = f_FRi; FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdpackh", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdpackh", "f_FRi 0x%x", 'x', f_FRi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11884,7 +11884,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRi) = f_FRi; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_munpackh", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_munpackh", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11920,7 +11920,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRi) = f_FRi; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdunpackh", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mdunpackh", "f_FRi 0x%x", 'x', f_FRi, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -11962,7 +11962,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mbtoh", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mbtoh", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -12006,7 +12006,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmbtoh", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmbtoh", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -12045,7 +12045,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhtob", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mhtob", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -12089,7 +12089,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmhtob", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmhtob", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -12128,7 +12128,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mbtohe", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mbtohe", "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -12176,7 +12176,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_FRj) = f_FRj; FLD (f_FRk) = f_FRk; FLD (f_cond) = f_cond; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmbtohe", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmbtohe", "f_CCi 0x%x", 'x', f_CCi, "f_FRj 0x%x", 'x', f_FRj, "f_FRk 0x%x", 'x', f_FRk, "f_cond 0x%x", 'x', f_cond, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -12216,7 +12216,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ACC40Sk) = f_ACC40Sk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mclracc_0", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mclracc_0", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, (char *) 0)); #undef FLD return idesc; @@ -12236,7 +12236,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ACC40Si) = f_ACC40Si; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mrdacc", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mrdacc", "f_ACC40Si 0x%x", 'x', f_ACC40Si, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -12264,7 +12264,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ACCGi) = f_ACCGi; FLD (f_FRk) = f_FRk; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mrdaccg", "f_ACCGi 0x%x", 'x', f_ACCGi, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mrdaccg", "f_ACCGi 0x%x", 'x', f_ACCGi, "f_FRk 0x%x", 'x', f_FRk, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -12292,7 +12292,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ACC40Sk) = f_ACC40Sk; FLD (f_FRi) = f_FRi; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mwtacc", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, "f_FRi 0x%x", 'x', f_FRi, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mwtacc", "f_ACC40Sk 0x%x", 'x', f_ACC40Sk, "f_FRi 0x%x", 'x', f_FRi, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -12321,7 +12321,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_ACCGk) = f_ACCGk; FLD (f_FRi) = f_FRi; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mwtaccg", "f_ACCGk 0x%x", 'x', f_ACCGk, "f_FRi 0x%x", 'x', f_FRi, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mwtaccg", "f_ACCGk 0x%x", 'x', f_ACCGk, "f_FRi 0x%x", 'x', f_FRi, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ diff --git a/sim/frv/mloop.in b/sim/frv/mloop.in index f158ead..2629a82 100644 --- a/sim/frv/mloop.in +++ b/sim/frv/mloop.in @@ -92,8 +92,8 @@ execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p) } else model_insn = FRV_INSN_NO_MODELING; - TRACE_INSN_INIT (current_cpu, abuf, 1); - TRACE_INSN (current_cpu, idesc->idata, + CGEN_TRACE_INSN_INIT (current_cpu, abuf, 1); + CGEN_TRACE_INSN (current_cpu, idesc->idata, (const struct argbuf *) abuf, abuf->addr); } #if WITH_SCACHE @@ -116,7 +116,7 @@ execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p) cycles = 1; @cpu@_model_insn_after (current_cpu, sc->last_insn_p, cycles); } - TRACE_INSN_FINI (current_cpu, abuf, 1); + CGEN_TRACE_INSN_FINI (current_cpu, abuf, 1); } } diff --git a/sim/frv/sem.c b/sim/frv/sem.c index 3cc0c37..568c3a1 100644 --- a/sim/frv/sem.c +++ b/sim/frv/sem.c @@ -36,8 +36,8 @@ This file is part of the GNU simulators. FAST_P, when desired, is defined on the command line, -DFAST_P=1. */ #if FAST_P #define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_semf_,fn) -#undef TRACE_RESULT -#define TRACE_RESULT(cpu, abuf, name, type, val) +#undef CGEN_TRACE_RESULT +#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val) #else #define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_sem_,fn) #endif @@ -210,7 +210,7 @@ SEM_FN_NAME (frvbf,add) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -231,7 +231,7 @@ SEM_FN_NAME (frvbf,sub) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -252,7 +252,7 @@ SEM_FN_NAME (frvbf,and) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ANDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -273,7 +273,7 @@ SEM_FN_NAME (frvbf,or) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -294,7 +294,7 @@ SEM_FN_NAME (frvbf,xor) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = XORSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -315,7 +315,7 @@ SEM_FN_NAME (frvbf,not) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = INVSI (GET_H_GR (FLD (f_GRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -416,7 +416,7 @@ SEM_FN_NAME (frvbf,smul) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj)))); sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); } return vpc; @@ -437,7 +437,7 @@ SEM_FN_NAME (frvbf,umul) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = MULDI (ZEXTSIDI (GET_H_GR (FLD (f_GRi))), ZEXTSIDI (GET_H_GR (FLD (f_GRj)))); sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); } return vpc; @@ -458,7 +458,7 @@ SEM_FN_NAME (frvbf,smu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj)))); sim_queue_fn_di_write (current_cpu, frvbf_h_iacc0_set, ((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "iacc0", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iacc0", 'D', opval); } return vpc; @@ -479,7 +479,7 @@ SEM_FN_NAME (frvbf,smass) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = (ANDIF (ANDIF (GTDI (MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj)))), 0), GTDI (GET_H_IACC0 (((UINT) 0)), 0)), LTDI (SUBDI (MAKEDI (2147483647, 0xffffffff), MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj))))), GET_H_IACC0 (((UINT) 0))))) ? (MAKEDI (2147483647, 0xffffffff)) : (ANDIF (ANDIF (LTDI (MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj)))), 0), LTDI (GET_H_IACC0 (((UINT) 0)), 0)), GTDI (SUBDI (MAKEDI (0x80000000, 0), MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj))))), GET_H_IACC0 (((UINT) 0))))) ? (MAKEDI (0x80000000, 0)) : (ADDDI (GET_H_IACC0 (((UINT) 0)), MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj)))))); sim_queue_fn_di_write (current_cpu, frvbf_h_iacc0_set, ((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "iacc0", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iacc0", 'D', opval); } return vpc; @@ -500,7 +500,7 @@ SEM_FN_NAME (frvbf,smsss) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = (ANDIF (ANDIF (LTDI (MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj)))), 0), GTDI (GET_H_IACC0 (((UINT) 0)), 0)), LTDI (ADDDI (MAKEDI (2147483647, 0xffffffff), MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj))))), GET_H_IACC0 (((UINT) 0))))) ? (MAKEDI (2147483647, 0xffffffff)) : (ANDIF (ANDIF (GTDI (MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj)))), 0), LTDI (GET_H_IACC0 (((UINT) 0)), 0)), GTDI (ADDDI (MAKEDI (0x80000000, 0), MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj))))), GET_H_IACC0 (((UINT) 0))))) ? (MAKEDI (0x80000000, 0)) : (SUBDI (GET_H_IACC0 (((UINT) 0)), MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj)))))); sim_queue_fn_di_write (current_cpu, frvbf_h_iacc0_set, ((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "iacc0", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iacc0", 'D', opval); } return vpc; @@ -521,7 +521,7 @@ SEM_FN_NAME (frvbf,sll) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SLLSI (GET_H_GR (FLD (f_GRi)), ANDSI (GET_H_GR (FLD (f_GRj)), 31)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -542,7 +542,7 @@ SEM_FN_NAME (frvbf,srl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRLSI (GET_H_GR (FLD (f_GRi)), ANDSI (GET_H_GR (FLD (f_GRj)), 31)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -563,7 +563,7 @@ SEM_FN_NAME (frvbf,sra) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRASI (GET_H_GR (FLD (f_GRi)), ANDSI (GET_H_GR (FLD (f_GRj)), 31)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -584,7 +584,7 @@ SEM_FN_NAME (frvbf,slass) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_shift_left_arith_saturate (current_cpu, GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -605,7 +605,7 @@ SEM_FN_NAME (frvbf,scutss) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_iacc_cut (current_cpu, GET_H_IACC0 (((UINT) 0)), GET_H_GR (FLD (f_GRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -631,7 +631,7 @@ SEM_FN_NAME (frvbf,scan) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_scan_result (current_cpu, XORSI (tmp_tmp1, tmp_tmp2)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -655,7 +655,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -680,7 +680,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = SUBSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -705,7 +705,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = ANDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -730,7 +730,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = ORSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -755,7 +755,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = XORSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -780,7 +780,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = INVSI (GET_H_GR (FLD (f_GRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -805,7 +805,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { DI opval = MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj)))); sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); } } @@ -876,7 +876,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = SLLSI (GET_H_GR (FLD (f_GRi)), ANDSI (GET_H_GR (FLD (f_GRj)), 31)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -901,7 +901,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = SRLSI (GET_H_GR (FLD (f_GRi)), ANDSI (GET_H_GR (FLD (f_GRj)), 31)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -926,7 +926,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = SRASI (GET_H_GR (FLD (f_GRi)), ANDSI (GET_H_GR (FLD (f_GRj)), 31)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -956,7 +956,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = frvbf_scan_result (current_cpu, XORSI (tmp_tmp1, tmp_tmp2)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -1007,12 +1007,12 @@ if (LTSI (tmp_result, 0)) { { SI opval = tmp_result; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } @@ -1061,12 +1061,12 @@ if (LTSI (tmp_result, 0)) { { SI opval = tmp_result; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } @@ -1091,14 +1091,14 @@ SEM_FN_NAME (frvbf,andcc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (EQSI (tmp_tmp, 0)) { { UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 7), 4); sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } else { if (LTSI (tmp_tmp, 0)) { @@ -1106,14 +1106,14 @@ if (LTSI (tmp_tmp, 0)) { UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 11), 8); sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } else { { UQI opval = ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 3); sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } } @@ -1141,14 +1141,14 @@ SEM_FN_NAME (frvbf,orcc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (EQSI (tmp_tmp, 0)) { { UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 7), 4); sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } else { if (LTSI (tmp_tmp, 0)) { @@ -1156,14 +1156,14 @@ if (LTSI (tmp_tmp, 0)) { UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 11), 8); sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } else { { UQI opval = ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 3); sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } } @@ -1191,14 +1191,14 @@ SEM_FN_NAME (frvbf,xorcc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (EQSI (tmp_tmp, 0)) { { UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 7), 4); sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } else { if (LTSI (tmp_tmp, 0)) { @@ -1206,14 +1206,14 @@ if (LTSI (tmp_tmp, 0)) { UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 11), 8); sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } else { { UQI opval = ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 3); sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } } @@ -1245,7 +1245,7 @@ SEM_FN_NAME (frvbf,sllcc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (EQSI (tmp_tmp, 0)) { tmp_cc = ORQI (ANDQI (tmp_cc, 7), 4); @@ -1259,7 +1259,7 @@ if (LTSI (tmp_tmp, 0)) { { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } @@ -1288,7 +1288,7 @@ SEM_FN_NAME (frvbf,srlcc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (EQSI (tmp_tmp, 0)) { tmp_cc = ORQI (ANDQI (tmp_cc, 7), 4); @@ -1302,7 +1302,7 @@ if (LTSI (tmp_tmp, 0)) { { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } @@ -1331,7 +1331,7 @@ SEM_FN_NAME (frvbf,sracc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (EQSI (tmp_tmp, 0)) { tmp_cc = ORQI (ANDQI (tmp_cc, 7), 4); @@ -1345,7 +1345,7 @@ if (LTSI (tmp_tmp, 0)) { { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } @@ -1382,12 +1382,12 @@ if (EQBI (EQDI (tmp_tmp, 0), 0)) { { DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); } { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } @@ -1424,12 +1424,12 @@ if (EQBI (EQDI (tmp_tmp, 0), 0)) { { DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); } { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } @@ -1480,13 +1480,13 @@ if (LTSI (tmp_result, 0)) { SI opval = tmp_result; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } } @@ -1539,13 +1539,13 @@ if (LTSI (tmp_result, 0)) { SI opval = tmp_result; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } } @@ -1586,13 +1586,13 @@ if (EQBI (EQDI (tmp_tmp, 0), 0)) { DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); } { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } } @@ -1621,14 +1621,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (EQSI (tmp_tmp, 0)) { { UQI opval = ORQI (ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 7), 4); sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } else { if (LTSI (tmp_tmp, 0)) { @@ -1636,14 +1636,14 @@ if (LTSI (tmp_tmp, 0)) { UQI opval = ORQI (ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 11), 8); sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } else { { UQI opval = ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 3); sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } } @@ -1674,14 +1674,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (EQSI (tmp_tmp, 0)) { { UQI opval = ORQI (ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 7), 4); sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } else { if (LTSI (tmp_tmp, 0)) { @@ -1689,14 +1689,14 @@ if (LTSI (tmp_tmp, 0)) { UQI opval = ORQI (ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 11), 8); sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } else { { UQI opval = ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 3); sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } } @@ -1727,14 +1727,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (EQSI (tmp_tmp, 0)) { { UQI opval = ORQI (ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 7), 4); sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } else { if (LTSI (tmp_tmp, 0)) { @@ -1742,14 +1742,14 @@ if (LTSI (tmp_tmp, 0)) { UQI opval = ORQI (ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 11), 8); sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } else { { UQI opval = ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 3); sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } } @@ -1784,7 +1784,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (EQSI (tmp_tmp, 0)) { tmp_cc = ORQI (ANDQI (tmp_cc, 7), 4); @@ -1799,7 +1799,7 @@ if (LTSI (tmp_tmp, 0)) { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } } @@ -1832,7 +1832,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (EQSI (tmp_tmp, 0)) { tmp_cc = ORQI (ANDQI (tmp_cc, 7), 4); @@ -1847,7 +1847,7 @@ if (LTSI (tmp_tmp, 0)) { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } } @@ -1880,7 +1880,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (EQSI (tmp_tmp, 0)) { tmp_cc = ORQI (ANDQI (tmp_cc, 7), 4); @@ -1895,7 +1895,7 @@ if (LTSI (tmp_tmp, 0)) { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } } @@ -1919,7 +1919,7 @@ SEM_FN_NAME (frvbf,addx) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDCSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 1))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1940,7 +1940,7 @@ SEM_FN_NAME (frvbf,subx) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBCSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 1))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1985,12 +1985,12 @@ if (LTSI (tmp_tmp, 0)) { { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } @@ -2036,12 +2036,12 @@ if (LTSI (tmp_tmp, 0)) { { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } @@ -2064,13 +2064,13 @@ SEM_FN_NAME (frvbf,addss) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (ADDOFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), 0)) { { SI opval = (GTSI (GET_H_GR (FLD (f_GRi)), 0)) ? (2147483647) : (LTSI (GET_H_GR (FLD (f_GRi)), 0)) ? (0x80000000) : (0); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -2094,13 +2094,13 @@ SEM_FN_NAME (frvbf,subss) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (SUBOFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), 0)) { { SI opval = (GTSI (GET_H_GR (FLD (f_GRi)), 0)) ? (2147483647) : (LTSI (GET_H_GR (FLD (f_GRi)), 0)) ? (0x80000000) : (0); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -2123,7 +2123,7 @@ SEM_FN_NAME (frvbf,addi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2144,7 +2144,7 @@ SEM_FN_NAME (frvbf,subi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2165,7 +2165,7 @@ SEM_FN_NAME (frvbf,andi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ANDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2186,7 +2186,7 @@ SEM_FN_NAME (frvbf,ori) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2207,7 +2207,7 @@ SEM_FN_NAME (frvbf,xori) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = XORSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2308,7 +2308,7 @@ SEM_FN_NAME (frvbf,smuli) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (FLD (f_d12))); sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); } return vpc; @@ -2329,7 +2329,7 @@ SEM_FN_NAME (frvbf,umuli) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = MULDI (ZEXTSIDI (GET_H_GR (FLD (f_GRi))), ZEXTSIDI (FLD (f_d12))); sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); } return vpc; @@ -2350,7 +2350,7 @@ SEM_FN_NAME (frvbf,slli) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SLLSI (GET_H_GR (FLD (f_GRi)), ANDSI (FLD (f_d12), 31)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2371,7 +2371,7 @@ SEM_FN_NAME (frvbf,srli) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRLSI (GET_H_GR (FLD (f_GRi)), ANDSI (FLD (f_d12), 31)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2392,7 +2392,7 @@ SEM_FN_NAME (frvbf,srai) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRASI (GET_H_GR (FLD (f_GRi)), ANDSI (FLD (f_d12), 31)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2418,7 +2418,7 @@ SEM_FN_NAME (frvbf,scani) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_scan_result (current_cpu, XORSI (tmp_tmp1, tmp_tmp2)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2467,12 +2467,12 @@ if (LTSI (tmp_result, 0)) { { SI opval = tmp_result; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } @@ -2521,12 +2521,12 @@ if (LTSI (tmp_result, 0)) { { SI opval = tmp_result; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } @@ -2551,14 +2551,14 @@ SEM_FN_NAME (frvbf,andicc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (EQSI (tmp_tmp, 0)) { { UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 7), 4); sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } else { if (LTSI (tmp_tmp, 0)) { @@ -2566,14 +2566,14 @@ if (LTSI (tmp_tmp, 0)) { UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 11), 8); sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } else { { UQI opval = ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 3); sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } } @@ -2601,14 +2601,14 @@ SEM_FN_NAME (frvbf,oricc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (EQSI (tmp_tmp, 0)) { { UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 7), 4); sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } else { if (LTSI (tmp_tmp, 0)) { @@ -2616,14 +2616,14 @@ if (LTSI (tmp_tmp, 0)) { UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 11), 8); sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } else { { UQI opval = ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 3); sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } } @@ -2651,14 +2651,14 @@ SEM_FN_NAME (frvbf,xoricc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (EQSI (tmp_tmp, 0)) { { UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 7), 4); sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } else { if (LTSI (tmp_tmp, 0)) { @@ -2666,14 +2666,14 @@ if (LTSI (tmp_tmp, 0)) { UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 11), 8); sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } else { { UQI opval = ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 3); sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } } @@ -2713,12 +2713,12 @@ if (EQBI (EQDI (tmp_tmp, 0), 0)) { { DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); } { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } @@ -2755,12 +2755,12 @@ if (EQBI (EQDI (tmp_tmp, 0), 0)) { { DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); } { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } @@ -2789,7 +2789,7 @@ SEM_FN_NAME (frvbf,sllicc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (EQSI (tmp_tmp, 0)) { tmp_cc = ORQI (ANDQI (tmp_cc, 7), 4); @@ -2803,7 +2803,7 @@ if (LTSI (tmp_tmp, 0)) { { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } @@ -2832,7 +2832,7 @@ SEM_FN_NAME (frvbf,srlicc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (EQSI (tmp_tmp, 0)) { tmp_cc = ORQI (ANDQI (tmp_cc, 7), 4); @@ -2846,7 +2846,7 @@ if (LTSI (tmp_tmp, 0)) { { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } @@ -2875,7 +2875,7 @@ SEM_FN_NAME (frvbf,sraicc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (EQSI (tmp_tmp, 0)) { tmp_cc = ORQI (ANDQI (tmp_cc, 7), 4); @@ -2889,7 +2889,7 @@ if (LTSI (tmp_tmp, 0)) { { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } @@ -2911,7 +2911,7 @@ SEM_FN_NAME (frvbf,addxi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDCSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 1))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2932,7 +2932,7 @@ SEM_FN_NAME (frvbf,subxi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBCSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 1))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2977,12 +2977,12 @@ if (LTSI (tmp_tmp, 0)) { { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } @@ -3028,12 +3028,12 @@ if (LTSI (tmp_tmp, 0)) { { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } @@ -3077,7 +3077,7 @@ if (EQBI (EQSI (ANDSI (GET_H_GR (FLD (f_GRi)), 255), ANDSI (GET_H_GR (FLD (f_GRj { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } @@ -3107,7 +3107,7 @@ if (EQBI (ORIF (EQSI (ANDSI (GET_H_GR (FLD (f_GRi)), 0xff000000), ANDSI (GET_H_G { UQI opval = tmp_cc; sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval); - TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval); } } @@ -3129,7 +3129,7 @@ SEM_FN_NAME (frvbf,setlo) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UHI opval = FLD (f_u16); sim_queue_fn_hi_write (current_cpu, frvbf_h_gr_lo_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr_lo", 'x', opval); } return vpc; @@ -3150,7 +3150,7 @@ SEM_FN_NAME (frvbf,sethi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UHI opval = FLD (f_u16); sim_queue_fn_hi_write (current_cpu, frvbf_h_gr_hi_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr_hi", 'x', opval); } return vpc; @@ -3171,7 +3171,7 @@ SEM_FN_NAME (frvbf,setlos) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = FLD (f_s16); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -3192,7 +3192,7 @@ SEM_FN_NAME (frvbf,ldsb) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_QI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -3213,7 +3213,7 @@ SEM_FN_NAME (frvbf,ldub) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_UQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -3234,7 +3234,7 @@ SEM_FN_NAME (frvbf,ldsh) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_HI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -3255,7 +3255,7 @@ SEM_FN_NAME (frvbf,lduh) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_UHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -3276,7 +3276,7 @@ SEM_FN_NAME (frvbf,ld) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -3297,7 +3297,7 @@ SEM_FN_NAME (frvbf,ldbf) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_UQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -3318,7 +3318,7 @@ SEM_FN_NAME (frvbf,ldhf) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_UHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -3339,7 +3339,7 @@ SEM_FN_NAME (frvbf,ldf) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -3360,7 +3360,7 @@ SEM_FN_NAME (frvbf,ldc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_si_write (current_cpu, & CPU (h_cpr[FLD (f_CPRk)]), opval); - TRACE_RESULT (current_cpu, abuf, "cpr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cpr", 'x', opval); } return vpc; @@ -3386,7 +3386,7 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_QI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3415,7 +3415,7 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_UQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3444,7 +3444,7 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_HI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3473,7 +3473,7 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_UHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3502,7 +3502,7 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -3531,7 +3531,7 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_UQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } } @@ -3560,7 +3560,7 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_UHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } } @@ -3589,7 +3589,7 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } } @@ -3619,7 +3619,7 @@ if (NESI (FLD (f_GRk), 0)) { DI opval = frvbf_read_mem_DI (current_cpu, pc, tmp_address); sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); } } } @@ -3648,7 +3648,7 @@ SEM_FN_NAME (frvbf,lddf) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = frvbf_read_mem_DF (current_cpu, pc, tmp_address); sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); } } } @@ -3675,7 +3675,7 @@ SEM_FN_NAME (frvbf,lddc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = frvbf_read_mem_DI (current_cpu, pc, tmp_address); sim_queue_fn_di_write (current_cpu, frvbf_h_cpr_double_set, FLD (f_CPRk), opval); - TRACE_RESULT (current_cpu, abuf, "cpr_double", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cpr_double", 'D', opval); } } } @@ -3708,7 +3708,7 @@ if (NESI (FLD (f_GRk), 0)) { DI opval = frvbf_read_mem_DI (current_cpu, pc, tmp_address); sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); } } } @@ -3744,7 +3744,7 @@ if (tmp_do_op) { DF opval = frvbf_read_mem_DF (current_cpu, pc, tmp_address); sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); } } } @@ -3900,7 +3900,7 @@ SEM_FN_NAME (frvbf,ldsbu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_QI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (NESI (FLD (f_GRi), FLD (f_GRk))) { { @@ -3908,7 +3908,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -3937,7 +3937,7 @@ SEM_FN_NAME (frvbf,ldubu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_UQI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (NESI (FLD (f_GRi), FLD (f_GRk))) { { @@ -3945,7 +3945,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -3974,7 +3974,7 @@ SEM_FN_NAME (frvbf,ldshu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_HI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (NESI (FLD (f_GRi), FLD (f_GRk))) { { @@ -3982,7 +3982,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4011,7 +4011,7 @@ SEM_FN_NAME (frvbf,lduhu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_UHI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (NESI (FLD (f_GRi), FLD (f_GRk))) { { @@ -4019,7 +4019,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4048,7 +4048,7 @@ SEM_FN_NAME (frvbf,ldu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_SI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (NESI (FLD (f_GRi), FLD (f_GRk))) { { @@ -4056,7 +4056,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4090,7 +4090,7 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_QI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (NESI (FLD (f_GRi), FLD (f_GRk))) { { @@ -4098,7 +4098,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4134,7 +4134,7 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_UQI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (NESI (FLD (f_GRi), FLD (f_GRk))) { { @@ -4142,7 +4142,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4178,7 +4178,7 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_HI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (NESI (FLD (f_GRi), FLD (f_GRk))) { { @@ -4186,7 +4186,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4222,7 +4222,7 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_UHI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (NESI (FLD (f_GRi), FLD (f_GRk))) { { @@ -4230,7 +4230,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4266,7 +4266,7 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_SI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (NESI (FLD (f_GRi), FLD (f_GRk))) { { @@ -4274,7 +4274,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4305,12 +4305,12 @@ SEM_FN_NAME (frvbf,ldbfu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_UQI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4336,12 +4336,12 @@ SEM_FN_NAME (frvbf,ldhfu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_UHI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4367,12 +4367,12 @@ SEM_FN_NAME (frvbf,ldfu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_SI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4398,12 +4398,12 @@ SEM_FN_NAME (frvbf,ldcu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_SI (current_cpu, pc, tmp_address); sim_queue_si_write (current_cpu, & CPU (h_cpr[FLD (f_CPRk)]), opval); - TRACE_RESULT (current_cpu, abuf, "cpr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cpr", 'x', opval); } { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4434,13 +4434,13 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_UQI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4474,13 +4474,13 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_UHI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4514,13 +4514,13 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_SI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4552,7 +4552,7 @@ if (NESI (FLD (f_GRk), 0)) { DI opval = frvbf_read_mem_DI (current_cpu, pc, tmp_address); sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); } } } @@ -4562,7 +4562,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4598,7 +4598,7 @@ if (NESI (FLD (f_GRk), 0)) { DI opval = frvbf_read_mem_DI (current_cpu, pc, tmp_address); sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); } } } @@ -4608,7 +4608,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4640,13 +4640,13 @@ SEM_FN_NAME (frvbf,lddfu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = frvbf_read_mem_DF (current_cpu, pc, tmp_address); sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); } } { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4673,13 +4673,13 @@ SEM_FN_NAME (frvbf,lddcu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = frvbf_read_mem_DI (current_cpu, pc, tmp_address); sim_queue_fn_di_write (current_cpu, frvbf_h_cpr_double_set, FLD (f_CPRk), opval); - TRACE_RESULT (current_cpu, abuf, "cpr_double", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cpr_double", 'D', opval); } } { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4711,14 +4711,14 @@ if (tmp_do_op) { DF opval = frvbf_read_mem_DF (current_cpu, pc, tmp_address); sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); } } { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4753,7 +4753,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4792,7 +4792,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4826,7 +4826,7 @@ frvbf_load_quad_FRint (current_cpu, pc, tmp_address, FLD (f_FRk)); { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4855,7 +4855,7 @@ frvbf_load_quad_CPR (current_cpu, pc, tmp_address, FLD (f_CPRk)); { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4889,7 +4889,7 @@ frvbf_load_quad_FRint (current_cpu, pc, tmp_address, FLD (f_FRk)); SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_force_update (current_cpu); } @@ -4915,7 +4915,7 @@ SEM_FN_NAME (frvbf,ldsbi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_QI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -4936,7 +4936,7 @@ SEM_FN_NAME (frvbf,ldshi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_HI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -4957,7 +4957,7 @@ SEM_FN_NAME (frvbf,ldi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -4978,7 +4978,7 @@ SEM_FN_NAME (frvbf,ldubi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_UQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -4999,7 +4999,7 @@ SEM_FN_NAME (frvbf,lduhi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_UHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -5020,7 +5020,7 @@ SEM_FN_NAME (frvbf,ldbfi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_UQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -5041,7 +5041,7 @@ SEM_FN_NAME (frvbf,ldhfi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_UHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -5062,7 +5062,7 @@ SEM_FN_NAME (frvbf,ldfi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_read_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -5088,7 +5088,7 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_QI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -5117,7 +5117,7 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_UQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -5146,7 +5146,7 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_HI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -5175,7 +5175,7 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_UHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -5204,7 +5204,7 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -5233,7 +5233,7 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_UQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } } @@ -5262,7 +5262,7 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_UHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } } @@ -5291,7 +5291,7 @@ if (tmp_do_op) { SI opval = frvbf_read_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } } @@ -5321,7 +5321,7 @@ if (NESI (FLD (f_GRk), 0)) { DI opval = frvbf_read_mem_DI (current_cpu, pc, tmp_address); sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); } } } @@ -5350,7 +5350,7 @@ SEM_FN_NAME (frvbf,lddfi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = frvbf_read_mem_DF (current_cpu, pc, tmp_address); sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); } } } @@ -5383,7 +5383,7 @@ if (NESI (FLD (f_GRk), 0)) { DI opval = frvbf_read_mem_DI (current_cpu, pc, tmp_address); sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); } } } @@ -5419,7 +5419,7 @@ if (tmp_do_op) { DF opval = frvbf_read_mem_DF (current_cpu, pc, tmp_address); sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); } } } @@ -5781,7 +5781,7 @@ frvbf_write_mem_QI (current_cpu, pc, tmp_address, GET_H_GR (FLD (f_GRk))); { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -5807,7 +5807,7 @@ frvbf_write_mem_HI (current_cpu, pc, tmp_address, GET_H_GR (FLD (f_GRk))); { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -5833,7 +5833,7 @@ frvbf_write_mem_WI (current_cpu, pc, tmp_address, GET_H_GR (FLD (f_GRk))); { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -5859,7 +5859,7 @@ frvbf_write_mem_QI (current_cpu, pc, tmp_address, GET_H_FR_INT (FLD (f_FRk))); { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -5885,7 +5885,7 @@ frvbf_write_mem_HI (current_cpu, pc, tmp_address, GET_H_FR_INT (FLD (f_FRk))); { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -5911,7 +5911,7 @@ frvbf_write_mem_SI (current_cpu, pc, tmp_address, GET_H_FR_INT (FLD (f_FRk))); { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -5937,7 +5937,7 @@ frvbf_write_mem_SI (current_cpu, pc, tmp_address, CPU (h_cpr[FLD (f_CPRk)])); { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -5965,7 +5965,7 @@ frvbf_write_mem_DI (current_cpu, pc, tmp_address, GET_H_GR_DOUBLE (FLD (f_GRk))) { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -5993,7 +5993,7 @@ frvbf_write_mem_DF (current_cpu, pc, tmp_address, GET_H_FR_DOUBLE (FLD (f_FRk))) { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -6021,7 +6021,7 @@ frvbf_write_mem_DI (current_cpu, pc, tmp_address, GET_H_CPR_DOUBLE (FLD (f_CPRk) { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -6049,7 +6049,7 @@ frvbf_store_quad_GR (current_cpu, pc, tmp_address, FLD (f_GRk)); { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -6077,7 +6077,7 @@ frvbf_store_quad_FRint (current_cpu, pc, tmp_address, FLD (f_FRk)); { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -6105,7 +6105,7 @@ frvbf_store_quad_CPR (current_cpu, pc, tmp_address, FLD (f_CPRk)); { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -6129,7 +6129,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = frvbf_read_mem_QI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -6154,7 +6154,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = frvbf_read_mem_UQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -6179,7 +6179,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = frvbf_read_mem_HI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -6204,7 +6204,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = frvbf_read_mem_UHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -6229,7 +6229,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = frvbf_read_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -6254,7 +6254,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = frvbf_read_mem_UQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } @@ -6279,7 +6279,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = frvbf_read_mem_UHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } @@ -6304,7 +6304,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = frvbf_read_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } @@ -6334,7 +6334,7 @@ if (NESI (FLD (f_GRk), 0)) { DI opval = frvbf_read_mem_DI (current_cpu, pc, tmp_address); sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); } } } @@ -6366,7 +6366,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { DF opval = frvbf_read_mem_DF (current_cpu, pc, tmp_address); sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); } } } @@ -6421,14 +6421,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = frvbf_read_mem_QI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (NESI (FLD (f_GRi), FLD (f_GRk))) { { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -6458,14 +6458,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = frvbf_read_mem_UQI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (NESI (FLD (f_GRi), FLD (f_GRk))) { { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -6495,14 +6495,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = frvbf_read_mem_HI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (NESI (FLD (f_GRi), FLD (f_GRk))) { { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -6532,14 +6532,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = frvbf_read_mem_UHI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (NESI (FLD (f_GRi), FLD (f_GRk))) { { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -6569,14 +6569,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = frvbf_read_mem_SI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (NESI (FLD (f_GRi), FLD (f_GRk))) { { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -6606,13 +6606,13 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = frvbf_read_mem_UQI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -6641,13 +6641,13 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = frvbf_read_mem_UHI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -6676,13 +6676,13 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = frvbf_read_mem_SI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -6713,7 +6713,7 @@ if (NESI (FLD (f_GRk), 0)) { DI opval = frvbf_read_mem_DI (current_cpu, pc, tmp_address); sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval); } } } @@ -6722,7 +6722,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -6753,14 +6753,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { DF opval = frvbf_read_mem_DF (current_cpu, pc, tmp_address); sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); } } { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -6793,7 +6793,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) { SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -7013,7 +7013,7 @@ frvbf_write_mem_QI (current_cpu, pc, tmp_address, GET_H_GR (FLD (f_GRk))); SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -7043,7 +7043,7 @@ frvbf_write_mem_HI (current_cpu, pc, tmp_address, GET_H_GR (FLD (f_GRk))); SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -7073,7 +7073,7 @@ frvbf_write_mem_SI (current_cpu, pc, tmp_address, GET_H_GR (FLD (f_GRk))); SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -7103,7 +7103,7 @@ frvbf_write_mem_QI (current_cpu, pc, tmp_address, GET_H_FR_INT (FLD (f_FRk))); SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -7133,7 +7133,7 @@ frvbf_write_mem_HI (current_cpu, pc, tmp_address, GET_H_FR_INT (FLD (f_FRk))); SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -7163,7 +7163,7 @@ frvbf_write_mem_SI (current_cpu, pc, tmp_address, GET_H_FR_INT (FLD (f_FRk))); SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -7195,7 +7195,7 @@ frvbf_write_mem_DI (current_cpu, pc, tmp_address, GET_H_GR_DOUBLE (FLD (f_GRk))) SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -7227,7 +7227,7 @@ frvbf_write_mem_DF (current_cpu, pc, tmp_address, GET_H_FR_DOUBLE (FLD (f_FRk))) SI opval = tmp_address; sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -7451,7 +7451,7 @@ frvbf_check_swap_address (current_cpu, tmp_address); { SI opval = frvbf_read_mem_WI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_write_mem_WI (current_cpu, pc, tmp_address, tmp_tmp); } @@ -7480,7 +7480,7 @@ frvbf_check_swap_address (current_cpu, tmp_address); { SI opval = frvbf_read_mem_WI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_write_mem_WI (current_cpu, pc, tmp_address, tmp_tmp); } @@ -7511,7 +7511,7 @@ frvbf_check_swap_address (current_cpu, tmp_address); SI opval = frvbf_read_mem_WI (current_cpu, pc, tmp_address); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } frvbf_write_mem_WI (current_cpu, pc, tmp_address, tmp_tmp); } @@ -7536,7 +7536,7 @@ SEM_FN_NAME (frvbf,movgf) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GET_H_GR (FLD (f_GRj)); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -7557,7 +7557,7 @@ SEM_FN_NAME (frvbf,movfg) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GET_H_FR_INT (FLD (f_FRk)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRj), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -7581,13 +7581,13 @@ if (EQSI (FLD (f_GRj), 0)) { SI opval = 0; sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { USI opval = 0; sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } } else { @@ -7596,13 +7596,13 @@ if (EQSI (FLD (f_GRj), 0)) { SI opval = GET_H_GR (FLD (f_GRj)); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { USI opval = GET_H_GR (ADDSI (FLD (f_GRj), 1)); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } } @@ -7629,13 +7629,13 @@ if (NESI (FLD (f_GRj), 0)) { SI opval = GET_H_FR_INT (FLD (f_FRk)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRj), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = GET_H_FR_INT (ADDSI (FLD (f_FRk), 1)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ADDSI (FLD (f_GRj), 1), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -7662,25 +7662,25 @@ if (EQSI (FLD (f_GRj), 0)) { SI opval = 0; sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { USI opval = 0; sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { USI opval = 0; sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 2), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { USI opval = 0; sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 3), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } } else { @@ -7689,25 +7689,25 @@ if (EQSI (FLD (f_GRj), 0)) { SI opval = GET_H_GR (FLD (f_GRj)); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { USI opval = GET_H_GR (ADDSI (FLD (f_GRj), 1)); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { USI opval = GET_H_GR (ADDSI (FLD (f_GRj), 2)); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 2), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { USI opval = GET_H_GR (ADDSI (FLD (f_GRj), 3)); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 3), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } } @@ -7734,25 +7734,25 @@ if (NESI (FLD (f_GRj), 0)) { SI opval = GET_H_FR_INT (FLD (f_FRk)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRj), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = GET_H_FR_INT (ADDSI (FLD (f_FRk), 1)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ADDSI (FLD (f_GRj), 1), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = GET_H_FR_INT (ADDSI (FLD (f_FRk), 2)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ADDSI (FLD (f_GRj), 2), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = GET_H_FR_INT (ADDSI (FLD (f_FRk), 3)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ADDSI (FLD (f_GRj), 3), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -7778,7 +7778,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = GET_H_GR (FLD (f_GRj)); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } @@ -7803,7 +7803,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = GET_H_FR_INT (FLD (f_FRk)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRj), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -7830,13 +7830,13 @@ if (EQSI (FLD (f_GRj), 0)) { SI opval = 0; sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { USI opval = 0; sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } } else { @@ -7845,13 +7845,13 @@ if (EQSI (FLD (f_GRj), 0)) { SI opval = GET_H_GR (FLD (f_GRj)); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { USI opval = GET_H_GR (ADDSI (FLD (f_GRj), 1)); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } } @@ -7879,13 +7879,13 @@ if (ANDIF (NESI (FLD (f_GRj), 0), EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_ SI opval = GET_H_FR_INT (FLD (f_FRk)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRj), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = GET_H_FR_INT (ADDSI (FLD (f_FRk), 1)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ADDSI (FLD (f_GRj), 1), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -7909,7 +7909,7 @@ SEM_FN_NAME (frvbf,movgs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { USI opval = GET_H_GR (FLD (f_GRj)); sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, FLD (f_spr), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } return vpc; @@ -7930,7 +7930,7 @@ SEM_FN_NAME (frvbf,movsg) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GET_H_SPR (FLD (f_spr)); sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRj), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -7953,7 +7953,7 @@ frvbf_model_branch (current_cpu, FLD (i_label16), FLD (f_hint)); { USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -7996,7 +7996,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2))) { USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8024,7 +8024,7 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2)))) { USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8052,7 +8052,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2)), XORBI USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8080,7 +8080,7 @@ if (NOTBI (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2)), USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8108,7 +8108,7 @@ if (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3)), TRUNC USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8136,7 +8136,7 @@ if (NOTBI (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3)) USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8164,7 +8164,7 @@ if (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1)), TRUNCQIBI (SRLQI USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8192,7 +8192,7 @@ if (NOTBI (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1)), TRUNCQIBI USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8220,7 +8220,7 @@ if (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1))) { USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8248,7 +8248,7 @@ if (NOTBI (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1)))) { USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8276,7 +8276,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3))) { USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8304,7 +8304,7 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3)))) { USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8332,7 +8332,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 2), 1))) { USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8360,7 +8360,7 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 2), 1)))) { USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8386,7 +8386,7 @@ frvbf_model_branch (current_cpu, FLD (i_label16), FLD (f_hint)); { USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -8429,7 +8429,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)), ORIF ( USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8457,7 +8457,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3))) { USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8485,7 +8485,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)), TRUNCQ USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8513,7 +8513,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), TRUNCQ USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8541,7 +8541,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)), TRUNCQ USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8569,7 +8569,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), TRUNCQ USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8597,7 +8597,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2))) { USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8625,7 +8625,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), ORIF ( USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8653,7 +8653,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 2), 1)), TRUNCQ USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8681,7 +8681,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), TRUNCQ USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8709,7 +8709,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 2), 1))) { USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8737,7 +8737,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), ORIF ( USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8765,7 +8765,7 @@ if (TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 1))) { USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8793,7 +8793,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), ORIF ( USI opval = FLD (i_label16); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8822,7 +8822,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (EQSI (FLD (f_ccond), 0)) { if (NESI (tmp_tmp, 0)) { @@ -8830,7 +8830,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -8839,7 +8839,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8867,7 +8867,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -8910,7 +8910,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2))) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8938,7 +8938,7 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2)))) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8966,7 +8966,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2)), XORBI USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -8994,7 +8994,7 @@ if (NOTBI (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2)), USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9022,7 +9022,7 @@ if (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3)), TRUNC USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9050,7 +9050,7 @@ if (NOTBI (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3)) USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9078,7 +9078,7 @@ if (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1)), TRUNCQIBI (SRLQI USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9106,7 +9106,7 @@ if (NOTBI (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1)), TRUNCQIBI USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9134,7 +9134,7 @@ if (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1))) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9162,7 +9162,7 @@ if (NOTBI (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1)))) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9190,7 +9190,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3))) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9218,7 +9218,7 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3)))) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9246,7 +9246,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 2), 1))) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9274,7 +9274,7 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 2), 1)))) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9300,7 +9300,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -9343,7 +9343,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3))) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9371,7 +9371,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)), ORIF ( USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9399,7 +9399,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)), TRUNCQ USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9427,7 +9427,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), TRUNCQ USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9455,7 +9455,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)), TRUNCQ USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9483,7 +9483,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), TRUNCQ USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9511,7 +9511,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2))) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9539,7 +9539,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), ORIF ( USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9567,7 +9567,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 2), 1)), TRUNCQ USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9595,7 +9595,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), TRUNCQ USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9623,7 +9623,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 2), 1))) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9651,7 +9651,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), ORIF ( USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9679,7 +9679,7 @@ if (TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 1))) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9707,7 +9707,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), ORIF ( USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9736,7 +9736,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (EQSI (FLD (f_ccond), 0)) { if (NESI (tmp_tmp, 0)) { @@ -9744,7 +9744,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -9753,7 +9753,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9784,7 +9784,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } ((void) 0); /*nop*/ } @@ -9813,7 +9813,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2))) { if (EQSI (FLD (f_ccond), 0)) { @@ -9822,7 +9822,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -9831,7 +9831,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9863,7 +9863,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2)))) { if (EQSI (FLD (f_ccond), 0)) { @@ -9872,7 +9872,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -9881,7 +9881,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9913,7 +9913,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2)), XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3)), TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 2), 1))))) { if (EQSI (FLD (f_ccond), 0)) { @@ -9922,7 +9922,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -9931,7 +9931,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -9963,7 +9963,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (NOTBI (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2)), XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3)), TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 2), 1)))))) { if (EQSI (FLD (f_ccond), 0)) { @@ -9972,7 +9972,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -9981,7 +9981,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -10013,7 +10013,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3)), TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 2), 1)))) { if (EQSI (FLD (f_ccond), 0)) { @@ -10022,7 +10022,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -10031,7 +10031,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -10063,7 +10063,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (NOTBI (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3)), TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 2), 1))))) { if (EQSI (FLD (f_ccond), 0)) { @@ -10072,7 +10072,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -10081,7 +10081,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -10113,7 +10113,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1)), TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2)))) { if (EQSI (FLD (f_ccond), 0)) { @@ -10122,7 +10122,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -10131,7 +10131,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -10163,7 +10163,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (NOTBI (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1)), TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2))))) { if (EQSI (FLD (f_ccond), 0)) { @@ -10172,7 +10172,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -10181,7 +10181,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -10213,7 +10213,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1))) { if (EQSI (FLD (f_ccond), 0)) { @@ -10222,7 +10222,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -10231,7 +10231,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -10263,7 +10263,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (NOTBI (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1)))) { if (EQSI (FLD (f_ccond), 0)) { @@ -10272,7 +10272,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -10281,7 +10281,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -10313,7 +10313,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3))) { if (EQSI (FLD (f_ccond), 0)) { @@ -10322,7 +10322,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -10331,7 +10331,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -10363,7 +10363,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3)))) { if (EQSI (FLD (f_ccond), 0)) { @@ -10372,7 +10372,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -10381,7 +10381,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -10413,7 +10413,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 2), 1))) { if (EQSI (FLD (f_ccond), 0)) { @@ -10422,7 +10422,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -10431,7 +10431,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -10463,7 +10463,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 2), 1)))) { if (EQSI (FLD (f_ccond), 0)) { @@ -10472,7 +10472,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -10481,7 +10481,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -10513,7 +10513,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (EQSI (FLD (f_ccond), 0)) { if (NESI (tmp_tmp, 0)) { @@ -10521,7 +10521,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -10530,7 +10530,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -10561,7 +10561,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } ((void) 0); /*nop*/ } @@ -10590,7 +10590,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3))) { if (EQSI (FLD (f_ccond), 0)) { @@ -10599,7 +10599,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -10608,7 +10608,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -10640,7 +10640,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)), ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 2), 1)), TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 1))))) { if (EQSI (FLD (f_ccond), 0)) { @@ -10649,7 +10649,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -10658,7 +10658,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -10690,7 +10690,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)), TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 2), 1)))) { if (EQSI (FLD (f_ccond), 0)) { @@ -10699,7 +10699,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -10708,7 +10708,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -10740,7 +10740,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 1)))) { if (EQSI (FLD (f_ccond), 0)) { @@ -10749,7 +10749,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -10758,7 +10758,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -10790,7 +10790,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)), TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 1)))) { if (EQSI (FLD (f_ccond), 0)) { @@ -10799,7 +10799,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -10808,7 +10808,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -10840,7 +10840,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 2), 1)))) { if (EQSI (FLD (f_ccond), 0)) { @@ -10849,7 +10849,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -10858,7 +10858,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -10890,7 +10890,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2))) { if (EQSI (FLD (f_ccond), 0)) { @@ -10899,7 +10899,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -10908,7 +10908,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -10940,7 +10940,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 2), 1)), TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 1))))) { if (EQSI (FLD (f_ccond), 0)) { @@ -10949,7 +10949,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -10958,7 +10958,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -10990,7 +10990,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 2), 1)), TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 1)))) { if (EQSI (FLD (f_ccond), 0)) { @@ -10999,7 +10999,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -11008,7 +11008,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -11040,7 +11040,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)))) { if (EQSI (FLD (f_ccond), 0)) { @@ -11049,7 +11049,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -11058,7 +11058,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -11090,7 +11090,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 2), 1))) { if (EQSI (FLD (f_ccond), 0)) { @@ -11099,7 +11099,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -11108,7 +11108,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -11140,7 +11140,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)), TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 1))))) { if (EQSI (FLD (f_ccond), 0)) { @@ -11149,7 +11149,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -11158,7 +11158,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -11190,7 +11190,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 1))) { if (EQSI (FLD (f_ccond), 0)) { @@ -11199,7 +11199,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -11208,7 +11208,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -11240,7 +11240,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint)); { USI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval); - TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval); } if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)), TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 2), 1))))) { if (EQSI (FLD (f_ccond), 0)) { @@ -11249,7 +11249,7 @@ if (NESI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -11258,7 +11258,7 @@ if (EQSI (tmp_tmp, 0)) { USI opval = GET_H_SPR (((UINT) 272)); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -11289,7 +11289,7 @@ frvbf_set_write_next_vliw_addr_to_LR (current_cpu, 1); { USI opval = ANDSI (ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))), 0xfffffffc); sim_queue_pc_write (current_cpu, opval); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } frvbf_model_branch (current_cpu, pc, 2); } @@ -11316,7 +11316,7 @@ frvbf_set_write_next_vliw_addr_to_LR (current_cpu, 1); { USI opval = ANDSI (ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))), 0xfffffffc); sim_queue_pc_write (current_cpu, opval); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } frvbf_model_branch (current_cpu, pc, 2); } @@ -11343,7 +11343,7 @@ frvbf_set_write_next_vliw_addr_to_LR (current_cpu, 1); { USI opval = ANDSI (ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)), 0xfffffffc); sim_queue_pc_write (current_cpu, opval); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } frvbf_model_branch (current_cpu, pc, 2); } @@ -11370,7 +11370,7 @@ frvbf_set_write_next_vliw_addr_to_LR (current_cpu, 1); { USI opval = ANDSI (ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)), 0xfffffffc); sim_queue_pc_write (current_cpu, opval); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } frvbf_model_branch (current_cpu, pc, 2); } @@ -11395,7 +11395,7 @@ frvbf_set_write_next_vliw_addr_to_LR (current_cpu, 1); { USI opval = FLD (i_label24); sim_queue_pc_write (current_cpu, opval); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } frvbf_model_branch (current_cpu, pc, 2); } @@ -11419,7 +11419,7 @@ SEM_FN_NAME (frvbf,rett) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { USI opval = frv_rett (current_cpu, pc, FLD (f_debug)); sim_queue_pc_write (current_cpu, opval); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } frvbf_model_branch (current_cpu, pc, 2); } @@ -13601,7 +13601,7 @@ SEM_FN_NAME (frvbf,andcr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = frvbf_cr_logic (current_cpu, 0, CPU (h_cccr[FLD (f_CRi)]), CPU (h_cccr[FLD (f_CRj)])); sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRk)]), opval); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } return vpc; @@ -13622,7 +13622,7 @@ SEM_FN_NAME (frvbf,orcr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = frvbf_cr_logic (current_cpu, 1, CPU (h_cccr[FLD (f_CRi)]), CPU (h_cccr[FLD (f_CRj)])); sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRk)]), opval); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } return vpc; @@ -13643,7 +13643,7 @@ SEM_FN_NAME (frvbf,xorcr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = frvbf_cr_logic (current_cpu, 2, CPU (h_cccr[FLD (f_CRi)]), CPU (h_cccr[FLD (f_CRj)])); sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRk)]), opval); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } return vpc; @@ -13664,7 +13664,7 @@ SEM_FN_NAME (frvbf,nandcr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = frvbf_cr_logic (current_cpu, 3, CPU (h_cccr[FLD (f_CRi)]), CPU (h_cccr[FLD (f_CRj)])); sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRk)]), opval); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } return vpc; @@ -13685,7 +13685,7 @@ SEM_FN_NAME (frvbf,norcr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = frvbf_cr_logic (current_cpu, 4, CPU (h_cccr[FLD (f_CRi)]), CPU (h_cccr[FLD (f_CRj)])); sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRk)]), opval); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } return vpc; @@ -13706,7 +13706,7 @@ SEM_FN_NAME (frvbf,andncr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = frvbf_cr_logic (current_cpu, 5, CPU (h_cccr[FLD (f_CRi)]), CPU (h_cccr[FLD (f_CRj)])); sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRk)]), opval); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } return vpc; @@ -13727,7 +13727,7 @@ SEM_FN_NAME (frvbf,orncr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = frvbf_cr_logic (current_cpu, 6, CPU (h_cccr[FLD (f_CRi)]), CPU (h_cccr[FLD (f_CRj)])); sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRk)]), opval); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } return vpc; @@ -13748,7 +13748,7 @@ SEM_FN_NAME (frvbf,nandncr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = frvbf_cr_logic (current_cpu, 7, CPU (h_cccr[FLD (f_CRi)]), CPU (h_cccr[FLD (f_CRj)])); sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRk)]), opval); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } return vpc; @@ -13769,7 +13769,7 @@ SEM_FN_NAME (frvbf,norncr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = frvbf_cr_logic (current_cpu, 8, CPU (h_cccr[FLD (f_CRi)]), CPU (h_cccr[FLD (f_CRj)])); sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRk)]), opval); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } return vpc; @@ -13790,7 +13790,7 @@ SEM_FN_NAME (frvbf,notcr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = XORQI (CPU (h_cccr[FLD (f_CRj)]), 1); sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRk)]), opval); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } return vpc; @@ -13811,7 +13811,7 @@ SEM_FN_NAME (frvbf,ckra) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } return vpc; @@ -13832,7 +13832,7 @@ SEM_FN_NAME (frvbf,ckno) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } return vpc; @@ -13855,14 +13855,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -13887,14 +13887,14 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2)))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -13919,14 +13919,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2)), XORBI UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -13951,14 +13951,14 @@ if (NOTBI (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2)), UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -13983,14 +13983,14 @@ if (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3)), TRUNC UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14015,14 +14015,14 @@ if (NOTBI (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3)) UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14047,14 +14047,14 @@ if (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1)), TRUNCQIBI (SRLQI UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14079,14 +14079,14 @@ if (NOTBI (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1)), TRUNCQIBI UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14111,14 +14111,14 @@ if (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14143,14 +14143,14 @@ if (NOTBI (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1)))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14175,14 +14175,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14207,14 +14207,14 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3)))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14239,14 +14239,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 2), 1))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14271,14 +14271,14 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 2), 1)))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14301,7 +14301,7 @@ SEM_FN_NAME (frvbf,fckra) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } return vpc; @@ -14322,7 +14322,7 @@ SEM_FN_NAME (frvbf,fckno) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } return vpc; @@ -14345,14 +14345,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2)), ORIF ( UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14377,14 +14377,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14409,14 +14409,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2)), TRUNCQ UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14441,14 +14441,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), TRUNCQ UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14473,14 +14473,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2)), TRUNCQ UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14505,14 +14505,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), TRUNCQ UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14537,14 +14537,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14569,14 +14569,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), ORIF ( UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14601,14 +14601,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 2), 1)), TRUNCQ UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14633,14 +14633,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), TRUNCQ UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14665,14 +14665,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 2), 1))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14697,14 +14697,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), ORIF ( UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14729,14 +14729,14 @@ if (TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 1))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14761,14 +14761,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), ORIF ( UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 1); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14793,14 +14793,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14825,14 +14825,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14858,14 +14858,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -14873,7 +14873,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2))) { UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14899,14 +14899,14 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2)))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -14914,7 +14914,7 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2)))) { UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14940,14 +14940,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2)), XORBI UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -14955,7 +14955,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2)), XORBI UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -14981,14 +14981,14 @@ if (NOTBI (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2)), UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -14996,7 +14996,7 @@ if (NOTBI (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2)), UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15022,14 +15022,14 @@ if (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3)), TRUNC UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -15037,7 +15037,7 @@ if (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3)), TRUNC UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15063,14 +15063,14 @@ if (NOTBI (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3)) UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -15078,7 +15078,7 @@ if (NOTBI (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3)) UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15104,14 +15104,14 @@ if (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1)), TRUNCQIBI (SRLQI UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -15119,7 +15119,7 @@ if (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1)), TRUNCQIBI (SRLQI UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15145,14 +15145,14 @@ if (NOTBI (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1)), TRUNCQIBI UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -15160,7 +15160,7 @@ if (NOTBI (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1)), TRUNCQIBI UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15186,14 +15186,14 @@ if (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -15201,7 +15201,7 @@ if (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1))) { UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15227,14 +15227,14 @@ if (NOTBI (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1)))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -15242,7 +15242,7 @@ if (NOTBI (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1)))) { UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15268,14 +15268,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -15283,7 +15283,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3))) { UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15309,14 +15309,14 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3)))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -15324,7 +15324,7 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3)))) { UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15350,14 +15350,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 2), 1))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -15365,7 +15365,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 2), 1))) { UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15391,14 +15391,14 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 2), 1)))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -15406,7 +15406,7 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 2), 1)))) { UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15431,14 +15431,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15463,14 +15463,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15496,14 +15496,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2)), ORIF ( UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -15511,7 +15511,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2)), ORIF ( UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15537,14 +15537,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -15552,7 +15552,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3))) { UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15578,14 +15578,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2)), TRUNCQ UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -15593,7 +15593,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2)), TRUNCQ UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15619,14 +15619,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), TRUNCQ UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -15634,7 +15634,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), TRUNCQ UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15660,14 +15660,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2)), TRUNCQ UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -15675,7 +15675,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2)), TRUNCQ UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15701,14 +15701,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), TRUNCQ UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -15716,7 +15716,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), TRUNCQ UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15742,14 +15742,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -15757,7 +15757,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2))) { UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15783,14 +15783,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), ORIF ( UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -15798,7 +15798,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), ORIF ( UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15824,14 +15824,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 2), 1)), TRUNCQ UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -15839,7 +15839,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 2), 1)), TRUNCQ UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15865,14 +15865,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), TRUNCQ UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -15880,7 +15880,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), TRUNCQ UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15906,14 +15906,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 2), 1))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -15921,7 +15921,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 2), 1))) { UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15947,14 +15947,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), ORIF ( UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -15962,7 +15962,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), ORIF ( UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -15988,14 +15988,14 @@ if (TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 1))) { UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -16003,7 +16003,7 @@ if (TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 1))) { UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -16029,14 +16029,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), ORIF ( UQI opval = 3; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } else { { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } } else { @@ -16044,7 +16044,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), ORIF ( UQI opval = 0; sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval); } } @@ -16073,7 +16073,7 @@ frvbf_set_write_next_vliw_addr_to_LR (current_cpu, 1); USI opval = ANDSI (ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))), 0xfffffffc); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } frvbf_model_branch (current_cpu, pc, 2); } @@ -16104,7 +16104,7 @@ frvbf_set_write_next_vliw_addr_to_LR (current_cpu, 1); USI opval = ANDSI (ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))), 0xfffffffc); sim_queue_pc_write (current_cpu, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } frvbf_model_branch (current_cpu, pc, 2); } @@ -16640,7 +16640,7 @@ SEM_FN_NAME (frvbf,fitos) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -16661,7 +16661,7 @@ SEM_FN_NAME (frvbf,fstoi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -16682,7 +16682,7 @@ SEM_FN_NAME (frvbf,fitod) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsidf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); } return vpc; @@ -16703,7 +16703,7 @@ SEM_FN_NAME (frvbf,fdtoi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = CGEN_CPU_FPU (current_cpu)->ops->fixdfsi (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR_DOUBLE (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -16725,12 +16725,12 @@ SEM_FN_NAME (frvbf,fditos) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR_INT (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -16753,12 +16753,12 @@ SEM_FN_NAME (frvbf,fdstoi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { USI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } @@ -16782,13 +16782,13 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR_INT (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -16812,13 +16812,13 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk)); { SI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1)); { USI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } @@ -16842,7 +16842,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -16867,7 +16867,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } @@ -16892,7 +16892,7 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -16916,7 +16916,7 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk)); { SI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } @@ -16938,7 +16938,7 @@ SEM_FN_NAME (frvbf,fmovs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = GET_H_FR (FLD (f_FRj)); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -16959,7 +16959,7 @@ SEM_FN_NAME (frvbf,fmovd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = GET_H_FR_DOUBLE (FLD (f_FRj)); sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); } return vpc; @@ -16981,12 +16981,12 @@ SEM_FN_NAME (frvbf,fdmovs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = GET_H_FR (FLD (f_FRj)); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = GET_H_FR (ADDSI (FLD (f_FRj), 1)); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -17010,7 +17010,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SF opval = GET_H_FR (FLD (f_FRj)); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -17033,7 +17033,7 @@ SEM_FN_NAME (frvbf,fnegs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->negsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -17054,7 +17054,7 @@ SEM_FN_NAME (frvbf,fnegd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = CGEN_CPU_FPU (current_cpu)->ops->negdf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRj))); sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); } return vpc; @@ -17076,12 +17076,12 @@ SEM_FN_NAME (frvbf,fdnegs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->negsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->negsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -17105,7 +17105,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->negsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -17128,7 +17128,7 @@ SEM_FN_NAME (frvbf,fabss) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->abssf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -17149,7 +17149,7 @@ SEM_FN_NAME (frvbf,fabsd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = CGEN_CPU_FPU (current_cpu)->ops->absdf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRj))); sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); } return vpc; @@ -17171,12 +17171,12 @@ SEM_FN_NAME (frvbf,fdabss) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->abssf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->abssf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -17200,7 +17200,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->abssf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -17223,7 +17223,7 @@ SEM_FN_NAME (frvbf,fsqrts) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->sqrtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -17245,12 +17245,12 @@ SEM_FN_NAME (frvbf,fdsqrts) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->sqrtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->sqrtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -17274,13 +17274,13 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->sqrtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->sqrtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -17302,7 +17302,7 @@ SEM_FN_NAME (frvbf,fsqrtd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = CGEN_CPU_FPU (current_cpu)->ops->sqrtdf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRj))); sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); } return vpc; @@ -17325,7 +17325,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->sqrtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -17350,7 +17350,7 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->sqrtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -17372,7 +17372,7 @@ SEM_FN_NAME (frvbf,fadds) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -17393,7 +17393,7 @@ SEM_FN_NAME (frvbf,fsubs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -17414,7 +17414,7 @@ SEM_FN_NAME (frvbf,fmuls) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -17435,7 +17435,7 @@ SEM_FN_NAME (frvbf,fdivs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->divsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -17456,7 +17456,7 @@ SEM_FN_NAME (frvbf,faddd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = CGEN_CPU_FPU (current_cpu)->ops->adddf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRi)), GET_H_FR_DOUBLE (FLD (f_FRj))); sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); } return vpc; @@ -17477,7 +17477,7 @@ SEM_FN_NAME (frvbf,fsubd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = CGEN_CPU_FPU (current_cpu)->ops->subdf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRi)), GET_H_FR_DOUBLE (FLD (f_FRj))); sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); } return vpc; @@ -17498,7 +17498,7 @@ SEM_FN_NAME (frvbf,fmuld) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = CGEN_CPU_FPU (current_cpu)->ops->muldf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRi)), GET_H_FR_DOUBLE (FLD (f_FRj))); sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); } return vpc; @@ -17519,7 +17519,7 @@ SEM_FN_NAME (frvbf,fdivd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = CGEN_CPU_FPU (current_cpu)->ops->divdf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRi)), GET_H_FR_DOUBLE (FLD (f_FRj))); sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); } return vpc; @@ -17542,7 +17542,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -17567,7 +17567,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -17592,7 +17592,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -17617,7 +17617,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->divsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -17642,7 +17642,7 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -17666,7 +17666,7 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -17690,7 +17690,7 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -17714,7 +17714,7 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->divsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -17738,7 +17738,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->gtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) { @@ -17746,7 +17746,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR UQI opval = 8; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) { @@ -17754,14 +17754,14 @@ if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR UQI opval = 4; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { { UQI opval = 1; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } } @@ -17788,7 +17788,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->gtdf (CGEN_CPU_FPU (current_cpu), GET_H_FR_ UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { if (CGEN_CPU_FPU (current_cpu)->ops->eqdf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRi)), GET_H_FR_DOUBLE (FLD (f_FRj)))) { @@ -17796,7 +17796,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->eqdf (CGEN_CPU_FPU (current_cpu), GET_H_FR_ UQI opval = 8; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { if (CGEN_CPU_FPU (current_cpu)->ops->ltdf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRi)), GET_H_FR_DOUBLE (FLD (f_FRj)))) { @@ -17804,14 +17804,14 @@ if (CGEN_CPU_FPU (current_cpu)->ops->ltdf (CGEN_CPU_FPU (current_cpu), GET_H_FR_ UQI opval = 4; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { { UQI opval = 1; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } } @@ -17839,7 +17839,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->gtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) { @@ -17847,7 +17847,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR UQI opval = 8; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) { @@ -17855,14 +17855,14 @@ if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR UQI opval = 4; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { { UQI opval = 1; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } } @@ -17891,7 +17891,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->gtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) { @@ -17899,7 +17899,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR UQI opval = 8; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) { @@ -17907,14 +17907,14 @@ if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR UQI opval = 4; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { { UQI opval = 1; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } } @@ -17924,7 +17924,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->gtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)))) { @@ -17932,7 +17932,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR UQI opval = 8; sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)))) { @@ -17940,14 +17940,14 @@ if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR UQI opval = 4; sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { { UQI opval = 1; sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } } @@ -17973,7 +17973,7 @@ SEM_FN_NAME (frvbf,fmadds) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))), GET_H_FR (FLD (f_FRk))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -17994,7 +17994,7 @@ SEM_FN_NAME (frvbf,fmsubs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))), GET_H_FR (FLD (f_FRk))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -18015,7 +18015,7 @@ SEM_FN_NAME (frvbf,fmaddd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = CGEN_CPU_FPU (current_cpu)->ops->adddf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->muldf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRi)), GET_H_FR_DOUBLE (FLD (f_FRj))), GET_H_FR_DOUBLE (FLD (f_FRk))); sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); } return vpc; @@ -18036,7 +18036,7 @@ SEM_FN_NAME (frvbf,fmsubd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = CGEN_CPU_FPU (current_cpu)->ops->subdf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->muldf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRi)), GET_H_FR_DOUBLE (FLD (f_FRj))), GET_H_FR_DOUBLE (FLD (f_FRk))); sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval); } return vpc; @@ -18058,12 +18058,12 @@ SEM_FN_NAME (frvbf,fdmadds) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))), GET_H_FR (FLD (f_FRk))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))), GET_H_FR (ADDSI (FLD (f_FRk), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18087,13 +18087,13 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))), GET_H_FR (FLD (f_FRk))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))), GET_H_FR (ADDSI (FLD (f_FRk), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18117,7 +18117,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))), GET_H_FR (FLD (f_FRk))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18142,7 +18142,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))), GET_H_FR (FLD (f_FRk))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18167,7 +18167,7 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))), GET_H_FR (FLD (f_FRk))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18191,7 +18191,7 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))), GET_H_FR (FLD (f_FRk))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18214,12 +18214,12 @@ SEM_FN_NAME (frvbf,fmas) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18242,12 +18242,12 @@ SEM_FN_NAME (frvbf,fmss) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18270,22 +18270,22 @@ SEM_FN_NAME (frvbf,fdmas) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 2)), GET_H_FR (ADDSI (FLD (f_FRj), 2))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 2), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 3)), GET_H_FR (ADDSI (FLD (f_FRj), 3))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 3), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18308,22 +18308,22 @@ SEM_FN_NAME (frvbf,fdmss) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 2)), GET_H_FR (ADDSI (FLD (f_FRj), 2))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 2), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 3)), GET_H_FR (ADDSI (FLD (f_FRj), 3))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 3), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18350,22 +18350,22 @@ frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 3)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 2)), GET_H_FR (ADDSI (FLD (f_FRj), 2))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 2), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 3)), GET_H_FR (ADDSI (FLD (f_FRj), 3))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 3), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18392,22 +18392,22 @@ frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 3)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 2)), GET_H_FR (ADDSI (FLD (f_FRj), 2))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 2), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 3)), GET_H_FR (ADDSI (FLD (f_FRj), 3))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 3), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18432,13 +18432,13 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } } @@ -18465,13 +18465,13 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } } @@ -18496,12 +18496,12 @@ SEM_FN_NAME (frvbf,fmad) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->ftruncdfsf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, CGEN_CPU_FPU (current_cpu)->ops->muldf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (FLD (f_FRi))), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (FLD (f_FRj))))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->ftruncdfsf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, CGEN_CPU_FPU (current_cpu)->ops->adddf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (ADDSI (FLD (f_FRi), 1))), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (ADDSI (FLD (f_FRj), 1))))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18524,12 +18524,12 @@ SEM_FN_NAME (frvbf,fmsd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->ftruncdfsf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, CGEN_CPU_FPU (current_cpu)->ops->muldf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (FLD (f_FRi))), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (FLD (f_FRj))))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->ftruncdfsf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, CGEN_CPU_FPU (current_cpu)->ops->subdf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (ADDSI (FLD (f_FRi), 1))), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (ADDSI (FLD (f_FRj), 1))))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18553,13 +18553,13 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18583,13 +18583,13 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18612,12 +18612,12 @@ SEM_FN_NAME (frvbf,fdadds) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18640,12 +18640,12 @@ SEM_FN_NAME (frvbf,fdsubs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18668,12 +18668,12 @@ SEM_FN_NAME (frvbf,fdmuls) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18696,12 +18696,12 @@ SEM_FN_NAME (frvbf,fddivs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->divsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->divsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18724,12 +18724,12 @@ SEM_FN_NAME (frvbf,fdsads) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18752,12 +18752,12 @@ SEM_FN_NAME (frvbf,fdmulcs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18781,13 +18781,13 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18811,13 +18811,13 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18841,13 +18841,13 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18871,13 +18871,13 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18901,13 +18901,13 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->divsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->divsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18931,13 +18931,13 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1)); { SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))); sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval); - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -18963,7 +18963,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->gtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) { @@ -18971,7 +18971,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR UQI opval = 8; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) { @@ -18979,14 +18979,14 @@ if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR UQI opval = 4; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { { UQI opval = 1; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } } @@ -18997,7 +18997,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->gtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)))) { @@ -19005,7 +19005,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR UQI opval = 8; sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)))) { @@ -19013,14 +19013,14 @@ if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR UQI opval = 4; sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { { UQI opval = 1; sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } } @@ -19046,7 +19046,7 @@ SEM_FN_NAME (frvbf,mhsetlos) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UHI opval = FLD (f_u12); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } return vpc; @@ -19067,7 +19067,7 @@ SEM_FN_NAME (frvbf,mhsethis) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UHI opval = FLD (f_u12); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } return vpc; @@ -19089,17 +19089,17 @@ SEM_FN_NAME (frvbf,mhdsets) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { UHI opval = FLD (f_u12); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = FLD (f_u12); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } @@ -19126,7 +19126,7 @@ SEM_FN_NAME (frvbf,mhsetloh) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } @@ -19153,7 +19153,7 @@ SEM_FN_NAME (frvbf,mhsethih) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } @@ -19176,7 +19176,7 @@ SEM_FN_NAME (frvbf,mhdseth) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { HI tmp_tmp; @@ -19186,7 +19186,7 @@ SEM_FN_NAME (frvbf,mhdseth) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } { @@ -19197,7 +19197,7 @@ SEM_FN_NAME (frvbf,mhdseth) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -19220,7 +19220,7 @@ SEM_FN_NAME (frvbf,mand) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ANDSI (GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -19241,7 +19241,7 @@ SEM_FN_NAME (frvbf,mor) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -19262,7 +19262,7 @@ SEM_FN_NAME (frvbf,mxor) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = XORSI (GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -19285,7 +19285,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = ANDSI (GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } @@ -19310,7 +19310,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = ORSI (GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } @@ -19335,7 +19335,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = XORSI (GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } @@ -19358,7 +19358,7 @@ SEM_FN_NAME (frvbf,mnot) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = INVSI (GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -19381,7 +19381,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = INVSI (GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } @@ -19404,7 +19404,7 @@ SEM_FN_NAME (frvbf,mrotli) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ROLSI (GET_H_FR_INT (FLD (f_FRi)), ANDSI (FLD (f_u6), 31)); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -19425,7 +19425,7 @@ SEM_FN_NAME (frvbf,mrotri) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = RORSI (GET_H_FR_INT (FLD (f_FRi)), ANDSI (FLD (f_u6), 31)); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -19446,7 +19446,7 @@ SEM_FN_NAME (frvbf,mwcut) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_cut (current_cpu, GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (ADDSI (FLD (f_FRi), 1)), GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -19467,7 +19467,7 @@ SEM_FN_NAME (frvbf,mwcuti) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_cut (current_cpu, GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (ADDSI (FLD (f_FRi), 1)), FLD (f_u6)); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -19488,7 +19488,7 @@ SEM_FN_NAME (frvbf,mcut) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_media_cut (current_cpu, GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -19509,7 +19509,7 @@ SEM_FN_NAME (frvbf,mcuti) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_media_cut (current_cpu, GET_H_ACC40S (FLD (f_ACC40Si)), FLD (f_s6)); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -19530,7 +19530,7 @@ SEM_FN_NAME (frvbf,mcutss) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_media_cut_ss (current_cpu, GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -19551,7 +19551,7 @@ SEM_FN_NAME (frvbf,mcutssi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_media_cut_ss (current_cpu, GET_H_ACC40S (FLD (f_ACC40Si)), FLD (f_s6)); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -19580,13 +19580,13 @@ frvbf_media_register_not_aligned (current_cpu); SI opval = frvbf_media_cut_ss (current_cpu, GET_H_ACC40S (FLD (f_ACC40Si)), FLD (f_s6)); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { USI opval = frvbf_media_cut_ss (current_cpu, GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 1)), FLD (f_s6)); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } } @@ -19611,7 +19611,7 @@ SEM_FN_NAME (frvbf,maveh) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frvbf_media_average (current_cpu, GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -19633,22 +19633,22 @@ SEM_FN_NAME (frvbf,msllhi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRi))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRi), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { UHI opval = SLLHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = SLLHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } @@ -19671,22 +19671,22 @@ SEM_FN_NAME (frvbf,msrlhi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRi))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRi), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { UHI opval = SRLHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = SRLHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } @@ -19709,22 +19709,22 @@ SEM_FN_NAME (frvbf,msrahi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRi))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRi), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { UHI opval = SRAHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = SRAHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } @@ -19751,13 +19751,13 @@ frvbf_media_register_not_aligned (current_cpu); SI opval = ROLSI (GET_H_FR_INT (FLD (f_FRi)), ANDSI (FLD (f_s6), 31)); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { USI opval = ROLSI (GET_H_FR_INT (ADDSI (FLD (f_FRi), 1)), ANDSI (FLD (f_s6), 31)); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } } @@ -19785,12 +19785,12 @@ SEM_FN_NAME (frvbf,mcplhi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRi))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRi), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } tmp_shift = ANDSI (FLD (f_u6), 15); tmp_arg1 = SLLHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), tmp_shift); @@ -19804,7 +19804,7 @@ if (NEHI (tmp_shift, 0)) { { UHI opval = tmp_arg1; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } @@ -19838,7 +19838,7 @@ if (NESI (tmp_shift, 0)) { { SI opval = tmp_tmp; sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } } @@ -19873,7 +19873,7 @@ if (GTHI (tmp_argihi, tmp_argjhi)) { UHI opval = tmp_argjhi; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } else { if (LTHI (tmp_argihi, INVHI (tmp_argjhi))) { @@ -19881,14 +19881,14 @@ if (LTHI (tmp_argihi, INVHI (tmp_argjhi))) { UHI opval = INVHI (tmp_argjhi); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } else { { UHI opval = tmp_argihi; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -19897,7 +19897,7 @@ if (GTHI (tmp_argilo, tmp_argjlo)) { UHI opval = tmp_argjlo; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } else { if (LTHI (tmp_argilo, INVHI (tmp_argjlo))) { @@ -19905,14 +19905,14 @@ if (LTHI (tmp_argilo, INVHI (tmp_argjlo))) { UHI opval = INVHI (tmp_argjlo); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } else { { UHI opval = tmp_argilo; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -19946,7 +19946,7 @@ frvbf_media_register_not_aligned (current_cpu); SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0)); @@ -19959,7 +19959,7 @@ if (GTHI (tmp_argihi, tmp_argjhi)) { UHI opval = tmp_argjhi; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } else { if (LTHI (tmp_argihi, INVHI (tmp_argjhi))) { @@ -19967,14 +19967,14 @@ if (LTHI (tmp_argihi, INVHI (tmp_argjhi))) { UHI opval = INVHI (tmp_argjhi); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } else { { UHI opval = tmp_argihi; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -19983,7 +19983,7 @@ if (GTHI (tmp_argilo, tmp_argjlo)) { UHI opval = tmp_argjlo; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } else { if (LTHI (tmp_argilo, INVHI (tmp_argjlo))) { @@ -19991,14 +19991,14 @@ if (LTHI (tmp_argilo, INVHI (tmp_argjlo))) { UHI opval = INVHI (tmp_argjlo); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } else { { UHI opval = tmp_argilo; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -20013,7 +20013,7 @@ if (GTHI (tmp_argihi, tmp_argjhi)) { UHI opval = tmp_argjhi; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } else { if (LTHI (tmp_argihi, INVHI (tmp_argjhi))) { @@ -20021,14 +20021,14 @@ if (LTHI (tmp_argihi, INVHI (tmp_argjhi))) { UHI opval = INVHI (tmp_argjhi); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } else { { UHI opval = tmp_argihi; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -20037,7 +20037,7 @@ if (GTHI (tmp_argilo, tmp_argjlo)) { UHI opval = tmp_argjlo; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } else { if (LTHI (tmp_argilo, INVHI (tmp_argjlo))) { @@ -20045,14 +20045,14 @@ if (LTHI (tmp_argilo, INVHI (tmp_argjlo))) { UHI opval = INVHI (tmp_argjlo); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } else { { UHI opval = tmp_argilo; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -20091,14 +20091,14 @@ if (GTUHI (tmp_argihi, tmp_argjhi)) { UHI opval = tmp_argjhi; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } else { { UHI opval = tmp_argihi; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } if (GTUHI (tmp_argilo, tmp_argjlo)) { @@ -20106,14 +20106,14 @@ if (GTUHI (tmp_argilo, tmp_argjlo)) { UHI opval = tmp_argjlo; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } else { { UHI opval = tmp_argilo; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -20153,7 +20153,7 @@ if (GTHI (tmp_argihi, tmp_argjhi)) { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCk)]), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { if (EQHI (tmp_argihi, tmp_argjhi)) { @@ -20161,7 +20161,7 @@ if (EQHI (tmp_argihi, tmp_argjhi)) { UQI opval = 8; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCk)]), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { if (LTHI (tmp_argihi, tmp_argjhi)) { @@ -20169,14 +20169,14 @@ if (LTHI (tmp_argihi, tmp_argjhi)) { UQI opval = 4; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCk)]), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { { UQI opval = 1; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCk)]), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } } @@ -20186,7 +20186,7 @@ if (GTHI (tmp_argilo, tmp_argjlo)) { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { if (EQHI (tmp_argilo, tmp_argjlo)) { @@ -20194,7 +20194,7 @@ if (EQHI (tmp_argilo, tmp_argjlo)) { UQI opval = 8; sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { if (LTHI (tmp_argilo, tmp_argjlo)) { @@ -20202,14 +20202,14 @@ if (LTHI (tmp_argilo, tmp_argjlo)) { UQI opval = 4; sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { { UQI opval = 1; sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } } @@ -20252,7 +20252,7 @@ if (GTUHI (tmp_argihi, tmp_argjhi)) { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCk)]), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { if (EQHI (tmp_argihi, tmp_argjhi)) { @@ -20260,7 +20260,7 @@ if (EQHI (tmp_argihi, tmp_argjhi)) { UQI opval = 8; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCk)]), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { if (LTUHI (tmp_argihi, tmp_argjhi)) { @@ -20268,14 +20268,14 @@ if (LTUHI (tmp_argihi, tmp_argjhi)) { UQI opval = 4; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCk)]), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { { UQI opval = 1; sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCk)]), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } } @@ -20285,7 +20285,7 @@ if (GTUHI (tmp_argilo, tmp_argjlo)) { UQI opval = 2; sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { if (EQHI (tmp_argilo, tmp_argjlo)) { @@ -20293,7 +20293,7 @@ if (EQHI (tmp_argilo, tmp_argjlo)) { UQI opval = 8; sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { if (LTUHI (tmp_argilo, tmp_argjlo)) { @@ -20301,14 +20301,14 @@ if (LTUHI (tmp_argilo, tmp_argjlo)) { UQI opval = 4; sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } else { { UQI opval = 1; sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval); } } } @@ -20338,12 +20338,12 @@ SEM_FN_NAME (frvbf,mabshs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRj), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } tmp_arghi = GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)); tmp_arglo = GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)); @@ -20353,7 +20353,7 @@ if (GTDI (ABSDI (EXTHIDI (tmp_arghi)), 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -20364,7 +20364,7 @@ if (LTDI (ABSDI (EXTHIDI (tmp_arghi)), -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -20373,7 +20373,7 @@ frvbf_media_overflow (current_cpu, 8); UHI opval = ABSDI (EXTHIDI (tmp_arghi)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -20383,7 +20383,7 @@ if (GTDI (ABSDI (EXTHIDI (tmp_arglo)), 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -20394,7 +20394,7 @@ if (LTDI (ABSDI (EXTHIDI (tmp_arglo)), -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -20403,7 +20403,7 @@ frvbf_media_overflow (current_cpu, 4); UHI opval = ABSDI (EXTHIDI (tmp_arglo)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -20445,7 +20445,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -20456,7 +20456,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -20465,7 +20465,7 @@ frvbf_media_overflow (current_cpu, 8); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -20479,7 +20479,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -20490,7 +20490,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -20499,7 +20499,7 @@ frvbf_media_overflow (current_cpu, 4); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -20542,7 +20542,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -20553,7 +20553,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -20562,7 +20562,7 @@ frvbf_media_overflow (current_cpu, 8); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -20576,7 +20576,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -20587,7 +20587,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -20596,7 +20596,7 @@ frvbf_media_overflow (current_cpu, 4); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -20639,7 +20639,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -20650,7 +20650,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -20659,7 +20659,7 @@ frvbf_media_overflow (current_cpu, 8); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -20673,7 +20673,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -20684,7 +20684,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -20693,7 +20693,7 @@ frvbf_media_overflow (current_cpu, 4); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -20736,7 +20736,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -20747,7 +20747,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -20756,7 +20756,7 @@ frvbf_media_overflow (current_cpu, 8); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -20770,7 +20770,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -20781,7 +20781,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -20790,7 +20790,7 @@ frvbf_media_overflow (current_cpu, 4); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -20834,7 +20834,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -20845,7 +20845,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -20854,7 +20854,7 @@ frvbf_media_overflow (current_cpu, 8); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -20868,7 +20868,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -20879,7 +20879,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -20888,7 +20888,7 @@ frvbf_media_overflow (current_cpu, 4); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -20933,7 +20933,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -20944,7 +20944,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -20953,7 +20953,7 @@ frvbf_media_overflow (current_cpu, 8); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -20967,7 +20967,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -20978,7 +20978,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -20987,7 +20987,7 @@ frvbf_media_overflow (current_cpu, 4); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -21032,7 +21032,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -21043,7 +21043,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -21052,7 +21052,7 @@ frvbf_media_overflow (current_cpu, 8); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -21066,7 +21066,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -21077,7 +21077,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -21086,7 +21086,7 @@ frvbf_media_overflow (current_cpu, 4); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -21131,7 +21131,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -21142,7 +21142,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -21151,7 +21151,7 @@ frvbf_media_overflow (current_cpu, 8); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -21165,7 +21165,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -21176,7 +21176,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -21185,7 +21185,7 @@ frvbf_media_overflow (current_cpu, 4); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -21221,7 +21221,7 @@ frvbf_media_register_not_aligned (current_cpu); SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0)); @@ -21238,7 +21238,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -21249,7 +21249,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -21258,7 +21258,7 @@ frvbf_media_overflow (current_cpu, 8); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -21272,7 +21272,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -21283,7 +21283,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -21292,7 +21292,7 @@ frvbf_media_overflow (current_cpu, 4); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -21312,7 +21312,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -21323,7 +21323,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -21332,7 +21332,7 @@ frvbf_media_overflow (current_cpu, 2); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -21346,7 +21346,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -21357,7 +21357,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -21366,7 +21366,7 @@ frvbf_media_overflow (current_cpu, 1); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -21402,7 +21402,7 @@ frvbf_media_register_not_aligned (current_cpu); SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0)); @@ -21419,7 +21419,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -21430,7 +21430,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -21439,7 +21439,7 @@ frvbf_media_overflow (current_cpu, 8); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -21453,7 +21453,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -21464,7 +21464,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -21473,7 +21473,7 @@ frvbf_media_overflow (current_cpu, 4); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -21493,7 +21493,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -21504,7 +21504,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -21513,7 +21513,7 @@ frvbf_media_overflow (current_cpu, 2); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -21527,7 +21527,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -21538,7 +21538,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -21547,7 +21547,7 @@ frvbf_media_overflow (current_cpu, 1); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -21583,7 +21583,7 @@ frvbf_media_register_not_aligned (current_cpu); SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0)); @@ -21600,7 +21600,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -21611,7 +21611,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -21620,7 +21620,7 @@ frvbf_media_overflow (current_cpu, 8); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -21634,7 +21634,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -21645,7 +21645,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -21654,7 +21654,7 @@ frvbf_media_overflow (current_cpu, 4); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -21674,7 +21674,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -21685,7 +21685,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -21694,7 +21694,7 @@ frvbf_media_overflow (current_cpu, 2); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -21708,7 +21708,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -21719,7 +21719,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -21728,7 +21728,7 @@ frvbf_media_overflow (current_cpu, 1); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -21764,7 +21764,7 @@ frvbf_media_register_not_aligned (current_cpu); SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0)); @@ -21781,7 +21781,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -21792,7 +21792,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -21801,7 +21801,7 @@ frvbf_media_overflow (current_cpu, 8); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -21815,7 +21815,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -21826,7 +21826,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -21835,7 +21835,7 @@ frvbf_media_overflow (current_cpu, 4); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -21855,7 +21855,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -21866,7 +21866,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -21875,7 +21875,7 @@ frvbf_media_overflow (current_cpu, 2); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -21889,7 +21889,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -21900,7 +21900,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -21909,7 +21909,7 @@ frvbf_media_overflow (current_cpu, 1); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -21946,7 +21946,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0)); @@ -21963,7 +21963,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -21974,7 +21974,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -21983,7 +21983,7 @@ frvbf_media_overflow (current_cpu, 8); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -21997,7 +21997,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -22008,7 +22008,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -22017,7 +22017,7 @@ frvbf_media_overflow (current_cpu, 4); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -22037,7 +22037,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -22048,7 +22048,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -22057,7 +22057,7 @@ frvbf_media_overflow (current_cpu, 2); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -22071,7 +22071,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -22082,7 +22082,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -22091,7 +22091,7 @@ frvbf_media_overflow (current_cpu, 1); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -22129,7 +22129,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0)); @@ -22146,7 +22146,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -22157,7 +22157,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -22166,7 +22166,7 @@ frvbf_media_overflow (current_cpu, 8); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -22180,7 +22180,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -22191,7 +22191,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -22200,7 +22200,7 @@ frvbf_media_overflow (current_cpu, 4); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -22220,7 +22220,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -22231,7 +22231,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -22240,7 +22240,7 @@ frvbf_media_overflow (current_cpu, 2); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -22254,7 +22254,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -22265,7 +22265,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -22274,7 +22274,7 @@ frvbf_media_overflow (current_cpu, 1); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -22312,7 +22312,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0)); @@ -22329,7 +22329,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -22340,7 +22340,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -22349,7 +22349,7 @@ frvbf_media_overflow (current_cpu, 8); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -22363,7 +22363,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -22374,7 +22374,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -22383,7 +22383,7 @@ frvbf_media_overflow (current_cpu, 4); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -22403,7 +22403,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -22414,7 +22414,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -22423,7 +22423,7 @@ frvbf_media_overflow (current_cpu, 2); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -22437,7 +22437,7 @@ if (GTDI (tmp_tmp, 32767)) { UHI opval = 32767; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -22448,7 +22448,7 @@ if (LTDI (tmp_tmp, -32768)) { UHI opval = -32768; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -22457,7 +22457,7 @@ frvbf_media_overflow (current_cpu, 1); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -22495,7 +22495,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0)); @@ -22512,7 +22512,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -22523,7 +22523,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -22532,7 +22532,7 @@ frvbf_media_overflow (current_cpu, 8); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -22546,7 +22546,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -22557,7 +22557,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -22566,7 +22566,7 @@ frvbf_media_overflow (current_cpu, 4); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -22586,7 +22586,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -22597,7 +22597,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -22606,7 +22606,7 @@ frvbf_media_overflow (current_cpu, 2); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } } } @@ -22620,7 +22620,7 @@ if (GTDI (tmp_tmp, 65535)) { UHI opval = 65535; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -22631,7 +22631,7 @@ if (LTDI (tmp_tmp, 0)) { UHI opval = 0; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -22640,7 +22640,7 @@ frvbf_media_overflow (current_cpu, 1); UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -22681,7 +22681,7 @@ frvbf_media_register_not_aligned (current_cpu); SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { tmp_a1 = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0)); @@ -22699,25 +22699,25 @@ frvbf_media_register_not_aligned (current_cpu); UHI opval = (LEUHI (ABSHI (tmp_a1), ABSHI (tmp_b1))) ? (0) : (LEHI (0, tmp_b1)) ? (tmp_a1) : (EQHI (tmp_a1, -32768)) ? (32767) : (NEGHI (tmp_a1)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = (LEUHI (ABSHI (tmp_a2), ABSHI (tmp_b2))) ? (0) : (LEHI (0, tmp_b2)) ? (tmp_a2) : (EQHI (tmp_a2, -32768)) ? (32767) : (NEGHI (tmp_a2)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } { UHI opval = (LEUHI (ABSHI (tmp_a3), ABSHI (tmp_b3))) ? (0) : (LEHI (0, tmp_b3)) ? (tmp_a3) : (EQHI (tmp_a3, -32768)) ? (32767) : (NEGHI (tmp_a3)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = (LEUHI (ABSHI (tmp_a4), ABSHI (tmp_b4))) ? (0) : (LEHI (0, tmp_b4)) ? (tmp_a4) : (EQHI (tmp_a4, -32768)) ? (32767) : (NEGHI (tmp_a4)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -22754,7 +22754,7 @@ frvbf_media_register_not_aligned (current_cpu); SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { tmp_a1 = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0)); @@ -22772,25 +22772,25 @@ frvbf_media_register_not_aligned (current_cpu); UHI opval = (ANDIF (GTHI (tmp_b1, -32768), GEHI (tmp_a1, ABSHI (tmp_b1)))) ? (tmp_b1) : (GTHI (tmp_a1, NEGHI (ABSHI (tmp_b1)))) ? (tmp_a1) : (EQHI (tmp_b1, -32768)) ? (32767) : (NEGHI (tmp_b1)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = (ANDIF (GTHI (tmp_b2, -32768), GEHI (tmp_a2, ABSHI (tmp_b2)))) ? (tmp_b2) : (GTHI (tmp_a2, NEGHI (ABSHI (tmp_b2)))) ? (tmp_a2) : (EQHI (tmp_b2, -32768)) ? (32767) : (NEGHI (tmp_b2)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } { UHI opval = (ANDIF (GTHI (tmp_b3, -32768), GEHI (tmp_a3, ABSHI (tmp_b3)))) ? (tmp_b3) : (GTHI (tmp_a3, NEGHI (ABSHI (tmp_b3)))) ? (tmp_a3) : (EQHI (tmp_b3, -32768)) ? (32767) : (NEGHI (tmp_b3)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = (ANDIF (GTHI (tmp_b4, -32768), GEHI (tmp_a4, ABSHI (tmp_b4)))) ? (tmp_b4) : (GTHI (tmp_a4, NEGHI (ABSHI (tmp_b4)))) ? (tmp_a4) : (EQHI (tmp_b4, -32768)) ? (32767) : (NEGHI (tmp_b4)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -22819,37 +22819,37 @@ frvbf_media_register_not_aligned (current_cpu); SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRi))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRi), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { UHI opval = SLLHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = SLLHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } { UHI opval = SLLHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), ANDSI (FLD (f_u6), 15)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = SLLHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), ANDSI (FLD (f_u6), 15)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -22878,37 +22878,37 @@ frvbf_media_register_not_aligned (current_cpu); SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRi))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRi), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { UHI opval = SRAHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = SRAHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } { UHI opval = SRAHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), ANDSI (FLD (f_u6), 15)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = SRAHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), ANDSI (FLD (f_u6), 15)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -22943,7 +22943,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -22954,7 +22954,7 @@ if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) { DI opval = INVDI (MAKEDI (127, 0xffffffff)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -22963,7 +22963,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -23002,7 +23002,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -23013,7 +23013,7 @@ if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) { DI opval = INVDI (MAKEDI (127, 0xffffffff)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -23022,7 +23022,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -23065,7 +23065,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -23076,7 +23076,7 @@ if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) { DI opval = INVDI (MAKEDI (127, 0xffffffff)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -23085,7 +23085,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -23099,7 +23099,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -23110,7 +23110,7 @@ if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) { DI opval = INVDI (MAKEDI (127, 0xffffffff)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -23119,7 +23119,7 @@ frvbf_media_overflow (current_cpu, 4); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -23164,7 +23164,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -23175,7 +23175,7 @@ if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) { DI opval = INVDI (MAKEDI (127, 0xffffffff)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -23184,7 +23184,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -23198,7 +23198,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -23209,7 +23209,7 @@ if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) { DI opval = INVDI (MAKEDI (127, 0xffffffff)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -23218,7 +23218,7 @@ frvbf_media_overflow (current_cpu, 4); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -23263,7 +23263,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -23274,7 +23274,7 @@ if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) { DI opval = INVDI (MAKEDI (127, 0xffffffff)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -23283,7 +23283,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -23297,7 +23297,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -23308,7 +23308,7 @@ if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) { DI opval = INVDI (MAKEDI (127, 0xffffffff)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -23317,7 +23317,7 @@ frvbf_media_overflow (current_cpu, 4); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -23362,7 +23362,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -23373,7 +23373,7 @@ if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) { DI opval = INVDI (MAKEDI (127, 0xffffffff)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -23382,7 +23382,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -23396,7 +23396,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -23407,7 +23407,7 @@ if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) { DI opval = INVDI (MAKEDI (127, 0xffffffff)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -23416,7 +23416,7 @@ frvbf_media_overflow (current_cpu, 4); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -23430,7 +23430,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -23441,7 +23441,7 @@ if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) { DI opval = INVDI (MAKEDI (127, 0xffffffff)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -23450,7 +23450,7 @@ frvbf_media_overflow (current_cpu, 2); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -23464,7 +23464,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -23475,7 +23475,7 @@ if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) { DI opval = INVDI (MAKEDI (127, 0xffffffff)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -23484,7 +23484,7 @@ frvbf_media_overflow (current_cpu, 1); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -23530,13 +23530,13 @@ frvbf_media_acc_not_aligned (current_cpu); DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -23577,13 +23577,13 @@ frvbf_media_acc_not_aligned (current_cpu); DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -23624,13 +23624,13 @@ frvbf_media_acc_not_aligned (current_cpu); DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjlo)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -23671,13 +23671,13 @@ frvbf_media_acc_not_aligned (current_cpu); DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjlo)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjhi)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -23719,13 +23719,13 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -23768,13 +23768,13 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -23819,13 +23819,13 @@ frvbf_media_register_not_aligned (current_cpu); DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0)); @@ -23837,13 +23837,13 @@ frvbf_media_register_not_aligned (current_cpu); DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -23888,13 +23888,13 @@ frvbf_media_register_not_aligned (current_cpu); DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0)); @@ -23906,13 +23906,13 @@ frvbf_media_register_not_aligned (current_cpu); DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -23957,13 +23957,13 @@ frvbf_media_register_not_aligned (current_cpu); DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjlo)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0)); @@ -23975,13 +23975,13 @@ frvbf_media_register_not_aligned (current_cpu); DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjlo)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -24026,13 +24026,13 @@ frvbf_media_register_not_aligned (current_cpu); DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjlo)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjhi)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0)); @@ -24044,13 +24044,13 @@ frvbf_media_register_not_aligned (current_cpu); DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjlo)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjhi)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -24096,13 +24096,13 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0)); @@ -24114,13 +24114,13 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -24167,13 +24167,13 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0)); @@ -24185,13 +24185,13 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } { DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -24239,7 +24239,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -24250,7 +24250,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -24259,7 +24259,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -24273,7 +24273,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -24284,7 +24284,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -24293,7 +24293,7 @@ frvbf_media_overflow (current_cpu, 4); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -24342,7 +24342,7 @@ if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) { UDI opval = MAKEDI (255, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -24353,7 +24353,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) { UDI opval = MAKEDI (0, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -24362,7 +24362,7 @@ frvbf_media_overflow (current_cpu, 8); UDI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } } } @@ -24376,7 +24376,7 @@ if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) { UDI opval = MAKEDI (255, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -24387,7 +24387,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) { UDI opval = MAKEDI (0, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -24396,7 +24396,7 @@ frvbf_media_overflow (current_cpu, 4); UDI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } } } @@ -24445,7 +24445,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -24456,7 +24456,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -24465,7 +24465,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -24479,7 +24479,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -24490,7 +24490,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -24499,7 +24499,7 @@ frvbf_media_overflow (current_cpu, 4); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -24548,7 +24548,7 @@ if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) { UDI opval = MAKEDI (255, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -24559,7 +24559,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) { UDI opval = MAKEDI (0, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -24568,7 +24568,7 @@ frvbf_media_overflow (current_cpu, 8); UDI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } } } @@ -24582,7 +24582,7 @@ if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) { UDI opval = MAKEDI (255, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -24593,7 +24593,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) { UDI opval = MAKEDI (0, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -24602,7 +24602,7 @@ frvbf_media_overflow (current_cpu, 4); UDI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } } } @@ -24652,7 +24652,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -24663,7 +24663,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -24672,7 +24672,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -24686,7 +24686,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -24697,7 +24697,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -24706,7 +24706,7 @@ frvbf_media_overflow (current_cpu, 4); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -24757,7 +24757,7 @@ if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) { UDI opval = MAKEDI (255, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -24768,7 +24768,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) { UDI opval = MAKEDI (0, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -24777,7 +24777,7 @@ frvbf_media_overflow (current_cpu, 8); UDI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } } } @@ -24791,7 +24791,7 @@ if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) { UDI opval = MAKEDI (255, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -24802,7 +24802,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) { UDI opval = MAKEDI (0, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -24811,7 +24811,7 @@ frvbf_media_overflow (current_cpu, 4); UDI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } } } @@ -24864,7 +24864,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -24875,7 +24875,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -24884,7 +24884,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -24898,7 +24898,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -24909,7 +24909,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -24918,7 +24918,7 @@ frvbf_media_overflow (current_cpu, 4); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -24938,7 +24938,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -24949,7 +24949,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -24958,7 +24958,7 @@ frvbf_media_overflow (current_cpu, 2); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -24972,7 +24972,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -24983,7 +24983,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -24992,7 +24992,7 @@ frvbf_media_overflow (current_cpu, 1); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -25045,7 +25045,7 @@ if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) { UDI opval = MAKEDI (255, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -25056,7 +25056,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) { UDI opval = MAKEDI (0, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -25065,7 +25065,7 @@ frvbf_media_overflow (current_cpu, 8); UDI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } } } @@ -25079,7 +25079,7 @@ if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) { UDI opval = MAKEDI (255, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -25090,7 +25090,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) { UDI opval = MAKEDI (0, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -25099,7 +25099,7 @@ frvbf_media_overflow (current_cpu, 4); UDI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } } } @@ -25119,7 +25119,7 @@ if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) { UDI opval = MAKEDI (255, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 2), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -25130,7 +25130,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) { UDI opval = MAKEDI (0, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 2), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -25139,7 +25139,7 @@ frvbf_media_overflow (current_cpu, 2); UDI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 2), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } } } @@ -25153,7 +25153,7 @@ if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) { UDI opval = MAKEDI (255, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 3), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -25164,7 +25164,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) { UDI opval = MAKEDI (0, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 3), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -25173,7 +25173,7 @@ frvbf_media_overflow (current_cpu, 1); UDI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 3), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } } } @@ -25227,7 +25227,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -25238,7 +25238,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -25247,7 +25247,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -25261,7 +25261,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -25272,7 +25272,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -25281,7 +25281,7 @@ frvbf_media_overflow (current_cpu, 4); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -25301,7 +25301,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -25312,7 +25312,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -25321,7 +25321,7 @@ frvbf_media_overflow (current_cpu, 2); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -25335,7 +25335,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 22); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -25346,7 +25346,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 22); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -25355,7 +25355,7 @@ frvbf_media_overflow (current_cpu, 1); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 22); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -25410,7 +25410,7 @@ if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) { UDI opval = MAKEDI (255, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -25421,7 +25421,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) { UDI opval = MAKEDI (0, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -25430,7 +25430,7 @@ frvbf_media_overflow (current_cpu, 8); UDI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } } } @@ -25444,7 +25444,7 @@ if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) { UDI opval = MAKEDI (255, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -25455,7 +25455,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) { UDI opval = MAKEDI (0, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -25464,7 +25464,7 @@ frvbf_media_overflow (current_cpu, 4); UDI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } } } @@ -25484,7 +25484,7 @@ if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) { UDI opval = MAKEDI (255, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 2), opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -25495,7 +25495,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) { UDI opval = MAKEDI (0, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 2), opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -25504,7 +25504,7 @@ frvbf_media_overflow (current_cpu, 2); UDI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 2), opval); written |= (1 << 21); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } } } @@ -25518,7 +25518,7 @@ if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) { UDI opval = MAKEDI (255, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 3), opval); written |= (1 << 22); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -25529,7 +25529,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) { UDI opval = MAKEDI (0, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 3), opval); written |= (1 << 22); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -25538,7 +25538,7 @@ frvbf_media_overflow (current_cpu, 1); UDI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 3), opval); written |= (1 << 22); - TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval); } } } @@ -25592,7 +25592,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -25603,7 +25603,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -25612,7 +25612,7 @@ frvbf_media_overflow (current_cpu, 2); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -25626,7 +25626,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -25637,7 +25637,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -25646,7 +25646,7 @@ frvbf_media_overflow (current_cpu, 1); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -25666,7 +25666,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -25677,7 +25677,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -25686,7 +25686,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -25700,7 +25700,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -25711,7 +25711,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -25720,7 +25720,7 @@ frvbf_media_overflow (current_cpu, 4); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -25773,7 +25773,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -25784,7 +25784,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -25793,7 +25793,7 @@ frvbf_media_overflow (current_cpu, 2); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -25807,7 +25807,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -25818,7 +25818,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -25827,7 +25827,7 @@ frvbf_media_overflow (current_cpu, 1); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -25847,7 +25847,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -25858,7 +25858,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -25867,7 +25867,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -25881,7 +25881,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -25892,7 +25892,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -25901,7 +25901,7 @@ frvbf_media_overflow (current_cpu, 4); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -25954,7 +25954,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -25965,7 +25965,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -25974,7 +25974,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -25988,7 +25988,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -25999,7 +25999,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -26008,7 +26008,7 @@ frvbf_media_overflow (current_cpu, 4); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -26028,7 +26028,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -26039,7 +26039,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 2); } @@ -26048,7 +26048,7 @@ frvbf_media_overflow (current_cpu, 2); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -26062,7 +26062,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -26073,7 +26073,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 1); } @@ -26082,7 +26082,7 @@ frvbf_media_overflow (current_cpu, 1); DI opval = tmp_tmp; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval); written |= (1 << 20); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -26132,7 +26132,7 @@ if (GTDI (tmp_tmp1, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -26143,7 +26143,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -26152,7 +26152,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp1; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -26200,7 +26200,7 @@ if (GTDI (tmp_tmp1, MAKEDI (255, 0xffffffff))) { DI opval = MAKEDI (255, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -26211,7 +26211,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0, 0))) { DI opval = MAKEDI (0, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -26220,7 +26220,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp1; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -26268,7 +26268,7 @@ if (GTDI (tmp_tmp1, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -26279,7 +26279,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -26288,7 +26288,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp1; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -26336,7 +26336,7 @@ if (GTDI (tmp_tmp1, MAKEDI (255, 0xffffffff))) { DI opval = MAKEDI (255, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -26347,7 +26347,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0, 0))) { DI opval = MAKEDI (0, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -26356,7 +26356,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp1; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -26405,7 +26405,7 @@ if (GTDI (tmp_tmp1, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -26416,7 +26416,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -26425,7 +26425,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp1; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -26475,7 +26475,7 @@ if (GTDI (tmp_tmp1, MAKEDI (255, 0xffffffff))) { DI opval = MAKEDI (255, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -26486,7 +26486,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0, 0))) { DI opval = MAKEDI (0, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -26495,7 +26495,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp1; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -26545,7 +26545,7 @@ if (GTDI (tmp_tmp1, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -26556,7 +26556,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -26565,7 +26565,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp1; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -26615,7 +26615,7 @@ if (GTDI (tmp_tmp1, MAKEDI (255, 0xffffffff))) { DI opval = MAKEDI (255, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -26626,7 +26626,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0, 0))) { DI opval = MAKEDI (0, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -26635,7 +26635,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp1; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -26690,7 +26690,7 @@ if (GTDI (tmp_tmp1, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -26701,7 +26701,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -26710,7 +26710,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp1; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -26733,7 +26733,7 @@ if (GTDI (tmp_tmp1, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -26744,7 +26744,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -26753,7 +26753,7 @@ frvbf_media_overflow (current_cpu, 4); DI opval = tmp_tmp1; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -26809,7 +26809,7 @@ if (GTDI (tmp_tmp1, MAKEDI (255, 0xffffffff))) { DI opval = MAKEDI (255, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -26820,7 +26820,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0, 0))) { DI opval = MAKEDI (0, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -26829,7 +26829,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp1; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -26852,7 +26852,7 @@ if (GTDI (tmp_tmp1, MAKEDI (255, 0xffffffff))) { DI opval = MAKEDI (255, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -26863,7 +26863,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0, 0))) { DI opval = MAKEDI (0, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -26872,7 +26872,7 @@ frvbf_media_overflow (current_cpu, 4); DI opval = tmp_tmp1; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -26928,7 +26928,7 @@ if (GTDI (tmp_tmp1, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -26939,7 +26939,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -26948,7 +26948,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp1; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -26971,7 +26971,7 @@ if (GTDI (tmp_tmp1, MAKEDI (127, 0xffffffff))) { DI opval = MAKEDI (127, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -26982,7 +26982,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0xffffff80, 0))) { DI opval = MAKEDI (0xffffff80, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -26991,7 +26991,7 @@ frvbf_media_overflow (current_cpu, 4); DI opval = tmp_tmp1; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -27047,7 +27047,7 @@ if (GTDI (tmp_tmp1, MAKEDI (255, 0xffffffff))) { DI opval = MAKEDI (255, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -27058,7 +27058,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0, 0))) { DI opval = MAKEDI (0, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 8); } @@ -27067,7 +27067,7 @@ frvbf_media_overflow (current_cpu, 8); DI opval = tmp_tmp1; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -27090,7 +27090,7 @@ if (GTDI (tmp_tmp1, MAKEDI (255, 0xffffffff))) { DI opval = MAKEDI (255, 0xffffffff); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -27101,7 +27101,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0, 0))) { DI opval = MAKEDI (0, 0); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } frvbf_media_overflow (current_cpu, 4); } @@ -27110,7 +27110,7 @@ frvbf_media_overflow (current_cpu, 4); DI opval = tmp_tmp1; sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } } } @@ -27146,12 +27146,12 @@ if (ANDSI (FLD (f_u6), 1)) { { UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } @@ -27182,13 +27182,13 @@ if (ANDSI (FLD (f_u6), 1)) { UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -27218,7 +27218,7 @@ frvbf_media_register_not_aligned (current_cpu); SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } if (ANDSI (FLD (f_u6), 1)) { tmp_tmp = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)); @@ -27229,25 +27229,25 @@ if (ANDSI (FLD (f_u6), 1)) { UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } { UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -27278,7 +27278,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } if (ANDSI (FLD (f_u6), 1)) { tmp_tmp = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)); @@ -27289,25 +27289,25 @@ if (ANDSI (FLD (f_u6), 1)) { UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } { UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = tmp_tmp; sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -27333,12 +27333,12 @@ SEM_FN_NAME (frvbf,mpackh) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } @@ -27365,32 +27365,32 @@ frvbf_media_register_not_aligned (current_cpu); SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRi))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRi), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRj), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { { UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } { @@ -27398,13 +27398,13 @@ frvbf_media_register_not_aligned (current_cpu); UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -27434,38 +27434,38 @@ frvbf_media_register_not_aligned (current_cpu); SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRi))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRi), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { { UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } { UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), ADDSI (0, 1)), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), ADDSI (0, 1)), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -27495,38 +27495,38 @@ frvbf_media_register_not_aligned (current_cpu); SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRi))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRi), opval); written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { { UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } { UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), ADDSI (0, 1)), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), ADDSI (0, 1)), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } { @@ -27534,25 +27534,25 @@ frvbf_media_register_not_aligned (current_cpu); UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 2), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 2), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } { UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), ADDSI (2, 1)), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), ADDSI (2, 1)), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -27578,12 +27578,12 @@ SEM_FN_NAME (frvbf,mbtoh) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRj), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } if (ANDSI (FLD (f_FRk), SUBSI (2, 1))) { frvbf_media_register_not_aligned (current_cpu); @@ -27593,25 +27593,25 @@ frvbf_media_register_not_aligned (current_cpu); UHI opval = GET_H_FR_3 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = GET_H_FR_2 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } { UHI opval = GET_H_FR_1 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = GET_H_FR_0 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -27637,12 +27637,12 @@ SEM_FN_NAME (frvbf,cmbtoh) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRj), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } if (ANDSI (FLD (f_FRk), SUBSI (2, 1))) { frvbf_media_register_not_aligned (current_cpu); @@ -27653,25 +27653,25 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { UHI opval = GET_H_FR_3 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = GET_H_FR_2 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } { UHI opval = GET_H_FR_1 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = GET_H_FR_0 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -27698,12 +27698,12 @@ SEM_FN_NAME (frvbf,mhtob) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRj), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } if (ANDSI (FLD (f_FRj), SUBSI (2, 1))) { frvbf_media_register_not_aligned (current_cpu); @@ -27713,25 +27713,25 @@ frvbf_media_register_not_aligned (current_cpu); UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_3_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "fr_3", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_3", 'x', opval); } { UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_2_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_2", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_2", 'x', opval); } { UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_1_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "fr_1", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_1", 'x', opval); } { UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_0_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_0", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_0", 'x', opval); } } } @@ -27757,12 +27757,12 @@ SEM_FN_NAME (frvbf,cmhtob) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRj), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } if (ANDSI (FLD (f_FRj), SUBSI (2, 1))) { frvbf_media_register_not_aligned (current_cpu); @@ -27773,25 +27773,25 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_3_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_3", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_3", 'x', opval); } { UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_2_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "fr_2", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_2", 'x', opval); } { UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_1_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "fr_1", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_1", 'x', opval); } { UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_0_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_0", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_0", 'x', opval); } } } @@ -27818,12 +27818,12 @@ SEM_FN_NAME (frvbf,mbtohe) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRj), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } if (ANDSI (FLD (f_FRk), SUBSI (4, 1))) { frvbf_media_register_not_aligned (current_cpu); @@ -27833,49 +27833,49 @@ frvbf_media_register_not_aligned (current_cpu); UHI opval = GET_H_FR_3 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = GET_H_FR_3 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } { UHI opval = GET_H_FR_2 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = GET_H_FR_2 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } { UHI opval = GET_H_FR_1 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 2), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = GET_H_FR_1 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 2), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } { UHI opval = GET_H_FR_0 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 3), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = GET_H_FR_0 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 3), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -27901,12 +27901,12 @@ SEM_FN_NAME (frvbf,cmbtohe) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRj))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRj), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } { SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk))); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } if (ANDSI (FLD (f_FRk), SUBSI (4, 1))) { frvbf_media_register_not_aligned (current_cpu); @@ -27917,49 +27917,49 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) { UHI opval = GET_H_FR_3 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 12); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = GET_H_FR_3 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval); written |= (1 << 16); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } { UHI opval = GET_H_FR_2 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 13); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = GET_H_FR_2 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval); written |= (1 << 17); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } { UHI opval = GET_H_FR_1 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 2), opval); written |= (1 << 14); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = GET_H_FR_1 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 2), opval); written |= (1 << 18); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } { UHI opval = GET_H_FR_0 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 3), opval); written |= (1 << 15); - TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval); } { UHI opval = GET_H_FR_0 (ADDSI (FLD (f_FRj), 0)); sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 3), opval); written |= (1 << 19); - TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval); } } } @@ -28036,7 +28036,7 @@ SEM_FN_NAME (frvbf,mrdacc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GET_H_ACC40S (FLD (f_ACC40Si)); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -28057,7 +28057,7 @@ SEM_FN_NAME (frvbf,mrdaccg) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GET_H_ACCG (FLD (f_ACCGi)); sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval); - TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval); } return vpc; @@ -28078,7 +28078,7 @@ SEM_FN_NAME (frvbf,mwtacc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (ANDDI (GET_H_ACC40S (FLD (f_ACC40Sk)), MAKEDI (0xffffffff, 0)), GET_H_FR_INT (FLD (f_FRi))); sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval); - TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval); } return vpc; @@ -28101,7 +28101,7 @@ frv_ref_SI (GET_H_ACCG (FLD (f_ACCGk))); { USI opval = GET_H_FR_INT (FLD (f_FRi)); sim_queue_fn_si_write (current_cpu, frvbf_h_accg_set, FLD (f_ACCGk), opval); - TRACE_RESULT (current_cpu, abuf, "accg", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accg", 'x', opval); } } diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog index e55b6f6..1f9ab27 100644 --- a/sim/iq2000/ChangeLog +++ b/sim/iq2000/ChangeLog @@ -1,3 +1,11 @@ +2015-06-12 Mike Frysinger <vapier@gentoo.org> + + * decode.c (frvbf_decode): Change TRACE_EXTRACT to CGEN_TRACE_EXTRACT. + * mloop.in (execute): Change TRACE_INSN_INIT to CGEN_TRACE_INSN_INIT, + TRACE_INSN to CGEN_TRACE_INSN, and TRACE_INSN_FINI to CGEN_TRACE_INSN_FINI. + * sem.c: Rename TRACE_RESULT to CGEN_TRACE_RESULT. + * sem-switch.c: Likewise. + 2015-04-18 Mike Frysinger <vapier@gentoo.org> * sim-main.h (USING_SIM_BASE_H): Delete. diff --git a/sim/iq2000/decode.c b/sim/iq2000/decode.c index 6edeb2d..3e881ba 100644 --- a/sim/iq2000/decode.c +++ b/sim/iq2000/decode.c @@ -883,7 +883,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0)); #undef FLD return idesc; @@ -906,7 +906,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_rs) = f_rs; FLD (f_rt) = f_rt; FLD (f_rd) = f_rd; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_rd 0x%x", 'x', f_rd, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_rd 0x%x", 'x', f_rd, (char *) 0)); #undef FLD return idesc; @@ -929,7 +929,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_imm) = f_imm; FLD (f_rs) = f_rs; FLD (f_rt) = f_rt; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi", "f_imm 0x%x", 'x', f_imm, "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi", "f_imm 0x%x", 'x', f_imm, "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, (char *) 0)); #undef FLD return idesc; @@ -958,7 +958,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_rd) = f_rd; FLD (f_rt) = f_rt; FLD (f_shamt) = f_shamt; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ram", "f_maskl 0x%x", 'x', f_maskl, "f_rs 0x%x", 'x', f_rs, "f_rd 0x%x", 'x', f_rd, "f_rt 0x%x", 'x', f_rt, "f_shamt 0x%x", 'x', f_shamt, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ram", "f_maskl 0x%x", 'x', f_maskl, "f_rs 0x%x", 'x', f_rs, "f_rd 0x%x", 'x', f_rd, "f_rt 0x%x", 'x', f_rt, "f_shamt 0x%x", 'x', f_shamt, (char *) 0)); #undef FLD return idesc; @@ -981,7 +981,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_rt) = f_rt; FLD (f_shamt) = f_shamt; FLD (f_rd) = f_rd; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sll", "f_rt 0x%x", 'x', f_rt, "f_shamt 0x%x", 'x', f_shamt, "f_rd 0x%x", 'x', f_rd, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sll", "f_rt 0x%x", 'x', f_rt, "f_shamt 0x%x", 'x', f_shamt, "f_rd 0x%x", 'x', f_rd, (char *) 0)); #undef FLD return idesc; @@ -1007,7 +1007,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_rt) = f_rt; FLD (f_shamt) = f_shamt; FLD (f_rd) = f_rd; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_slmv", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_shamt 0x%x", 'x', f_shamt, "f_rd 0x%x", 'x', f_rd, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_slmv", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_shamt 0x%x", 'x', f_shamt, "f_rd 0x%x", 'x', f_rd, (char *) 0)); #undef FLD return idesc; @@ -1030,7 +1030,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_rs) = f_rs; FLD (f_rt) = f_rt; FLD (f_rd) = f_rd; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_slt", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_rd 0x%x", 'x', f_rd, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_slt", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_rd 0x%x", 'x', f_rd, (char *) 0)); #undef FLD return idesc; @@ -1053,7 +1053,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_imm) = f_imm; FLD (f_rs) = f_rs; FLD (f_rt) = f_rt; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_slti", "f_imm 0x%x", 'x', f_imm, "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_slti", "f_imm 0x%x", 'x', f_imm, "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, (char *) 0)); #undef FLD return idesc; @@ -1076,7 +1076,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_rt) = f_rt; FLD (f_rs) = f_rs; FLD (i_offset) = f_offset; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bbi", "f_rt 0x%x", 'x', f_rt, "f_rs 0x%x", 'x', f_rs, "offset 0x%x", 'x', f_offset, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bbi", "f_rt 0x%x", 'x', f_rt, "f_rs 0x%x", 'x', f_rs, "offset 0x%x", 'x', f_offset, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1105,7 +1105,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_rs) = f_rs; FLD (f_rt) = f_rt; FLD (i_offset) = f_offset; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bbv", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "offset 0x%x", 'x', f_offset, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bbv", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "offset 0x%x", 'x', f_offset, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1131,7 +1131,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rs) = f_rs; FLD (i_offset) = f_offset; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bgez", "f_rs 0x%x", 'x', f_rs, "offset 0x%x", 'x', f_offset, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bgez", "f_rs 0x%x", 'x', f_rs, "offset 0x%x", 'x', f_offset, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1157,7 +1157,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rs) = f_rs; FLD (i_offset) = f_offset; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bgezal", "f_rs 0x%x", 'x', f_rs, "offset 0x%x", 'x', f_offset, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bgezal", "f_rs 0x%x", 'x', f_rs, "offset 0x%x", 'x', f_offset, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1183,7 +1183,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rs) = f_rs; FLD (f_rd) = f_rd; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jalr", "f_rs 0x%x", 'x', f_rs, "f_rd 0x%x", 'x', f_rd, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jalr", "f_rs 0x%x", 'x', f_rs, "f_rd 0x%x", 'x', f_rd, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1206,7 +1206,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rs) = f_rs; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jr", "f_rs 0x%x", 'x', f_rs, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jr", "f_rs 0x%x", 'x', f_rs, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1235,7 +1235,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_rs) = f_rs; FLD (f_imm) = f_imm; FLD (f_rt) = f_rt; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lb", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lb", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0)); #undef FLD return idesc; @@ -1258,7 +1258,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_rs) = f_rs; FLD (f_imm) = f_imm; FLD (f_rt) = f_rt; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lh", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lh", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0)); #undef FLD return idesc; @@ -1278,7 +1278,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm) = f_imm; FLD (f_rt) = f_rt; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lui", "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lui", "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0)); #undef FLD return idesc; @@ -1301,7 +1301,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_rs) = f_rs; FLD (f_imm) = f_imm; FLD (f_rt) = f_rt; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lw", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lw", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0)); #undef FLD return idesc; @@ -1324,7 +1324,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_rs) = f_rs; FLD (f_imm) = f_imm; FLD (f_rt) = f_rt; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sb", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sb", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0)); #undef FLD return idesc; @@ -1347,7 +1347,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_rs) = f_rs; FLD (f_imm) = f_imm; FLD (f_rt) = f_rt; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sh", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sh", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0)); #undef FLD return idesc; @@ -1370,7 +1370,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_rs) = f_rs; FLD (f_imm) = f_imm; FLD (f_rt) = f_rt; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sw", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sw", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0)); #undef FLD return idesc; @@ -1383,7 +1383,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_break", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_break", (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1402,7 +1402,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_syscall", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_syscall", (char *) 0)); #undef FLD return idesc; @@ -1425,7 +1425,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_imm) = f_imm; FLD (f_rs) = f_rs; FLD (f_rt) = f_rt; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andoui", "f_imm 0x%x", 'x', f_imm, "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andoui", "f_imm 0x%x", 'x', f_imm, "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, (char *) 0)); #undef FLD return idesc; @@ -1451,7 +1451,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_rs) = f_rs; FLD (f_rt) = f_rt; FLD (f_rd) = f_rd; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mrgb", "f_mask 0x%x", 'x', f_mask, "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_rd 0x%x", 'x', f_rd, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mrgb", "f_mask 0x%x", 'x', f_mask, "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_rd 0x%x", 'x', f_rd, (char *) 0)); #undef FLD return idesc; @@ -1464,7 +1464,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bctxt", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bctxt", (char *) 0)); #undef FLD return idesc; @@ -1487,7 +1487,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_rs) = f_rs; FLD (f_rt) = f_rt; FLD (f_imm) = f_imm; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldw", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_imm 0x%x", 'x', f_imm, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldw", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_imm 0x%x", 'x', f_imm, (char *) 0)); #undef FLD return idesc; @@ -1510,7 +1510,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_rs) = f_rs; FLD (f_rt) = f_rt; FLD (f_imm) = f_imm; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sdw", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_imm 0x%x", 'x', f_imm, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sdw", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_imm 0x%x", 'x', f_imm, (char *) 0)); #undef FLD return idesc; @@ -1527,7 +1527,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_jmptarg) = f_jtarg; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_j", "jmptarg 0x%x", 'x', f_jtarg, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_j", "jmptarg 0x%x", 'x', f_jtarg, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1550,7 +1550,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_jmptarg) = f_jtarg; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jal", "jmptarg 0x%x", 'x', f_jtarg, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jal", "jmptarg 0x%x", 'x', f_jtarg, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ diff --git a/sim/iq2000/mloop.in b/sim/iq2000/mloop.in index 7fc7020..094a656 100644 --- a/sim/iq2000/mloop.in +++ b/sim/iq2000/mloop.in @@ -96,8 +96,8 @@ execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p) if (PROFILE_MODEL_P (current_cpu) && ARGBUF_PROFILE_P (abuf)) @cpu@_model_insn_before (current_cpu, 1 /*first_p*/); - TRACE_INSN_INIT (current_cpu, abuf, 1); - TRACE_INSN (current_cpu, idesc->idata, + CGEN_TRACE_INSN_INIT (current_cpu, abuf, 1); + CGEN_TRACE_INSN (current_cpu, idesc->idata, (const struct argbuf *) abuf, abuf->addr); } #if WITH_SCACHE @@ -116,7 +116,7 @@ execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p) cycles = (*idesc->timing->model_fn) (current_cpu, sc); @cpu@_model_insn_after (current_cpu, 1 /*last_p*/, cycles); } - TRACE_INSN_FINI (current_cpu, abuf, 1); + CGEN_TRACE_INSN_FINI (current_cpu, abuf, 1); } #else abort (); diff --git a/sim/iq2000/sem-switch.c b/sim/iq2000/sem-switch.c index b9d7853..7a6009f 100644 --- a/sim/iq2000/sem-switch.c +++ b/sim/iq2000/sem-switch.c @@ -201,13 +201,13 @@ This file is part of the GNU simulators. /* If hyper-fast [well not unnecessarily slow] execution is selected, turn off frills like tracing and profiling. */ -/* FIXME: A better way would be to have TRACE_RESULT check for something +/* FIXME: A better way would be to have CGEN_TRACE_RESULT check for something that can cause it to be optimized out. Another way would be to emit special handlers into the instruction "stream". */ #if FAST_P -#undef TRACE_RESULT -#define TRACE_RESULT(cpu, abuf, name, type, val) +#undef CGEN_TRACE_RESULT +#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val) #endif #undef GET_ATTR @@ -392,7 +392,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ADDSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -411,7 +411,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -430,7 +430,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -449,7 +449,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ADDSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -473,7 +473,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ORSI (SLLSI (tmp_high, 16), tmp_low); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -493,7 +493,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ANDSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -512,7 +512,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ANDSI (GET_H_GR (FLD (f_rs)), ZEXTSISI (FLD (f_imm))); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -531,7 +531,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ANDSI (GET_H_GR (FLD (f_rs)), ORSI (0xffff0000, EXTHISI (TRUNCSIHI (FLD (f_imm))))); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -550,7 +550,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = INVSI (ORSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -569,7 +569,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ORSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -588,7 +588,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ORSI (GET_H_GR (FLD (f_rs)), ZEXTSISI (FLD (f_imm))); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -608,17 +608,17 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = RORSI (GET_H_GR (FLD (f_rt)), FLD (f_shamt)); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = ANDSI (GET_H_GR (FLD (f_rd)), SRLSI (0xffffffff, FLD (f_maskl))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = ANDSI (GET_H_GR (FLD (f_rd)), SLLSI (0xffffffff, FLD (f_rs))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -638,7 +638,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = SLLSI (GET_H_GR (FLD (f_rt)), FLD (f_shamt)); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -657,7 +657,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = SLLSI (GET_H_GR (FLD (f_rt)), ANDSI (GET_H_GR (FLD (f_rs)), 31)); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -676,7 +676,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ANDSI (SLLSI (GET_H_GR (FLD (f_rt)), FLD (f_shamt)), SRLSI (0xffffffff, GET_H_GR (FLD (f_rs)))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -697,14 +697,14 @@ if (LTSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) { SI opval = 1; SET_H_GR (FLD (f_rd), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else { { SI opval = 0; SET_H_GR (FLD (f_rd), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -727,14 +727,14 @@ if (LTSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm))))) { SI opval = 1; SET_H_GR (FLD (f_rt), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else { { SI opval = 0; SET_H_GR (FLD (f_rt), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -757,14 +757,14 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm))))) { SI opval = 1; SET_H_GR (FLD (f_rt), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else { { SI opval = 0; SET_H_GR (FLD (f_rt), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -787,14 +787,14 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) { SI opval = 1; SET_H_GR (FLD (f_rd), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else { { SI opval = 0; SET_H_GR (FLD (f_rd), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -815,7 +815,7 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) { { SI opval = SRASI (GET_H_GR (FLD (f_rt)), FLD (f_shamt)); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -834,7 +834,7 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) { { SI opval = SRASI (GET_H_GR (FLD (f_rt)), ANDSI (GET_H_GR (FLD (f_rs)), 31)); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -853,7 +853,7 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) { { SI opval = SRLSI (GET_H_GR (FLD (f_rt)), FLD (f_shamt)); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -872,7 +872,7 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) { { SI opval = SRLSI (GET_H_GR (FLD (f_rt)), ANDSI (GET_H_GR (FLD (f_rs)), 31)); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -891,7 +891,7 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) { { SI opval = ANDSI (SRLSI (GET_H_GR (FLD (f_rt)), FLD (f_shamt)), SLLSI (0xffffffff, GET_H_GR (FLD (f_rs)))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -910,7 +910,7 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) { { SI opval = SUBSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -929,7 +929,7 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) { { SI opval = SUBSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -948,7 +948,7 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) { { SI opval = XORSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -967,7 +967,7 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) { { SI opval = XORSI (GET_H_GR (FLD (f_rs)), ZEXTSISI (FLD (f_imm))); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -990,7 +990,7 @@ if (ANDSI (GET_H_GR (FLD (f_rs)), SLLSI (1, FLD (f_rt)))) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1017,7 +1017,7 @@ if (NOTSI (ANDSI (GET_H_GR (FLD (f_rs)), SLLSI (1, FLD (f_rt))))) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1044,7 +1044,7 @@ if (ANDSI (GET_H_GR (FLD (f_rs)), SLLSI (1, ANDSI (GET_H_GR (FLD (f_rt)), 31)))) USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1071,7 +1071,7 @@ if (NOTSI (ANDSI (GET_H_GR (FLD (f_rs)), SLLSI (1, ANDSI (GET_H_GR (FLD (f_rt)), USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1098,7 +1098,7 @@ if (EQSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1125,7 +1125,7 @@ if (EQSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -1155,7 +1155,7 @@ if (GESI (GET_H_GR (FLD (f_rs)), 0)) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1182,14 +1182,14 @@ if (GESI (GET_H_GR (FLD (f_rs)), 0)) { SI opval = ADDSI (pc, 8); SET_H_GR (((UINT) 31), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1217,14 +1217,14 @@ if (GESI (GET_H_GR (FLD (f_rs)), 0)) { SI opval = ADDSI (pc, 8); SET_H_GR (((UINT) 31), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1255,7 +1255,7 @@ if (GESI (GET_H_GR (FLD (f_rs)), 0)) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -1285,7 +1285,7 @@ if (LTSI (GET_H_GR (FLD (f_rs)), 0)) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1312,7 +1312,7 @@ if (LTSI (GET_H_GR (FLD (f_rs)), 0)) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -1342,14 +1342,14 @@ if (LTSI (GET_H_GR (FLD (f_rs)), 0)) { SI opval = ADDSI (pc, 8); SET_H_GR (((UINT) 31), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1377,14 +1377,14 @@ if (LTSI (GET_H_GR (FLD (f_rs)), 0)) { SI opval = ADDSI (pc, 8); SET_H_GR (((UINT) 31), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1415,7 +1415,7 @@ if (EQSI (ANDSI (GET_H_GR (FLD (f_rs)), 255), ANDSI (GET_H_GR (FLD (f_rt)), 255) USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1442,7 +1442,7 @@ if (EQSI (ANDSI (GET_H_GR (FLD (f_rs)), 65280), ANDSI (GET_H_GR (FLD (f_rt)), 65 USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1469,7 +1469,7 @@ if (EQSI (ANDSI (GET_H_GR (FLD (f_rs)), 16711680), ANDSI (GET_H_GR (FLD (f_rt)), USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1496,7 +1496,7 @@ if (EQSI (ANDSI (GET_H_GR (FLD (f_rs)), 0xff000000), ANDSI (GET_H_GR (FLD (f_rt) USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1523,7 +1523,7 @@ if (NESI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1550,7 +1550,7 @@ if (NESI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -1579,12 +1579,12 @@ if (1) { SI opval = ADDSI (pc, 8); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = GET_H_GR (FLD (f_rs)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1608,7 +1608,7 @@ if (1) { USI opval = GET_H_GR (FLD (f_rs)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1629,7 +1629,7 @@ if (1) { SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))))); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1648,7 +1648,7 @@ if (1) { SI opval = ZEXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))))); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1667,7 +1667,7 @@ if (1) { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))))); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1686,7 +1686,7 @@ if (1) { SI opval = ZEXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))))); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1705,7 +1705,7 @@ if (1) { SI opval = SLLSI (FLD (f_imm), 16); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1724,7 +1724,7 @@ if (1) { SI opval = GETMEMSI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm))))); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1743,7 +1743,7 @@ if (1) { QI opval = ANDQI (GET_H_GR (FLD (f_rt)), 255); SETMEMQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -1762,7 +1762,7 @@ if (1) { HI opval = ANDHI (GET_H_GR (FLD (f_rt)), 65535); SETMEMHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -1781,7 +1781,7 @@ if (1) { SI opval = GET_H_GR (FLD (f_rt)); SETMEMSI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -1830,7 +1830,7 @@ do_syscall (current_cpu); { SI opval = ANDSI (GET_H_GR (FLD (f_rs)), ORSI (SLLSI (FLD (f_imm), 16), 65535)); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1849,7 +1849,7 @@ do_syscall (current_cpu); { SI opval = ORSI (GET_H_GR (FLD (f_rs)), SLLSI (FLD (f_imm), 16)); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1872,7 +1872,7 @@ if (GTSI (GET_H_GR (FLD (f_rs)), 0)) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1899,7 +1899,7 @@ if (GTSI (GET_H_GR (FLD (f_rs)), 0)) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -1929,7 +1929,7 @@ if (LESI (GET_H_GR (FLD (f_rs)), 0)) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1956,7 +1956,7 @@ if (LESI (GET_H_GR (FLD (f_rs)), 0)) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -2004,7 +2004,7 @@ if (NOTSI (ANDSI (FLD (f_mask), SLLSI (1, 3)))) { { SI opval = tmp_temp; SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -3112,12 +3112,12 @@ if (NOTSI (ANDSI (FLD (f_mask), SLLSI (1, 3)))) { { SI opval = GETMEMSI (current_cpu, pc, tmp_addr); SET_H_GR (ADDSI (FLD (f_rt), 1), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = GETMEMSI (current_cpu, pc, ADDSI (tmp_addr, 4)); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -3140,12 +3140,12 @@ if (NOTSI (ANDSI (FLD (f_mask), SLLSI (1, 3)))) { { SI opval = GET_H_GR (FLD (f_rt)); SETMEMSI (current_cpu, pc, ADDSI (tmp_addr, 4), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = GET_H_GR (ADDSI (FLD (f_rt), 1)); SETMEMSI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } @@ -3167,7 +3167,7 @@ if (NOTSI (ANDSI (FLD (f_mask), SLLSI (1, 3)))) { { USI opval = FLD (i_jmptarg); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -3191,12 +3191,12 @@ if (NOTSI (ANDSI (FLD (f_mask), SLLSI (1, 3)))) { { SI opval = ADDSI (pc, 8); SET_H_GR (((UINT) 31), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_jmptarg); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -3237,7 +3237,7 @@ if (tmp_branch_) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } diff --git a/sim/iq2000/sem.c b/sim/iq2000/sem.c index ba069c6..446d8ac 100644 --- a/sim/iq2000/sem.c +++ b/sim/iq2000/sem.c @@ -36,8 +36,8 @@ This file is part of the GNU simulators. FAST_P, when desired, is defined on the command line, -DFAST_P=1. */ #if FAST_P #define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_semf_,fn) -#undef TRACE_RESULT -#define TRACE_RESULT(cpu, abuf, name, type, val) +#undef CGEN_TRACE_RESULT +#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val) #else #define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_sem_,fn) #endif @@ -210,7 +210,7 @@ SEM_FN_NAME (iq2000bf,add) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -231,7 +231,7 @@ SEM_FN_NAME (iq2000bf,addi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -252,7 +252,7 @@ SEM_FN_NAME (iq2000bf,addiu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -273,7 +273,7 @@ SEM_FN_NAME (iq2000bf,addu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -299,7 +299,7 @@ SEM_FN_NAME (iq2000bf,ado16) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (SLLSI (tmp_high, 16), tmp_low); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -321,7 +321,7 @@ SEM_FN_NAME (iq2000bf,and) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ANDSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -342,7 +342,7 @@ SEM_FN_NAME (iq2000bf,andi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ANDSI (GET_H_GR (FLD (f_rs)), ZEXTSISI (FLD (f_imm))); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -363,7 +363,7 @@ SEM_FN_NAME (iq2000bf,andoi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ANDSI (GET_H_GR (FLD (f_rs)), ORSI (0xffff0000, EXTHISI (TRUNCSIHI (FLD (f_imm))))); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -384,7 +384,7 @@ SEM_FN_NAME (iq2000bf,nor) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = INVSI (ORSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -405,7 +405,7 @@ SEM_FN_NAME (iq2000bf,or) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -426,7 +426,7 @@ SEM_FN_NAME (iq2000bf,ori) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (GET_H_GR (FLD (f_rs)), ZEXTSISI (FLD (f_imm))); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -448,17 +448,17 @@ SEM_FN_NAME (iq2000bf,ram) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = RORSI (GET_H_GR (FLD (f_rt)), FLD (f_shamt)); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = ANDSI (GET_H_GR (FLD (f_rd)), SRLSI (0xffffffff, FLD (f_maskl))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = ANDSI (GET_H_GR (FLD (f_rd)), SLLSI (0xffffffff, FLD (f_rs))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -480,7 +480,7 @@ SEM_FN_NAME (iq2000bf,sll) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SLLSI (GET_H_GR (FLD (f_rt)), FLD (f_shamt)); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -501,7 +501,7 @@ SEM_FN_NAME (iq2000bf,sllv) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SLLSI (GET_H_GR (FLD (f_rt)), ANDSI (GET_H_GR (FLD (f_rs)), 31)); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -522,7 +522,7 @@ SEM_FN_NAME (iq2000bf,slmv) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ANDSI (SLLSI (GET_H_GR (FLD (f_rt)), FLD (f_shamt)), SRLSI (0xffffffff, GET_H_GR (FLD (f_rs)))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -545,14 +545,14 @@ if (LTSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) { SI opval = 1; SET_H_GR (FLD (f_rd), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else { { SI opval = 0; SET_H_GR (FLD (f_rd), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -577,14 +577,14 @@ if (LTSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm))))) { SI opval = 1; SET_H_GR (FLD (f_rt), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else { { SI opval = 0; SET_H_GR (FLD (f_rt), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -609,14 +609,14 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm))))) { SI opval = 1; SET_H_GR (FLD (f_rt), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else { { SI opval = 0; SET_H_GR (FLD (f_rt), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -641,14 +641,14 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) { SI opval = 1; SET_H_GR (FLD (f_rd), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } else { { SI opval = 0; SET_H_GR (FLD (f_rd), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -671,7 +671,7 @@ SEM_FN_NAME (iq2000bf,sra) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRASI (GET_H_GR (FLD (f_rt)), FLD (f_shamt)); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -692,7 +692,7 @@ SEM_FN_NAME (iq2000bf,srav) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRASI (GET_H_GR (FLD (f_rt)), ANDSI (GET_H_GR (FLD (f_rs)), 31)); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -713,7 +713,7 @@ SEM_FN_NAME (iq2000bf,srl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRLSI (GET_H_GR (FLD (f_rt)), FLD (f_shamt)); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -734,7 +734,7 @@ SEM_FN_NAME (iq2000bf,srlv) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRLSI (GET_H_GR (FLD (f_rt)), ANDSI (GET_H_GR (FLD (f_rs)), 31)); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -755,7 +755,7 @@ SEM_FN_NAME (iq2000bf,srmv) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ANDSI (SRLSI (GET_H_GR (FLD (f_rt)), FLD (f_shamt)), SLLSI (0xffffffff, GET_H_GR (FLD (f_rs)))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -776,7 +776,7 @@ SEM_FN_NAME (iq2000bf,sub) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -797,7 +797,7 @@ SEM_FN_NAME (iq2000bf,subu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -818,7 +818,7 @@ SEM_FN_NAME (iq2000bf,xor) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = XORSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt))); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -839,7 +839,7 @@ SEM_FN_NAME (iq2000bf,xori) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = XORSI (GET_H_GR (FLD (f_rs)), ZEXTSISI (FLD (f_imm))); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -864,7 +864,7 @@ if (ANDSI (GET_H_GR (FLD (f_rs)), SLLSI (1, FLD (f_rt)))) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -893,7 +893,7 @@ if (NOTSI (ANDSI (GET_H_GR (FLD (f_rs)), SLLSI (1, FLD (f_rt))))) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -922,7 +922,7 @@ if (ANDSI (GET_H_GR (FLD (f_rs)), SLLSI (1, ANDSI (GET_H_GR (FLD (f_rt)), 31)))) USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -951,7 +951,7 @@ if (NOTSI (ANDSI (GET_H_GR (FLD (f_rs)), SLLSI (1, ANDSI (GET_H_GR (FLD (f_rt)), USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -980,7 +980,7 @@ if (EQSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1009,7 +1009,7 @@ if (EQSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -1041,7 +1041,7 @@ if (GESI (GET_H_GR (FLD (f_rs)), 0)) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1070,14 +1070,14 @@ if (GESI (GET_H_GR (FLD (f_rs)), 0)) { SI opval = ADDSI (pc, 8); SET_H_GR (((UINT) 31), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1107,14 +1107,14 @@ if (GESI (GET_H_GR (FLD (f_rs)), 0)) { SI opval = ADDSI (pc, 8); SET_H_GR (((UINT) 31), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1147,7 +1147,7 @@ if (GESI (GET_H_GR (FLD (f_rs)), 0)) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -1179,7 +1179,7 @@ if (LTSI (GET_H_GR (FLD (f_rs)), 0)) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1208,7 +1208,7 @@ if (LTSI (GET_H_GR (FLD (f_rs)), 0)) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -1240,14 +1240,14 @@ if (LTSI (GET_H_GR (FLD (f_rs)), 0)) { SI opval = ADDSI (pc, 8); SET_H_GR (((UINT) 31), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1277,14 +1277,14 @@ if (LTSI (GET_H_GR (FLD (f_rs)), 0)) { SI opval = ADDSI (pc, 8); SET_H_GR (((UINT) 31), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1317,7 +1317,7 @@ if (EQSI (ANDSI (GET_H_GR (FLD (f_rs)), 255), ANDSI (GET_H_GR (FLD (f_rt)), 255) USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1346,7 +1346,7 @@ if (EQSI (ANDSI (GET_H_GR (FLD (f_rs)), 65280), ANDSI (GET_H_GR (FLD (f_rt)), 65 USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1375,7 +1375,7 @@ if (EQSI (ANDSI (GET_H_GR (FLD (f_rs)), 16711680), ANDSI (GET_H_GR (FLD (f_rt)), USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1404,7 +1404,7 @@ if (EQSI (ANDSI (GET_H_GR (FLD (f_rs)), 0xff000000), ANDSI (GET_H_GR (FLD (f_rt) USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1433,7 +1433,7 @@ if (NESI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1462,7 +1462,7 @@ if (NESI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -1493,12 +1493,12 @@ SEM_FN_NAME (iq2000bf,jalr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (pc, 8); SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = GET_H_GR (FLD (f_rs)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1524,7 +1524,7 @@ SEM_FN_NAME (iq2000bf,jr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { USI opval = GET_H_GR (FLD (f_rs)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1547,7 +1547,7 @@ SEM_FN_NAME (iq2000bf,lb) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))))); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1568,7 +1568,7 @@ SEM_FN_NAME (iq2000bf,lbu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ZEXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))))); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1589,7 +1589,7 @@ SEM_FN_NAME (iq2000bf,lh) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))))); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1610,7 +1610,7 @@ SEM_FN_NAME (iq2000bf,lhu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ZEXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))))); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1631,7 +1631,7 @@ SEM_FN_NAME (iq2000bf,lui) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SLLSI (FLD (f_imm), 16); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1652,7 +1652,7 @@ SEM_FN_NAME (iq2000bf,lw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMSI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm))))); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1673,7 +1673,7 @@ SEM_FN_NAME (iq2000bf,sb) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { QI opval = ANDQI (GET_H_GR (FLD (f_rt)), 255); SETMEMQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -1694,7 +1694,7 @@ SEM_FN_NAME (iq2000bf,sh) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { HI opval = ANDHI (GET_H_GR (FLD (f_rt)), 65535); SETMEMHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -1715,7 +1715,7 @@ SEM_FN_NAME (iq2000bf,sw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GET_H_GR (FLD (f_rt)); SETMEMSI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -1770,7 +1770,7 @@ SEM_FN_NAME (iq2000bf,andoui) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ANDSI (GET_H_GR (FLD (f_rs)), ORSI (SLLSI (FLD (f_imm), 16), 65535)); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1791,7 +1791,7 @@ SEM_FN_NAME (iq2000bf,orui) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (GET_H_GR (FLD (f_rs)), SLLSI (FLD (f_imm), 16)); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1816,7 +1816,7 @@ if (GTSI (GET_H_GR (FLD (f_rs)), 0)) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1845,7 +1845,7 @@ if (GTSI (GET_H_GR (FLD (f_rs)), 0)) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -1877,7 +1877,7 @@ if (LESI (GET_H_GR (FLD (f_rs)), 0)) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1906,7 +1906,7 @@ if (LESI (GET_H_GR (FLD (f_rs)), 0)) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } else { @@ -1956,7 +1956,7 @@ if (NOTSI (ANDSI (FLD (f_mask), SLLSI (1, 3)))) { { SI opval = tmp_temp; SET_H_GR (FLD (f_rd), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -3208,12 +3208,12 @@ SEM_FN_NAME (iq2000bf,ldw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMSI (current_cpu, pc, tmp_addr); SET_H_GR (ADDSI (FLD (f_rt), 1), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = GETMEMSI (current_cpu, pc, ADDSI (tmp_addr, 4)); SET_H_GR (FLD (f_rt), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -3238,12 +3238,12 @@ SEM_FN_NAME (iq2000bf,sdw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GET_H_GR (FLD (f_rt)); SETMEMSI (current_cpu, pc, ADDSI (tmp_addr, 4), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = GET_H_GR (ADDSI (FLD (f_rt), 1)); SETMEMSI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } @@ -3267,7 +3267,7 @@ SEM_FN_NAME (iq2000bf,j) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { USI opval = FLD (i_jmptarg); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -3293,12 +3293,12 @@ SEM_FN_NAME (iq2000bf,jal) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (pc, 8); SET_H_GR (((UINT) 31), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_jmptarg); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -3341,7 +3341,7 @@ if (tmp_branch_) { USI opval = FLD (i_offset); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog index 4cb55c5..bd5760a 100644 --- a/sim/lm32/ChangeLog +++ b/sim/lm32/ChangeLog @@ -1,3 +1,11 @@ +2015-06-12 Mike Frysinger <vapier@gentoo.org> + + * decode.c (lm32bf_decode): Change TRACE_EXTRACT to CGEN_TRACE_EXTRACT. + * mloop.in (execute): Change TRACE_INSN_INIT to CGEN_TRACE_INSN_INIT, + TRACE_INSN to CGEN_TRACE_INSN, and TRACE_INSN_FINI to CGEN_TRACE_INSN_FINI. + * sem.c: Rename TRACE_RESULT to CGEN_TRACE_RESULT. + * sem-switch.c: Likewise. + 2015-04-18 Mike Frysinger <vapier@gentoo.org> * sim-main.h (SIM_ENGINE_HALT_HOOK, SIM_ENGINE_RESTART_HOOK): Delete. diff --git a/sim/lm32/decode.c b/sim/lm32/decode.c index 0900dca..097ead3 100644 --- a/sim/lm32/decode.c +++ b/sim/lm32/decode.c @@ -352,7 +352,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0)); #undef FLD return idesc; @@ -375,7 +375,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r0) = f_r0; FLD (f_r1) = f_r1; FLD (f_r2) = f_r2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add", "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add", "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, (char *) 0)); #undef FLD return idesc; @@ -398,7 +398,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_imm) = f_imm; FLD (f_r0) = f_r0; FLD (f_r1) = f_r1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi", "f_imm 0x%x", 'x', f_imm, "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi", "f_imm 0x%x", 'x', f_imm, "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, (char *) 0)); #undef FLD return idesc; @@ -421,7 +421,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r0) = f_r0; FLD (f_uimm) = f_uimm; FLD (f_r1) = f_r1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andi", "f_r0 0x%x", 'x', f_r0, "f_uimm 0x%x", 'x', f_uimm, "f_r1 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andi", "f_r0 0x%x", 'x', f_r0, "f_uimm 0x%x", 'x', f_uimm, "f_r1 0x%x", 'x', f_r1, (char *) 0)); #undef FLD return idesc; @@ -444,7 +444,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_uimm) = f_uimm; FLD (f_r0) = f_r0; FLD (f_r1) = f_r1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andhii", "f_uimm 0x%x", 'x', f_uimm, "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andhii", "f_uimm 0x%x", 'x', f_uimm, "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, (char *) 0)); #undef FLD return idesc; @@ -461,7 +461,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_r0) = f_r0; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_b", "f_r0 0x%x", 'x', f_r0, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_b", "f_r0 0x%x", 'x', f_r0, (char *) 0)); #undef FLD return idesc; @@ -478,7 +478,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_call) = f_call; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bi", "call 0x%x", 'x', f_call, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bi", "call 0x%x", 'x', f_call, (char *) 0)); #undef FLD return idesc; @@ -501,7 +501,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r0) = f_r0; FLD (f_r1) = f_r1; FLD (i_branch) = f_branch; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_be", "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, "branch 0x%x", 'x', f_branch, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_be", "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, "branch 0x%x", 'x', f_branch, (char *) 0)); #undef FLD return idesc; @@ -518,7 +518,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_r0) = f_r0; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_call", "f_r0 0x%x", 'x', f_r0, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_call", "f_r0 0x%x", 'x', f_r0, (char *) 0)); #undef FLD return idesc; @@ -535,7 +535,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_call) = f_call; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_calli", "call 0x%x", 'x', f_call, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_calli", "call 0x%x", 'x', f_call, (char *) 0)); #undef FLD return idesc; @@ -558,7 +558,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r0) = f_r0; FLD (f_r1) = f_r1; FLD (f_r2) = f_r2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_divu", "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_divu", "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, (char *) 0)); #undef FLD return idesc; @@ -581,7 +581,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_imm) = f_imm; FLD (f_r0) = f_r0; FLD (f_r1) = f_r1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lb", "f_imm 0x%x", 'x', f_imm, "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lb", "f_imm 0x%x", 'x', f_imm, "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, (char *) 0)); #undef FLD return idesc; @@ -604,7 +604,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_imm) = f_imm; FLD (f_r0) = f_r0; FLD (f_r1) = f_r1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lh", "f_imm 0x%x", 'x', f_imm, "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lh", "f_imm 0x%x", 'x', f_imm, "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, (char *) 0)); #undef FLD return idesc; @@ -627,7 +627,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_imm) = f_imm; FLD (f_r0) = f_r0; FLD (f_r1) = f_r1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lw", "f_imm 0x%x", 'x', f_imm, "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lw", "f_imm 0x%x", 'x', f_imm, "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, (char *) 0)); #undef FLD return idesc; @@ -650,7 +650,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_uimm) = f_uimm; FLD (f_r0) = f_r0; FLD (f_r1) = f_r1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ori", "f_uimm 0x%x", 'x', f_uimm, "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ori", "f_uimm 0x%x", 'x', f_uimm, "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, (char *) 0)); #undef FLD return idesc; @@ -670,7 +670,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_csr) = f_csr; FLD (f_r2) = f_r2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rcsr", "f_csr 0x%x", 'x', f_csr, "f_r2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rcsr", "f_csr 0x%x", 'x', f_csr, "f_r2 0x%x", 'x', f_r2, (char *) 0)); #undef FLD return idesc; @@ -693,7 +693,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_imm) = f_imm; FLD (f_r0) = f_r0; FLD (f_r1) = f_r1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sb", "f_imm 0x%x", 'x', f_imm, "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sb", "f_imm 0x%x", 'x', f_imm, "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, (char *) 0)); #undef FLD return idesc; @@ -713,7 +713,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_r0) = f_r0; FLD (f_r2) = f_r2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sextb", "f_r0 0x%x", 'x', f_r0, "f_r2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sextb", "f_r0 0x%x", 'x', f_r0, "f_r2 0x%x", 'x', f_r2, (char *) 0)); #undef FLD return idesc; @@ -736,7 +736,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_imm) = f_imm; FLD (f_r0) = f_r0; FLD (f_r1) = f_r1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sh", "f_imm 0x%x", 'x', f_imm, "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sh", "f_imm 0x%x", 'x', f_imm, "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, (char *) 0)); #undef FLD return idesc; @@ -759,7 +759,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_imm) = f_imm; FLD (f_r0) = f_r0; FLD (f_r1) = f_r1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sw", "f_imm 0x%x", 'x', f_imm, "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sw", "f_imm 0x%x", 'x', f_imm, "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, (char *) 0)); #undef FLD return idesc; @@ -785,7 +785,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (f_user) = f_user; FLD (f_r2) = f_r2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_user", "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, "f_user 0x%x", 'x', f_user, "f_r2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_user", "f_r0 0x%x", 'x', f_r0, "f_r1 0x%x", 'x', f_r1, "f_user 0x%x", 'x', f_user, "f_r2 0x%x", 'x', f_r2, (char *) 0)); #undef FLD return idesc; @@ -805,7 +805,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_csr) = f_csr; FLD (f_r1) = f_r1; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_wcsr", "f_csr 0x%x", 'x', f_csr, "f_r1 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_wcsr", "f_csr 0x%x", 'x', f_csr, "f_r1 0x%x", 'x', f_r1, (char *) 0)); #undef FLD return idesc; @@ -818,7 +818,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_break", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_break", (char *) 0)); #undef FLD return idesc; diff --git a/sim/lm32/mloop.in b/sim/lm32/mloop.in index 54f433c..a8db7f5 100644 --- a/sim/lm32/mloop.in +++ b/sim/lm32/mloop.in @@ -86,8 +86,8 @@ execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p) if (PROFILE_MODEL_P (current_cpu) && ARGBUF_PROFILE_P (abuf)) @cpu@_model_insn_before (current_cpu, 1 /*first_p*/); - TRACE_INSN_INIT (current_cpu, abuf, 1); - TRACE_INSN (current_cpu, idata, + CGEN_TRACE_INSN_INIT (current_cpu, abuf, 1); + CGEN_TRACE_INSN (current_cpu, idata, (const struct argbuf *) abuf, abuf->addr); } #if WITH_SCACHE @@ -106,7 +106,7 @@ execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p) cycles = (*idesc->timing->model_fn) (current_cpu, sc); @cpu@_model_insn_after (current_cpu, 1 /*last_p*/, cycles); } - TRACE_INSN_FINI (current_cpu, abuf, 1); + CGEN_TRACE_INSN_FINI (current_cpu, abuf, 1); } #else abort (); diff --git a/sim/lm32/sem-switch.c b/sim/lm32/sem-switch.c index 7b658df..e1eace8 100644 --- a/sim/lm32/sem-switch.c +++ b/sim/lm32/sem-switch.c @@ -119,13 +119,13 @@ This file is part of the GNU simulators. /* If hyper-fast [well not unnecessarily slow] execution is selected, turn off frills like tracing and profiling. */ -/* FIXME: A better way would be to have TRACE_RESULT check for something +/* FIXME: A better way would be to have CGEN_TRACE_RESULT check for something that can cause it to be optimized out. Another way would be to emit special handlers into the instruction "stream". */ #if FAST_P -#undef TRACE_RESULT -#define TRACE_RESULT(cpu, abuf, name, type, val) +#undef CGEN_TRACE_RESULT +#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val) #endif #undef GET_ATTR @@ -310,7 +310,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ADDSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -329,7 +329,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ADDSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -348,7 +348,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ANDSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -367,7 +367,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ANDSI (CPU (h_gr[FLD (f_r0)]), ZEXTSISI (FLD (f_uimm))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -386,7 +386,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ANDSI (CPU (h_gr[FLD (f_r0)]), SLLSI (FLD (f_uimm), 16)); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -406,7 +406,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { USI opval = lm32bf_b_insn (current_cpu, CPU (h_gr[FLD (f_r0)]), FLD (f_r0)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -427,7 +427,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { USI opval = EXTSISI (FLD (i_call)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -450,7 +450,7 @@ if (EQSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { USI opval = FLD (i_branch); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -475,7 +475,7 @@ if (GTSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { USI opval = FLD (i_branch); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -500,7 +500,7 @@ if (GESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { USI opval = FLD (i_branch); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -525,7 +525,7 @@ if (GEUSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { USI opval = FLD (i_branch); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -550,7 +550,7 @@ if (GTUSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { USI opval = FLD (i_branch); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -575,7 +575,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { USI opval = FLD (i_branch); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -599,12 +599,12 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = ADDSI (pc, 4); CPU (h_gr[((UINT) 29)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = CPU (h_gr[FLD (f_r0)]); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -627,12 +627,12 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = ADDSI (pc, 4); CPU (h_gr[((UINT) 29)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = EXTSISI (FLD (i_call)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -653,7 +653,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = EQSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -672,7 +672,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = EQSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -691,7 +691,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = GTSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -710,7 +710,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = GTSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -729,7 +729,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = GESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -748,7 +748,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = GESI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -767,7 +767,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = GEUSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -786,7 +786,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = GEUSI (CPU (h_gr[FLD (f_r0)]), ZEXTSISI (FLD (f_uimm))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -805,7 +805,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = GTUSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -824,7 +824,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = GTUSI (CPU (h_gr[FLD (f_r0)]), ZEXTSISI (FLD (f_uimm))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -843,7 +843,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -862,7 +862,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = NESI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -882,7 +882,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { USI opval = lm32bf_divu_insn (current_cpu, pc, FLD (f_r0), FLD (f_r1), FLD (f_r2)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -902,7 +902,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -921,7 +921,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = ZEXTQISI (GETMEMQI (current_cpu, pc, ADDSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -940,7 +940,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -959,7 +959,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = ZEXTHISI (GETMEMHI (current_cpu, pc, ADDSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -978,7 +978,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = GETMEMSI (current_cpu, pc, ADDSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm))))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -998,7 +998,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { USI opval = lm32bf_modu_insn (current_cpu, pc, FLD (f_r0), FLD (f_r1), FLD (f_r2)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -1018,7 +1018,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = MULSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1037,7 +1037,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = MULSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1056,7 +1056,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = INVSI (ORSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1075,7 +1075,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = INVSI (ORSI (CPU (h_gr[FLD (f_r0)]), ZEXTSISI (FLD (f_uimm)))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1094,7 +1094,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = ORSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1113,7 +1113,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = ORSI (CPU (h_gr[FLD (f_r0)]), ZEXTSISI (FLD (f_uimm))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1132,7 +1132,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = ORSI (CPU (h_gr[FLD (f_r0)]), SLLSI (FLD (f_uimm), 16)); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1151,7 +1151,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = CPU (h_csr[FLD (f_csr)]); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1170,7 +1170,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { QI opval = CPU (h_gr[FLD (f_r1)]); SETMEMQI (current_cpu, pc, ADDSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -1189,7 +1189,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = EXTQISI (TRUNCSIQI (CPU (h_gr[FLD (f_r0)]))); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1208,7 +1208,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = EXTHISI (TRUNCSIHI (CPU (h_gr[FLD (f_r0)]))); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1227,7 +1227,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { HI opval = CPU (h_gr[FLD (f_r1)]); SETMEMHI (current_cpu, pc, ADDSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -1246,7 +1246,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = SLLSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1265,7 +1265,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = SLLSI (CPU (h_gr[FLD (f_r0)]), FLD (f_imm)); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1284,7 +1284,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = SRASI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1303,7 +1303,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = SRASI (CPU (h_gr[FLD (f_r0)]), FLD (f_imm)); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1322,7 +1322,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = SRLSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1341,7 +1341,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = SRLSI (CPU (h_gr[FLD (f_r0)]), FLD (f_imm)); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1360,7 +1360,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = SUBSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1379,7 +1379,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = CPU (h_gr[FLD (f_r1)]); SETMEMSI (current_cpu, pc, ADDSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -1398,7 +1398,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { { SI opval = lm32bf_user_insn (current_cpu, CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]), FLD (f_user)); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1432,7 +1432,7 @@ lm32bf_wcsr_insn (current_cpu, FLD (f_csr), CPU (h_gr[FLD (f_r1)])); { SI opval = XORSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1451,7 +1451,7 @@ lm32bf_wcsr_insn (current_cpu, FLD (f_csr), CPU (h_gr[FLD (f_r1)])); { SI opval = XORSI (CPU (h_gr[FLD (f_r0)]), ZEXTSISI (FLD (f_uimm))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1470,7 +1470,7 @@ lm32bf_wcsr_insn (current_cpu, FLD (f_csr), CPU (h_gr[FLD (f_r1)])); { SI opval = INVSI (XORSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1489,7 +1489,7 @@ lm32bf_wcsr_insn (current_cpu, FLD (f_csr), CPU (h_gr[FLD (f_r1)])); { SI opval = INVSI (XORSI (CPU (h_gr[FLD (f_r0)]), ZEXTSISI (FLD (f_uimm)))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1509,7 +1509,7 @@ lm32bf_wcsr_insn (current_cpu, FLD (f_csr), CPU (h_gr[FLD (f_r1)])); { USI opval = lm32bf_break_insn (current_cpu, pc); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -1530,7 +1530,7 @@ lm32bf_wcsr_insn (current_cpu, FLD (f_csr), CPU (h_gr[FLD (f_r1)])); { USI opval = lm32bf_scall_insn (current_cpu, pc); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); diff --git a/sim/lm32/sem.c b/sim/lm32/sem.c index d350521..451f9d3 100644 --- a/sim/lm32/sem.c +++ b/sim/lm32/sem.c @@ -36,8 +36,8 @@ This file is part of the GNU simulators. FAST_P, when desired, is defined on the command line, -DFAST_P=1. */ #if FAST_P #define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_semf_,fn) -#undef TRACE_RESULT -#define TRACE_RESULT(cpu, abuf, name, type, val) +#undef CGEN_TRACE_RESULT +#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val) #else #define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_sem_,fn) #endif @@ -210,7 +210,7 @@ SEM_FN_NAME (lm32bf,add) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -231,7 +231,7 @@ SEM_FN_NAME (lm32bf,addi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -252,7 +252,7 @@ SEM_FN_NAME (lm32bf,and) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ANDSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -273,7 +273,7 @@ SEM_FN_NAME (lm32bf,andi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ANDSI (CPU (h_gr[FLD (f_r0)]), ZEXTSISI (FLD (f_uimm))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -294,7 +294,7 @@ SEM_FN_NAME (lm32bf,andhii) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ANDSI (CPU (h_gr[FLD (f_r0)]), SLLSI (FLD (f_uimm), 16)); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -316,7 +316,7 @@ SEM_FN_NAME (lm32bf,b) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { USI opval = lm32bf_b_insn (current_cpu, CPU (h_gr[FLD (f_r0)]), FLD (f_r0)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -339,7 +339,7 @@ SEM_FN_NAME (lm32bf,bi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { USI opval = EXTSISI (FLD (i_call)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -364,7 +364,7 @@ if (EQSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { USI opval = FLD (i_branch); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -391,7 +391,7 @@ if (GTSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { USI opval = FLD (i_branch); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -418,7 +418,7 @@ if (GESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { USI opval = FLD (i_branch); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -445,7 +445,7 @@ if (GEUSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { USI opval = FLD (i_branch); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -472,7 +472,7 @@ if (GTUSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { USI opval = FLD (i_branch); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -499,7 +499,7 @@ if (NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))) { USI opval = FLD (i_branch); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -525,12 +525,12 @@ SEM_FN_NAME (lm32bf,call) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (pc, 4); CPU (h_gr[((UINT) 29)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = CPU (h_gr[FLD (f_r0)]); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -555,12 +555,12 @@ SEM_FN_NAME (lm32bf,calli) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (pc, 4); CPU (h_gr[((UINT) 29)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = EXTSISI (FLD (i_call)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -583,7 +583,7 @@ SEM_FN_NAME (lm32bf,cmpe) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EQSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -604,7 +604,7 @@ SEM_FN_NAME (lm32bf,cmpei) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EQSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -625,7 +625,7 @@ SEM_FN_NAME (lm32bf,cmpg) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GTSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -646,7 +646,7 @@ SEM_FN_NAME (lm32bf,cmpgi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GTSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -667,7 +667,7 @@ SEM_FN_NAME (lm32bf,cmpge) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -688,7 +688,7 @@ SEM_FN_NAME (lm32bf,cmpgei) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GESI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -709,7 +709,7 @@ SEM_FN_NAME (lm32bf,cmpgeu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GEUSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -730,7 +730,7 @@ SEM_FN_NAME (lm32bf,cmpgeui) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GEUSI (CPU (h_gr[FLD (f_r0)]), ZEXTSISI (FLD (f_uimm))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -751,7 +751,7 @@ SEM_FN_NAME (lm32bf,cmpgu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GTUSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -772,7 +772,7 @@ SEM_FN_NAME (lm32bf,cmpgui) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GTUSI (CPU (h_gr[FLD (f_r0)]), ZEXTSISI (FLD (f_uimm))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -793,7 +793,7 @@ SEM_FN_NAME (lm32bf,cmpne) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = NESI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -814,7 +814,7 @@ SEM_FN_NAME (lm32bf,cmpnei) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = NESI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -836,7 +836,7 @@ SEM_FN_NAME (lm32bf,divu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { USI opval = lm32bf_divu_insn (current_cpu, pc, FLD (f_r0), FLD (f_r1), FLD (f_r2)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -858,7 +858,7 @@ SEM_FN_NAME (lm32bf,lb) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -879,7 +879,7 @@ SEM_FN_NAME (lm32bf,lbu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ZEXTQISI (GETMEMQI (current_cpu, pc, ADDSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -900,7 +900,7 @@ SEM_FN_NAME (lm32bf,lh) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -921,7 +921,7 @@ SEM_FN_NAME (lm32bf,lhu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ZEXTHISI (GETMEMHI (current_cpu, pc, ADDSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -942,7 +942,7 @@ SEM_FN_NAME (lm32bf,lw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMSI (current_cpu, pc, ADDSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm))))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -964,7 +964,7 @@ SEM_FN_NAME (lm32bf,modu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { USI opval = lm32bf_modu_insn (current_cpu, pc, FLD (f_r0), FLD (f_r1), FLD (f_r2)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -986,7 +986,7 @@ SEM_FN_NAME (lm32bf,mul) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = MULSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1007,7 +1007,7 @@ SEM_FN_NAME (lm32bf,muli) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = MULSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1028,7 +1028,7 @@ SEM_FN_NAME (lm32bf,nor) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = INVSI (ORSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1049,7 +1049,7 @@ SEM_FN_NAME (lm32bf,nori) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = INVSI (ORSI (CPU (h_gr[FLD (f_r0)]), ZEXTSISI (FLD (f_uimm)))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1070,7 +1070,7 @@ SEM_FN_NAME (lm32bf,or) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1091,7 +1091,7 @@ SEM_FN_NAME (lm32bf,ori) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (CPU (h_gr[FLD (f_r0)]), ZEXTSISI (FLD (f_uimm))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1112,7 +1112,7 @@ SEM_FN_NAME (lm32bf,orhii) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (CPU (h_gr[FLD (f_r0)]), SLLSI (FLD (f_uimm), 16)); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1133,7 +1133,7 @@ SEM_FN_NAME (lm32bf,rcsr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = CPU (h_csr[FLD (f_csr)]); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1154,7 +1154,7 @@ SEM_FN_NAME (lm32bf,sb) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { QI opval = CPU (h_gr[FLD (f_r1)]); SETMEMQI (current_cpu, pc, ADDSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -1175,7 +1175,7 @@ SEM_FN_NAME (lm32bf,sextb) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTQISI (TRUNCSIQI (CPU (h_gr[FLD (f_r0)]))); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1196,7 +1196,7 @@ SEM_FN_NAME (lm32bf,sexth) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTHISI (TRUNCSIHI (CPU (h_gr[FLD (f_r0)]))); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1217,7 +1217,7 @@ SEM_FN_NAME (lm32bf,sh) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { HI opval = CPU (h_gr[FLD (f_r1)]); SETMEMHI (current_cpu, pc, ADDSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -1238,7 +1238,7 @@ SEM_FN_NAME (lm32bf,sl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SLLSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1259,7 +1259,7 @@ SEM_FN_NAME (lm32bf,sli) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SLLSI (CPU (h_gr[FLD (f_r0)]), FLD (f_imm)); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1280,7 +1280,7 @@ SEM_FN_NAME (lm32bf,sr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRASI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1301,7 +1301,7 @@ SEM_FN_NAME (lm32bf,sri) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRASI (CPU (h_gr[FLD (f_r0)]), FLD (f_imm)); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1322,7 +1322,7 @@ SEM_FN_NAME (lm32bf,sru) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRLSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1343,7 +1343,7 @@ SEM_FN_NAME (lm32bf,srui) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRLSI (CPU (h_gr[FLD (f_r0)]), FLD (f_imm)); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1364,7 +1364,7 @@ SEM_FN_NAME (lm32bf,sub) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1385,7 +1385,7 @@ SEM_FN_NAME (lm32bf,sw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = CPU (h_gr[FLD (f_r1)]); SETMEMSI (current_cpu, pc, ADDSI (CPU (h_gr[FLD (f_r0)]), EXTHISI (TRUNCSIHI (FLD (f_imm)))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -1406,7 +1406,7 @@ SEM_FN_NAME (lm32bf,user) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = lm32bf_user_insn (current_cpu, CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]), FLD (f_user)); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1444,7 +1444,7 @@ SEM_FN_NAME (lm32bf,xor) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = XORSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)])); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1465,7 +1465,7 @@ SEM_FN_NAME (lm32bf,xori) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = XORSI (CPU (h_gr[FLD (f_r0)]), ZEXTSISI (FLD (f_uimm))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1486,7 +1486,7 @@ SEM_FN_NAME (lm32bf,xnor) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = INVSI (XORSI (CPU (h_gr[FLD (f_r0)]), CPU (h_gr[FLD (f_r1)]))); CPU (h_gr[FLD (f_r2)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1507,7 +1507,7 @@ SEM_FN_NAME (lm32bf,xnori) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = INVSI (XORSI (CPU (h_gr[FLD (f_r0)]), ZEXTSISI (FLD (f_uimm)))); CPU (h_gr[FLD (f_r1)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1529,7 +1529,7 @@ SEM_FN_NAME (lm32bf,break) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { USI opval = lm32bf_break_insn (current_cpu, pc); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -1552,7 +1552,7 @@ SEM_FN_NAME (lm32bf,scall) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { USI opval = lm32bf_scall_insn (current_cpu, pc); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index c85b181..ccd88a3 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/ChangeLog @@ -1,3 +1,15 @@ +2015-06-12 Mike Frysinger <vapier@gentoo.org> + + * decode.c (m32rbf_decode): Change TRACE_EXTRACT to CGEN_TRACE_EXTRACT. + * decode2.c (m32r2f_decode): Likewise. + * decodex.c (m32rxf_decode): Likewise. + * mloop.in (execute): Change TRACE_INSN_INIT to CGEN_TRACE_INSN_INIT, + TRACE_INSN to CGEN_TRACE_INSN, and TRACE_INSN_FINI to CGEN_TRACE_INSN_FINI. + * sem.c: Rename TRACE_RESULT to CGEN_TRACE_RESULT. + * sem-switch.c: Likewise. + * sem-switch2.c: Likewise. + * sem-switchx.c: Likewise. + 2015-04-18 Mike Frysinger <vapier@gentoo.org> * sim-main.h (SIM_ENGINE_HALT_HOOK, SIM_ENGINE_RESTART_HOOK): Delete. diff --git a/sim/m32r/decode.c b/sim/m32r/decode.c index 1274dec..3713e5d 100644 --- a/sim/m32r/decode.c +++ b/sim/m32r/decode.c @@ -577,7 +577,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0)); #undef FLD return idesc; @@ -599,7 +599,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_dr) = & CPU (h_gr)[f_r1]; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -633,7 +633,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add3", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add3", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -666,7 +666,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and3", "f_r2 0x%x", 'x', f_r2, "f_uimm16 0x%x", 'x', f_uimm16, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and3", "f_r2 0x%x", 'x', f_r2, "f_uimm16 0x%x", 'x', f_uimm16, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -699,7 +699,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_or3", "f_r2 0x%x", 'x', f_r2, "f_uimm16 0x%x", 'x', f_uimm16, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_or3", "f_r2 0x%x", 'x', f_r2, "f_uimm16 0x%x", 'x', f_uimm16, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -728,7 +728,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (f_simm8) = f_simm8; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi", "f_r1 0x%x", 'x', f_r1, "f_simm8 0x%x", 'x', f_simm8, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi", "f_r1 0x%x", 'x', f_r1, "f_simm8 0x%x", 'x', f_simm8, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -758,7 +758,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_dr) = & CPU (h_gr)[f_r1]; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addv", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addv", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -792,7 +792,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addv3", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addv3", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -822,7 +822,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_dr) = & CPU (h_gr)[f_r1]; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addx", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addx", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -848,7 +848,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp8) = f_disp8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bc8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bc8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -871,7 +871,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp24) = f_disp24; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bc24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bc24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -902,7 +902,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (i_disp16) = f_disp16; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beq", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beq", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -931,7 +931,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_disp16) = f_disp16; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beqz", "f_r2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beqz", "f_r2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -955,7 +955,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp8) = f_disp8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bl8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bl8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -979,7 +979,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp24) = f_disp24; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bl24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bl24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1003,7 +1003,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp8) = f_disp8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bra8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bra8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1026,7 +1026,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp24) = f_disp24; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bra24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bra24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1054,7 +1054,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1083,7 +1083,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_simm16) = f_simm16; FLD (f_r2) = f_r2; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpi", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpi", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1112,7 +1112,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_dr) = & CPU (h_gr)[f_r1]; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_div", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_div", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1139,7 +1139,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_r2) = f_r2; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jl", "f_r2 0x%x", 'x', f_r2, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jl", "f_r2 0x%x", 'x', f_r2, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1165,7 +1165,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_r2) = f_r2; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jmp", "f_r2 0x%x", 'x', f_r2, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jmp", "f_r2 0x%x", 'x', f_r2, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1194,7 +1194,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1227,7 +1227,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld_d", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld_d", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1257,7 +1257,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldb", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldb", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1290,7 +1290,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldb_d", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldb_d", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1320,7 +1320,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldh", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldh", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1353,7 +1353,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldh_d", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldh_d", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1383,7 +1383,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld_plus", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld_plus", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1413,7 +1413,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_uimm24) = f_uimm24; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld24", "f_r1 0x%x", 'x', f_r1, "uimm24 0x%x", 'x', f_uimm24, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld24", "f_r1 0x%x", 'x', f_r1, "uimm24 0x%x", 'x', f_uimm24, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1441,7 +1441,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_simm8) = f_simm8; FLD (f_r1) = f_r1; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldi8", "f_simm8 0x%x", 'x', f_simm8, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldi8", "f_simm8 0x%x", 'x', f_simm8, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1469,7 +1469,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_simm16) = f_simm16; FLD (f_r1) = f_r1; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldi16", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldi16", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1498,7 +1498,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lock", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lock", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1528,7 +1528,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_machi", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_machi", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1558,7 +1558,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mulhi", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mulhi", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1588,7 +1588,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mv", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mv", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1614,7 +1614,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_r1) = f_r1; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvfachi", "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvfachi", "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1642,7 +1642,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (f_r1) = f_r1; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvfc", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvfc", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1667,7 +1667,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_r1) = f_r1; FLD (i_src1) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvtachi", "f_r1 0x%x", 'x', f_r1, "src1 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvtachi", "f_r1 0x%x", 'x', f_r1, "src1 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1695,7 +1695,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvtc", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvtc", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1715,7 +1715,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nop", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nop", (char *) 0)); #undef FLD return idesc; @@ -1728,7 +1728,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rac", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rac", (char *) 0)); #undef FLD return idesc; @@ -1741,7 +1741,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rte", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rte", (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1768,7 +1768,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_hi16) = f_hi16; FLD (f_r1) = f_r1; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_seth", "f_hi16 0x%x", 'x', f_hi16, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_seth", "f_hi16 0x%x", 'x', f_hi16, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1800,7 +1800,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sll3", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sll3", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1829,7 +1829,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (f_uimm5) = f_uimm5; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_slli", "f_r1 0x%x", 'x', f_r1, "f_uimm5 0x%x", 'x', f_uimm5, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_slli", "f_r1 0x%x", 'x', f_r1, "f_uimm5 0x%x", 'x', f_uimm5, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1859,7 +1859,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_st", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_st", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1892,7 +1892,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_st_d", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_st_d", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1922,7 +1922,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1955,7 +1955,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb_d", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb_d", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1985,7 +1985,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sth", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sth", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2018,7 +2018,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sth_d", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sth_d", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2048,7 +2048,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_st_plus", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_st_plus", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2074,7 +2074,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_uimm4) = f_uimm4; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_trap", "f_uimm4 0x%x", 'x', f_uimm4, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_trap", "f_uimm4 0x%x", 'x', f_uimm4, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2102,7 +2102,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_unlock", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_unlock", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2127,7 +2127,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_uimm8) = f_uimm8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrpsw", "f_uimm8 0x%x", 'x', f_uimm8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrpsw", "f_uimm8 0x%x", 'x', f_uimm8, (char *) 0)); #undef FLD return idesc; @@ -2144,7 +2144,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_uimm8) = f_uimm8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_setpsw", "f_uimm8 0x%x", 'x', f_uimm8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_setpsw", "f_uimm8 0x%x", 'x', f_uimm8, (char *) 0)); #undef FLD return idesc; @@ -2168,7 +2168,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (f_uimm3) = f_uimm3; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bset", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_uimm3 0x%x", 'x', f_uimm3, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bset", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_uimm3 0x%x", 'x', f_uimm3, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2196,7 +2196,7 @@ m32rbf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (f_uimm3) = f_uimm3; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_btst", "f_r2 0x%x", 'x', f_r2, "f_uimm3 0x%x", 'x', f_uimm3, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_btst", "f_r2 0x%x", 'x', f_r2, "f_uimm3 0x%x", 'x', f_uimm3, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ diff --git a/sim/m32r/decode2.c b/sim/m32r/decode2.c index 5b8220d..62adb15 100644 --- a/sim/m32r/decode2.c +++ b/sim/m32r/decode2.c @@ -766,7 +766,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0)); #undef FLD return idesc; @@ -788,7 +788,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_dr) = & CPU (h_gr)[f_r1]; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -822,7 +822,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add3", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add3", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -855,7 +855,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and3", "f_r2 0x%x", 'x', f_r2, "f_uimm16 0x%x", 'x', f_uimm16, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and3", "f_r2 0x%x", 'x', f_r2, "f_uimm16 0x%x", 'x', f_uimm16, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -888,7 +888,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_or3", "f_r2 0x%x", 'x', f_r2, "f_uimm16 0x%x", 'x', f_uimm16, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_or3", "f_r2 0x%x", 'x', f_r2, "f_uimm16 0x%x", 'x', f_uimm16, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -917,7 +917,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (f_simm8) = f_simm8; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi", "f_r1 0x%x", 'x', f_r1, "f_simm8 0x%x", 'x', f_simm8, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi", "f_r1 0x%x", 'x', f_r1, "f_simm8 0x%x", 'x', f_simm8, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -947,7 +947,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_dr) = & CPU (h_gr)[f_r1]; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addv", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addv", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -981,7 +981,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addv3", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addv3", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1011,7 +1011,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_dr) = & CPU (h_gr)[f_r1]; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addx", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addx", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1037,7 +1037,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp8) = f_disp8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bc8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bc8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1060,7 +1060,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp24) = f_disp24; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bc24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bc24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1091,7 +1091,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (i_disp16) = f_disp16; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beq", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beq", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1120,7 +1120,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_disp16) = f_disp16; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beqz", "f_r2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beqz", "f_r2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1144,7 +1144,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp8) = f_disp8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bl8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bl8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1168,7 +1168,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp24) = f_disp24; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bl24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bl24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1192,7 +1192,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp8) = f_disp8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcl8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcl8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1216,7 +1216,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp24) = f_disp24; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcl24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcl24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1240,7 +1240,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp8) = f_disp8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bra8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bra8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1263,7 +1263,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp24) = f_disp24; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bra24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bra24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1291,7 +1291,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1320,7 +1320,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_simm16) = f_simm16; FLD (f_r2) = f_r2; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpi", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpi", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1345,7 +1345,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_r2) = f_r2; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpz", "f_r2 0x%x", 'x', f_r2, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpz", "f_r2 0x%x", 'x', f_r2, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1374,7 +1374,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_dr) = & CPU (h_gr)[f_r1]; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_div", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_div", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1401,7 +1401,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_r2) = f_r2; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jc", "f_r2 0x%x", 'x', f_r2, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jc", "f_r2 0x%x", 'x', f_r2, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1426,7 +1426,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_r2) = f_r2; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jl", "f_r2 0x%x", 'x', f_r2, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jl", "f_r2 0x%x", 'x', f_r2, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1452,7 +1452,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_r2) = f_r2; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jmp", "f_r2 0x%x", 'x', f_r2, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jmp", "f_r2 0x%x", 'x', f_r2, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1481,7 +1481,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1514,7 +1514,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld_d", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld_d", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1544,7 +1544,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldb", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldb", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1577,7 +1577,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldb_d", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldb_d", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1607,7 +1607,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldh", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldh", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1640,7 +1640,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldh_d", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldh_d", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1670,7 +1670,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld_plus", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld_plus", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1700,7 +1700,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_uimm24) = f_uimm24; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld24", "f_r1 0x%x", 'x', f_r1, "uimm24 0x%x", 'x', f_uimm24, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld24", "f_r1 0x%x", 'x', f_r1, "uimm24 0x%x", 'x', f_uimm24, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1728,7 +1728,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_simm8) = f_simm8; FLD (f_r1) = f_r1; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldi8", "f_simm8 0x%x", 'x', f_simm8, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldi8", "f_simm8 0x%x", 'x', f_simm8, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1756,7 +1756,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_simm16) = f_simm16; FLD (f_r1) = f_r1; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldi16", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldi16", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1785,7 +1785,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lock", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lock", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1818,7 +1818,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_machi_a", "f_acc 0x%x", 'x', f_acc, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_machi_a", "f_acc 0x%x", 'x', f_acc, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1851,7 +1851,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_acc) = f_acc; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mulhi_a", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "f_acc 0x%x", 'x', f_acc, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mulhi_a", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "f_acc 0x%x", 'x', f_acc, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1881,7 +1881,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mv", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mv", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1910,7 +1910,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_accs) = f_accs; FLD (f_r1) = f_r1; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvfachi_a", "f_accs 0x%x", 'x', f_accs, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvfachi_a", "f_accs 0x%x", 'x', f_accs, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1938,7 +1938,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (f_r1) = f_r1; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvfc", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvfc", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1966,7 +1966,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_accs) = f_accs; FLD (f_r1) = f_r1; FLD (i_src1) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvtachi_a", "f_accs 0x%x", 'x', f_accs, "f_r1 0x%x", 'x', f_r1, "src1 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvtachi_a", "f_accs 0x%x", 'x', f_accs, "f_r1 0x%x", 'x', f_r1, "src1 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1994,7 +1994,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvtc", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvtc", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2014,7 +2014,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nop", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nop", (char *) 0)); #undef FLD return idesc; @@ -2037,7 +2037,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_accs) = f_accs; FLD (f_imm1) = f_imm1; FLD (f_accd) = f_accd; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rac_dsi", "f_accs 0x%x", 'x', f_accs, "f_imm1 0x%x", 'x', f_imm1, "f_accd 0x%x", 'x', f_accd, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rac_dsi", "f_accs 0x%x", 'x', f_accs, "f_imm1 0x%x", 'x', f_imm1, "f_accd 0x%x", 'x', f_accd, (char *) 0)); #undef FLD return idesc; @@ -2050,7 +2050,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rte", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rte", (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2077,7 +2077,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_hi16) = f_hi16; FLD (f_r1) = f_r1; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_seth", "f_hi16 0x%x", 'x', f_hi16, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_seth", "f_hi16 0x%x", 'x', f_hi16, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2109,7 +2109,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sll3", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sll3", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2138,7 +2138,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (f_uimm5) = f_uimm5; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_slli", "f_r1 0x%x", 'x', f_r1, "f_uimm5 0x%x", 'x', f_uimm5, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_slli", "f_r1 0x%x", 'x', f_r1, "f_uimm5 0x%x", 'x', f_uimm5, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2168,7 +2168,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_st", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_st", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2201,7 +2201,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_st_d", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_st_d", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2231,7 +2231,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2264,7 +2264,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb_d", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb_d", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2294,7 +2294,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sth", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sth", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2327,7 +2327,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sth_d", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sth_d", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2357,7 +2357,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_st_plus", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_st_plus", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2388,7 +2388,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sth_plus", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sth_plus", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2419,7 +2419,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb_plus", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb_plus", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2445,7 +2445,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_uimm4) = f_uimm4; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_trap", "f_uimm4 0x%x", 'x', f_uimm4, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_trap", "f_uimm4 0x%x", 'x', f_uimm4, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2473,7 +2473,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_unlock", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_unlock", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2503,7 +2503,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_satb", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_satb", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2533,7 +2533,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sat", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sat", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2554,7 +2554,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sadd", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sadd", (char *) 0)); #undef FLD return idesc; @@ -2576,7 +2576,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_macwu1", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_macwu1", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2606,7 +2606,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_msblo", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_msblo", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2636,7 +2636,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mulwu1", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mulwu1", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2657,7 +2657,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sc", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sc", (char *) 0)); #undef FLD return idesc; @@ -2674,7 +2674,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_uimm8) = f_uimm8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrpsw", "f_uimm8 0x%x", 'x', f_uimm8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrpsw", "f_uimm8 0x%x", 'x', f_uimm8, (char *) 0)); #undef FLD return idesc; @@ -2691,7 +2691,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_uimm8) = f_uimm8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_setpsw", "f_uimm8 0x%x", 'x', f_uimm8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_setpsw", "f_uimm8 0x%x", 'x', f_uimm8, (char *) 0)); #undef FLD return idesc; @@ -2715,7 +2715,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (f_uimm3) = f_uimm3; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bset", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_uimm3 0x%x", 'x', f_uimm3, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bset", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_uimm3 0x%x", 'x', f_uimm3, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2743,7 +2743,7 @@ m32r2f_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (f_uimm3) = f_uimm3; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_btst", "f_r2 0x%x", 'x', f_r2, "f_uimm3 0x%x", 'x', f_uimm3, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_btst", "f_r2 0x%x", 'x', f_r2, "f_uimm3 0x%x", 'x', f_uimm3, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ diff --git a/sim/m32r/decodex.c b/sim/m32r/decodex.c index 0ccf363..e5b1605 100644 --- a/sim/m32r/decodex.c +++ b/sim/m32r/decodex.c @@ -707,7 +707,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0)); #undef FLD return idesc; @@ -729,7 +729,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_dr) = & CPU (h_gr)[f_r1]; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -763,7 +763,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add3", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add3", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -796,7 +796,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and3", "f_r2 0x%x", 'x', f_r2, "f_uimm16 0x%x", 'x', f_uimm16, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and3", "f_r2 0x%x", 'x', f_r2, "f_uimm16 0x%x", 'x', f_uimm16, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -829,7 +829,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_or3", "f_r2 0x%x", 'x', f_r2, "f_uimm16 0x%x", 'x', f_uimm16, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_or3", "f_r2 0x%x", 'x', f_r2, "f_uimm16 0x%x", 'x', f_uimm16, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -858,7 +858,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (f_simm8) = f_simm8; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi", "f_r1 0x%x", 'x', f_r1, "f_simm8 0x%x", 'x', f_simm8, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi", "f_r1 0x%x", 'x', f_r1, "f_simm8 0x%x", 'x', f_simm8, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -888,7 +888,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_dr) = & CPU (h_gr)[f_r1]; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addv", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addv", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -922,7 +922,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addv3", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addv3", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -952,7 +952,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_dr) = & CPU (h_gr)[f_r1]; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addx", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addx", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -978,7 +978,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp8) = f_disp8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bc8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bc8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1001,7 +1001,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp24) = f_disp24; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bc24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bc24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1032,7 +1032,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (i_disp16) = f_disp16; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beq", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beq", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1061,7 +1061,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_disp16) = f_disp16; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beqz", "f_r2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beqz", "f_r2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1085,7 +1085,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp8) = f_disp8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bl8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bl8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1109,7 +1109,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp24) = f_disp24; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bl24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bl24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1133,7 +1133,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp8) = f_disp8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcl8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcl8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1157,7 +1157,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp24) = f_disp24; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcl24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bcl24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1181,7 +1181,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp8) = f_disp8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bra8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bra8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1204,7 +1204,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp24) = f_disp24; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bra24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bra24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1232,7 +1232,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmp", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1261,7 +1261,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_simm16) = f_simm16; FLD (f_r2) = f_r2; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpi", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpi", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1286,7 +1286,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_r2) = f_r2; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpz", "f_r2 0x%x", 'x', f_r2, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpz", "f_r2 0x%x", 'x', f_r2, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1315,7 +1315,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_dr) = & CPU (h_gr)[f_r1]; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_div", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_div", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1342,7 +1342,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_r2) = f_r2; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jc", "f_r2 0x%x", 'x', f_r2, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jc", "f_r2 0x%x", 'x', f_r2, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1367,7 +1367,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_r2) = f_r2; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jl", "f_r2 0x%x", 'x', f_r2, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jl", "f_r2 0x%x", 'x', f_r2, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1393,7 +1393,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_r2) = f_r2; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jmp", "f_r2 0x%x", 'x', f_r2, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jmp", "f_r2 0x%x", 'x', f_r2, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1422,7 +1422,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1455,7 +1455,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld_d", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld_d", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1485,7 +1485,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldb", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldb", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1518,7 +1518,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldb_d", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldb_d", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1548,7 +1548,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldh", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldh", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1581,7 +1581,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldh_d", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldh_d", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1611,7 +1611,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld_plus", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld_plus", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1641,7 +1641,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_uimm24) = f_uimm24; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld24", "f_r1 0x%x", 'x', f_r1, "uimm24 0x%x", 'x', f_uimm24, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ld24", "f_r1 0x%x", 'x', f_r1, "uimm24 0x%x", 'x', f_uimm24, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1669,7 +1669,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_simm8) = f_simm8; FLD (f_r1) = f_r1; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldi8", "f_simm8 0x%x", 'x', f_simm8, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldi8", "f_simm8 0x%x", 'x', f_simm8, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1697,7 +1697,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_simm16) = f_simm16; FLD (f_r1) = f_r1; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldi16", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldi16", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1726,7 +1726,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lock", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lock", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1759,7 +1759,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_machi_a", "f_acc 0x%x", 'x', f_acc, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_machi_a", "f_acc 0x%x", 'x', f_acc, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1792,7 +1792,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_acc) = f_acc; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mulhi_a", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "f_acc 0x%x", 'x', f_acc, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mulhi_a", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "f_acc 0x%x", 'x', f_acc, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1822,7 +1822,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mv", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mv", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1851,7 +1851,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_accs) = f_accs; FLD (f_r1) = f_r1; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvfachi_a", "f_accs 0x%x", 'x', f_accs, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvfachi_a", "f_accs 0x%x", 'x', f_accs, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1879,7 +1879,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (f_r1) = f_r1; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvfc", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvfc", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1907,7 +1907,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_accs) = f_accs; FLD (f_r1) = f_r1; FLD (i_src1) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvtachi_a", "f_accs 0x%x", 'x', f_accs, "f_r1 0x%x", 'x', f_r1, "src1 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvtachi_a", "f_accs 0x%x", 'x', f_accs, "f_r1 0x%x", 'x', f_r1, "src1 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1935,7 +1935,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvtc", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mvtc", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1955,7 +1955,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nop", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nop", (char *) 0)); #undef FLD return idesc; @@ -1978,7 +1978,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_accs) = f_accs; FLD (f_imm1) = f_imm1; FLD (f_accd) = f_accd; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rac_dsi", "f_accs 0x%x", 'x', f_accs, "f_imm1 0x%x", 'x', f_imm1, "f_accd 0x%x", 'x', f_accd, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rac_dsi", "f_accs 0x%x", 'x', f_accs, "f_imm1 0x%x", 'x', f_imm1, "f_accd 0x%x", 'x', f_accd, (char *) 0)); #undef FLD return idesc; @@ -1991,7 +1991,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rte", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rte", (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2018,7 +2018,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_hi16) = f_hi16; FLD (f_r1) = f_r1; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_seth", "f_hi16 0x%x", 'x', f_hi16, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_seth", "f_hi16 0x%x", 'x', f_hi16, "f_r1 0x%x", 'x', f_r1, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2050,7 +2050,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sll3", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sll3", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2079,7 +2079,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (f_uimm5) = f_uimm5; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_slli", "f_r1 0x%x", 'x', f_r1, "f_uimm5 0x%x", 'x', f_uimm5, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_slli", "f_r1 0x%x", 'x', f_r1, "f_uimm5 0x%x", 'x', f_uimm5, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2109,7 +2109,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_st", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_st", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2142,7 +2142,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_st_d", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_st_d", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2172,7 +2172,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2205,7 +2205,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb_d", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb_d", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2235,7 +2235,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sth", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sth", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2268,7 +2268,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sth_d", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sth_d", "f_simm16 0x%x", 'x', f_simm16, "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2298,7 +2298,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_st_plus", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_st_plus", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2329,7 +2329,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sth_plus", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sth_plus", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2360,7 +2360,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb_plus", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb_plus", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2386,7 +2386,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_uimm4) = f_uimm4; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_trap", "f_uimm4 0x%x", 'x', f_uimm4, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_trap", "f_uimm4 0x%x", 'x', f_uimm4, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2414,7 +2414,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_unlock", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_unlock", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2444,7 +2444,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_satb", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_satb", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2474,7 +2474,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r1) = f_r1; FLD (i_sr) = & CPU (h_gr)[f_r2]; FLD (i_dr) = & CPU (h_gr)[f_r1]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sat", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sat", "f_r2 0x%x", 'x', f_r2, "f_r1 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2495,7 +2495,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sadd", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sadd", (char *) 0)); #undef FLD return idesc; @@ -2517,7 +2517,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_macwu1", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_macwu1", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2547,7 +2547,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_msblo", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_msblo", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2577,7 +2577,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (i_src1) = & CPU (h_gr)[f_r1]; FLD (i_src2) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mulwu1", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mulwu1", "f_r1 0x%x", 'x', f_r1, "f_r2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2598,7 +2598,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sc", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sc", (char *) 0)); #undef FLD return idesc; @@ -2615,7 +2615,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_uimm8) = f_uimm8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrpsw", "f_uimm8 0x%x", 'x', f_uimm8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrpsw", "f_uimm8 0x%x", 'x', f_uimm8, (char *) 0)); #undef FLD return idesc; @@ -2632,7 +2632,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_uimm8) = f_uimm8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_setpsw", "f_uimm8 0x%x", 'x', f_uimm8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_setpsw", "f_uimm8 0x%x", 'x', f_uimm8, (char *) 0)); #undef FLD return idesc; @@ -2656,7 +2656,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (f_uimm3) = f_uimm3; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bset", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_uimm3 0x%x", 'x', f_uimm3, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bset", "f_simm16 0x%x", 'x', f_simm16, "f_r2 0x%x", 'x', f_r2, "f_uimm3 0x%x", 'x', f_uimm3, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2684,7 +2684,7 @@ m32rxf_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_r2) = f_r2; FLD (f_uimm3) = f_uimm3; FLD (i_sr) = & CPU (h_gr)[f_r2]; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_btst", "f_r2 0x%x", 'x', f_r2, "f_uimm3 0x%x", 'x', f_uimm3, "sr 0x%x", 'x', f_r2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_btst", "f_r2 0x%x", 'x', f_r2, "f_uimm3 0x%x", 'x', f_uimm3, "sr 0x%x", 'x', f_r2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ diff --git a/sim/m32r/mloop.in b/sim/m32r/mloop.in index e1508ff..95b3652 100644 --- a/sim/m32r/mloop.in +++ b/sim/m32r/mloop.in @@ -113,8 +113,8 @@ execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p) if (PROFILE_MODEL_P (current_cpu) && ARGBUF_PROFILE_P (abuf)) @cpu@_model_insn_before (current_cpu, 1 /*first_p*/); - TRACE_INSN_INIT (current_cpu, abuf, 1); - TRACE_INSN (current_cpu, idata, + CGEN_TRACE_INSN_INIT (current_cpu, abuf, 1); + CGEN_TRACE_INSN (current_cpu, idata, (const struct argbuf *) abuf, abuf->addr); } #if WITH_SCACHE @@ -133,7 +133,7 @@ execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p) cycles = (*idesc->timing->model_fn) (current_cpu, sc); @cpu@_model_insn_after (current_cpu, 1 /*last_p*/, cycles); } - TRACE_INSN_FINI (current_cpu, abuf, 1); + CGEN_TRACE_INSN_FINI (current_cpu, abuf, 1); } #else abort (); diff --git a/sim/m32r/sem-switch.c b/sim/m32r/sem-switch.c index 01a3d4f..b0f147c 100644 --- a/sim/m32r/sem-switch.c +++ b/sim/m32r/sem-switch.c @@ -161,13 +161,13 @@ This file is part of the GNU simulators. /* If hyper-fast [well not unnecessarily slow] execution is selected, turn off frills like tracing and profiling. */ -/* FIXME: A better way would be to have TRACE_RESULT check for something +/* FIXME: A better way would be to have CGEN_TRACE_RESULT check for something that can cause it to be optimized out. Another way would be to emit special handlers into the instruction "stream". */ #if FAST_P -#undef TRACE_RESULT -#define TRACE_RESULT(cpu, abuf, name, type, val) +#undef CGEN_TRACE_RESULT +#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val) #endif #undef GET_ATTR @@ -352,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -371,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -390,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -409,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -428,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -447,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -466,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -485,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -504,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -527,12 +527,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -556,12 +556,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -585,12 +585,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -613,7 +613,7 @@ if (CPU (h_cond)) { USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -638,7 +638,7 @@ if (CPU (h_cond)) { USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -663,7 +663,7 @@ if (EQSI (* FLD (i_src1), * FLD (i_src2))) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -688,7 +688,7 @@ if (EQSI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -713,7 +713,7 @@ if (GESI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -738,7 +738,7 @@ if (GTSI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -763,7 +763,7 @@ if (LESI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -788,7 +788,7 @@ if (LTSI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -813,7 +813,7 @@ if (NESI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -837,12 +837,12 @@ 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", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -865,12 +865,12 @@ if (NESI (* FLD (i_src2), 0)) { { SI opval = ADDSI (pc, 4); CPU (h_gr[((UINT) 14)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -894,7 +894,7 @@ if (NOTBI (CPU (h_cond))) { USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -919,7 +919,7 @@ if (NOTBI (CPU (h_cond))) { USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -944,7 +944,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -967,7 +967,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) { { USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -988,7 +988,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) { { USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -1008,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, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1027,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, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1046,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, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1065,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, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1086,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1109,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1132,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1155,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1181,12 +1181,12 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = temp0; CPU (h_gr[((UINT) 14)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = temp1; SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1208,7 +1208,7 @@ if (NESI (* FLD (i_sr), 0)) { { USI opval = ANDSI (* FLD (i_sr), -4); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -1228,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1247,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1266,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1285,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1304,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1323,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1342,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1361,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1380,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1399,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1422,12 +1422,12 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = temp1; * FLD (i_sr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1447,7 +1447,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = FLD (i_uimm24); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1466,7 +1466,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = FLD (f_simm8); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1485,7 +1485,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = FLD (f_simm16); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1505,12 +1505,12 @@ if (NESI (* FLD (i_sr), 0)) { { BI opval = 1; CPU (h_lock) = opval; - TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); } { SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1530,7 +1530,7 @@ if (NESI (* FLD (i_sr), 0)) { { DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUM (), MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))))), 8), 8); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } #undef FLD @@ -1549,7 +1549,7 @@ if (NESI (* FLD (i_sr), 0)) { { DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUM (), MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))))), 8), 8); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } #undef FLD @@ -1568,7 +1568,7 @@ if (NESI (* FLD (i_sr), 0)) { { DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUM (), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))))), 8), 8); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } #undef FLD @@ -1587,7 +1587,7 @@ if (NESI (* FLD (i_sr), 0)) { { DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUM (), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))))), 8), 8); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } #undef FLD @@ -1606,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1625,7 +1625,7 @@ if (NESI (* FLD (i_sr), 0)) { { DI opval = SRADI (SLLDI (MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))), 16), 16); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } #undef FLD @@ -1644,7 +1644,7 @@ if (NESI (* FLD (i_sr), 0)) { { DI opval = SRADI (SLLDI (MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 16), 16); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } #undef FLD @@ -1663,7 +1663,7 @@ if (NESI (* FLD (i_sr), 0)) { { DI opval = SRADI (SLLDI (MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))), 8), 8); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } #undef FLD @@ -1682,7 +1682,7 @@ if (NESI (* FLD (i_sr), 0)) { { DI opval = SRADI (SLLDI (MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 8), 8); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } #undef FLD @@ -1701,7 +1701,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = * FLD (i_sr); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1720,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1739,7 +1739,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = TRUNCDISI (GET_H_ACCUM ()); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1758,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1777,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1796,7 +1796,7 @@ if (NESI (* FLD (i_sr), 0)) { { DI opval = ORDI (ANDDI (GET_H_ACCUM (), MAKEDI (0, 0xffffffff)), SLLDI (EXTSIDI (* FLD (i_src1)), 32)); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } #undef FLD @@ -1815,7 +1815,7 @@ if (NESI (* FLD (i_sr), 0)) { { DI opval = ORDI (ANDDI (GET_H_ACCUM (), MAKEDI (0xffffffff, 0)), ZEXTSIDI (* FLD (i_src1))); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } #undef FLD @@ -1834,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, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } #undef FLD @@ -1853,7 +1853,7 @@ if (NESI (* FLD (i_sr), 0)) { { SI opval = NEGSI (* FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1887,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1910,7 +1910,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_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } } @@ -1943,7 +1943,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { DI opval = SRADI (SLLDI (tmp_tmp1, 7), 7); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } } @@ -1965,22 +1965,22 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { USI opval = ANDSI (GET_H_CR (((UINT) 6)), -4); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } { USI opval = GET_H_CR (((UINT) 14)); SET_H_CR (((UINT) 6), opval); - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { UQI opval = CPU (h_bpsw); SET_H_PSW (opval); - TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); } { UQI opval = CPU (h_bbpsw); CPU (h_bpsw) = opval; - TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); } } @@ -2001,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2020,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2039,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2058,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2077,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2096,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2115,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2134,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2153,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2172,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2191,7 +2191,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { SI opval = * FLD (i_src1); SETMEMSI (current_cpu, pc, * FLD (i_src2), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -2210,7 +2210,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { SI opval = * FLD (i_src1); SETMEMSI (current_cpu, pc, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -2229,7 +2229,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { QI opval = * FLD (i_src1); SETMEMQI (current_cpu, pc, * FLD (i_src2), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -2248,7 +2248,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { QI opval = * FLD (i_src1); SETMEMQI (current_cpu, pc, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -2267,7 +2267,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { HI opval = * FLD (i_src1); SETMEMHI (current_cpu, pc, * FLD (i_src2), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -2286,7 +2286,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { HI opval = * FLD (i_src1); SETMEMHI (current_cpu, pc, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -2308,12 +2308,12 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { SI opval = * FLD (i_src1); SETMEMSI (current_cpu, pc, tmp_new_src2, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_new_src2; * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2336,12 +2336,12 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { SI opval = * FLD (i_src1); SETMEMSI (current_cpu, pc, tmp_new_src2, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_new_src2; * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2361,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2384,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -2413,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -2440,32 +2440,32 @@ 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", 'x', opval); + CGEN_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", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { UQI opval = CPU (h_bpsw); CPU (h_bbpsw) = opval; - TRACE_RESULT (current_cpu, abuf, "bbpsw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "bbpsw", 'x', opval); } { UQI opval = GET_H_PSW (); CPU (h_bpsw) = opval; - TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); } { UQI opval = ANDQI (GET_H_PSW (), 128); SET_H_PSW (opval); - TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); } { SI opval = m32r_trap (current_cpu, pc, FLD (f_uimm4)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -2489,13 +2489,13 @@ if (CPU (h_lock)) { SI opval = * FLD (i_src1); SETMEMSI (current_cpu, pc, * FLD (i_src2), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } { BI opval = 0; CPU (h_lock) = opval; - TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); } } @@ -2516,7 +2516,7 @@ if (CPU (h_lock)) { { USI opval = ANDSI (GET_H_CR (((UINT) 0)), ORSI (ZEXTQISI (INVQI (FLD (f_uimm8))), 65280)); SET_H_CR (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } #undef FLD @@ -2535,7 +2535,7 @@ if (CPU (h_lock)) { { USI opval = FLD (f_uimm8); SET_H_CR (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } #undef FLD @@ -2554,7 +2554,7 @@ if (CPU (h_lock)) { { QI opval = ORQI (GETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16))), SLLQI (1, SUBSI (7, FLD (f_uimm3)))); SETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -2573,7 +2573,7 @@ if (CPU (h_lock)) { { QI opval = ANDQI (GETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16))), INVQI (SLLQI (1, SUBSI (7, FLD (f_uimm3))))); SETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -2592,7 +2592,7 @@ if (CPU (h_lock)) { { BI opval = ANDQI (SRLQI (* FLD (i_sr), SUBSI (7, FLD (f_uimm3))), 1); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD diff --git a/sim/m32r/sem.c b/sim/m32r/sem.c index a20e024..dcd82d9 100644 --- a/sim/m32r/sem.c +++ b/sim/m32r/sem.c @@ -36,8 +36,8 @@ This file is part of the GNU simulators. FAST_P, when desired, is defined on the command line, -DFAST_P=1. */ #if FAST_P #define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_semf_,fn) -#undef TRACE_RESULT -#define TRACE_RESULT(cpu, abuf, name, type, val) +#undef CGEN_TRACE_RESULT +#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val) #else #define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_sem_,fn) #endif @@ -210,7 +210,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -231,7 +231,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -252,7 +252,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -273,7 +273,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -294,7 +294,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -315,7 +315,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -336,7 +336,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -357,7 +357,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -378,7 +378,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -403,12 +403,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -434,12 +434,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -465,12 +465,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -495,7 +495,7 @@ if (CPU (h_cond)) { USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -522,7 +522,7 @@ if (CPU (h_cond)) { USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -549,7 +549,7 @@ if (EQSI (* FLD (i_src1), * FLD (i_src2))) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -576,7 +576,7 @@ if (EQSI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -603,7 +603,7 @@ if (GESI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -630,7 +630,7 @@ if (GTSI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -657,7 +657,7 @@ if (LESI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -684,7 +684,7 @@ if (LTSI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -711,7 +711,7 @@ if (NESI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -737,12 +737,12 @@ 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", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -767,12 +767,12 @@ 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", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -798,7 +798,7 @@ if (NOTBI (CPU (h_cond))) { USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -825,7 +825,7 @@ if (NOTBI (CPU (h_cond))) { USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -852,7 +852,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -877,7 +877,7 @@ SEM_FN_NAME (m32rbf,bra8) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -900,7 +900,7 @@ SEM_FN_NAME (m32rbf,bra24) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -922,7 +922,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, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } return vpc; @@ -943,7 +943,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, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } return vpc; @@ -964,7 +964,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, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } return vpc; @@ -985,7 +985,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, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } return vpc; @@ -1008,7 +1008,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1033,7 +1033,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1058,7 +1058,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1083,7 +1083,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1111,12 +1111,12 @@ 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", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = temp1; SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1140,7 +1140,7 @@ SEM_FN_NAME (m32rbf,jmp) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { USI opval = ANDSI (* FLD (i_sr), -4); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -1162,7 +1162,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1183,7 +1183,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1204,7 +1204,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1225,7 +1225,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1246,7 +1246,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1267,7 +1267,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1288,7 +1288,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1309,7 +1309,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1330,7 +1330,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1351,7 +1351,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1376,12 +1376,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = temp1; * FLD (i_sr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1403,7 +1403,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1424,7 +1424,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1445,7 +1445,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1467,12 +1467,12 @@ SEM_FN_NAME (m32rbf,lock) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = 1; CPU (h_lock) = opval; - TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); } { SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1494,7 +1494,7 @@ SEM_FN_NAME (m32rbf,machi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUM (), MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))))), 8), 8); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } return vpc; @@ -1515,7 +1515,7 @@ SEM_FN_NAME (m32rbf,maclo) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUM (), MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))))), 8), 8); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } return vpc; @@ -1536,7 +1536,7 @@ SEM_FN_NAME (m32rbf,macwhi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUM (), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))))), 8), 8); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } return vpc; @@ -1557,7 +1557,7 @@ SEM_FN_NAME (m32rbf,macwlo) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUM (), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))))), 8), 8); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } return vpc; @@ -1578,7 +1578,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1599,7 +1599,7 @@ SEM_FN_NAME (m32rbf,mulhi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = SRADI (SLLDI (MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))), 16), 16); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } return vpc; @@ -1620,7 +1620,7 @@ SEM_FN_NAME (m32rbf,mullo) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = SRADI (SLLDI (MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 16), 16); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } return vpc; @@ -1641,7 +1641,7 @@ SEM_FN_NAME (m32rbf,mulwhi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = SRADI (SLLDI (MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))), 8), 8); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } return vpc; @@ -1662,7 +1662,7 @@ SEM_FN_NAME (m32rbf,mulwlo) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = SRADI (SLLDI (MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 8), 8); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } return vpc; @@ -1683,7 +1683,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1704,7 +1704,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1725,7 +1725,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1746,7 +1746,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1767,7 +1767,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1788,7 +1788,7 @@ SEM_FN_NAME (m32rbf,mvtachi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (ANDDI (GET_H_ACCUM (), MAKEDI (0, 0xffffffff)), SLLDI (EXTSIDI (* FLD (i_src1)), 32)); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } return vpc; @@ -1809,7 +1809,7 @@ SEM_FN_NAME (m32rbf,mvtaclo) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (ANDDI (GET_H_ACCUM (), MAKEDI (0xffffffff, 0)), ZEXTSIDI (* FLD (i_src1))); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } return vpc; @@ -1830,7 +1830,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, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } return vpc; @@ -1851,7 +1851,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1889,7 +1889,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1914,7 +1914,7 @@ SEM_FN_NAME (m32rbf,rac) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { 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_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } } @@ -1949,7 +1949,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083 { DI opval = SRADI (SLLDI (tmp_tmp1, 7), 7); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } } @@ -1973,22 +1973,22 @@ SEM_FN_NAME (m32rbf,rte) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { USI opval = ANDSI (GET_H_CR (((UINT) 6)), -4); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } { USI opval = GET_H_CR (((UINT) 14)); SET_H_CR (((UINT) 6), opval); - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { UQI opval = CPU (h_bpsw); SET_H_PSW (opval); - TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); } { UQI opval = CPU (h_bbpsw); CPU (h_bpsw) = opval; - TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); } } @@ -2011,7 +2011,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2032,7 +2032,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2053,7 +2053,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2074,7 +2074,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2095,7 +2095,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2116,7 +2116,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2137,7 +2137,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2158,7 +2158,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2179,7 +2179,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2200,7 +2200,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2221,7 +2221,7 @@ SEM_FN_NAME (m32rbf,st) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = * FLD (i_src1); SETMEMSI (current_cpu, pc, * FLD (i_src2), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -2242,7 +2242,7 @@ SEM_FN_NAME (m32rbf,st_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = * FLD (i_src1); SETMEMSI (current_cpu, pc, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -2263,7 +2263,7 @@ SEM_FN_NAME (m32rbf,stb) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { QI opval = * FLD (i_src1); SETMEMQI (current_cpu, pc, * FLD (i_src2), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -2284,7 +2284,7 @@ SEM_FN_NAME (m32rbf,stb_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { QI opval = * FLD (i_src1); SETMEMQI (current_cpu, pc, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -2305,7 +2305,7 @@ SEM_FN_NAME (m32rbf,sth) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { HI opval = * FLD (i_src1); SETMEMHI (current_cpu, pc, * FLD (i_src2), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -2326,7 +2326,7 @@ SEM_FN_NAME (m32rbf,sth_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { HI opval = * FLD (i_src1); SETMEMHI (current_cpu, pc, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -2350,12 +2350,12 @@ SEM_FN_NAME (m32rbf,st_plus) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = * FLD (i_src1); SETMEMSI (current_cpu, pc, tmp_new_src2, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_new_src2; * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2380,12 +2380,12 @@ SEM_FN_NAME (m32rbf,st_minus) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = * FLD (i_src1); SETMEMSI (current_cpu, pc, tmp_new_src2, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_new_src2; * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2407,7 +2407,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2432,12 +2432,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -2463,12 +2463,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -2492,32 +2492,32 @@ 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", 'x', opval); + CGEN_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", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { UQI opval = CPU (h_bpsw); CPU (h_bbpsw) = opval; - TRACE_RESULT (current_cpu, abuf, "bbpsw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "bbpsw", 'x', opval); } { UQI opval = GET_H_PSW (); CPU (h_bpsw) = opval; - TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); } { UQI opval = ANDQI (GET_H_PSW (), 128); SET_H_PSW (opval); - TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); } { SI opval = m32r_trap (current_cpu, pc, FLD (f_uimm4)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -2543,13 +2543,13 @@ if (CPU (h_lock)) { SI opval = * FLD (i_src1); SETMEMSI (current_cpu, pc, * FLD (i_src2), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } { BI opval = 0; CPU (h_lock) = opval; - TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); } } @@ -2572,7 +2572,7 @@ SEM_FN_NAME (m32rbf,clrpsw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { USI opval = ANDSI (GET_H_CR (((UINT) 0)), ORSI (ZEXTQISI (INVQI (FLD (f_uimm8))), 65280)); SET_H_CR (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } return vpc; @@ -2593,7 +2593,7 @@ SEM_FN_NAME (m32rbf,setpsw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { USI opval = FLD (f_uimm8); SET_H_CR (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } return vpc; @@ -2614,7 +2614,7 @@ SEM_FN_NAME (m32rbf,bset) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { QI opval = ORQI (GETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16))), SLLQI (1, SUBSI (7, FLD (f_uimm3)))); SETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -2635,7 +2635,7 @@ SEM_FN_NAME (m32rbf,bclr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { QI opval = ANDQI (GETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16))), INVQI (SLLQI (1, SUBSI (7, FLD (f_uimm3))))); SETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -2656,7 +2656,7 @@ SEM_FN_NAME (m32rbf,btst) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = ANDQI (SRLQI (* FLD (i_sr), SUBSI (7, FLD (f_uimm3))), 1); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } return vpc; diff --git a/sim/m32r/sem2-switch.c b/sim/m32r/sem2-switch.c index f899b4b3..c8d01f0 100644 --- a/sim/m32r/sem2-switch.c +++ b/sim/m32r/sem2-switch.c @@ -352,13 +352,13 @@ This file is part of the GNU simulators. /* If hyper-fast [well not unnecessarily slow] execution is selected, turn off frills like tracing and profiling. */ -/* FIXME: A better way would be to have TRACE_RESULT check for something +/* FIXME: A better way would be to have CGEN_TRACE_RESULT check for something that can cause it to be optimized out. Another way would be to emit special handlers into the instruction "stream". */ #if FAST_P -#undef TRACE_RESULT -#define TRACE_RESULT(cpu, abuf, name, type, val) +#undef CGEN_TRACE_RESULT +#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val) #endif #undef GET_ATTR @@ -543,7 +543,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -562,7 +562,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -581,7 +581,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -600,7 +600,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -619,7 +619,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -638,7 +638,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -657,7 +657,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -676,7 +676,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -695,7 +695,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -718,12 +718,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -747,12 +747,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -776,12 +776,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -804,7 +804,7 @@ if (CPU (h_cond)) { USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -829,7 +829,7 @@ if (CPU (h_cond)) { USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -854,7 +854,7 @@ if (EQSI (* FLD (i_src1), * FLD (i_src2))) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -879,7 +879,7 @@ if (EQSI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -904,7 +904,7 @@ if (GESI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -929,7 +929,7 @@ if (GTSI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -954,7 +954,7 @@ if (LESI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -979,7 +979,7 @@ if (LTSI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1004,7 +1004,7 @@ if (NESI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1028,12 +1028,12 @@ 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", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1056,12 +1056,12 @@ if (NESI (* FLD (i_src2), 0)) { { SI opval = ADDSI (pc, 4); CPU (h_gr[((UINT) 14)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1086,13 +1086,13 @@ 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", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1119,13 +1119,13 @@ if (CPU (h_cond)) { SI opval = ADDSI (pc, 4); CPU (h_gr[((UINT) 14)]) = opval; written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1151,7 +1151,7 @@ if (NOTBI (CPU (h_cond))) { USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1176,7 +1176,7 @@ if (NOTBI (CPU (h_cond))) { USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1201,7 +1201,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1224,7 +1224,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) { { USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -1245,7 +1245,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) { { USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -1269,13 +1269,13 @@ 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", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1302,13 +1302,13 @@ 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", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1331,7 +1331,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = LTSI (* FLD (i_src1), * FLD (i_src2)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1350,7 +1350,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = LTSI (* FLD (i_src2), FLD (f_simm16)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1369,7 +1369,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = LTUSI (* FLD (i_src1), * FLD (i_src2)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1388,7 +1388,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = LTUSI (* FLD (i_src2), FLD (f_simm16)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1407,7 +1407,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = EQSI (* FLD (i_src1), * FLD (i_src2)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1426,7 +1426,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = EQSI (* FLD (i_src2), 0); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1447,7 +1447,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1470,7 +1470,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1493,7 +1493,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1516,7 +1516,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1539,7 +1539,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = MODSI (EXTHISI (TRUNCSIHI (* FLD (i_dr))), * FLD (i_sr)); * FLD (i_dr) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1562,7 +1562,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1585,7 +1585,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = MODSI (EXTBISI (TRUNCSIBI (* FLD (i_dr))), * FLD (i_sr)); * FLD (i_dr) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1608,7 +1608,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1631,7 +1631,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1654,7 +1654,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = DIVSI (EXTBISI (TRUNCSIBI (* FLD (i_dr))), * FLD (i_sr)); * FLD (i_dr) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1677,7 +1677,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1700,7 +1700,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1724,7 +1724,7 @@ if (CPU (h_cond)) { USI opval = ANDSI (* FLD (i_sr), -4); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1749,7 +1749,7 @@ if (NOTBI (CPU (h_cond))) { USI opval = ANDSI (* FLD (i_sr), -4); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1776,12 +1776,12 @@ if (NOTBI (CPU (h_cond))) { { SI opval = temp0; CPU (h_gr[((UINT) 14)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = temp1; SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1803,7 +1803,7 @@ if (NOTBI (CPU (h_cond))) { { USI opval = ANDSI (* FLD (i_sr), -4); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -1823,7 +1823,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1842,7 +1842,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1861,7 +1861,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1880,7 +1880,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1899,7 +1899,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1918,7 +1918,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1937,7 +1937,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1956,7 +1956,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1975,7 +1975,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1994,7 +1994,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2017,12 +2017,12 @@ if (NOTBI (CPU (h_cond))) { { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = temp1; * FLD (i_sr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2042,7 +2042,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = FLD (i_uimm24); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2061,7 +2061,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = FLD (f_simm8); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2080,7 +2080,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = FLD (f_simm16); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2100,12 +2100,12 @@ if (NOTBI (CPU (h_cond))) { { BI opval = 1; CPU (h_lock) = opval; - TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); } { SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2125,7 +2125,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2144,7 +2144,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2163,7 +2163,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2182,7 +2182,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2201,7 +2201,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = MULSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2220,7 +2220,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2239,7 +2239,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2258,7 +2258,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2277,7 +2277,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2296,7 +2296,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = * FLD (i_sr); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2315,7 +2315,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2334,7 +2334,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = TRUNCDISI (GET_H_ACCUMS (FLD (f_accs))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2353,7 +2353,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2372,7 +2372,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = GET_H_CR (FLD (f_r2)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2391,7 +2391,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2410,7 +2410,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2429,7 +2429,7 @@ if (NOTBI (CPU (h_cond))) { { USI opval = * FLD (i_sr); SET_H_CR (FLD (f_r1), opval); - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } #undef FLD @@ -2448,7 +2448,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = NEGSI (* FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2482,7 +2482,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = INVSI (* FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2505,7 +2505,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } } @@ -2529,7 +2529,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } } @@ -2551,22 +2551,22 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { USI opval = ANDSI (GET_H_CR (((UINT) 6)), -4); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } { USI opval = GET_H_CR (((UINT) 14)); SET_H_CR (((UINT) 6), opval); - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { UQI opval = CPU (h_bpsw); SET_H_PSW (opval); - TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); } { UQI opval = CPU (h_bbpsw); CPU (h_bpsw) = opval; - TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); } } @@ -2587,7 +2587,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = SLLSI (FLD (f_hi16), 16); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2606,7 +2606,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2625,7 +2625,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2644,7 +2644,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2663,7 +2663,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2682,7 +2682,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2701,7 +2701,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2720,7 +2720,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2739,7 +2739,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2758,7 +2758,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2777,7 +2777,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = * FLD (i_src1); SETMEMSI (current_cpu, pc, * FLD (i_src2), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -2796,7 +2796,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = * FLD (i_src1); SETMEMSI (current_cpu, pc, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -2815,7 +2815,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { QI opval = * FLD (i_src1); SETMEMQI (current_cpu, pc, * FLD (i_src2), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -2834,7 +2834,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { QI opval = * FLD (i_src1); SETMEMQI (current_cpu, pc, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -2853,7 +2853,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { HI opval = * FLD (i_src1); SETMEMHI (current_cpu, pc, * FLD (i_src2), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -2872,7 +2872,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { HI opval = * FLD (i_src1); SETMEMHI (current_cpu, pc, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -2894,12 +2894,12 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = * FLD (i_src1); SETMEMSI (current_cpu, pc, tmp_new_src2, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_new_src2; * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2922,12 +2922,12 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { HI opval = * FLD (i_src1); SETMEMHI (current_cpu, pc, tmp_new_src2, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = ADDSI (tmp_new_src2, 2); * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2950,12 +2950,12 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { QI opval = * FLD (i_src1); SETMEMQI (current_cpu, pc, tmp_new_src2, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = ADDSI (tmp_new_src2, 1); * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2978,12 +2978,12 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = * FLD (i_src1); SETMEMSI (current_cpu, pc, tmp_new_src2, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_new_src2; * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -3003,7 +3003,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -3026,12 +3026,12 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -3055,12 +3055,12 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -3082,32 +3082,32 @@ 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", 'x', opval); + CGEN_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", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { UQI opval = CPU (h_bpsw); CPU (h_bbpsw) = opval; - TRACE_RESULT (current_cpu, abuf, "bbpsw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "bbpsw", 'x', opval); } { UQI opval = GET_H_PSW (); CPU (h_bpsw) = opval; - TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); } { UQI opval = ANDQI (GET_H_PSW (), 128); SET_H_PSW (opval); - TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); } { SI opval = m32r_trap (current_cpu, pc, FLD (f_uimm4)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -3131,13 +3131,13 @@ if (CPU (h_lock)) { SI opval = * FLD (i_src1); SETMEMSI (current_cpu, pc, * FLD (i_src2), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } { BI opval = 0; CPU (h_lock) = opval; - TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); } } @@ -3158,7 +3158,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -3177,7 +3177,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -3196,7 +3196,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -3215,7 +3215,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, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -3234,7 +3234,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", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -3253,7 +3253,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", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -3272,7 +3272,7 @@ if (CPU (h_lock)) { { DI opval = SRADI (SLLDI (SUBDI (GET_H_ACCUM (), SRADI (SLLDI (MULDI (EXTHIDI (TRUNCSIHI (* FLD (i_src1))), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 32), 16)), 8), 8); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } #undef FLD @@ -3291,7 +3291,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", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -3310,7 +3310,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", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -3361,7 +3361,7 @@ if (ZEXTBISI (NOTBI (CPU (h_cond)))) { USI opval = ANDSI (GET_H_CR (((UINT) 0)), ORSI (ZEXTQISI (INVQI (FLD (f_uimm8))), 65280)); SET_H_CR (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } #undef FLD @@ -3380,7 +3380,7 @@ if (ZEXTBISI (NOTBI (CPU (h_cond)))) { USI opval = FLD (f_uimm8); SET_H_CR (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } #undef FLD @@ -3399,7 +3399,7 @@ if (ZEXTBISI (NOTBI (CPU (h_cond)))) { QI opval = ORQI (GETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16))), SLLQI (1, SUBSI (7, FLD (f_uimm3)))); SETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -3418,7 +3418,7 @@ if (ZEXTBISI (NOTBI (CPU (h_cond)))) { QI opval = ANDQI (GETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16))), INVQI (SLLQI (1, SUBSI (7, FLD (f_uimm3))))); SETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -3437,7 +3437,7 @@ if (ZEXTBISI (NOTBI (CPU (h_cond)))) { BI opval = ANDQI (SRLQI (* FLD (i_sr), SUBSI (7, FLD (f_uimm3))), 1); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -3457,7 +3457,7 @@ if (ZEXTBISI (NOTBI (CPU (h_cond)))) { SI opval = ADDSI (* FLD (i_dr), * FLD (i_sr)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -3495,7 +3495,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -3533,7 +3533,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -3571,7 +3571,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -3609,7 +3609,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -3651,12 +3651,12 @@ CASE (sem, INSN_WRITE_ADDI) : /* addi $dr,$simm8 */ { SI opval = temp0; OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -3700,12 +3700,12 @@ CASE (sem, INSN_WRITE_ADDV) : /* addv $dr,$sr */ { SI opval = temp0; OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -3747,7 +3747,7 @@ if (CPU (h_cond)) { USI opval = FLD (i_disp8); OPRND (pc) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -3793,12 +3793,12 @@ CASE (sem, INSN_WRITE_BC8) : /* bc.s $disp8 */ { SI opval = ADDSI (ANDSI (pc, -4), 4); OPRND (h_gr_SI_14) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); OPRND (pc) = opval; - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -3843,13 +3843,13 @@ if (CPU (h_cond)) { SI opval = ADDSI (ANDSI (pc, -4), 4); OPRND (h_gr_SI_14) = opval; written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); OPRND (pc) = opval; written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -3901,7 +3901,7 @@ if (NOTBI (CPU (h_cond))) { USI opval = FLD (i_disp8); OPRND (pc) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -3946,7 +3946,7 @@ CASE (sem, INSN_WRITE_BNC8) : /* bnc.s $disp8 */ { USI opval = FLD (i_disp8); OPRND (pc) = opval; - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } #undef OPRND @@ -3989,13 +3989,13 @@ if (NOTBI (CPU (h_cond))) { SI opval = ADDSI (ANDSI (pc, -4), 4); OPRND (h_gr_SI_14) = opval; written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); OPRND (pc) = opval; written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -4045,7 +4045,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, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef OPRND @@ -4083,7 +4083,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, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef OPRND @@ -4121,7 +4121,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, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef OPRND @@ -4159,7 +4159,7 @@ CASE (sem, INSN_WRITE_CMPEQ) : /* cmpeq $src1,$src2 */ { BI opval = EQSI (* FLD (i_src2), 0); OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef OPRND @@ -4199,7 +4199,7 @@ if (CPU (h_cond)) { USI opval = ANDSI (* FLD (i_sr), -4); OPRND (pc) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -4246,7 +4246,7 @@ if (NOTBI (CPU (h_cond))) { USI opval = ANDSI (* FLD (i_sr), -4); OPRND (pc) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -4295,12 +4295,12 @@ CASE (sem, INSN_WRITE_JNC) : /* jnc $sr */ { SI opval = temp0; OPRND (h_gr_SI_14) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = temp1; OPRND (pc) = opval; - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -4342,7 +4342,7 @@ CASE (sem, INSN_WRITE_JL) : /* jl $sr */ { USI opval = ANDSI (* FLD (i_sr), -4); OPRND (pc) = opval; - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } #undef OPRND @@ -4382,7 +4382,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4420,7 +4420,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4458,7 +4458,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4496,7 +4496,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4534,7 +4534,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4576,12 +4576,12 @@ CASE (sem, INSN_WRITE_LDUH) : /* lduh $dr,@$sr */ { SI opval = temp0; OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = temp1; OPRND (sr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -4621,7 +4621,7 @@ CASE (sem, INSN_WRITE_LD_PLUS) : /* ld $dr,@$sr+ */ { SI opval = FLD (f_simm8); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4660,12 +4660,12 @@ CASE (sem, INSN_WRITE_LDI8) : /* ldi8 $dr,$simm8 */ { BI opval = 1; OPRND (h_lock_BI) = opval; - TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); } { SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -4705,7 +4705,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4743,7 +4743,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4781,7 +4781,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4819,7 +4819,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4857,7 +4857,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4895,7 +4895,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4933,7 +4933,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4971,7 +4971,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -5009,7 +5009,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -5047,7 +5047,7 @@ CASE (sem, INSN_WRITE_MULWLO_A) : /* mulwlo $src1,$src2,$acc */ { SI opval = * FLD (i_sr); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5085,7 +5085,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5123,7 +5123,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5161,7 +5161,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5199,7 +5199,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5237,7 +5237,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -5275,7 +5275,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -5313,7 +5313,7 @@ CASE (sem, INSN_WRITE_MVTACLO_A) : /* mvtaclo $src1,$accs */ { USI opval = * FLD (i_sr); OPRND (dcr) = opval; - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } #undef OPRND @@ -5351,7 +5351,7 @@ CASE (sem, INSN_WRITE_MVTC) : /* mvtc $sr,$dcr */ { SI opval = NEGSI (* FLD (i_sr)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5422,7 +5422,7 @@ CASE (sem, INSN_WRITE_NOP) : /* nop */ { SI opval = INVSI (* FLD (i_sr)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5464,7 +5464,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } } @@ -5507,7 +5507,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } } @@ -5547,22 +5547,22 @@ CASE (sem, INSN_WRITE_RACH_DSI) : /* rach $accd,$accs,$imm1 */ { USI opval = ANDSI (GET_H_CR (((UINT) 6)), -4); OPRND (pc) = opval; - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } { USI opval = GET_H_CR (((UINT) 14)); OPRND (h_cr_USI_6) = opval; - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { UQI opval = CPU (h_bpsw); OPRND (h_psw_UQI) = opval; - TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); } { UQI opval = CPU (h_bbpsw); OPRND (h_bpsw_UQI) = opval; - TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); } } @@ -5606,7 +5606,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5644,7 +5644,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5682,7 +5682,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5720,7 +5720,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5758,7 +5758,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5796,7 +5796,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5835,7 +5835,7 @@ CASE (sem, INSN_WRITE_SRLI) : /* srli $dr,$uimm5 */ SI opval = * FLD (i_src1); OPRND (h_memory_SI_src2_idx) = * FLD (i_src2); OPRND (h_memory_SI_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef OPRND @@ -5874,7 +5874,7 @@ CASE (sem, INSN_WRITE_ST) : /* st $src1,@$src2 */ QI opval = * FLD (i_src1); OPRND (h_memory_QI_src2_idx) = * FLD (i_src2); OPRND (h_memory_QI_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef OPRND @@ -5913,7 +5913,7 @@ CASE (sem, INSN_WRITE_STB) : /* stb $src1,@$src2 */ HI opval = * FLD (i_src1); OPRND (h_memory_HI_src2_idx) = * FLD (i_src2); OPRND (h_memory_HI_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef OPRND @@ -5955,12 +5955,12 @@ CASE (sem, INSN_WRITE_STH) : /* sth $src1,@$src2 */ SI opval = * FLD (i_src1); OPRND (h_memory_SI_new_src2_idx) = tmp_new_src2; OPRND (h_memory_SI_new_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_new_src2; OPRND (src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -6004,12 +6004,12 @@ CASE (sem, INSN_WRITE_ST_PLUS) : /* st $src1,@+$src2 */ HI opval = * FLD (i_src1); OPRND (h_memory_HI_new_src2_idx) = tmp_new_src2; OPRND (h_memory_HI_new_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = ADDSI (tmp_new_src2, 2); OPRND (src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -6053,12 +6053,12 @@ CASE (sem, INSN_WRITE_STH_PLUS) : /* sth $src1,@$src2+ */ QI opval = * FLD (i_src1); OPRND (h_memory_QI_new_src2_idx) = tmp_new_src2; OPRND (h_memory_QI_new_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = ADDSI (tmp_new_src2, 1); OPRND (src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -6102,12 +6102,12 @@ CASE (sem, INSN_WRITE_STB_PLUS) : /* stb $src1,@$src2+ */ SI opval = * FLD (i_src1); OPRND (h_memory_SI_new_src2_idx) = tmp_new_src2; OPRND (h_memory_SI_new_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_new_src2; OPRND (src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -6147,7 +6147,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -6189,12 +6189,12 @@ CASE (sem, INSN_WRITE_SUB) : /* sub $dr,$sr */ { SI opval = temp0; OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -6238,12 +6238,12 @@ CASE (sem, INSN_WRITE_SUBV) : /* subv $dr,$sr */ { SI opval = temp0; OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -6284,32 +6284,32 @@ CASE (sem, INSN_WRITE_SUBX) : /* subx $dr,$sr */ { USI opval = GET_H_CR (((UINT) 6)); OPRND (h_cr_USI_14) = opval; - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { USI opval = ADDSI (pc, 4); OPRND (h_cr_USI_6) = opval; - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { UQI opval = CPU (h_bpsw); OPRND (h_bbpsw_UQI) = opval; - TRACE_RESULT (current_cpu, abuf, "bbpsw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "bbpsw", 'x', opval); } { UQI opval = GET_H_PSW (); OPRND (h_bpsw_UQI) = opval; - TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); } { UQI opval = ANDQI (GET_H_PSW (), 128); OPRND (h_psw_UQI) = opval; - TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); } { SI opval = m32r_trap (current_cpu, pc, FLD (f_uimm4)); OPRND (pc) = opval; - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -6359,13 +6359,13 @@ if (CPU (h_lock)) { OPRND (h_memory_SI_src2_idx) = * FLD (i_src2); OPRND (h_memory_SI_src2) = opval; written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } { BI opval = 0; OPRND (h_lock_BI) = opval; - TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); } } @@ -6409,7 +6409,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, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef OPRND @@ -6447,7 +6447,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_DI_0) = opval; - TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -6485,7 +6485,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_DI_1) = opval; - TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -6523,7 +6523,7 @@ CASE (sem, INSN_WRITE_MACWU1) : /* macwu1 $src1,$src2 */ { DI opval = SRADI (SLLDI (SUBDI (GET_H_ACCUM (), SRADI (SLLDI (MULDI (EXTHIDI (TRUNCSIHI (* FLD (i_src1))), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 32), 16)), 8), 8); OPRND (accum) = opval; - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } #undef OPRND @@ -6561,7 +6561,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_DI_1) = opval; - TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -6599,7 +6599,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_DI_1) = opval; - TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -6705,7 +6705,7 @@ CASE (sem, INSN_WRITE_SNC) : /* snc */ { USI opval = ANDSI (GET_H_CR (((UINT) 0)), ORSI (ZEXTQISI (INVQI (FLD (f_uimm8))), 65280)); OPRND (h_cr_USI_0) = opval; - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } #undef OPRND @@ -6743,7 +6743,7 @@ CASE (sem, INSN_WRITE_CLRPSW) : /* clrpsw $uimm8 */ { USI opval = FLD (f_uimm8); OPRND (h_cr_USI_0) = opval; - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } #undef OPRND @@ -6781,7 +6781,7 @@ CASE (sem, INSN_WRITE_SETPSW) : /* setpsw $uimm8 */ { BI opval = ANDQI (SRLQI (* FLD (i_sr), SUBSI (7, FLD (f_uimm3))), 1); OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef OPRND diff --git a/sim/m32r/semx-switch.c b/sim/m32r/semx-switch.c index 8ab7f22..e76f3c5 100644 --- a/sim/m32r/semx-switch.c +++ b/sim/m32r/semx-switch.c @@ -345,13 +345,13 @@ This file is part of the GNU simulators. /* If hyper-fast [well not unnecessarily slow] execution is selected, turn off frills like tracing and profiling. */ -/* FIXME: A better way would be to have TRACE_RESULT check for something +/* FIXME: A better way would be to have CGEN_TRACE_RESULT check for something that can cause it to be optimized out. Another way would be to emit special handlers into the instruction "stream". */ #if FAST_P -#undef TRACE_RESULT -#define TRACE_RESULT(cpu, abuf, name, type, val) +#undef CGEN_TRACE_RESULT +#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val) #endif #undef GET_ATTR @@ -536,7 +536,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -555,7 +555,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -574,7 +574,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -593,7 +593,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -612,7 +612,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -631,7 +631,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -650,7 +650,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -669,7 +669,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -688,7 +688,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -711,12 +711,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -740,12 +740,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -769,12 +769,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -797,7 +797,7 @@ if (CPU (h_cond)) { USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -822,7 +822,7 @@ if (CPU (h_cond)) { USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -847,7 +847,7 @@ if (EQSI (* FLD (i_src1), * FLD (i_src2))) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -872,7 +872,7 @@ if (EQSI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -897,7 +897,7 @@ if (GESI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -922,7 +922,7 @@ if (GTSI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -947,7 +947,7 @@ if (LESI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -972,7 +972,7 @@ if (LTSI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -997,7 +997,7 @@ if (NESI (* FLD (i_src2), 0)) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1021,12 +1021,12 @@ 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", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1049,12 +1049,12 @@ if (NESI (* FLD (i_src2), 0)) { { SI opval = ADDSI (pc, 4); CPU (h_gr[((UINT) 14)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1079,13 +1079,13 @@ 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", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1112,13 +1112,13 @@ if (CPU (h_cond)) { SI opval = ADDSI (pc, 4); CPU (h_gr[((UINT) 14)]) = opval; written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1144,7 +1144,7 @@ if (NOTBI (CPU (h_cond))) { USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1169,7 +1169,7 @@ if (NOTBI (CPU (h_cond))) { USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1194,7 +1194,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) { USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1217,7 +1217,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) { { USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -1238,7 +1238,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) { { USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -1262,13 +1262,13 @@ 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", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1295,13 +1295,13 @@ 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", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -1324,7 +1324,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = LTSI (* FLD (i_src1), * FLD (i_src2)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1343,7 +1343,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = LTSI (* FLD (i_src2), FLD (f_simm16)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1362,7 +1362,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = LTUSI (* FLD (i_src1), * FLD (i_src2)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1381,7 +1381,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = LTUSI (* FLD (i_src2), FLD (f_simm16)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1400,7 +1400,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = EQSI (* FLD (i_src1), * FLD (i_src2)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1419,7 +1419,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = EQSI (* FLD (i_src2), 0); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -1440,7 +1440,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1463,7 +1463,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1486,7 +1486,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1509,7 +1509,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1532,7 +1532,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1556,7 +1556,7 @@ if (CPU (h_cond)) { USI opval = ANDSI (* FLD (i_sr), -4); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1581,7 +1581,7 @@ if (NOTBI (CPU (h_cond))) { USI opval = ANDSI (* FLD (i_sr), -4); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1608,12 +1608,12 @@ if (NOTBI (CPU (h_cond))) { { SI opval = temp0; CPU (h_gr[((UINT) 14)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = temp1; SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -1635,7 +1635,7 @@ if (NOTBI (CPU (h_cond))) { { USI opval = ANDSI (* FLD (i_sr), -4); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } SEM_BRANCH_FINI (vpc); @@ -1655,7 +1655,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1674,7 +1674,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1693,7 +1693,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1712,7 +1712,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1731,7 +1731,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1750,7 +1750,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1769,7 +1769,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1788,7 +1788,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1807,7 +1807,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1826,7 +1826,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1849,12 +1849,12 @@ if (NOTBI (CPU (h_cond))) { { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = temp1; * FLD (i_sr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1874,7 +1874,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = FLD (i_uimm24); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1893,7 +1893,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = FLD (f_simm8); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1912,7 +1912,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = FLD (f_simm16); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -1932,12 +1932,12 @@ if (NOTBI (CPU (h_cond))) { { BI opval = 1; CPU (h_lock) = opval; - TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); } { SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1957,7 +1957,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -1976,7 +1976,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -1995,7 +1995,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2014,7 +2014,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2033,7 +2033,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = MULSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2052,7 +2052,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2071,7 +2071,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2090,7 +2090,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2109,7 +2109,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2128,7 +2128,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = * FLD (i_sr); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2147,7 +2147,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2166,7 +2166,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = TRUNCDISI (GET_H_ACCUMS (FLD (f_accs))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2185,7 +2185,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2204,7 +2204,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = GET_H_CR (FLD (f_r2)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2223,7 +2223,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2242,7 +2242,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -2261,7 +2261,7 @@ if (NOTBI (CPU (h_cond))) { { USI opval = * FLD (i_sr); SET_H_CR (FLD (f_r1), opval); - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } #undef FLD @@ -2280,7 +2280,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = NEGSI (* FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2314,7 +2314,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = INVSI (* FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2337,7 +2337,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } } @@ -2361,7 +2361,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } } @@ -2383,22 +2383,22 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { USI opval = ANDSI (GET_H_CR (((UINT) 6)), -4); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } { USI opval = GET_H_CR (((UINT) 14)); SET_H_CR (((UINT) 6), opval); - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { UQI opval = CPU (h_bpsw); SET_H_PSW (opval); - TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); } { UQI opval = CPU (h_bbpsw); CPU (h_bpsw) = opval; - TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); } } @@ -2419,7 +2419,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = SLLSI (FLD (f_hi16), 16); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2438,7 +2438,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2457,7 +2457,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2476,7 +2476,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2495,7 +2495,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2514,7 +2514,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2533,7 +2533,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2552,7 +2552,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2571,7 +2571,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2590,7 +2590,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2609,7 +2609,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = * FLD (i_src1); SETMEMSI (current_cpu, pc, * FLD (i_src2), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -2628,7 +2628,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = * FLD (i_src1); SETMEMSI (current_cpu, pc, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -2647,7 +2647,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { QI opval = * FLD (i_src1); SETMEMQI (current_cpu, pc, * FLD (i_src2), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -2666,7 +2666,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { QI opval = * FLD (i_src1); SETMEMQI (current_cpu, pc, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -2685,7 +2685,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { HI opval = * FLD (i_src1); SETMEMHI (current_cpu, pc, * FLD (i_src2), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -2704,7 +2704,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { HI opval = * FLD (i_src1); SETMEMHI (current_cpu, pc, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -2726,12 +2726,12 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = * FLD (i_src1); SETMEMSI (current_cpu, pc, tmp_new_src2, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_new_src2; * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2754,12 +2754,12 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { HI opval = * FLD (i_src1); SETMEMHI (current_cpu, pc, tmp_new_src2, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = ADDSI (tmp_new_src2, 2); * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2782,12 +2782,12 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { QI opval = * FLD (i_src1); SETMEMQI (current_cpu, pc, tmp_new_src2, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = ADDSI (tmp_new_src2, 1); * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2810,12 +2810,12 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = * FLD (i_src1); SETMEMSI (current_cpu, pc, tmp_new_src2, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_new_src2; * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2835,7 +2835,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -2858,12 +2858,12 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -2887,12 +2887,12 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -2914,32 +2914,32 @@ 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", 'x', opval); + CGEN_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", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { UQI opval = CPU (h_bpsw); CPU (h_bbpsw) = opval; - TRACE_RESULT (current_cpu, abuf, "bbpsw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "bbpsw", 'x', opval); } { UQI opval = GET_H_PSW (); CPU (h_bpsw) = opval; - TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); } { UQI opval = ANDQI (GET_H_PSW (), 128); SET_H_PSW (opval); - TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); } { SI opval = m32r_trap (current_cpu, pc, FLD (f_uimm4)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -2963,13 +2963,13 @@ if (CPU (h_lock)) { SI opval = * FLD (i_src1); SETMEMSI (current_cpu, pc, * FLD (i_src2), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } { BI opval = 0; CPU (h_lock) = opval; - TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); } } @@ -2990,7 +2990,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -3009,7 +3009,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -3028,7 +3028,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef FLD @@ -3047,7 +3047,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, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -3066,7 +3066,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", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -3085,7 +3085,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", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -3104,7 +3104,7 @@ if (CPU (h_lock)) { { DI opval = SRADI (SLLDI (SUBDI (GET_H_ACCUM (), SRADI (SLLDI (MULDI (EXTHIDI (TRUNCSIHI (* FLD (i_src1))), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 32), 16)), 8), 8); SET_H_ACCUM (opval); - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } #undef FLD @@ -3123,7 +3123,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", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -3142,7 +3142,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", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef FLD @@ -3193,7 +3193,7 @@ if (ZEXTBISI (NOTBI (CPU (h_cond)))) { USI opval = ANDSI (GET_H_CR (((UINT) 0)), ORSI (ZEXTQISI (INVQI (FLD (f_uimm8))), 65280)); SET_H_CR (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } #undef FLD @@ -3212,7 +3212,7 @@ if (ZEXTBISI (NOTBI (CPU (h_cond)))) { USI opval = FLD (f_uimm8); SET_H_CR (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } #undef FLD @@ -3231,7 +3231,7 @@ if (ZEXTBISI (NOTBI (CPU (h_cond)))) { QI opval = ORQI (GETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16))), SLLQI (1, SUBSI (7, FLD (f_uimm3)))); SETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -3250,7 +3250,7 @@ if (ZEXTBISI (NOTBI (CPU (h_cond)))) { QI opval = ANDQI (GETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16))), INVQI (SLLQI (1, SUBSI (7, FLD (f_uimm3))))); SETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -3269,7 +3269,7 @@ if (ZEXTBISI (NOTBI (CPU (h_cond)))) { BI opval = ANDQI (SRLQI (* FLD (i_sr), SUBSI (7, FLD (f_uimm3))), 1); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef FLD @@ -3289,7 +3289,7 @@ if (ZEXTBISI (NOTBI (CPU (h_cond)))) { SI opval = ADDSI (* FLD (i_dr), * FLD (i_sr)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -3327,7 +3327,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -3365,7 +3365,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -3403,7 +3403,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -3441,7 +3441,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -3483,12 +3483,12 @@ CASE (sem, INSN_WRITE_ADDI) : /* addi $dr,$simm8 */ { SI opval = temp0; OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -3532,12 +3532,12 @@ CASE (sem, INSN_WRITE_ADDV) : /* addv $dr,$sr */ { SI opval = temp0; OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -3579,7 +3579,7 @@ if (CPU (h_cond)) { USI opval = FLD (i_disp8); OPRND (pc) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -3625,12 +3625,12 @@ CASE (sem, INSN_WRITE_BC8) : /* bc.s $disp8 */ { SI opval = ADDSI (ANDSI (pc, -4), 4); OPRND (h_gr_SI_14) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); OPRND (pc) = opval; - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -3675,13 +3675,13 @@ if (CPU (h_cond)) { SI opval = ADDSI (ANDSI (pc, -4), 4); OPRND (h_gr_SI_14) = opval; written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); OPRND (pc) = opval; written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -3733,7 +3733,7 @@ if (NOTBI (CPU (h_cond))) { USI opval = FLD (i_disp8); OPRND (pc) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -3778,7 +3778,7 @@ CASE (sem, INSN_WRITE_BNC8) : /* bnc.s $disp8 */ { USI opval = FLD (i_disp8); OPRND (pc) = opval; - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } #undef OPRND @@ -3821,13 +3821,13 @@ if (NOTBI (CPU (h_cond))) { SI opval = ADDSI (ANDSI (pc, -4), 4); OPRND (h_gr_SI_14) = opval; written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); OPRND (pc) = opval; written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } } @@ -3877,7 +3877,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, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef OPRND @@ -3915,7 +3915,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, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef OPRND @@ -3953,7 +3953,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, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef OPRND @@ -3991,7 +3991,7 @@ CASE (sem, INSN_WRITE_CMPEQ) : /* cmpeq $src1,$src2 */ { BI opval = EQSI (* FLD (i_src2), 0); OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef OPRND @@ -4031,7 +4031,7 @@ if (CPU (h_cond)) { USI opval = ANDSI (* FLD (i_sr), -4); OPRND (pc) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -4078,7 +4078,7 @@ if (NOTBI (CPU (h_cond))) { USI opval = ANDSI (* FLD (i_sr), -4); OPRND (pc) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -4127,12 +4127,12 @@ CASE (sem, INSN_WRITE_JNC) : /* jnc $sr */ { SI opval = temp0; OPRND (h_gr_SI_14) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = temp1; OPRND (pc) = opval; - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -4174,7 +4174,7 @@ CASE (sem, INSN_WRITE_JL) : /* jl $sr */ { USI opval = ANDSI (* FLD (i_sr), -4); OPRND (pc) = opval; - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } #undef OPRND @@ -4214,7 +4214,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4252,7 +4252,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4290,7 +4290,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4328,7 +4328,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4366,7 +4366,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4408,12 +4408,12 @@ CASE (sem, INSN_WRITE_LDUH) : /* lduh $dr,@$sr */ { SI opval = temp0; OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = temp1; OPRND (sr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -4453,7 +4453,7 @@ CASE (sem, INSN_WRITE_LD_PLUS) : /* ld $dr,@$sr+ */ { SI opval = FLD (f_simm8); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4492,12 +4492,12 @@ CASE (sem, INSN_WRITE_LDI8) : /* ldi8 $dr,$simm8 */ { BI opval = 1; OPRND (h_lock_BI) = opval; - TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); } { SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -4537,7 +4537,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4575,7 +4575,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4613,7 +4613,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4651,7 +4651,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4689,7 +4689,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4727,7 +4727,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4765,7 +4765,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4803,7 +4803,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4841,7 +4841,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -4879,7 +4879,7 @@ CASE (sem, INSN_WRITE_MULWLO_A) : /* mulwlo $src1,$src2,$acc */ { SI opval = * FLD (i_sr); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4917,7 +4917,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4955,7 +4955,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -4993,7 +4993,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5031,7 +5031,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5069,7 +5069,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -5107,7 +5107,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -5145,7 +5145,7 @@ CASE (sem, INSN_WRITE_MVTACLO_A) : /* mvtaclo $src1,$accs */ { USI opval = * FLD (i_sr); OPRND (dcr) = opval; - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } #undef OPRND @@ -5183,7 +5183,7 @@ CASE (sem, INSN_WRITE_MVTC) : /* mvtc $sr,$dcr */ { SI opval = NEGSI (* FLD (i_sr)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5254,7 +5254,7 @@ CASE (sem, INSN_WRITE_NOP) : /* nop */ { SI opval = INVSI (* FLD (i_sr)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5296,7 +5296,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } } @@ -5339,7 +5339,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, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } } @@ -5379,22 +5379,22 @@ CASE (sem, INSN_WRITE_RACH_DSI) : /* rach $accd,$accs,$imm1 */ { USI opval = ANDSI (GET_H_CR (((UINT) 6)), -4); OPRND (pc) = opval; - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } { USI opval = GET_H_CR (((UINT) 14)); OPRND (h_cr_USI_6) = opval; - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { UQI opval = CPU (h_bpsw); OPRND (h_psw_UQI) = opval; - TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); } { UQI opval = CPU (h_bbpsw); OPRND (h_bpsw_UQI) = opval; - TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); } } @@ -5438,7 +5438,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5476,7 +5476,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5514,7 +5514,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5552,7 +5552,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5590,7 +5590,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5628,7 +5628,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -5667,7 +5667,7 @@ CASE (sem, INSN_WRITE_SRLI) : /* srli $dr,$uimm5 */ SI opval = * FLD (i_src1); OPRND (h_memory_SI_src2_idx) = * FLD (i_src2); OPRND (h_memory_SI_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef OPRND @@ -5706,7 +5706,7 @@ CASE (sem, INSN_WRITE_ST) : /* st $src1,@$src2 */ QI opval = * FLD (i_src1); OPRND (h_memory_QI_src2_idx) = * FLD (i_src2); OPRND (h_memory_QI_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef OPRND @@ -5745,7 +5745,7 @@ CASE (sem, INSN_WRITE_STB) : /* stb $src1,@$src2 */ HI opval = * FLD (i_src1); OPRND (h_memory_HI_src2_idx) = * FLD (i_src2); OPRND (h_memory_HI_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef OPRND @@ -5787,12 +5787,12 @@ CASE (sem, INSN_WRITE_STH) : /* sth $src1,@$src2 */ SI opval = * FLD (i_src1); OPRND (h_memory_SI_new_src2_idx) = tmp_new_src2; OPRND (h_memory_SI_new_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_new_src2; OPRND (src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -5836,12 +5836,12 @@ CASE (sem, INSN_WRITE_ST_PLUS) : /* st $src1,@+$src2 */ HI opval = * FLD (i_src1); OPRND (h_memory_HI_new_src2_idx) = tmp_new_src2; OPRND (h_memory_HI_new_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = ADDSI (tmp_new_src2, 2); OPRND (src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -5885,12 +5885,12 @@ CASE (sem, INSN_WRITE_STH_PLUS) : /* sth $src1,@$src2+ */ QI opval = * FLD (i_src1); OPRND (h_memory_QI_new_src2_idx) = tmp_new_src2; OPRND (h_memory_QI_new_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = ADDSI (tmp_new_src2, 1); OPRND (src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -5934,12 +5934,12 @@ CASE (sem, INSN_WRITE_STB_PLUS) : /* stb $src1,@$src2+ */ SI opval = * FLD (i_src1); OPRND (h_memory_SI_new_src2_idx) = tmp_new_src2; OPRND (h_memory_SI_new_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_new_src2; OPRND (src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -5979,7 +5979,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, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } #undef OPRND @@ -6021,12 +6021,12 @@ CASE (sem, INSN_WRITE_SUB) : /* sub $dr,$sr */ { SI opval = temp0; OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -6070,12 +6070,12 @@ CASE (sem, INSN_WRITE_SUBV) : /* subv $dr,$sr */ { SI opval = temp0; OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -6116,32 +6116,32 @@ CASE (sem, INSN_WRITE_SUBX) : /* subx $dr,$sr */ { USI opval = GET_H_CR (((UINT) 6)); OPRND (h_cr_USI_14) = opval; - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { USI opval = ADDSI (pc, 4); OPRND (h_cr_USI_6) = opval; - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { UQI opval = CPU (h_bpsw); OPRND (h_bbpsw_UQI) = opval; - TRACE_RESULT (current_cpu, abuf, "bbpsw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "bbpsw", 'x', opval); } { UQI opval = GET_H_PSW (); OPRND (h_bpsw_UQI) = opval; - TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); } { UQI opval = ANDQI (GET_H_PSW (), 128); OPRND (h_psw_UQI) = opval; - TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); } { SI opval = m32r_trap (current_cpu, pc, FLD (f_uimm4)); OPRND (pc) = opval; - TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } } @@ -6191,13 +6191,13 @@ if (CPU (h_lock)) { OPRND (h_memory_SI_src2_idx) = * FLD (i_src2); OPRND (h_memory_SI_src2) = opval; written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } { BI opval = 0; OPRND (h_lock_BI) = opval; - TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); } } @@ -6241,7 +6241,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, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef OPRND @@ -6279,7 +6279,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_DI_0) = opval; - TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -6317,7 +6317,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_DI_1) = opval; - TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -6355,7 +6355,7 @@ CASE (sem, INSN_WRITE_MACWU1) : /* macwu1 $src1,$src2 */ { DI opval = SRADI (SLLDI (SUBDI (GET_H_ACCUM (), SRADI (SLLDI (MULDI (EXTHIDI (TRUNCSIHI (* FLD (i_src1))), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 32), 16)), 8), 8); OPRND (accum) = opval; - TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval); } #undef OPRND @@ -6393,7 +6393,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_DI_1) = opval; - TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -6431,7 +6431,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_DI_1) = opval; - TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); } #undef OPRND @@ -6537,7 +6537,7 @@ CASE (sem, INSN_WRITE_SNC) : /* snc */ { USI opval = ANDSI (GET_H_CR (((UINT) 0)), ORSI (ZEXTQISI (INVQI (FLD (f_uimm8))), 65280)); OPRND (h_cr_USI_0) = opval; - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } #undef OPRND @@ -6575,7 +6575,7 @@ CASE (sem, INSN_WRITE_CLRPSW) : /* clrpsw $uimm8 */ { USI opval = FLD (f_uimm8); OPRND (h_cr_USI_0) = opval; - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } #undef OPRND @@ -6613,7 +6613,7 @@ CASE (sem, INSN_WRITE_SETPSW) : /* setpsw $uimm8 */ { BI opval = ANDQI (SRLQI (* FLD (i_sr), SUBSI (7, FLD (f_uimm3))), 1); OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } #undef OPRND diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog index e8b81e1..a443a1a 100644 --- a/sim/sh64/ChangeLog +++ b/sim/sh64/ChangeLog @@ -1,3 +1,19 @@ +2015-06-12 Mike Frysinger <vapier@gentoo.org> + + * decode-compact.c (sh64_compact_decode): Change TRACE_EXTRACT to + CGEN_TRACE_EXTRACT. + * decode-media.c: Likewise. + * mloop-compact.in (execute): Change TRACE_INSN_INIT to + CGEN_TRACE_INSN_INIT, TRACE_INSN to CGEN_TRACE_INSN, and TRACE_INSN_FINI + to CGEN_TRACE_INSN_FINI. + (sh64_compact_pbb_before): Likewise. + (sh64_compact_pbb_after): Change TRACE_INSN_FINI to CGEN_TRACE_INSN_FINI. + * mloop-media.in: Likewise. + * sem-compact.c: Rename TRACE_RESULT to CGEN_TRACE_RESULT. + * sem-compact-switch.c: Likewise. + * sem-media.c: Likewise. + * sem-media-switch.c: Likewise. + 2015-04-18 Mike Frysinger <vapier@gentoo.org> * sim-main.h (USING_SIM_BASE_H): Delete. diff --git a/sim/sh64/decode-compact.c b/sim/sh64/decode-compact.c index d50fedd..887545e 100644 --- a/sim/sh64/decode-compact.c +++ b/sim/sh64/decode-compact.c @@ -2649,7 +2649,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0)); #undef FLD return idesc; @@ -2669,7 +2669,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2698,7 +2698,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm8) = f_imm8; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi_compact", "f_imm8 0x%x", 'x', f_imm8, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi_compact", "f_imm8 0x%x", 'x', f_imm8, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2726,7 +2726,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addc_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addc_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2755,7 +2755,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addv_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addv_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2784,7 +2784,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2810,7 +2810,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm8) = f_imm8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andi_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andi_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2835,7 +2835,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm8) = f_imm8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andb_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andb_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2859,7 +2859,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp8) = f_disp8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bf_compact", "disp8 0x%x", 'x', f_disp8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bf_compact", "disp8 0x%x", 'x', f_disp8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2882,7 +2882,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp8) = f_disp8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bfs_compact", "disp8 0x%x", 'x', f_disp8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bfs_compact", "disp8 0x%x", 'x', f_disp8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2905,7 +2905,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp12) = f_disp12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bra_compact", "disp12 0x%x", 'x', f_disp12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bra_compact", "disp12 0x%x", 'x', f_disp12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2928,7 +2928,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_braf_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_braf_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2948,7 +2948,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_brk_compact", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_brk_compact", (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2971,7 +2971,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (i_disp12) = f_disp12; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bsr_compact", "disp12 0x%x", 'x', f_disp12, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bsr_compact", "disp12 0x%x", 'x', f_disp12, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2994,7 +2994,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bsrf_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bsrf_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3014,7 +3014,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrmac_compact", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrmac_compact", (char *) 0)); #undef FLD return idesc; @@ -3027,7 +3027,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrs_compact", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrs_compact", (char *) 0)); #undef FLD return idesc; @@ -3040,7 +3040,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrt_compact", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_clrt_compact", (char *) 0)); #undef FLD return idesc; @@ -3060,7 +3060,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpeq_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpeq_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3085,7 +3085,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm8) = f_imm8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpeqi_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmpeqi_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3109,7 +3109,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmppl_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmppl_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3136,7 +3136,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_div0s_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_div0s_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3157,7 +3157,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_div0u_compact", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_div0u_compact", (char *) 0)); #undef FLD return idesc; @@ -3177,7 +3177,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_div1_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_div1_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3203,7 +3203,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_divu_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_divu_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3232,7 +3232,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_dmulsl_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_dmulsl_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3257,7 +3257,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_dt_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_dt_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3285,7 +3285,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_extsb_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_extsb_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3310,7 +3310,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fabs_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fabs_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3338,7 +3338,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fadd_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fadd_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3367,7 +3367,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcmpeq_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcmpeq_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3392,7 +3392,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_dn) = f_dn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcnvds_compact", "f_dn 0x%x", 'x', f_dn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcnvds_compact", "f_dn 0x%x", 'x', f_dn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3417,7 +3417,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_dn) = f_dn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcnvsd_compact", "f_dn 0x%x", 'x', f_dn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcnvsd_compact", "f_dn 0x%x", 'x', f_dn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3445,7 +3445,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_vm) = f_vm; FLD (f_vn) = f_vn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fipr_compact", "f_vm 0x%x", 'x', f_vm, "f_vn 0x%x", 'x', f_vn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fipr_compact", "f_vm 0x%x", 'x', f_vm, "f_vn 0x%x", 'x', f_vn, (char *) 0)); #undef FLD return idesc; @@ -3462,7 +3462,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_flds_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_flds_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3487,7 +3487,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fldi0_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fldi0_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3511,7 +3511,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_float_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_float_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3539,7 +3539,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmac_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmac_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3569,7 +3569,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov1_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov1_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3597,7 +3597,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov2_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov2_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3625,7 +3625,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov3_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov3_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3654,7 +3654,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov4_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov4_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3683,7 +3683,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov5_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov5_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3711,7 +3711,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov6_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov6_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3740,7 +3740,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov7_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov7_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3772,7 +3772,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_imm12x8) = f_imm12x8; FLD (f_rm) = f_rm; FLD (f_dn) = f_dn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov8_compact", "f_imm12x8 0x%x", 'x', f_imm12x8, "f_rm 0x%x", 'x', f_rm, "f_dn 0x%x", 'x', f_dn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov8_compact", "f_imm12x8 0x%x", 'x', f_imm12x8, "f_rm 0x%x", 'x', f_rm, "f_dn 0x%x", 'x', f_dn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3803,7 +3803,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_dm) = f_dm; FLD (f_imm12x8) = f_imm12x8; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov9_compact", "f_dm 0x%x", 'x', f_dm, "f_imm12x8 0x%x", 'x', f_imm12x8, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmov9_compact", "f_dm 0x%x", 'x', f_dm, "f_imm12x8 0x%x", 'x', f_imm12x8, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3824,7 +3824,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_frchg_compact", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_frchg_compact", (char *) 0)); #undef FLD return idesc; @@ -3837,7 +3837,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fschg_compact", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fschg_compact", (char *) 0)); #undef FLD return idesc; @@ -3854,7 +3854,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fsts_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fsts_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3879,7 +3879,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftrc_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftrc_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3904,7 +3904,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_vn) = f_vn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftrv_compact", "f_vn 0x%x", 'x', f_vn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftrv_compact", "f_vn 0x%x", 'x', f_vn, (char *) 0)); #undef FLD return idesc; @@ -3921,7 +3921,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldc_gbr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldc_gbr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3945,7 +3945,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldc_vbr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldc_vbr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3969,7 +3969,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldc_sr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldc_sr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3993,7 +3993,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldcl_gbr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldcl_gbr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4018,7 +4018,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldcl_vbr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldcl_vbr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4043,7 +4043,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lds_fpscr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lds_fpscr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4067,7 +4067,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsl_fpscr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsl_fpscr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4092,7 +4092,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lds_fpul_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lds_fpul_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4117,7 +4117,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsl_fpul_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsl_fpul_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4143,7 +4143,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lds_mach_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lds_mach_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4167,7 +4167,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsl_mach_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsl_mach_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4192,7 +4192,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lds_macl_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lds_macl_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4216,7 +4216,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsl_macl_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsl_macl_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4241,7 +4241,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lds_pr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lds_pr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4265,7 +4265,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsl_pr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldsl_pr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4293,7 +4293,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_macl_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_macl_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4323,7 +4323,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_macw_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_macw_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4353,7 +4353,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mov_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mov_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4381,7 +4381,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm8) = f_imm8; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movi_compact", "f_imm8 0x%x", 'x', f_imm8, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movi_compact", "f_imm8 0x%x", 'x', f_imm8, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4412,7 +4412,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm20) = f_imm20; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movi20_compact", "f_imm20 0x%x", 'x', f_imm20, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movi20_compact", "f_imm20 0x%x", 'x', f_imm20, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4439,7 +4439,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb1_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb1_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4467,7 +4467,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb2_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb2_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4496,7 +4496,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb3_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb3_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4522,7 +4522,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm8) = f_imm8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb4_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb4_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4549,7 +4549,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm4) = f_imm4; FLD (f_rm) = f_rm; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb5_compact", "f_imm4 0x%x", 'x', f_imm4, "f_rm 0x%x", 'x', f_rm, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb5_compact", "f_imm4 0x%x", 'x', f_imm4, "f_rm 0x%x", 'x', f_rm, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4577,7 +4577,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb6_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb6_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4605,7 +4605,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb7_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb7_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4634,7 +4634,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb8_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb8_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4660,7 +4660,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm8) = f_imm8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb9_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb9_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4687,7 +4687,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm4) = f_imm4; FLD (f_rm) = f_rm; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb10_compact", "f_imm4 0x%x", 'x', f_imm4, "f_rm 0x%x", 'x', f_rm, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movb10_compact", "f_imm4 0x%x", 'x', f_imm4, "f_rm 0x%x", 'x', f_rm, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4715,7 +4715,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl1_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl1_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4743,7 +4743,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl2_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl2_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4772,7 +4772,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl3_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl3_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4798,7 +4798,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm8x4) = f_imm8x4; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl4_compact", "f_imm8x4 0x%x", 'x', f_imm8x4, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl4_compact", "f_imm8x4 0x%x", 'x', f_imm8x4, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4828,7 +4828,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_imm4x4) = f_imm4x4; FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl5_compact", "f_imm4x4 0x%x", 'x', f_imm4x4, "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl5_compact", "f_imm4x4 0x%x", 'x', f_imm4x4, "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4856,7 +4856,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl6_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl6_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4884,7 +4884,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl7_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl7_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4914,7 +4914,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl8_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl8_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4940,7 +4940,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm8x4) = f_imm8x4; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl9_compact", "f_imm8x4 0x%x", 'x', f_imm8x4, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl9_compact", "f_imm8x4 0x%x", 'x', f_imm8x4, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4967,7 +4967,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm8x4) = f_imm8x4; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl10_compact", "f_imm8x4 0x%x", 'x', f_imm8x4, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl10_compact", "f_imm8x4 0x%x", 'x', f_imm8x4, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4997,7 +4997,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_imm4x4) = f_imm4x4; FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl11_compact", "f_imm4x4 0x%x", 'x', f_imm4x4, "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl11_compact", "f_imm4x4 0x%x", 'x', f_imm4x4, "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5028,7 +5028,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_imm12x4) = f_imm12x4; FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl12_compact", "f_imm12x4 0x%x", 'x', f_imm12x4, "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl12_compact", "f_imm12x4 0x%x", 'x', f_imm12x4, "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5059,7 +5059,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_imm12x4) = f_imm12x4; FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl13_compact", "f_imm12x4 0x%x", 'x', f_imm12x4, "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movl13_compact", "f_imm12x4 0x%x", 'x', f_imm12x4, "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5087,7 +5087,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw1_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw1_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5115,7 +5115,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw2_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw2_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5144,7 +5144,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw3_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw3_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5170,7 +5170,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm8x2) = f_imm8x2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw4_compact", "f_imm8x2 0x%x", 'x', f_imm8x2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw4_compact", "f_imm8x2 0x%x", 'x', f_imm8x2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5197,7 +5197,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm4x2) = f_imm4x2; FLD (f_rm) = f_rm; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw5_compact", "f_imm4x2 0x%x", 'x', f_imm4x2, "f_rm 0x%x", 'x', f_rm, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw5_compact", "f_imm4x2 0x%x", 'x', f_imm4x2, "f_rm 0x%x", 'x', f_rm, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5225,7 +5225,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw6_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw6_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5253,7 +5253,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw7_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw7_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5282,7 +5282,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw8_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw8_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5308,7 +5308,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm8x2) = f_imm8x2; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw9_compact", "f_imm8x2 0x%x", 'x', f_imm8x2, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw9_compact", "f_imm8x2 0x%x", 'x', f_imm8x2, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5335,7 +5335,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm8x2) = f_imm8x2; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw10_compact", "f_imm8x2 0x%x", 'x', f_imm8x2, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw10_compact", "f_imm8x2 0x%x", 'x', f_imm8x2, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5362,7 +5362,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm4x2) = f_imm4x2; FLD (f_rm) = f_rm; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw11_compact", "f_imm4x2 0x%x", 'x', f_imm4x2, "f_rm 0x%x", 'x', f_rm, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movw11_compact", "f_imm4x2 0x%x", 'x', f_imm4x2, "f_rm 0x%x", 'x', f_rm, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5387,7 +5387,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm8x4) = f_imm8x4; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mova_compact", "f_imm8x4 0x%x", 'x', f_imm8x4, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mova_compact", "f_imm8x4 0x%x", 'x', f_imm8x4, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5411,7 +5411,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movcal_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movcal_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5436,7 +5436,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movcol_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movcol_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5461,7 +5461,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movt_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movt_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5485,7 +5485,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movual_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movual_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5510,7 +5510,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movual2_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movual2_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5539,7 +5539,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mull_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mull_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5567,7 +5567,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_negc_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_negc_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5588,7 +5588,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nop_compact", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nop_compact", (char *) 0)); #undef FLD return idesc; @@ -5605,7 +5605,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_pref_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_pref_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5629,7 +5629,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rotcl_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rotcl_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5650,7 +5650,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rts_compact", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_rts_compact", (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5676,7 +5676,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rm) = f_rm; FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_shad_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_shad_compact", "f_rm 0x%x", 'x', f_rm, "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5702,7 +5702,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stc_gbr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stc_gbr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5726,7 +5726,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stc_vbr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stc_vbr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5750,7 +5750,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stcl_gbr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stcl_gbr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5775,7 +5775,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stcl_vbr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stcl_vbr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5800,7 +5800,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sts_fpscr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sts_fpscr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5824,7 +5824,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stsl_fpscr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stsl_fpscr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5849,7 +5849,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sts_fpul_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sts_fpul_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5874,7 +5874,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stsl_fpul_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stsl_fpul_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5900,7 +5900,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sts_mach_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sts_mach_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5924,7 +5924,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stsl_mach_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stsl_mach_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5949,7 +5949,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sts_macl_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sts_macl_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5973,7 +5973,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stsl_macl_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stsl_macl_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -5998,7 +5998,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sts_pr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sts_pr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6022,7 +6022,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stsl_pr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stsl_pr_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6047,7 +6047,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_rn) = f_rn; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_tasb_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_tasb_compact", "f_rn 0x%x", 'x', f_rn, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6071,7 +6071,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm8) = f_imm8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_trapa_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_trapa_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6094,7 +6094,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm8) = f_imm8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_tsti_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_tsti_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -6118,7 +6118,7 @@ sh64_compact_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm8) = f_imm8; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_tstb_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_tstb_compact", "f_imm8 0x%x", 'x', f_imm8, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ diff --git a/sim/sh64/decode-media.c b/sim/sh64/decode-media.c index 2f25304..7c6ba13 100644 --- a/sim/sh64/decode-media.c +++ b/sim/sh64/decode-media.c @@ -1539,7 +1539,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0)); #undef FLD return idesc; @@ -1562,7 +1562,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_left) = f_left; FLD (f_right) = f_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1594,7 +1594,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp10) = f_disp10; FLD (f_left) = f_left; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi", "f_disp10 0x%x", 'x', f_disp10, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi", "f_disp10 0x%x", 'x', f_disp10, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1619,7 +1619,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_left) = f_left; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_alloco", "f_left 0x%x", 'x', f_left, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_alloco", "f_left 0x%x", 'x', f_left, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1650,7 +1650,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_left) = f_left; FLD (f_right) = f_right; FLD (f_tra) = f_tra; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beq", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_tra 0x%x", 'x', f_tra, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beq", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_tra 0x%x", 'x', f_tra, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1682,7 +1682,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_imm6) = f_imm6; FLD (f_left) = f_left; FLD (f_tra) = f_tra; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beqi", "f_imm6 0x%x", 'x', f_imm6, "f_left 0x%x", 'x', f_left, "f_tra 0x%x", 'x', f_tra, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_beqi", "f_imm6 0x%x", 'x', f_imm6, "f_left 0x%x", 'x', f_left, "f_tra 0x%x", 'x', f_tra, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1710,7 +1710,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_dest) = f_dest; FLD (f_trb) = f_trb; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_blink", "f_dest 0x%x", 'x', f_dest, "f_trb 0x%x", 'x', f_trb, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_blink", "f_dest 0x%x", 'x', f_dest, "f_trb 0x%x", 'x', f_trb, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1741,7 +1741,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_imm6) = f_imm6; FLD (f_left) = f_left; FLD (f_tra) = f_tra; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bnei", "f_imm6 0x%x", 'x', f_imm6, "f_left 0x%x", 'x', f_left, "f_tra 0x%x", 'x', f_tra, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bnei", "f_imm6 0x%x", 'x', f_imm6, "f_left 0x%x", 'x', f_left, "f_tra 0x%x", 'x', f_tra, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1762,7 +1762,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_brk", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_brk", (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1788,7 +1788,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_left) = f_left; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_byterev", "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_byterev", "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1819,7 +1819,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_left) = f_left; FLD (f_right) = f_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmveq", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_cmveq", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1852,7 +1852,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_left_right) = f_left_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fabsd", "f_left_right 0x%x", 'x', f_left_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fabsd", "f_left_right 0x%x", 'x', f_left_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1884,7 +1884,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_left_right) = f_left_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fabss", "f_left_right 0x%x", 'x', f_left_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fabss", "f_left_right 0x%x", 'x', f_left_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1915,7 +1915,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_left) = f_left; FLD (f_right) = f_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_faddd", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_faddd", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1947,7 +1947,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_left) = f_left; FLD (f_right) = f_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fadds", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fadds", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -1979,7 +1979,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_left) = f_left; FLD (f_right) = f_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcmpeqd", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcmpeqd", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2011,7 +2011,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_left) = f_left; FLD (f_right) = f_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcmpeqs", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcmpeqs", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2044,7 +2044,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_left_right) = f_left_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcnvds", "f_left_right 0x%x", 'x', f_left_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcnvds", "f_left_right 0x%x", 'x', f_left_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2076,7 +2076,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_left_right) = f_left_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcnvsd", "f_left_right 0x%x", 'x', f_left_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fcnvsd", "f_left_right 0x%x", 'x', f_left_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2101,7 +2101,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fgetscr", "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fgetscr", "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2131,7 +2131,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_left) = f_left; FLD (f_right) = f_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fiprs", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fiprs", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2165,7 +2165,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp10x8) = f_disp10x8; FLD (f_left) = f_left; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fldd", "f_disp10x8 0x%x", 'x', f_disp10x8, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fldd", "f_disp10x8 0x%x", 'x', f_disp10x8, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2196,7 +2196,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp10x8) = f_disp10x8; FLD (f_dest) = f_dest; FLD (f_left) = f_left; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fldp", "f_disp10x8 0x%x", 'x', f_disp10x8, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fldp", "f_disp10x8 0x%x", 'x', f_disp10x8, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2228,7 +2228,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp10x4) = f_disp10x4; FLD (f_left) = f_left; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_flds", "f_disp10x4 0x%x", 'x', f_disp10x4, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_flds", "f_disp10x4 0x%x", 'x', f_disp10x4, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2259,7 +2259,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_left) = f_left; FLD (f_right) = f_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fldxd", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fldxd", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2291,7 +2291,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_dest) = f_dest; FLD (f_left) = f_left; FLD (f_right) = f_right; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fldxp", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fldxp", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2324,7 +2324,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_left) = f_left; FLD (f_right) = f_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fldxs", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fldxs", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2356,7 +2356,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_dest) = f_dest; FLD (f_left) = f_left; FLD (f_right) = f_right; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmacs", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmacs", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2390,7 +2390,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_left_right) = f_left_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmovdq", "f_left_right 0x%x", 'x', f_left_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmovdq", "f_left_right 0x%x", 'x', f_left_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2418,7 +2418,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_left) = f_left; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmovls", "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmovls", "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2446,7 +2446,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_left) = f_left; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmovqd", "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmovqd", "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2478,7 +2478,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_left_right) = f_left_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmovsl", "f_left_right 0x%x", 'x', f_left_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fmovsl", "f_left_right 0x%x", 'x', f_left_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2507,7 +2507,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_left_right) = f_left_right; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fputscr", "f_left_right 0x%x", 'x', f_left_right, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fputscr", "f_left_right 0x%x", 'x', f_left_right, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2537,7 +2537,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp10x8) = f_disp10x8; FLD (f_dest) = f_dest; FLD (f_left) = f_left; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fstd", "f_disp10x8 0x%x", 'x', f_disp10x8, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fstd", "f_disp10x8 0x%x", 'x', f_disp10x8, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2568,7 +2568,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp10x4) = f_disp10x4; FLD (f_dest) = f_dest; FLD (f_left) = f_left; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fsts", "f_disp10x4 0x%x", 'x', f_disp10x4, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fsts", "f_disp10x4 0x%x", 'x', f_disp10x4, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2599,7 +2599,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_dest) = f_dest; FLD (f_left) = f_left; FLD (f_right) = f_right; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fstxd", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fstxd", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2631,7 +2631,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_dest) = f_dest; FLD (f_left) = f_left; FLD (f_right) = f_right; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fstxs", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fstxs", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2663,7 +2663,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_left) = f_left; FLD (f_right) = f_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fsubd", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_fsubd", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2696,7 +2696,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_left_right) = f_left_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftrcdq", "f_left_right 0x%x", 'x', f_left_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftrcdq", "f_left_right 0x%x", 'x', f_left_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2727,7 +2727,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_dest) = f_dest; FLD (f_left) = f_left; FLD (f_right) = f_right; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftrvs", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ftrvs", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2762,7 +2762,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp6) = f_disp6; FLD (f_left) = f_left; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_getcfg", "f_disp6 0x%x", 'x', f_disp6, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_getcfg", "f_disp6 0x%x", 'x', f_disp6, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2790,7 +2790,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_left) = f_left; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_getcon", "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_getcon", "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2817,7 +2817,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_trb) = f_trb; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_gettr", "f_trb 0x%x", 'x', f_trb, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_gettr", "f_trb 0x%x", 'x', f_trb, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2848,7 +2848,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp10) = f_disp10; FLD (f_left) = f_left; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldb", "f_disp10 0x%x", 'x', f_disp10, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldb", "f_disp10 0x%x", 'x', f_disp10, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2879,7 +2879,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp10x4) = f_disp10x4; FLD (f_left) = f_left; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldl", "f_disp10x4 0x%x", 'x', f_disp10x4, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldl", "f_disp10x4 0x%x", 'x', f_disp10x4, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2910,7 +2910,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp10x8) = f_disp10x8; FLD (f_left) = f_left; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldq", "f_disp10x8 0x%x", 'x', f_disp10x8, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldq", "f_disp10x8 0x%x", 'x', f_disp10x8, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2941,7 +2941,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp10x2) = f_disp10x2; FLD (f_left) = f_left; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lduw", "f_disp10x2 0x%x", 'x', f_disp10x2, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lduw", "f_disp10x2 0x%x", 'x', f_disp10x2, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -2972,7 +2972,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp6) = f_disp6; FLD (f_left) = f_left; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldhil", "f_disp6 0x%x", 'x', f_disp6, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldhil", "f_disp6 0x%x", 'x', f_disp6, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3003,7 +3003,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp6) = f_disp6; FLD (f_left) = f_left; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldhiq", "f_disp6 0x%x", 'x', f_disp6, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldhiq", "f_disp6 0x%x", 'x', f_disp6, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3034,7 +3034,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp6) = f_disp6; FLD (f_left) = f_left; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldlol", "f_disp6 0x%x", 'x', f_disp6, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldlol", "f_disp6 0x%x", 'x', f_disp6, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3065,7 +3065,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp6) = f_disp6; FLD (f_left) = f_left; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldloq", "f_disp6 0x%x", 'x', f_disp6, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldloq", "f_disp6 0x%x", 'x', f_disp6, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3096,7 +3096,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_left) = f_left; FLD (f_right) = f_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldxb", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldxb", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3128,7 +3128,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_left) = f_left; FLD (f_right) = f_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldxl", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldxl", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3160,7 +3160,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_left) = f_left; FLD (f_right) = f_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldxq", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldxq", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3192,7 +3192,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_left) = f_left; FLD (f_right) = f_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldxub", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldxub", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3224,7 +3224,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_left) = f_left; FLD (f_right) = f_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldxuw", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldxuw", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3256,7 +3256,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_left) = f_left; FLD (f_right) = f_right; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldxw", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldxw", "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3288,7 +3288,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_dest) = f_dest; FLD (f_left) = f_left; FLD (f_right) = f_right; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcmv", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mcmv", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3321,7 +3321,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_dest) = f_dest; FLD (f_left) = f_left; FLD (f_right) = f_right; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mmacnfx_wl", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mmacnfx_wl", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3351,7 +3351,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_imm16) = f_imm16; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movi", "f_imm16 0x%x", 'x', f_imm16, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_movi", "f_imm16 0x%x", 'x', f_imm16, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3371,7 +3371,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nop", (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_nop", (char *) 0)); #undef FLD return idesc; @@ -3394,7 +3394,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_imm10) = f_imm10; FLD (f_left) = f_left; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ori", "f_imm10 0x%x", 'x', f_imm10, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ori", "f_imm10 0x%x", 'x', f_imm10, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3419,7 +3419,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_left) = f_left; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_prefi", "f_left 0x%x", 'x', f_left, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_prefi", "f_left 0x%x", 'x', f_left, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3447,7 +3447,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_disp16) = f_disp16; FLD (f_tra) = f_tra; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_pta", "f_disp16 0x%x", 'x', f_disp16, "f_tra 0x%x", 'x', f_tra, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_pta", "f_disp16 0x%x", 'x', f_disp16, "f_tra 0x%x", 'x', f_tra, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3474,7 +3474,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_right) = f_right; FLD (f_tra) = f_tra; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ptabs", "f_right 0x%x", 'x', f_right, "f_tra 0x%x", 'x', f_tra, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ptabs", "f_right 0x%x", 'x', f_right, "f_tra 0x%x", 'x', f_tra, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3502,7 +3502,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_right) = f_right; FLD (f_tra) = f_tra; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ptrel", "f_right 0x%x", 'x', f_right, "f_tra 0x%x", 'x', f_tra, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ptrel", "f_right 0x%x", 'x', f_right, "f_tra 0x%x", 'x', f_tra, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3533,7 +3533,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp6) = f_disp6; FLD (f_dest) = f_dest; FLD (f_left) = f_left; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_putcfg", "f_disp6 0x%x", 'x', f_disp6, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_putcfg", "f_disp6 0x%x", 'x', f_disp6, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3561,7 +3561,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_left) = f_left; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_putcon", "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_putcon", "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3591,7 +3591,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_left) = f_left; FLD (f_uimm6) = f_uimm6; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_shari", "f_left 0x%x", 'x', f_left, "f_uimm6 0x%x", 'x', f_uimm6, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_shari", "f_left 0x%x", 'x', f_left, "f_uimm6 0x%x", 'x', f_uimm6, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3619,7 +3619,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_dest) = f_dest; FLD (f_uimm16) = f_uimm16; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_shori", "f_dest 0x%x", 'x', f_dest, "f_uimm16 0x%x", 'x', f_uimm16, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_shori", "f_dest 0x%x", 'x', f_dest, "f_uimm16 0x%x", 'x', f_uimm16, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3650,7 +3650,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp10) = f_disp10; FLD (f_dest) = f_dest; FLD (f_left) = f_left; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb", "f_disp10 0x%x", 'x', f_disp10, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stb", "f_disp10 0x%x", 'x', f_disp10, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3681,7 +3681,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp10x4) = f_disp10x4; FLD (f_dest) = f_dest; FLD (f_left) = f_left; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stl", "f_disp10x4 0x%x", 'x', f_disp10x4, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stl", "f_disp10x4 0x%x", 'x', f_disp10x4, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3712,7 +3712,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp10x8) = f_disp10x8; FLD (f_dest) = f_dest; FLD (f_left) = f_left; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stq", "f_disp10x8 0x%x", 'x', f_disp10x8, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stq", "f_disp10x8 0x%x", 'x', f_disp10x8, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3743,7 +3743,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp10x2) = f_disp10x2; FLD (f_dest) = f_dest; FLD (f_left) = f_left; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stw", "f_disp10x2 0x%x", 'x', f_disp10x2, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stw", "f_disp10x2 0x%x", 'x', f_disp10x2, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3774,7 +3774,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp6) = f_disp6; FLD (f_dest) = f_dest; FLD (f_left) = f_left; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sthil", "f_disp6 0x%x", 'x', f_disp6, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sthil", "f_disp6 0x%x", 'x', f_disp6, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3805,7 +3805,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp6) = f_disp6; FLD (f_dest) = f_dest; FLD (f_left) = f_left; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sthiq", "f_disp6 0x%x", 'x', f_disp6, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sthiq", "f_disp6 0x%x", 'x', f_disp6, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3836,7 +3836,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp6) = f_disp6; FLD (f_dest) = f_dest; FLD (f_left) = f_left; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stlol", "f_disp6 0x%x", 'x', f_disp6, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stlol", "f_disp6 0x%x", 'x', f_disp6, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3867,7 +3867,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_disp6) = f_disp6; FLD (f_dest) = f_dest; FLD (f_left) = f_left; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stloq", "f_disp6 0x%x", 'x', f_disp6, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stloq", "f_disp6 0x%x", 'x', f_disp6, "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3898,7 +3898,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_dest) = f_dest; FLD (f_left) = f_left; FLD (f_right) = f_right; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stxb", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stxb", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3930,7 +3930,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_dest) = f_dest; FLD (f_left) = f_left; FLD (f_right) = f_right; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stxl", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stxl", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3962,7 +3962,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_dest) = f_dest; FLD (f_left) = f_left; FLD (f_right) = f_right; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stxq", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stxq", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -3994,7 +3994,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_dest) = f_dest; FLD (f_left) = f_left; FLD (f_right) = f_right; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stxw", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_stxw", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4026,7 +4026,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_dest) = f_dest; FLD (f_left) = f_left; FLD (f_right) = f_right; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_swapq", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_swapq", "f_dest 0x%x", 'x', f_dest, "f_left 0x%x", 'x', f_left, "f_right 0x%x", 'x', f_right, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4053,7 +4053,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, /* Record the fields for the semantic handler. */ FLD (f_left) = f_left; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_trapa", "f_left 0x%x", 'x', f_left, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_trapa", "f_left 0x%x", 'x', f_left, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ @@ -4083,7 +4083,7 @@ sh64_media_decode (SIM_CPU *current_cpu, IADDR pc, FLD (f_imm6) = f_imm6; FLD (f_left) = f_left; FLD (f_dest) = f_dest; - TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_xori", "f_imm6 0x%x", 'x', f_imm6, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); + CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_xori", "f_imm6 0x%x", 'x', f_imm6, "f_left 0x%x", 'x', f_left, "f_dest 0x%x", 'x', f_dest, (char *) 0)); #if WITH_PROFILE_MODEL_P /* Record the fields for profiling. */ diff --git a/sim/sh64/mloop-compact.c b/sim/sh64/mloop-compact.c index fb6b552..16d6e63 100644 --- a/sim/sh64/mloop-compact.c +++ b/sim/sh64/mloop-compact.c @@ -124,8 +124,8 @@ execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p) if (PROFILE_MODEL_P (current_cpu) && ARGBUF_PROFILE_P (abuf)) sh64_compact_model_insn_before (current_cpu, 1 /*first_p*/); - TRACE_INSN_INIT (current_cpu, abuf, 1); - TRACE_INSN (current_cpu, idesc->idata, + CGEN_TRACE_INSN_INIT (current_cpu, abuf, 1); + CGEN_TRACE_INSN (current_cpu, idesc->idata, (const struct argbuf *) abuf, abuf->addr); } #if WITH_SCACHE @@ -144,7 +144,7 @@ execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p) cycles = (*idesc->timing->model_fn) (current_cpu, sc); sh64_compact_model_insn_after (current_cpu, 1 /*last_p*/, cycles); } - TRACE_INSN_FINI (current_cpu, abuf, 1); + CGEN_TRACE_INSN_FINI (current_cpu, abuf, 1); } #else abort (); @@ -459,7 +459,7 @@ sh64_compact_pbb_before (SIM_CPU *current_cpu, SCACHE *sc) } } - TRACE_INSN_FINI (current_cpu, cur_abuf, 0 /*last_p*/); + CGEN_TRACE_INSN_FINI (current_cpu, cur_abuf, 0 /*last_p*/); } /* FIXME: Later make cover macros: PROFILE_INSN_{INIT,FINI}. */ @@ -467,8 +467,8 @@ sh64_compact_pbb_before (SIM_CPU *current_cpu, SCACHE *sc) && ARGBUF_PROFILE_P (cur_abuf)) sh64_compact_model_insn_before (current_cpu, first_p); - TRACE_INSN_INIT (current_cpu, cur_abuf, first_p); - TRACE_INSN (current_cpu, cur_idesc->idata, cur_abuf, pc); + CGEN_TRACE_INSN_INIT (current_cpu, cur_abuf, first_p); + CGEN_TRACE_INSN (current_cpu, cur_idesc->idata, cur_abuf, pc); } /* x-after handler. @@ -493,7 +493,7 @@ sh64_compact_pbb_after (SIM_CPU *current_cpu, SCACHE *sc) cycles = (*prev_idesc->timing->model_fn) (current_cpu, prev_sem_arg); sh64_compact_model_insn_after (current_cpu, 1 /*last_p*/, cycles); } - TRACE_INSN_FINI (current_cpu, prev_abuf, 1 /*last_p*/); + CGEN_TRACE_INSN_FINI (current_cpu, prev_abuf, 1 /*last_p*/); } #define FAST_P 0 diff --git a/sim/sh64/mloop-media.c b/sim/sh64/mloop-media.c index 03c5df5..2146d3e 100644 --- a/sim/sh64/mloop-media.c +++ b/sim/sh64/mloop-media.c @@ -124,8 +124,8 @@ execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p) if (PROFILE_MODEL_P (current_cpu) && ARGBUF_PROFILE_P (abuf)) sh64_media_model_insn_before (current_cpu, 1 /*first_p*/); - TRACE_INSN_INIT (current_cpu, abuf, 1); - TRACE_INSN (current_cpu, idesc->idata, + CGEN_TRACE_INSN_INIT (current_cpu, abuf, 1); + CGEN_TRACE_INSN (current_cpu, idesc->idata, (const struct argbuf *) abuf, abuf->addr); } #if WITH_SCACHE @@ -144,7 +144,7 @@ execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p) cycles = (*idesc->timing->model_fn) (current_cpu, sc); sh64_media_model_insn_after (current_cpu, 1 /*last_p*/, cycles); } - TRACE_INSN_FINI (current_cpu, abuf, 1); + CGEN_TRACE_INSN_FINI (current_cpu, abuf, 1); } #else abort (); @@ -446,7 +446,7 @@ sh64_media_pbb_before (SIM_CPU *current_cpu, SCACHE *sc) } } - TRACE_INSN_FINI (current_cpu, cur_abuf, 0 /*last_p*/); + CGEN_TRACE_INSN_FINI (current_cpu, cur_abuf, 0 /*last_p*/); } /* FIXME: Later make cover macros: PROFILE_INSN_{INIT,FINI}. */ @@ -454,8 +454,8 @@ sh64_media_pbb_before (SIM_CPU *current_cpu, SCACHE *sc) && ARGBUF_PROFILE_P (cur_abuf)) sh64_media_model_insn_before (current_cpu, first_p); - TRACE_INSN_INIT (current_cpu, cur_abuf, first_p); - TRACE_INSN (current_cpu, cur_idesc->idata, cur_abuf, pc); + CGEN_TRACE_INSN_INIT (current_cpu, cur_abuf, first_p); + CGEN_TRACE_INSN (current_cpu, cur_idesc->idata, cur_abuf, pc); } /* x-after handler. @@ -480,7 +480,7 @@ sh64_media_pbb_after (SIM_CPU *current_cpu, SCACHE *sc) cycles = (*prev_idesc->timing->model_fn) (current_cpu, prev_sem_arg); sh64_media_model_insn_after (current_cpu, 1 /*last_p*/, cycles); } - TRACE_INSN_FINI (current_cpu, prev_abuf, 1 /*last_p*/); + CGEN_TRACE_INSN_FINI (current_cpu, prev_abuf, 1 /*last_p*/); } #define FAST_P 0 diff --git a/sim/sh64/sem-compact-switch.c b/sim/sh64/sem-compact-switch.c index 08fb43c..04225cb 100644 --- a/sim/sh64/sem-compact-switch.c +++ b/sim/sh64/sem-compact-switch.c @@ -251,13 +251,13 @@ This file is part of the GNU simulators. /* If hyper-fast [well not unnecessarily slow] execution is selected, turn off frills like tracing and profiling. */ -/* FIXME: A better way would be to have TRACE_RESULT check for something +/* FIXME: A better way would be to have CGEN_TRACE_RESULT check for something that can cause it to be optimized out. Another way would be to emit special handlers into the instruction "stream". */ #if FAST_P -#undef TRACE_RESULT -#define TRACE_RESULT(cpu, abuf, name, type, val) +#undef CGEN_TRACE_RESULT +#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val) #endif #undef GET_ATTR @@ -442,7 +442,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -461,7 +461,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), EXTQISI (ANDQI (FLD (f_imm8), 255))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -483,12 +483,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ADDCSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)), GET_H_TBIT ()); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = tmp_flag; SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -511,12 +511,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = tmp_t; SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -536,7 +536,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { DI opval = ANDDI (GET_H_GR (FLD (f_rm)), GET_H_GR (FLD (f_rn))); SET_H_GR (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -555,7 +555,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = ANDSI (GET_H_GRC (((UINT) 0)), ZEXTSIDI (FLD (f_imm8))); SET_H_GRC (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -579,7 +579,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { UQI opval = tmp_data; SETMEMUQI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } @@ -602,7 +602,7 @@ if (NOTBI (GET_H_TBIT ())) { UDI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } @@ -628,7 +628,7 @@ if (NOTBI (GET_H_TBIT ())) { UDI opval = ADDDI (pc, 2); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } ((void) 0); /*nop*/ { @@ -636,7 +636,7 @@ if (NOTBI (GET_H_TBIT ())) { UDI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -662,14 +662,14 @@ if (NOTBI (GET_H_TBIT ())) { { UDI opval = ADDDI (pc, 2); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } ((void) 0); /*nop*/ { { UDI opval = FLD (i_disp12); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -693,14 +693,14 @@ if (NOTBI (GET_H_TBIT ())) { { UDI opval = ADDDI (pc, 2); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } ((void) 0); /*nop*/ { { UDI opval = ADDDI (EXTSIDI (GET_H_GRC (FLD (f_rn))), ADDDI (pc, 4)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -740,20 +740,20 @@ sh64_break (current_cpu, pc); { SI opval = ADDDI (pc, 4); SET_H_PR (opval); - TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval); } } { UDI opval = ADDDI (pc, 2); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } ((void) 0); /*nop*/ { { UDI opval = FLD (i_disp12); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -778,20 +778,20 @@ sh64_break (current_cpu, pc); { SI opval = ADDDI (pc, 4); SET_H_PR (opval); - TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval); } } { UDI opval = ADDDI (pc, 2); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } ((void) 0); /*nop*/ { { UDI opval = ADDDI (EXTSIDI (GET_H_GRC (FLD (f_rn))), ADDDI (pc, 4)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -816,7 +816,7 @@ if (GET_H_TBIT ()) { UDI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } @@ -842,7 +842,7 @@ if (GET_H_TBIT ()) { UDI opval = ADDDI (pc, 2); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } ((void) 0); /*nop*/ { @@ -850,7 +850,7 @@ if (GET_H_TBIT ()) { UDI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -875,12 +875,12 @@ if (GET_H_TBIT ()) { { SI opval = 0; SET_H_MACL (opval); - TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); } { SI opval = 0; SET_H_MACH (opval); - TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); } } @@ -900,7 +900,7 @@ if (GET_H_TBIT ()) { { BI opval = 0; SET_H_SBIT (opval); - TRACE_RESULT (current_cpu, abuf, "sbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sbit", 'x', opval); } #undef FLD @@ -919,7 +919,7 @@ if (GET_H_TBIT ()) { { BI opval = 0; SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } #undef FLD @@ -938,7 +938,7 @@ if (GET_H_TBIT ()) { { BI opval = EQSI (GET_H_GRC (FLD (f_rm)), GET_H_GRC (FLD (f_rn))); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } #undef FLD @@ -957,7 +957,7 @@ if (GET_H_TBIT ()) { { BI opval = EQSI (GET_H_GRC (((UINT) 0)), EXTQISI (ANDQI (FLD (f_imm8), 255))); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } #undef FLD @@ -976,7 +976,7 @@ if (GET_H_TBIT ()) { { BI opval = GESI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm))); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } #undef FLD @@ -995,7 +995,7 @@ if (GET_H_TBIT ()) { { BI opval = GTSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm))); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } #undef FLD @@ -1014,7 +1014,7 @@ if (GET_H_TBIT ()) { { BI opval = GTUSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm))); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } #undef FLD @@ -1033,7 +1033,7 @@ if (GET_H_TBIT ()) { { BI opval = GEUSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm))); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } #undef FLD @@ -1052,7 +1052,7 @@ if (GET_H_TBIT ()) { { BI opval = GTSI (GET_H_GRC (FLD (f_rn)), 0); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } #undef FLD @@ -1071,7 +1071,7 @@ if (GET_H_TBIT ()) { { BI opval = GESI (GET_H_GRC (FLD (f_rn)), 0); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } #undef FLD @@ -1098,7 +1098,7 @@ if (GET_H_TBIT ()) { { BI opval = ((GTUBI (tmp_t, 0)) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -1119,17 +1119,17 @@ if (GET_H_TBIT ()) { { BI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 31); SET_H_QBIT (opval); - TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); } { BI opval = SRLSI (GET_H_GRC (FLD (f_rm)), 31); SET_H_MBIT (opval); - TRACE_RESULT (current_cpu, abuf, "mbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "mbit", 'x', opval); } { BI opval = ((EQSI (SRLSI (GET_H_GRC (FLD (f_rm)), 31), SRLSI (GET_H_GRC (FLD (f_rn)), 31))) ? (0) : (1)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -1150,17 +1150,17 @@ if (GET_H_TBIT ()) { { BI opval = 0; SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } { BI opval = 0; SET_H_QBIT (opval); - TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); } { BI opval = 0; SET_H_MBIT (opval); - TRACE_RESULT (current_cpu, abuf, "mbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "mbit", 'x', opval); } } @@ -1185,12 +1185,12 @@ if (GET_H_TBIT ()) { { BI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 31); SET_H_QBIT (opval); - TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); } { SI opval = ORSI (SLLSI (GET_H_GRC (FLD (f_rn)), 1), ZEXTBISI (GET_H_TBIT ())); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } if (NOTBI (tmp_oldq)) { if (NOTBI (GET_H_MBIT ())) { @@ -1199,20 +1199,20 @@ if (NOTBI (GET_H_MBIT ())) { { SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } tmp_tmp1 = GTUSI (GET_H_GRC (FLD (f_rn)), tmp_tmp0); if (NOTBI (GET_H_QBIT ())) { { BI opval = ((tmp_tmp1) ? (1) : (0)); SET_H_QBIT (opval); - TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); } } else { { BI opval = ((EQQI (tmp_tmp1, 0)) ? (1) : (0)); SET_H_QBIT (opval); - TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); } } } @@ -1222,20 +1222,20 @@ if (NOTBI (GET_H_QBIT ())) { { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } tmp_tmp1 = LTUSI (GET_H_GRC (FLD (f_rn)), tmp_tmp0); if (NOTBI (GET_H_QBIT ())) { { BI opval = ((EQQI (tmp_tmp1, 0)) ? (1) : (0)); SET_H_QBIT (opval); - TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); } } else { { BI opval = ((tmp_tmp1) ? (1) : (0)); SET_H_QBIT (opval); - TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); } } } @@ -1247,20 +1247,20 @@ if (NOTBI (GET_H_MBIT ())) { { SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), GET_H_GRC (FLD (f_rn))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } tmp_tmp1 = LTUSI (GET_H_GRC (FLD (f_rn)), tmp_tmp0); if (NOTBI (GET_H_QBIT ())) { { BI opval = ((tmp_tmp1) ? (1) : (0)); SET_H_QBIT (opval); - TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); } } else { { BI opval = ((EQQI (tmp_tmp1, 0)) ? (1) : (0)); SET_H_QBIT (opval); - TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); } } } @@ -1270,20 +1270,20 @@ if (NOTBI (GET_H_QBIT ())) { { SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } tmp_tmp1 = GTUSI (GET_H_GRC (FLD (f_rn)), tmp_tmp0); if (NOTBI (GET_H_QBIT ())) { { BI opval = ((EQQI (tmp_tmp1, 0)) ? (1) : (0)); SET_H_QBIT (opval); - TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); } } else { { BI opval = ((tmp_tmp1) ? (1) : (0)); SET_H_QBIT (opval); - TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); } } } @@ -1292,7 +1292,7 @@ if (NOTBI (GET_H_QBIT ())) { { BI opval = ((EQBI (GET_H_QBIT (), GET_H_MBIT ())) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -1312,7 +1312,7 @@ if (NOTBI (GET_H_QBIT ())) { { SI opval = UDIVSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (((UINT) 0))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -1331,7 +1331,7 @@ if (NOTBI (GET_H_QBIT ())) { { SI opval = MULSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (((UINT) 0))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -1353,12 +1353,12 @@ if (NOTBI (GET_H_QBIT ())) { { SI opval = SUBWORDDISI (tmp_result, 0); SET_H_MACH (opval); - TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); } { SI opval = SUBWORDDISI (tmp_result, 1); SET_H_MACL (opval); - TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); } } @@ -1381,12 +1381,12 @@ if (NOTBI (GET_H_QBIT ())) { { SI opval = SUBWORDDISI (tmp_result, 0); SET_H_MACH (opval); - TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); } { SI opval = SUBWORDDISI (tmp_result, 1); SET_H_MACL (opval); - TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); } } @@ -1407,12 +1407,12 @@ if (NOTBI (GET_H_QBIT ())) { { SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), 1); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = EQSI (GET_H_GRC (FLD (f_rn)), 0); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -1432,7 +1432,7 @@ if (NOTBI (GET_H_QBIT ())) { { SI opval = EXTQISI (SUBWORDSIQI (GET_H_GRC (FLD (f_rm)), 3)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -1451,7 +1451,7 @@ if (NOTBI (GET_H_QBIT ())) { { SI opval = EXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -1470,7 +1470,7 @@ if (NOTBI (GET_H_QBIT ())) { { SI opval = ZEXTQISI (SUBWORDSIQI (GET_H_GRC (FLD (f_rm)), 3)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -1489,7 +1489,7 @@ if (NOTBI (GET_H_QBIT ())) { { SI opval = ZEXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -1510,14 +1510,14 @@ if (GET_H_PRBIT ()) { DF opval = sh64_fabsd (current_cpu, GET_H_FSD (FLD (f_rn))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } else { { DF opval = sh64_fabss (current_cpu, GET_H_FSD (FLD (f_rn))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } @@ -1540,14 +1540,14 @@ if (GET_H_PRBIT ()) { DF opval = sh64_faddd (current_cpu, GET_H_FSD (FLD (f_rm)), GET_H_FSD (FLD (f_rn))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } else { { DF opval = sh64_fadds (current_cpu, GET_H_FSD (FLD (f_rm)), GET_H_FSD (FLD (f_rn))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } @@ -1570,14 +1570,14 @@ if (GET_H_PRBIT ()) { BI opval = sh64_fcmpeqd (current_cpu, GET_H_FSD (FLD (f_rm)), GET_H_FSD (FLD (f_rn))); SET_H_TBIT (opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } else { { BI opval = sh64_fcmpeqs (current_cpu, GET_H_FSD (FLD (f_rm)), GET_H_FSD (FLD (f_rn))); SET_H_TBIT (opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -1600,14 +1600,14 @@ if (GET_H_PRBIT ()) { BI opval = sh64_fcmpgtd (current_cpu, GET_H_FSD (FLD (f_rn)), GET_H_FSD (FLD (f_rm))); SET_H_TBIT (opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } else { { BI opval = sh64_fcmpgts (current_cpu, GET_H_FSD (FLD (f_rn)), GET_H_FSD (FLD (f_rm))); SET_H_TBIT (opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -1628,7 +1628,7 @@ if (GET_H_PRBIT ()) { { SF opval = sh64_fcnvds (current_cpu, GET_H_DRC (FLD (f_dn))); CPU (h_fr[((UINT) 32)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } #undef FLD @@ -1647,7 +1647,7 @@ if (GET_H_PRBIT ()) { { DF opval = sh64_fcnvsd (current_cpu, CPU (h_fr[((UINT) 32)])); SET_H_DRC (FLD (f_dn), opval); - TRACE_RESULT (current_cpu, abuf, "drc", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "drc", 'f', opval); } #undef FLD @@ -1668,14 +1668,14 @@ if (GET_H_PRBIT ()) { DF opval = sh64_fdivd (current_cpu, GET_H_FSD (FLD (f_rn)), GET_H_FSD (FLD (f_rm))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } else { { DF opval = sh64_fdivs (current_cpu, GET_H_FSD (FLD (f_rn)), GET_H_FSD (FLD (f_rm))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } @@ -1711,7 +1711,7 @@ sh64_fipr (current_cpu, FLD (f_vm), FLD (f_vn)); { SF opval = GET_H_FRC (FLD (f_rn)); CPU (h_fr[((UINT) 32)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } #undef FLD @@ -1730,7 +1730,7 @@ sh64_fipr (current_cpu, FLD (f_vm), FLD (f_vn)); { SF opval = sh64_fldi0 (current_cpu); SET_H_FRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval); } #undef FLD @@ -1749,7 +1749,7 @@ sh64_fipr (current_cpu, FLD (f_vm), FLD (f_vn)); { SF opval = sh64_fldi1 (current_cpu); SET_H_FRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval); } #undef FLD @@ -1770,14 +1770,14 @@ if (GET_H_PRBIT ()) { DF opval = sh64_floatld (current_cpu, CPU (h_fr[((UINT) 32)])); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } else { { DF opval = sh64_floatls (current_cpu, CPU (h_fr[((UINT) 32)])); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } @@ -1798,7 +1798,7 @@ if (GET_H_PRBIT ()) { { SF opval = sh64_fmacs (current_cpu, GET_H_FRC (((UINT) 0)), GET_H_FRC (FLD (f_rm)), GET_H_FRC (FLD (f_rn))); SET_H_FRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval); } #undef FLD @@ -1817,7 +1817,7 @@ if (GET_H_PRBIT ()) { { DF opval = GET_H_FMOV (FLD (f_rm)); SET_H_FMOV (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); } #undef FLD @@ -1838,14 +1838,14 @@ if (NOTBI (GET_H_SZBIT ())) { DF opval = GETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rm))); SET_H_FMOV (FLD (f_rn), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); } } else { { DF opval = GETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rm))); SET_H_FMOV (FLD (f_rn), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); } } @@ -1869,13 +1869,13 @@ if (NOTBI (GET_H_SZBIT ())) { DF opval = GETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rm))); SET_H_FMOV (FLD (f_rn), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 4); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } } else { @@ -1884,13 +1884,13 @@ if (NOTBI (GET_H_SZBIT ())) { DF opval = GETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rm))); SET_H_FMOV (FLD (f_rn), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 8); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } } @@ -1914,14 +1914,14 @@ if (NOTBI (GET_H_SZBIT ())) { DF opval = GETMEMSF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm)))); SET_H_FMOV (FLD (f_rn), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); } } else { { DF opval = GETMEMDF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm)))); SET_H_FMOV (FLD (f_rn), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); } } @@ -1944,14 +1944,14 @@ if (NOTBI (GET_H_SZBIT ())) { SF opval = GET_H_FMOV (FLD (f_rm)); SETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } } else { { DF opval = GET_H_FMOV (FLD (f_rm)); SETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } } @@ -1975,13 +1975,13 @@ if (NOTBI (GET_H_SZBIT ())) { SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), 4); SET_H_GRC (FLD (f_rn), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { SF opval = GET_H_FMOV (FLD (f_rm)); SETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } } } else { @@ -1990,13 +1990,13 @@ if (NOTBI (GET_H_SZBIT ())) { SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), 8); SET_H_GRC (FLD (f_rn), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { DF opval = GET_H_FMOV (FLD (f_rm)); SETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } } } @@ -2020,14 +2020,14 @@ if (NOTBI (GET_H_SZBIT ())) { SF opval = GET_H_FMOV (FLD (f_rm)); SETMEMSF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } } else { { DF opval = GET_H_FMOV (FLD (f_rm)); SETMEMDF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } } @@ -2048,7 +2048,7 @@ if (NOTBI (GET_H_SZBIT ())) { { DF opval = GETMEMDF (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm12x8))); SET_H_DRC (FLD (f_dn), opval); - TRACE_RESULT (current_cpu, abuf, "drc", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "drc", 'f', opval); } #undef FLD @@ -2067,7 +2067,7 @@ if (NOTBI (GET_H_SZBIT ())) { { DF opval = GET_H_DRC (FLD (f_dm)); SETMEMDF (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rn)), FLD (f_imm12x8)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } #undef FLD @@ -2088,14 +2088,14 @@ if (GET_H_PRBIT ()) { DF opval = sh64_fmuld (current_cpu, GET_H_FSD (FLD (f_rm)), GET_H_FSD (FLD (f_rn))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } else { { DF opval = sh64_fmuls (current_cpu, GET_H_FSD (FLD (f_rm)), GET_H_FSD (FLD (f_rn))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } @@ -2118,14 +2118,14 @@ if (GET_H_PRBIT ()) { DF opval = sh64_fnegd (current_cpu, GET_H_FSD (FLD (f_rn))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } else { { DF opval = sh64_fnegs (current_cpu, GET_H_FSD (FLD (f_rn))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } @@ -2146,7 +2146,7 @@ if (GET_H_PRBIT ()) { { BI opval = NOTBI (GET_H_FRBIT ()); SET_H_FRBIT (opval); - TRACE_RESULT (current_cpu, abuf, "frbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "frbit", 'x', opval); } #undef FLD @@ -2165,7 +2165,7 @@ if (GET_H_PRBIT ()) { { BI opval = NOTBI (GET_H_SZBIT ()); SET_H_SZBIT (opval); - TRACE_RESULT (current_cpu, abuf, "szbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "szbit", 'x', opval); } #undef FLD @@ -2186,14 +2186,14 @@ if (GET_H_PRBIT ()) { DF opval = sh64_fsqrtd (current_cpu, GET_H_FSD (FLD (f_rn))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } else { { DF opval = sh64_fsqrts (current_cpu, GET_H_FSD (FLD (f_rn))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } @@ -2214,7 +2214,7 @@ if (GET_H_PRBIT ()) { { SF opval = CPU (h_fr[((UINT) 32)]); SET_H_FRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval); } #undef FLD @@ -2235,14 +2235,14 @@ if (GET_H_PRBIT ()) { DF opval = sh64_fsubd (current_cpu, GET_H_FSD (FLD (f_rn)), GET_H_FSD (FLD (f_rm))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } else { { DF opval = sh64_fsubs (current_cpu, GET_H_FSD (FLD (f_rn)), GET_H_FSD (FLD (f_rm))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } @@ -2263,7 +2263,7 @@ if (GET_H_PRBIT ()) { { SF opval = ((GET_H_PRBIT ()) ? (sh64_ftrcdl (current_cpu, GET_H_FSD (FLD (f_rn)))) : (sh64_ftrcsl (current_cpu, GET_H_FSD (FLD (f_rn))))); CPU (h_fr[((UINT) 32)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } #undef FLD @@ -2299,14 +2299,14 @@ sh64_ftrv (current_cpu, FLD (f_vn)); { UDI opval = ADDDI (pc, 2); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } ((void) 0); /*nop*/ { { UDI opval = GET_H_GRC (FLD (f_rn)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } ((void) 0); /*nop*/ @@ -2332,20 +2332,20 @@ sh64_ftrv (current_cpu, FLD (f_vn)); { SI opval = ADDDI (pc, 4); SET_H_PR (opval); - TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval); } } { UDI opval = ADDDI (pc, 2); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } ((void) 0); /*nop*/ { { UDI opval = GET_H_GRC (FLD (f_rn)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } ((void) 0); /*nop*/ @@ -2368,7 +2368,7 @@ sh64_ftrv (current_cpu, FLD (f_vn)); { SI opval = GET_H_GRC (FLD (f_rn)); SET_H_GBR (opval); - TRACE_RESULT (current_cpu, abuf, "gbr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gbr", 'x', opval); } #undef FLD @@ -2387,7 +2387,7 @@ sh64_ftrv (current_cpu, FLD (f_vn)); { SI opval = GET_H_GRC (FLD (f_rn)); SET_H_VBR (opval); - TRACE_RESULT (current_cpu, abuf, "vbr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbr", 'x', opval); } #undef FLD @@ -2406,7 +2406,7 @@ sh64_ftrv (current_cpu, FLD (f_vn)); { SI opval = GET_H_GRC (FLD (f_rn)); CPU (h_sr) = opval; - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } #undef FLD @@ -2426,12 +2426,12 @@ sh64_ftrv (current_cpu, FLD (f_vn)); { SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn))); SET_H_GBR (opval); - TRACE_RESULT (current_cpu, abuf, "gbr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gbr", 'x', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -2452,12 +2452,12 @@ sh64_ftrv (current_cpu, FLD (f_vn)); { SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn))); SET_H_VBR (opval); - TRACE_RESULT (current_cpu, abuf, "vbr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbr", 'x', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -2477,7 +2477,7 @@ sh64_ftrv (current_cpu, FLD (f_vn)); { SI opval = GET_H_GRC (FLD (f_rn)); CPU (h_fpscr) = opval; - TRACE_RESULT (current_cpu, abuf, "fpscr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fpscr", 'x', opval); } #undef FLD @@ -2497,12 +2497,12 @@ sh64_ftrv (current_cpu, FLD (f_vn)); { SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn))); CPU (h_fpscr) = opval; - TRACE_RESULT (current_cpu, abuf, "fpscr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fpscr", 'x', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -2522,7 +2522,7 @@ sh64_ftrv (current_cpu, FLD (f_vn)); { SF opval = SUBWORDSISF (GET_H_GRC (FLD (f_rn))); CPU (h_fr[((UINT) 32)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } #undef FLD @@ -2542,12 +2542,12 @@ sh64_ftrv (current_cpu, FLD (f_vn)); { SF opval = GETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rn))); CPU (h_fr[((UINT) 32)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -2567,7 +2567,7 @@ sh64_ftrv (current_cpu, FLD (f_vn)); { SI opval = GET_H_GRC (FLD (f_rn)); SET_H_MACH (opval); - TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); } #undef FLD @@ -2587,12 +2587,12 @@ sh64_ftrv (current_cpu, FLD (f_vn)); { SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn))); SET_H_MACH (opval); - TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -2612,7 +2612,7 @@ sh64_ftrv (current_cpu, FLD (f_vn)); { SI opval = GET_H_GRC (FLD (f_rn)); SET_H_MACL (opval); - TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); } #undef FLD @@ -2632,12 +2632,12 @@ sh64_ftrv (current_cpu, FLD (f_vn)); { SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn))); SET_H_MACL (opval); - TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -2657,7 +2657,7 @@ sh64_ftrv (current_cpu, FLD (f_vn)); { SI opval = GET_H_GRC (FLD (f_rn)); SET_H_PR (opval); - TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval); } #undef FLD @@ -2677,12 +2677,12 @@ sh64_ftrv (current_cpu, FLD (f_vn)); { SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn))); SET_H_PR (opval); - TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -2709,20 +2709,20 @@ sh64_ftrv (current_cpu, FLD (f_vn)); { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } if (EQSI (FLD (f_rn), FLD (f_rm))) { { { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 4); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } } @@ -2731,7 +2731,7 @@ if (EQSI (FLD (f_rn), FLD (f_rm))) { SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 4); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } tmp_tmpry = MULDI (ZEXTSIDI (tmp_x), ZEXTSIDI (tmp_y)); tmp_mac = ORDI (SLLDI (ZEXTSIDI (GET_H_MACH ()), 32), ZEXTSIDI (GET_H_MACL ())); @@ -2755,12 +2755,12 @@ if (LTDI (tmp_result, tmp_min)) { { SI opval = SUBWORDDISI (tmp_result, 0); SET_H_MACH (opval); - TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); } { SI opval = SUBWORDDISI (tmp_result, 1); SET_H_MACL (opval); - TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); } } } @@ -2789,20 +2789,20 @@ if (LTDI (tmp_result, tmp_min)) { { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 2); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } if (EQSI (FLD (f_rn), FLD (f_rm))) { { { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 2); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 2); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } } @@ -2811,7 +2811,7 @@ if (EQSI (FLD (f_rn), FLD (f_rm))) { SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 2); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } tmp_tmpry = MULSI (ZEXTHISI (tmp_x), ZEXTHISI (tmp_y)); if (GET_H_SBIT ()) { @@ -2821,14 +2821,14 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) { SI opval = 1; SET_H_MACH (opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); } } { SI opval = ADDSI (tmp_tmpry, GET_H_MACL ()); SET_H_MACL (opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); } } } else { @@ -2839,13 +2839,13 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) { SI opval = SUBWORDDISI (tmp_result, 0); SET_H_MACH (opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); } { SI opval = SUBWORDDISI (tmp_result, 1); SET_H_MACL (opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); } } } @@ -2868,7 +2868,7 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) { { DI opval = GET_H_GR (FLD (f_rm)); SET_H_GR (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -2887,7 +2887,7 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) { { SI opval = EXTQIDI (ANDQI (FLD (f_imm8), 255)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -2906,7 +2906,7 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) { { SI opval = FLD (f_imm20); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -2925,7 +2925,7 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) { { UQI opval = SUBWORDSIUQI (GET_H_GRC (FLD (f_rm)), 3); SETMEMUQI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -2947,12 +2947,12 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) { { UQI opval = SUBWORDSIUQI (GET_H_GRC (FLD (f_rm)), 3); SETMEMUQI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_addr; SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -2972,7 +2972,7 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) { { UQI opval = SUBWORDSIUQI (GET_H_GRC (FLD (f_rm)), 3); SETMEMUQI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -2994,7 +2994,7 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) { { UQI opval = SUBWORDSIUQI (GET_H_GRC (((UINT) 0)), 3); SETMEMUQI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } @@ -3017,7 +3017,7 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) { { UQI opval = SUBWORDSIUQI (GET_H_GRC (((UINT) 0)), 3); SETMEMUQI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } @@ -3037,7 +3037,7 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) { { SI opval = EXTQISI (GETMEMQI (current_cpu, pc, GET_H_GRC (FLD (f_rm)))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -3061,20 +3061,20 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { SI opval = EXTQISI (tmp_data); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } else { { SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 1); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } { SI opval = EXTQISI (tmp_data); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -3095,7 +3095,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm))))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -3114,7 +3114,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8)))); SET_H_GRC (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -3133,7 +3133,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm4)))); SET_H_GRC (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -3152,7 +3152,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = GET_H_GRC (FLD (f_rm)); SETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -3174,12 +3174,12 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = GET_H_GRC (FLD (f_rm)); SETMEMSI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_addr; SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -3199,7 +3199,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = GET_H_GRC (FLD (f_rm)); SETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -3218,7 +3218,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = GET_H_GRC (((UINT) 0)); SETMEMSI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8x4)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -3237,7 +3237,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = GET_H_GRC (FLD (f_rm)); SETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rn)), FLD (f_imm4x4)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -3256,7 +3256,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rm))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -3276,21 +3276,21 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rm))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = GET_H_GRC (FLD (f_rn)); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } else { { SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 4); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } } @@ -3312,7 +3312,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = GETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm)))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -3331,7 +3331,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = GETMEMSI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8x4))); SET_H_GRC (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -3350,7 +3350,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = GETMEMSI (current_cpu, pc, ADDSI (FLD (f_imm8x4), ANDDI (ADDDI (pc, 4), INVSI (3)))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -3369,7 +3369,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = GETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm4x4))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -3388,7 +3388,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = GETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm12x4))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -3407,7 +3407,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = GET_H_GRC (FLD (f_rm)); SETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rn)), FLD (f_imm12x4)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -3426,7 +3426,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { HI opval = SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1); SETMEMHI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -3448,12 +3448,12 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { HI opval = SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1); SETMEMHI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_addr; SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -3473,7 +3473,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { HI opval = SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1); SETMEMHI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -3492,7 +3492,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { HI opval = SUBWORDSIHI (GET_H_GRC (((UINT) 0)), 1); SETMEMHI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8x2)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -3511,7 +3511,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { HI opval = SUBWORDSIHI (GET_H_GRC (((UINT) 0)), 1); SETMEMHI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm4x2)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -3530,7 +3530,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, GET_H_GRC (FLD (f_rm)))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -3554,20 +3554,20 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { SI opval = EXTHISI (tmp_data); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } else { { SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 2); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } { SI opval = EXTHISI (tmp_data); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -3588,7 +3588,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm))))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -3607,7 +3607,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8x2)))); SET_H_GRC (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -3626,7 +3626,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDDI (ADDDI (pc, 4), FLD (f_imm8x2)))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -3645,7 +3645,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm4x2)))); SET_H_GRC (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -3664,7 +3664,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = ADDDI (ANDDI (ADDDI (pc, 4), INVSI (3)), FLD (f_imm8x4)); SET_H_GRC (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -3683,7 +3683,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = GET_H_GRC (((UINT) 0)); SETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -3702,7 +3702,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = GET_H_GRC (FLD (f_rn)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -3721,7 +3721,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = ZEXTBISI (GET_H_TBIT ()); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -3740,7 +3740,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = sh64_movua (current_cpu, pc, GET_H_GRC (FLD (f_rn))); SET_H_GRC (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -3760,12 +3760,12 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = sh64_movua (current_cpu, pc, GET_H_GRC (FLD (f_rn))); SET_H_GRC (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -3785,7 +3785,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = MULSI (GET_H_GRC (FLD (f_rm)), GET_H_GRC (FLD (f_rn))); SET_H_MACL (opval); - TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); } #undef FLD @@ -3804,7 +3804,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = MULSI (EXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1)), EXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rn)), 1))); SET_H_MACL (opval); - TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); } #undef FLD @@ -3823,7 +3823,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = MULSI (ZEXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1)), ZEXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rn)), 1))); SET_H_MACL (opval); - TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); } #undef FLD @@ -3842,7 +3842,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = NEGSI (GET_H_GRC (FLD (f_rm))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -3864,12 +3864,12 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = SUBCSI (0, GET_H_GRC (FLD (f_rm)), GET_H_TBIT ()); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = tmp_flag; SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -3904,7 +3904,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { DI opval = INVDI (GET_H_GR (FLD (f_rm))); SET_H_GR (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -3924,7 +3924,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = GET_H_GRC (FLD (f_rn)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } ((void) 0); /*nop*/ } @@ -3946,7 +3946,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = GET_H_GRC (FLD (f_rn)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } ((void) 0); /*nop*/ } @@ -3968,7 +3968,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = GET_H_GRC (FLD (f_rn)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } ((void) 0); /*nop*/ } @@ -3989,7 +3989,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { DI opval = ORDI (GET_H_GR (FLD (f_rm)), GET_H_GR (FLD (f_rn))); SET_H_GR (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -4008,7 +4008,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = ORSI (GET_H_GRC (((UINT) 0)), ZEXTSIDI (FLD (f_imm8))); SET_H_GRC (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -4032,7 +4032,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { { UQI opval = tmp_data; SETMEMUQI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } @@ -4070,12 +4070,12 @@ sh64_pref (current_cpu, GET_H_GRC (FLD (f_rn))); { SI opval = ORSI (SLLSI (GET_H_GRC (FLD (f_rn)), 1), GET_H_TBIT ()); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = ((tmp_temp) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -4100,12 +4100,12 @@ sh64_pref (current_cpu, GET_H_GRC (FLD (f_rn))); { SI opval = ORSI (SRLSI (GET_H_GRC (FLD (f_rn)), 1), SLLSI (tmp_temp, 31)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = ((tmp_lsbit) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -4128,12 +4128,12 @@ sh64_pref (current_cpu, GET_H_GRC (FLD (f_rn))); { SI opval = ORSI (SLLSI (GET_H_GRC (FLD (f_rn)), 1), tmp_temp); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = ((tmp_temp) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -4158,12 +4158,12 @@ sh64_pref (current_cpu, GET_H_GRC (FLD (f_rn))); { SI opval = ORSI (SRLSI (GET_H_GRC (FLD (f_rn)), 1), SLLSI (tmp_temp, 31)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = ((tmp_lsbit) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -4185,14 +4185,14 @@ sh64_pref (current_cpu, GET_H_GRC (FLD (f_rn))); { UDI opval = ADDDI (pc, 2); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } ((void) 0); /*nop*/ { { UDI opval = GET_H_PR (); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } ((void) 0); /*nop*/ @@ -4215,7 +4215,7 @@ sh64_pref (current_cpu, GET_H_GRC (FLD (f_rn))); { BI opval = 1; SET_H_SBIT (opval); - TRACE_RESULT (current_cpu, abuf, "sbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sbit", 'x', opval); } #undef FLD @@ -4234,7 +4234,7 @@ sh64_pref (current_cpu, GET_H_GRC (FLD (f_rn))); { BI opval = 1; SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } #undef FLD @@ -4258,7 +4258,7 @@ if (GESI (GET_H_GRC (FLD (f_rm)), 0)) { SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), tmp_shamt); SET_H_GRC (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } else { if (NESI (tmp_shamt, 0)) { @@ -4266,7 +4266,7 @@ if (NESI (tmp_shamt, 0)) { SI opval = SRASI (GET_H_GRC (FLD (f_rn)), SUBSI (32, tmp_shamt)); SET_H_GRC (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } else { if (LTSI (GET_H_GRC (FLD (f_rn)), 0)) { @@ -4274,14 +4274,14 @@ if (LTSI (GET_H_GRC (FLD (f_rn)), 0)) { SI opval = NEGSI (1); SET_H_GRC (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } else { { SI opval = 0; SET_H_GRC (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } } @@ -4308,12 +4308,12 @@ if (LTSI (GET_H_GRC (FLD (f_rn)), 0)) { { SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 1); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = ((tmp_t) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -4336,12 +4336,12 @@ if (LTSI (GET_H_GRC (FLD (f_rn)), 0)) { { SI opval = SRASI (GET_H_GRC (FLD (f_rn)), 1); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = ((tmp_t) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -4366,7 +4366,7 @@ if (GESI (GET_H_GRC (FLD (f_rm)), 0)) { SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), tmp_shamt); SET_H_GRC (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } else { if (NESI (tmp_shamt, 0)) { @@ -4374,14 +4374,14 @@ if (NESI (tmp_shamt, 0)) { SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), SUBSI (32, tmp_shamt)); SET_H_GRC (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } else { { SI opval = 0; SET_H_GRC (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } } @@ -4407,12 +4407,12 @@ if (NESI (tmp_shamt, 0)) { { SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 1); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = ((tmp_t) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -4432,7 +4432,7 @@ if (NESI (tmp_shamt, 0)) { { SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 2); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -4451,7 +4451,7 @@ if (NESI (tmp_shamt, 0)) { { SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 8); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -4470,7 +4470,7 @@ if (NESI (tmp_shamt, 0)) { { SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 16); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -4492,12 +4492,12 @@ if (NESI (tmp_shamt, 0)) { { SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 1); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = ((tmp_t) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -4517,7 +4517,7 @@ if (NESI (tmp_shamt, 0)) { { SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 2); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -4536,7 +4536,7 @@ if (NESI (tmp_shamt, 0)) { { SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 8); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -4555,7 +4555,7 @@ if (NESI (tmp_shamt, 0)) { { SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 16); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -4574,7 +4574,7 @@ if (NESI (tmp_shamt, 0)) { { SI opval = GET_H_GBR (); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -4593,7 +4593,7 @@ if (NESI (tmp_shamt, 0)) { { SI opval = GET_H_VBR (); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -4615,12 +4615,12 @@ if (NESI (tmp_shamt, 0)) { { SI opval = GET_H_GBR (); SETMEMSI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_addr; SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -4643,12 +4643,12 @@ if (NESI (tmp_shamt, 0)) { { SI opval = GET_H_VBR (); SETMEMSI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_addr; SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -4668,7 +4668,7 @@ if (NESI (tmp_shamt, 0)) { { SI opval = CPU (h_fpscr); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -4690,12 +4690,12 @@ if (NESI (tmp_shamt, 0)) { { SI opval = CPU (h_fpscr); SETMEMSI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_addr; SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -4715,7 +4715,7 @@ if (NESI (tmp_shamt, 0)) { { SI opval = SUBWORDSFSI (CPU (h_fr[((UINT) 32)])); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -4737,12 +4737,12 @@ if (NESI (tmp_shamt, 0)) { { SF opval = CPU (h_fr[((UINT) 32)]); SETMEMSF (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } { SI opval = tmp_addr; SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -4762,7 +4762,7 @@ if (NESI (tmp_shamt, 0)) { { SI opval = GET_H_MACH (); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -4784,12 +4784,12 @@ if (NESI (tmp_shamt, 0)) { { SI opval = GET_H_MACH (); SETMEMSI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_addr; SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -4809,7 +4809,7 @@ if (NESI (tmp_shamt, 0)) { { SI opval = GET_H_MACL (); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -4831,12 +4831,12 @@ if (NESI (tmp_shamt, 0)) { { SI opval = GET_H_MACL (); SETMEMSI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_addr; SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -4856,7 +4856,7 @@ if (NESI (tmp_shamt, 0)) { { SI opval = GET_H_PR (); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -4878,12 +4878,12 @@ if (NESI (tmp_shamt, 0)) { { SI opval = GET_H_PR (); SETMEMSI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_addr; SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -4903,7 +4903,7 @@ if (NESI (tmp_shamt, 0)) { { SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -4925,12 +4925,12 @@ if (NESI (tmp_shamt, 0)) { { SI opval = SUBCSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)), GET_H_TBIT ()); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = tmp_flag; SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -4953,12 +4953,12 @@ if (NESI (tmp_shamt, 0)) { { SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = ((tmp_t) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -4985,7 +4985,7 @@ if (NESI (tmp_shamt, 0)) { { SI opval = ORSI (SLLSI (tmp_top_half, 16), ORSI (SLLSI (tmp_byte0, 8), tmp_byte1)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -5005,7 +5005,7 @@ if (NESI (tmp_shamt, 0)) { { SI opval = ORSI (SRLSI (GET_H_GRC (FLD (f_rm)), 16), SLLSI (GET_H_GRC (FLD (f_rm)), 16)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -5027,13 +5027,13 @@ if (NESI (tmp_shamt, 0)) { { BI opval = ((EQQI (tmp_byte, 0)) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } tmp_byte = ORQI (tmp_byte, 128); { UQI opval = tmp_byte; SETMEMUQI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } @@ -5068,7 +5068,7 @@ sh64_compact_trapa (current_cpu, FLD (f_imm8), pc); { BI opval = ((EQSI (ANDSI (GET_H_GRC (FLD (f_rm)), GET_H_GRC (FLD (f_rn))), 0)) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } #undef FLD @@ -5087,7 +5087,7 @@ sh64_compact_trapa (current_cpu, FLD (f_imm8), pc); { BI opval = ((EQSI (ANDSI (GET_H_GRC (((UINT) 0)), ZEXTSISI (FLD (f_imm8))), 0)) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } #undef FLD @@ -5109,7 +5109,7 @@ sh64_compact_trapa (current_cpu, FLD (f_imm8), pc); { BI opval = ((EQQI (ANDQI (GETMEMUQI (current_cpu, pc, tmp_addr), FLD (f_imm8)), 0)) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -5129,7 +5129,7 @@ sh64_compact_trapa (current_cpu, FLD (f_imm8), pc); { DI opval = XORDI (GET_H_GR (FLD (f_rn)), GET_H_GR (FLD (f_rm))); SET_H_GR (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -5148,7 +5148,7 @@ sh64_compact_trapa (current_cpu, FLD (f_imm8), pc); { SI opval = XORSI (GET_H_GRC (((UINT) 0)), ZEXTSIDI (FLD (f_imm8))); SET_H_GRC (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD @@ -5172,7 +5172,7 @@ sh64_compact_trapa (current_cpu, FLD (f_imm8), pc); { UQI opval = tmp_data; SETMEMUQI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } @@ -5192,7 +5192,7 @@ sh64_compact_trapa (current_cpu, FLD (f_imm8), pc); { SI opval = ORSI (SLLSI (GET_H_GRC (FLD (f_rm)), 16), SRLSI (GET_H_GRC (FLD (f_rn)), 16)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } #undef FLD diff --git a/sim/sh64/sem-compact.c b/sim/sh64/sem-compact.c index 87e9451..d5629af 100644 --- a/sim/sh64/sem-compact.c +++ b/sim/sh64/sem-compact.c @@ -36,8 +36,8 @@ This file is part of the GNU simulators. FAST_P, when desired, is defined on the command line, -DFAST_P=1. */ #if FAST_P #define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_semf_,fn) -#undef TRACE_RESULT -#define TRACE_RESULT(cpu, abuf, name, type, val) +#undef CGEN_TRACE_RESULT +#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val) #else #define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_sem_,fn) #endif @@ -210,7 +210,7 @@ SEM_FN_NAME (sh64_compact,add_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -231,7 +231,7 @@ SEM_FN_NAME (sh64_compact,addi_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), EXTQISI (ANDQI (FLD (f_imm8), 255))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -255,12 +255,12 @@ SEM_FN_NAME (sh64_compact,addc_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDCSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)), GET_H_TBIT ()); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = tmp_flag; SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -285,12 +285,12 @@ SEM_FN_NAME (sh64_compact,addv_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = tmp_t; SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -312,7 +312,7 @@ SEM_FN_NAME (sh64_compact,and_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ANDDI (GET_H_GR (FLD (f_rm)), GET_H_GR (FLD (f_rn))); SET_H_GR (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -333,7 +333,7 @@ SEM_FN_NAME (sh64_compact,andi_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ANDSI (GET_H_GRC (((UINT) 0)), ZEXTSIDI (FLD (f_imm8))); SET_H_GRC (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -359,7 +359,7 @@ SEM_FN_NAME (sh64_compact,andb_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = tmp_data; SETMEMUQI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } @@ -384,7 +384,7 @@ if (NOTBI (GET_H_TBIT ())) { UDI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } @@ -412,7 +412,7 @@ if (NOTBI (GET_H_TBIT ())) { UDI opval = ADDDI (pc, 2); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } ((void) 0); /*nop*/ { @@ -420,7 +420,7 @@ if (NOTBI (GET_H_TBIT ())) { UDI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -448,14 +448,14 @@ SEM_FN_NAME (sh64_compact,bra_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UDI opval = ADDDI (pc, 2); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } ((void) 0); /*nop*/ { { UDI opval = FLD (i_disp12); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -481,14 +481,14 @@ SEM_FN_NAME (sh64_compact,braf_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UDI opval = ADDDI (pc, 2); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } ((void) 0); /*nop*/ { { UDI opval = ADDDI (EXTSIDI (GET_H_GRC (FLD (f_rn))), ADDDI (pc, 4)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -532,20 +532,20 @@ SEM_FN_NAME (sh64_compact,bsr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDDI (pc, 4); SET_H_PR (opval); - TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval); } } { UDI opval = ADDDI (pc, 2); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } ((void) 0); /*nop*/ { { UDI opval = FLD (i_disp12); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -572,20 +572,20 @@ SEM_FN_NAME (sh64_compact,bsrf_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDDI (pc, 4); SET_H_PR (opval); - TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval); } } { UDI opval = ADDDI (pc, 2); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } ((void) 0); /*nop*/ { { UDI opval = ADDDI (EXTSIDI (GET_H_GRC (FLD (f_rn))), ADDDI (pc, 4)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -612,7 +612,7 @@ if (GET_H_TBIT ()) { UDI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } @@ -640,7 +640,7 @@ if (GET_H_TBIT ()) { UDI opval = ADDDI (pc, 2); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } ((void) 0); /*nop*/ { @@ -648,7 +648,7 @@ if (GET_H_TBIT ()) { UDI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -675,12 +675,12 @@ SEM_FN_NAME (sh64_compact,clrmac_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { SI opval = 0; SET_H_MACL (opval); - TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); } { SI opval = 0; SET_H_MACH (opval); - TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); } } @@ -702,7 +702,7 @@ SEM_FN_NAME (sh64_compact,clrs_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = 0; SET_H_SBIT (opval); - TRACE_RESULT (current_cpu, abuf, "sbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sbit", 'x', opval); } return vpc; @@ -723,7 +723,7 @@ SEM_FN_NAME (sh64_compact,clrt_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = 0; SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } return vpc; @@ -744,7 +744,7 @@ SEM_FN_NAME (sh64_compact,cmpeq_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = EQSI (GET_H_GRC (FLD (f_rm)), GET_H_GRC (FLD (f_rn))); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } return vpc; @@ -765,7 +765,7 @@ SEM_FN_NAME (sh64_compact,cmpeqi_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { BI opval = EQSI (GET_H_GRC (((UINT) 0)), EXTQISI (ANDQI (FLD (f_imm8), 255))); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } return vpc; @@ -786,7 +786,7 @@ SEM_FN_NAME (sh64_compact,cmpge_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = GESI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm))); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } return vpc; @@ -807,7 +807,7 @@ SEM_FN_NAME (sh64_compact,cmpgt_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = GTSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm))); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } return vpc; @@ -828,7 +828,7 @@ SEM_FN_NAME (sh64_compact,cmphi_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = GTUSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm))); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } return vpc; @@ -849,7 +849,7 @@ SEM_FN_NAME (sh64_compact,cmphs_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = GEUSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm))); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } return vpc; @@ -870,7 +870,7 @@ SEM_FN_NAME (sh64_compact,cmppl_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = GTSI (GET_H_GRC (FLD (f_rn)), 0); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } return vpc; @@ -891,7 +891,7 @@ SEM_FN_NAME (sh64_compact,cmppz_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = GESI (GET_H_GRC (FLD (f_rn)), 0); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } return vpc; @@ -920,7 +920,7 @@ SEM_FN_NAME (sh64_compact,cmpstr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { BI opval = ((GTUBI (tmp_t, 0)) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -943,17 +943,17 @@ SEM_FN_NAME (sh64_compact,div0s_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 31); SET_H_QBIT (opval); - TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); } { BI opval = SRLSI (GET_H_GRC (FLD (f_rm)), 31); SET_H_MBIT (opval); - TRACE_RESULT (current_cpu, abuf, "mbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "mbit", 'x', opval); } { BI opval = ((EQSI (SRLSI (GET_H_GRC (FLD (f_rm)), 31), SRLSI (GET_H_GRC (FLD (f_rn)), 31))) ? (0) : (1)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -976,17 +976,17 @@ SEM_FN_NAME (sh64_compact,div0u_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = 0; SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } { BI opval = 0; SET_H_QBIT (opval); - TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); } { BI opval = 0; SET_H_MBIT (opval); - TRACE_RESULT (current_cpu, abuf, "mbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "mbit", 'x', opval); } } @@ -1013,12 +1013,12 @@ SEM_FN_NAME (sh64_compact,div1_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 31); SET_H_QBIT (opval); - TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); } { SI opval = ORSI (SLLSI (GET_H_GRC (FLD (f_rn)), 1), ZEXTBISI (GET_H_TBIT ())); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } if (NOTBI (tmp_oldq)) { if (NOTBI (GET_H_MBIT ())) { @@ -1027,20 +1027,20 @@ if (NOTBI (GET_H_MBIT ())) { { SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } tmp_tmp1 = GTUSI (GET_H_GRC (FLD (f_rn)), tmp_tmp0); if (NOTBI (GET_H_QBIT ())) { { BI opval = ((tmp_tmp1) ? (1) : (0)); SET_H_QBIT (opval); - TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); } } else { { BI opval = ((EQQI (tmp_tmp1, 0)) ? (1) : (0)); SET_H_QBIT (opval); - TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); } } } @@ -1050,20 +1050,20 @@ if (NOTBI (GET_H_QBIT ())) { { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } tmp_tmp1 = LTUSI (GET_H_GRC (FLD (f_rn)), tmp_tmp0); if (NOTBI (GET_H_QBIT ())) { { BI opval = ((EQQI (tmp_tmp1, 0)) ? (1) : (0)); SET_H_QBIT (opval); - TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); } } else { { BI opval = ((tmp_tmp1) ? (1) : (0)); SET_H_QBIT (opval); - TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); } } } @@ -1075,20 +1075,20 @@ if (NOTBI (GET_H_MBIT ())) { { SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), GET_H_GRC (FLD (f_rn))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } tmp_tmp1 = LTUSI (GET_H_GRC (FLD (f_rn)), tmp_tmp0); if (NOTBI (GET_H_QBIT ())) { { BI opval = ((tmp_tmp1) ? (1) : (0)); SET_H_QBIT (opval); - TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); } } else { { BI opval = ((EQQI (tmp_tmp1, 0)) ? (1) : (0)); SET_H_QBIT (opval); - TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); } } } @@ -1098,20 +1098,20 @@ if (NOTBI (GET_H_QBIT ())) { { SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } tmp_tmp1 = GTUSI (GET_H_GRC (FLD (f_rn)), tmp_tmp0); if (NOTBI (GET_H_QBIT ())) { { BI opval = ((EQQI (tmp_tmp1, 0)) ? (1) : (0)); SET_H_QBIT (opval); - TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); } } else { { BI opval = ((tmp_tmp1) ? (1) : (0)); SET_H_QBIT (opval); - TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval); } } } @@ -1120,7 +1120,7 @@ if (NOTBI (GET_H_QBIT ())) { { BI opval = ((EQBI (GET_H_QBIT (), GET_H_MBIT ())) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -1142,7 +1142,7 @@ SEM_FN_NAME (sh64_compact,divu_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = UDIVSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (((UINT) 0))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -1163,7 +1163,7 @@ SEM_FN_NAME (sh64_compact,mulr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = MULSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (((UINT) 0))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -1187,12 +1187,12 @@ SEM_FN_NAME (sh64_compact,dmulsl_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { SI opval = SUBWORDDISI (tmp_result, 0); SET_H_MACH (opval); - TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); } { SI opval = SUBWORDDISI (tmp_result, 1); SET_H_MACL (opval); - TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); } } @@ -1217,12 +1217,12 @@ SEM_FN_NAME (sh64_compact,dmulul_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { SI opval = SUBWORDDISI (tmp_result, 0); SET_H_MACH (opval); - TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); } { SI opval = SUBWORDDISI (tmp_result, 1); SET_H_MACL (opval); - TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); } } @@ -1245,12 +1245,12 @@ SEM_FN_NAME (sh64_compact,dt_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), 1); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = EQSI (GET_H_GRC (FLD (f_rn)), 0); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -1272,7 +1272,7 @@ SEM_FN_NAME (sh64_compact,extsb_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTQISI (SUBWORDSIQI (GET_H_GRC (FLD (f_rm)), 3)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -1293,7 +1293,7 @@ SEM_FN_NAME (sh64_compact,extsw_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -1314,7 +1314,7 @@ SEM_FN_NAME (sh64_compact,extub_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ZEXTQISI (SUBWORDSIQI (GET_H_GRC (FLD (f_rm)), 3)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -1335,7 +1335,7 @@ SEM_FN_NAME (sh64_compact,extuw_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ZEXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -1358,14 +1358,14 @@ if (GET_H_PRBIT ()) { DF opval = sh64_fabsd (current_cpu, GET_H_FSD (FLD (f_rn))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } else { { DF opval = sh64_fabss (current_cpu, GET_H_FSD (FLD (f_rn))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } @@ -1390,14 +1390,14 @@ if (GET_H_PRBIT ()) { DF opval = sh64_faddd (current_cpu, GET_H_FSD (FLD (f_rm)), GET_H_FSD (FLD (f_rn))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } else { { DF opval = sh64_fadds (current_cpu, GET_H_FSD (FLD (f_rm)), GET_H_FSD (FLD (f_rn))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } @@ -1422,14 +1422,14 @@ if (GET_H_PRBIT ()) { BI opval = sh64_fcmpeqd (current_cpu, GET_H_FSD (FLD (f_rm)), GET_H_FSD (FLD (f_rn))); SET_H_TBIT (opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } else { { BI opval = sh64_fcmpeqs (current_cpu, GET_H_FSD (FLD (f_rm)), GET_H_FSD (FLD (f_rn))); SET_H_TBIT (opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -1454,14 +1454,14 @@ if (GET_H_PRBIT ()) { BI opval = sh64_fcmpgtd (current_cpu, GET_H_FSD (FLD (f_rn)), GET_H_FSD (FLD (f_rm))); SET_H_TBIT (opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } else { { BI opval = sh64_fcmpgts (current_cpu, GET_H_FSD (FLD (f_rn)), GET_H_FSD (FLD (f_rm))); SET_H_TBIT (opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -1484,7 +1484,7 @@ SEM_FN_NAME (sh64_compact,fcnvds_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { SF opval = sh64_fcnvds (current_cpu, GET_H_DRC (FLD (f_dn))); CPU (h_fr[((UINT) 32)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -1505,7 +1505,7 @@ SEM_FN_NAME (sh64_compact,fcnvsd_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { DF opval = sh64_fcnvsd (current_cpu, CPU (h_fr[((UINT) 32)])); SET_H_DRC (FLD (f_dn), opval); - TRACE_RESULT (current_cpu, abuf, "drc", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "drc", 'f', opval); } return vpc; @@ -1528,14 +1528,14 @@ if (GET_H_PRBIT ()) { DF opval = sh64_fdivd (current_cpu, GET_H_FSD (FLD (f_rn)), GET_H_FSD (FLD (f_rm))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } else { { DF opval = sh64_fdivs (current_cpu, GET_H_FSD (FLD (f_rn)), GET_H_FSD (FLD (f_rm))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } @@ -1575,7 +1575,7 @@ SEM_FN_NAME (sh64_compact,flds_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = GET_H_FRC (FLD (f_rn)); CPU (h_fr[((UINT) 32)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -1596,7 +1596,7 @@ SEM_FN_NAME (sh64_compact,fldi0_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = sh64_fldi0 (current_cpu); SET_H_FRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval); } return vpc; @@ -1617,7 +1617,7 @@ SEM_FN_NAME (sh64_compact,fldi1_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = sh64_fldi1 (current_cpu); SET_H_FRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval); } return vpc; @@ -1640,14 +1640,14 @@ if (GET_H_PRBIT ()) { DF opval = sh64_floatld (current_cpu, CPU (h_fr[((UINT) 32)])); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } else { { DF opval = sh64_floatls (current_cpu, CPU (h_fr[((UINT) 32)])); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } @@ -1670,7 +1670,7 @@ SEM_FN_NAME (sh64_compact,fmac_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = sh64_fmacs (current_cpu, GET_H_FRC (((UINT) 0)), GET_H_FRC (FLD (f_rm)), GET_H_FRC (FLD (f_rn))); SET_H_FRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval); } return vpc; @@ -1691,7 +1691,7 @@ SEM_FN_NAME (sh64_compact,fmov1_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = GET_H_FMOV (FLD (f_rm)); SET_H_FMOV (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); } return vpc; @@ -1714,14 +1714,14 @@ if (NOTBI (GET_H_SZBIT ())) { DF opval = GETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rm))); SET_H_FMOV (FLD (f_rn), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); } } else { { DF opval = GETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rm))); SET_H_FMOV (FLD (f_rn), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); } } @@ -1747,13 +1747,13 @@ if (NOTBI (GET_H_SZBIT ())) { DF opval = GETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rm))); SET_H_FMOV (FLD (f_rn), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 4); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } } else { @@ -1762,13 +1762,13 @@ if (NOTBI (GET_H_SZBIT ())) { DF opval = GETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rm))); SET_H_FMOV (FLD (f_rn), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 8); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } } @@ -1794,14 +1794,14 @@ if (NOTBI (GET_H_SZBIT ())) { DF opval = GETMEMSF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm)))); SET_H_FMOV (FLD (f_rn), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); } } else { { DF opval = GETMEMDF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm)))); SET_H_FMOV (FLD (f_rn), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval); } } @@ -1826,14 +1826,14 @@ if (NOTBI (GET_H_SZBIT ())) { SF opval = GET_H_FMOV (FLD (f_rm)); SETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } } else { { DF opval = GET_H_FMOV (FLD (f_rm)); SETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } } @@ -1859,13 +1859,13 @@ if (NOTBI (GET_H_SZBIT ())) { SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), 4); SET_H_GRC (FLD (f_rn), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { SF opval = GET_H_FMOV (FLD (f_rm)); SETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } } } else { @@ -1874,13 +1874,13 @@ if (NOTBI (GET_H_SZBIT ())) { SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), 8); SET_H_GRC (FLD (f_rn), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { DF opval = GET_H_FMOV (FLD (f_rm)); SETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } } } @@ -1906,14 +1906,14 @@ if (NOTBI (GET_H_SZBIT ())) { SF opval = GET_H_FMOV (FLD (f_rm)); SETMEMSF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } } else { { DF opval = GET_H_FMOV (FLD (f_rm)); SETMEMDF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } } @@ -1936,7 +1936,7 @@ SEM_FN_NAME (sh64_compact,fmov8_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = GETMEMDF (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm12x8))); SET_H_DRC (FLD (f_dn), opval); - TRACE_RESULT (current_cpu, abuf, "drc", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "drc", 'f', opval); } return vpc; @@ -1957,7 +1957,7 @@ SEM_FN_NAME (sh64_compact,fmov9_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = GET_H_DRC (FLD (f_dm)); SETMEMDF (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rn)), FLD (f_imm12x8)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } return vpc; @@ -1980,14 +1980,14 @@ if (GET_H_PRBIT ()) { DF opval = sh64_fmuld (current_cpu, GET_H_FSD (FLD (f_rm)), GET_H_FSD (FLD (f_rn))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } else { { DF opval = sh64_fmuls (current_cpu, GET_H_FSD (FLD (f_rm)), GET_H_FSD (FLD (f_rn))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } @@ -2012,14 +2012,14 @@ if (GET_H_PRBIT ()) { DF opval = sh64_fnegd (current_cpu, GET_H_FSD (FLD (f_rn))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } else { { DF opval = sh64_fnegs (current_cpu, GET_H_FSD (FLD (f_rn))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } @@ -2042,7 +2042,7 @@ SEM_FN_NAME (sh64_compact,frchg_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = NOTBI (GET_H_FRBIT ()); SET_H_FRBIT (opval); - TRACE_RESULT (current_cpu, abuf, "frbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "frbit", 'x', opval); } return vpc; @@ -2063,7 +2063,7 @@ SEM_FN_NAME (sh64_compact,fschg_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = NOTBI (GET_H_SZBIT ()); SET_H_SZBIT (opval); - TRACE_RESULT (current_cpu, abuf, "szbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "szbit", 'x', opval); } return vpc; @@ -2086,14 +2086,14 @@ if (GET_H_PRBIT ()) { DF opval = sh64_fsqrtd (current_cpu, GET_H_FSD (FLD (f_rn))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } else { { DF opval = sh64_fsqrts (current_cpu, GET_H_FSD (FLD (f_rn))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } @@ -2116,7 +2116,7 @@ SEM_FN_NAME (sh64_compact,fsts_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CPU (h_fr[((UINT) 32)]); SET_H_FRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval); } return vpc; @@ -2139,14 +2139,14 @@ if (GET_H_PRBIT ()) { DF opval = sh64_fsubd (current_cpu, GET_H_FSD (FLD (f_rn)), GET_H_FSD (FLD (f_rm))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } else { { DF opval = sh64_fsubs (current_cpu, GET_H_FSD (FLD (f_rn)), GET_H_FSD (FLD (f_rm))); SET_H_FSD (FLD (f_rn), opval); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval); } } @@ -2169,7 +2169,7 @@ SEM_FN_NAME (sh64_compact,ftrc_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = ((GET_H_PRBIT ()) ? (sh64_ftrcdl (current_cpu, GET_H_FSD (FLD (f_rn)))) : (sh64_ftrcsl (current_cpu, GET_H_FSD (FLD (f_rn))))); CPU (h_fr[((UINT) 32)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -2209,14 +2209,14 @@ SEM_FN_NAME (sh64_compact,jmp_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UDI opval = ADDDI (pc, 2); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } ((void) 0); /*nop*/ { { UDI opval = GET_H_GRC (FLD (f_rn)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } ((void) 0); /*nop*/ @@ -2244,20 +2244,20 @@ SEM_FN_NAME (sh64_compact,jsr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDDI (pc, 4); SET_H_PR (opval); - TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval); } } { UDI opval = ADDDI (pc, 2); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } ((void) 0); /*nop*/ { { UDI opval = GET_H_GRC (FLD (f_rn)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } ((void) 0); /*nop*/ @@ -2282,7 +2282,7 @@ SEM_FN_NAME (sh64_compact,ldc_gbr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_ar { SI opval = GET_H_GRC (FLD (f_rn)); SET_H_GBR (opval); - TRACE_RESULT (current_cpu, abuf, "gbr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gbr", 'x', opval); } return vpc; @@ -2303,7 +2303,7 @@ SEM_FN_NAME (sh64_compact,ldc_vbr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_ar { SI opval = GET_H_GRC (FLD (f_rn)); SET_H_VBR (opval); - TRACE_RESULT (current_cpu, abuf, "vbr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbr", 'x', opval); } return vpc; @@ -2324,7 +2324,7 @@ SEM_FN_NAME (sh64_compact,ldc_sr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { SI opval = GET_H_GRC (FLD (f_rn)); CPU (h_sr) = opval; - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } return vpc; @@ -2346,12 +2346,12 @@ SEM_FN_NAME (sh64_compact,ldcl_gbr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_a { SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn))); SET_H_GBR (opval); - TRACE_RESULT (current_cpu, abuf, "gbr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gbr", 'x', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -2374,12 +2374,12 @@ SEM_FN_NAME (sh64_compact,ldcl_vbr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_a { SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn))); SET_H_VBR (opval); - TRACE_RESULT (current_cpu, abuf, "vbr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "vbr", 'x', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -2401,7 +2401,7 @@ SEM_FN_NAME (sh64_compact,lds_fpscr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_ { SI opval = GET_H_GRC (FLD (f_rn)); CPU (h_fpscr) = opval; - TRACE_RESULT (current_cpu, abuf, "fpscr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fpscr", 'x', opval); } return vpc; @@ -2423,12 +2423,12 @@ SEM_FN_NAME (sh64_compact,ldsl_fpscr_compact) (SIM_CPU *current_cpu, SEM_ARG sem { SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn))); CPU (h_fpscr) = opval; - TRACE_RESULT (current_cpu, abuf, "fpscr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fpscr", 'x', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -2450,7 +2450,7 @@ SEM_FN_NAME (sh64_compact,lds_fpul_compact) (SIM_CPU *current_cpu, SEM_ARG sem_a { SF opval = SUBWORDSISF (GET_H_GRC (FLD (f_rn))); CPU (h_fr[((UINT) 32)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -2472,12 +2472,12 @@ SEM_FN_NAME (sh64_compact,ldsl_fpul_compact) (SIM_CPU *current_cpu, SEM_ARG sem_ { SF opval = GETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rn))); CPU (h_fr[((UINT) 32)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -2499,7 +2499,7 @@ SEM_FN_NAME (sh64_compact,lds_mach_compact) (SIM_CPU *current_cpu, SEM_ARG sem_a { SI opval = GET_H_GRC (FLD (f_rn)); SET_H_MACH (opval); - TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); } return vpc; @@ -2521,12 +2521,12 @@ SEM_FN_NAME (sh64_compact,ldsl_mach_compact) (SIM_CPU *current_cpu, SEM_ARG sem_ { SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn))); SET_H_MACH (opval); - TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -2548,7 +2548,7 @@ SEM_FN_NAME (sh64_compact,lds_macl_compact) (SIM_CPU *current_cpu, SEM_ARG sem_a { SI opval = GET_H_GRC (FLD (f_rn)); SET_H_MACL (opval); - TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); } return vpc; @@ -2570,12 +2570,12 @@ SEM_FN_NAME (sh64_compact,ldsl_macl_compact) (SIM_CPU *current_cpu, SEM_ARG sem_ { SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn))); SET_H_MACL (opval); - TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -2597,7 +2597,7 @@ SEM_FN_NAME (sh64_compact,lds_pr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { SI opval = GET_H_GRC (FLD (f_rn)); SET_H_PR (opval); - TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval); } return vpc; @@ -2619,12 +2619,12 @@ SEM_FN_NAME (sh64_compact,ldsl_pr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_ar { SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn))); SET_H_PR (opval); - TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -2653,20 +2653,20 @@ SEM_FN_NAME (sh64_compact,macl_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } if (EQSI (FLD (f_rn), FLD (f_rm))) { { { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 4); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } } @@ -2675,7 +2675,7 @@ if (EQSI (FLD (f_rn), FLD (f_rm))) { SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 4); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } tmp_tmpry = MULDI (ZEXTSIDI (tmp_x), ZEXTSIDI (tmp_y)); tmp_mac = ORDI (SLLDI (ZEXTSIDI (GET_H_MACH ()), 32), ZEXTSIDI (GET_H_MACL ())); @@ -2699,12 +2699,12 @@ if (LTDI (tmp_result, tmp_min)) { { SI opval = SUBWORDDISI (tmp_result, 0); SET_H_MACH (opval); - TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); } { SI opval = SUBWORDDISI (tmp_result, 1); SET_H_MACL (opval); - TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); } } } @@ -2735,20 +2735,20 @@ SEM_FN_NAME (sh64_compact,macw_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 2); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } if (EQSI (FLD (f_rn), FLD (f_rm))) { { { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 2); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 2); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } } @@ -2757,7 +2757,7 @@ if (EQSI (FLD (f_rn), FLD (f_rm))) { SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 2); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } tmp_tmpry = MULSI (ZEXTHISI (tmp_x), ZEXTHISI (tmp_y)); if (GET_H_SBIT ()) { @@ -2767,14 +2767,14 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) { SI opval = 1; SET_H_MACH (opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); } } { SI opval = ADDSI (tmp_tmpry, GET_H_MACL ()); SET_H_MACL (opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); } } } else { @@ -2785,13 +2785,13 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) { SI opval = SUBWORDDISI (tmp_result, 0); SET_H_MACH (opval); written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval); } { SI opval = SUBWORDDISI (tmp_result, 1); SET_H_MACL (opval); written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); } } } @@ -2816,7 +2816,7 @@ SEM_FN_NAME (sh64_compact,mov_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = GET_H_GR (FLD (f_rm)); SET_H_GR (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -2837,7 +2837,7 @@ SEM_FN_NAME (sh64_compact,movi_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTQIDI (ANDQI (FLD (f_imm8), 255)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -2858,7 +2858,7 @@ SEM_FN_NAME (sh64_compact,movi20_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { SI opval = FLD (f_imm20); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -2879,7 +2879,7 @@ SEM_FN_NAME (sh64_compact,movb1_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = SUBWORDSIUQI (GET_H_GRC (FLD (f_rm)), 3); SETMEMUQI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -2903,12 +2903,12 @@ SEM_FN_NAME (sh64_compact,movb2_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = SUBWORDSIUQI (GET_H_GRC (FLD (f_rm)), 3); SETMEMUQI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_addr; SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -2930,7 +2930,7 @@ SEM_FN_NAME (sh64_compact,movb3_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = SUBWORDSIUQI (GET_H_GRC (FLD (f_rm)), 3); SETMEMUQI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -2954,7 +2954,7 @@ SEM_FN_NAME (sh64_compact,movb4_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = SUBWORDSIUQI (GET_H_GRC (((UINT) 0)), 3); SETMEMUQI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } @@ -2979,7 +2979,7 @@ SEM_FN_NAME (sh64_compact,movb5_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = SUBWORDSIUQI (GET_H_GRC (((UINT) 0)), 3); SETMEMUQI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } @@ -3001,7 +3001,7 @@ SEM_FN_NAME (sh64_compact,movb6_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTQISI (GETMEMQI (current_cpu, pc, GET_H_GRC (FLD (f_rm)))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -3027,20 +3027,20 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { SI opval = EXTQISI (tmp_data); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } else { { SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 1); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } { SI opval = EXTQISI (tmp_data); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -3063,7 +3063,7 @@ SEM_FN_NAME (sh64_compact,movb8_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm))))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -3084,7 +3084,7 @@ SEM_FN_NAME (sh64_compact,movb9_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8)))); SET_H_GRC (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -3105,7 +3105,7 @@ SEM_FN_NAME (sh64_compact,movb10_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm4)))); SET_H_GRC (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -3126,7 +3126,7 @@ SEM_FN_NAME (sh64_compact,movl1_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GET_H_GRC (FLD (f_rm)); SETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -3150,12 +3150,12 @@ SEM_FN_NAME (sh64_compact,movl2_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GET_H_GRC (FLD (f_rm)); SETMEMSI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_addr; SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -3177,7 +3177,7 @@ SEM_FN_NAME (sh64_compact,movl3_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GET_H_GRC (FLD (f_rm)); SETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -3198,7 +3198,7 @@ SEM_FN_NAME (sh64_compact,movl4_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GET_H_GRC (((UINT) 0)); SETMEMSI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8x4)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -3219,7 +3219,7 @@ SEM_FN_NAME (sh64_compact,movl5_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GET_H_GRC (FLD (f_rm)); SETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rn)), FLD (f_imm4x4)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -3240,7 +3240,7 @@ SEM_FN_NAME (sh64_compact,movl6_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rm))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -3262,21 +3262,21 @@ SEM_FN_NAME (sh64_compact,movl7_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rm))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } if (EQSI (FLD (f_rm), FLD (f_rn))) { { SI opval = GET_H_GRC (FLD (f_rn)); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } else { { SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 4); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } } @@ -3300,7 +3300,7 @@ SEM_FN_NAME (sh64_compact,movl8_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm)))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -3321,7 +3321,7 @@ SEM_FN_NAME (sh64_compact,movl9_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMSI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8x4))); SET_H_GRC (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -3342,7 +3342,7 @@ SEM_FN_NAME (sh64_compact,movl10_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { SI opval = GETMEMSI (current_cpu, pc, ADDSI (FLD (f_imm8x4), ANDDI (ADDDI (pc, 4), INVSI (3)))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -3363,7 +3363,7 @@ SEM_FN_NAME (sh64_compact,movl11_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { SI opval = GETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm4x4))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -3384,7 +3384,7 @@ SEM_FN_NAME (sh64_compact,movl12_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { SI opval = GETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm12x4))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -3405,7 +3405,7 @@ SEM_FN_NAME (sh64_compact,movl13_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { SI opval = GET_H_GRC (FLD (f_rm)); SETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rn)), FLD (f_imm12x4)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -3426,7 +3426,7 @@ SEM_FN_NAME (sh64_compact,movw1_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { HI opval = SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1); SETMEMHI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -3450,12 +3450,12 @@ SEM_FN_NAME (sh64_compact,movw2_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { HI opval = SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1); SETMEMHI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_addr; SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -3477,7 +3477,7 @@ SEM_FN_NAME (sh64_compact,movw3_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { HI opval = SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1); SETMEMHI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -3498,7 +3498,7 @@ SEM_FN_NAME (sh64_compact,movw4_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { HI opval = SUBWORDSIHI (GET_H_GRC (((UINT) 0)), 1); SETMEMHI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8x2)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -3519,7 +3519,7 @@ SEM_FN_NAME (sh64_compact,movw5_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { HI opval = SUBWORDSIHI (GET_H_GRC (((UINT) 0)), 1); SETMEMHI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm4x2)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -3540,7 +3540,7 @@ SEM_FN_NAME (sh64_compact,movw6_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, GET_H_GRC (FLD (f_rm)))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -3566,20 +3566,20 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) { SI opval = EXTHISI (tmp_data); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } else { { SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 2); SET_H_GRC (FLD (f_rm), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } { SI opval = EXTHISI (tmp_data); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -3602,7 +3602,7 @@ SEM_FN_NAME (sh64_compact,movw8_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm))))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -3623,7 +3623,7 @@ SEM_FN_NAME (sh64_compact,movw9_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8x2)))); SET_H_GRC (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -3644,7 +3644,7 @@ SEM_FN_NAME (sh64_compact,movw10_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDDI (ADDDI (pc, 4), FLD (f_imm8x2)))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -3665,7 +3665,7 @@ SEM_FN_NAME (sh64_compact,movw11_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm4x2)))); SET_H_GRC (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -3686,7 +3686,7 @@ SEM_FN_NAME (sh64_compact,mova_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDDI (ANDDI (ADDDI (pc, 4), INVSI (3)), FLD (f_imm8x4)); SET_H_GRC (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -3707,7 +3707,7 @@ SEM_FN_NAME (sh64_compact,movcal_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { SI opval = GET_H_GRC (((UINT) 0)); SETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -3728,7 +3728,7 @@ SEM_FN_NAME (sh64_compact,movcol_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { SI opval = GET_H_GRC (FLD (f_rn)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -3749,7 +3749,7 @@ SEM_FN_NAME (sh64_compact,movt_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ZEXTBISI (GET_H_TBIT ()); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -3770,7 +3770,7 @@ SEM_FN_NAME (sh64_compact,movual_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { SI opval = sh64_movua (current_cpu, pc, GET_H_GRC (FLD (f_rn))); SET_H_GRC (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -3792,12 +3792,12 @@ SEM_FN_NAME (sh64_compact,movual2_compact) (SIM_CPU *current_cpu, SEM_ARG sem_ar { SI opval = sh64_movua (current_cpu, pc, GET_H_GRC (FLD (f_rn))); SET_H_GRC (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -3819,7 +3819,7 @@ SEM_FN_NAME (sh64_compact,mull_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = MULSI (GET_H_GRC (FLD (f_rm)), GET_H_GRC (FLD (f_rn))); SET_H_MACL (opval); - TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); } return vpc; @@ -3840,7 +3840,7 @@ SEM_FN_NAME (sh64_compact,mulsw_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = MULSI (EXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1)), EXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rn)), 1))); SET_H_MACL (opval); - TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); } return vpc; @@ -3861,7 +3861,7 @@ SEM_FN_NAME (sh64_compact,muluw_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = MULSI (ZEXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1)), ZEXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rn)), 1))); SET_H_MACL (opval); - TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval); } return vpc; @@ -3882,7 +3882,7 @@ SEM_FN_NAME (sh64_compact,neg_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = NEGSI (GET_H_GRC (FLD (f_rm))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -3906,12 +3906,12 @@ SEM_FN_NAME (sh64_compact,negc_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBCSI (0, GET_H_GRC (FLD (f_rm)), GET_H_TBIT ()); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = tmp_flag; SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -3950,7 +3950,7 @@ SEM_FN_NAME (sh64_compact,not_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = INVDI (GET_H_GR (FLD (f_rm))); SET_H_GR (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -3972,7 +3972,7 @@ SEM_FN_NAME (sh64_compact,ocbi_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GET_H_GRC (FLD (f_rn)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } ((void) 0); /*nop*/ } @@ -3996,7 +3996,7 @@ SEM_FN_NAME (sh64_compact,ocbp_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GET_H_GRC (FLD (f_rn)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } ((void) 0); /*nop*/ } @@ -4020,7 +4020,7 @@ SEM_FN_NAME (sh64_compact,ocbwb_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GET_H_GRC (FLD (f_rn)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } ((void) 0); /*nop*/ } @@ -4043,7 +4043,7 @@ SEM_FN_NAME (sh64_compact,or_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (GET_H_GR (FLD (f_rm)), GET_H_GR (FLD (f_rn))); SET_H_GR (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -4064,7 +4064,7 @@ SEM_FN_NAME (sh64_compact,ori_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (GET_H_GRC (((UINT) 0)), ZEXTSIDI (FLD (f_imm8))); SET_H_GRC (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -4090,7 +4090,7 @@ SEM_FN_NAME (sh64_compact,orb_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = tmp_data; SETMEMUQI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } @@ -4132,12 +4132,12 @@ SEM_FN_NAME (sh64_compact,rotcl_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (SLLSI (GET_H_GRC (FLD (f_rn)), 1), GET_H_TBIT ()); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = ((tmp_temp) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -4164,12 +4164,12 @@ SEM_FN_NAME (sh64_compact,rotcr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (SRLSI (GET_H_GRC (FLD (f_rn)), 1), SLLSI (tmp_temp, 31)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = ((tmp_lsbit) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -4194,12 +4194,12 @@ SEM_FN_NAME (sh64_compact,rotl_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (SLLSI (GET_H_GRC (FLD (f_rn)), 1), tmp_temp); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = ((tmp_temp) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -4226,12 +4226,12 @@ SEM_FN_NAME (sh64_compact,rotr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (SRLSI (GET_H_GRC (FLD (f_rn)), 1), SLLSI (tmp_temp, 31)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = ((tmp_lsbit) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -4255,14 +4255,14 @@ SEM_FN_NAME (sh64_compact,rts_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UDI opval = ADDDI (pc, 2); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } ((void) 0); /*nop*/ { { UDI opval = GET_H_PR (); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } ((void) 0); /*nop*/ @@ -4287,7 +4287,7 @@ SEM_FN_NAME (sh64_compact,sets_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = 1; SET_H_SBIT (opval); - TRACE_RESULT (current_cpu, abuf, "sbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "sbit", 'x', opval); } return vpc; @@ -4308,7 +4308,7 @@ SEM_FN_NAME (sh64_compact,sett_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = 1; SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } return vpc; @@ -4334,7 +4334,7 @@ if (GESI (GET_H_GRC (FLD (f_rm)), 0)) { SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), tmp_shamt); SET_H_GRC (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } else { if (NESI (tmp_shamt, 0)) { @@ -4342,7 +4342,7 @@ if (NESI (tmp_shamt, 0)) { SI opval = SRASI (GET_H_GRC (FLD (f_rn)), SUBSI (32, tmp_shamt)); SET_H_GRC (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } else { if (LTSI (GET_H_GRC (FLD (f_rn)), 0)) { @@ -4350,14 +4350,14 @@ if (LTSI (GET_H_GRC (FLD (f_rn)), 0)) { SI opval = NEGSI (1); SET_H_GRC (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } else { { SI opval = 0; SET_H_GRC (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } } @@ -4386,12 +4386,12 @@ SEM_FN_NAME (sh64_compact,shal_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 1); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = ((tmp_t) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -4416,12 +4416,12 @@ SEM_FN_NAME (sh64_compact,shar_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRASI (GET_H_GRC (FLD (f_rn)), 1); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = ((tmp_t) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -4448,7 +4448,7 @@ if (GESI (GET_H_GRC (FLD (f_rm)), 0)) { SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), tmp_shamt); SET_H_GRC (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } else { if (NESI (tmp_shamt, 0)) { @@ -4456,14 +4456,14 @@ if (NESI (tmp_shamt, 0)) { SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), SUBSI (32, tmp_shamt)); SET_H_GRC (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } else { { SI opval = 0; SET_H_GRC (FLD (f_rn), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } } @@ -4491,12 +4491,12 @@ SEM_FN_NAME (sh64_compact,shll_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 1); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = ((tmp_t) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -4518,7 +4518,7 @@ SEM_FN_NAME (sh64_compact,shll2_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 2); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -4539,7 +4539,7 @@ SEM_FN_NAME (sh64_compact,shll8_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 8); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -4560,7 +4560,7 @@ SEM_FN_NAME (sh64_compact,shll16_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 16); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -4584,12 +4584,12 @@ SEM_FN_NAME (sh64_compact,shlr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 1); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = ((tmp_t) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -4611,7 +4611,7 @@ SEM_FN_NAME (sh64_compact,shlr2_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 2); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -4632,7 +4632,7 @@ SEM_FN_NAME (sh64_compact,shlr8_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 8); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -4653,7 +4653,7 @@ SEM_FN_NAME (sh64_compact,shlr16_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 16); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -4674,7 +4674,7 @@ SEM_FN_NAME (sh64_compact,stc_gbr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_ar { SI opval = GET_H_GBR (); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -4695,7 +4695,7 @@ SEM_FN_NAME (sh64_compact,stc_vbr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_ar { SI opval = GET_H_VBR (); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -4719,12 +4719,12 @@ SEM_FN_NAME (sh64_compact,stcl_gbr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_a { SI opval = GET_H_GBR (); SETMEMSI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_addr; SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -4749,12 +4749,12 @@ SEM_FN_NAME (sh64_compact,stcl_vbr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_a { SI opval = GET_H_VBR (); SETMEMSI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_addr; SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -4776,7 +4776,7 @@ SEM_FN_NAME (sh64_compact,sts_fpscr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_ { SI opval = CPU (h_fpscr); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -4800,12 +4800,12 @@ SEM_FN_NAME (sh64_compact,stsl_fpscr_compact) (SIM_CPU *current_cpu, SEM_ARG sem { SI opval = CPU (h_fpscr); SETMEMSI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_addr; SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -4827,7 +4827,7 @@ SEM_FN_NAME (sh64_compact,sts_fpul_compact) (SIM_CPU *current_cpu, SEM_ARG sem_a { SI opval = SUBWORDSFSI (CPU (h_fr[((UINT) 32)])); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -4851,12 +4851,12 @@ SEM_FN_NAME (sh64_compact,stsl_fpul_compact) (SIM_CPU *current_cpu, SEM_ARG sem_ { SF opval = CPU (h_fr[((UINT) 32)]); SETMEMSF (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } { SI opval = tmp_addr; SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -4878,7 +4878,7 @@ SEM_FN_NAME (sh64_compact,sts_mach_compact) (SIM_CPU *current_cpu, SEM_ARG sem_a { SI opval = GET_H_MACH (); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -4902,12 +4902,12 @@ SEM_FN_NAME (sh64_compact,stsl_mach_compact) (SIM_CPU *current_cpu, SEM_ARG sem_ { SI opval = GET_H_MACH (); SETMEMSI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_addr; SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -4929,7 +4929,7 @@ SEM_FN_NAME (sh64_compact,sts_macl_compact) (SIM_CPU *current_cpu, SEM_ARG sem_a { SI opval = GET_H_MACL (); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -4953,12 +4953,12 @@ SEM_FN_NAME (sh64_compact,stsl_macl_compact) (SIM_CPU *current_cpu, SEM_ARG sem_ { SI opval = GET_H_MACL (); SETMEMSI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_addr; SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -4980,7 +4980,7 @@ SEM_FN_NAME (sh64_compact,sts_pr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg { SI opval = GET_H_PR (); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -5004,12 +5004,12 @@ SEM_FN_NAME (sh64_compact,stsl_pr_compact) (SIM_CPU *current_cpu, SEM_ARG sem_ar { SI opval = GET_H_PR (); SETMEMSI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_addr; SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -5031,7 +5031,7 @@ SEM_FN_NAME (sh64_compact,sub_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -5055,12 +5055,12 @@ SEM_FN_NAME (sh64_compact,subc_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBCSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)), GET_H_TBIT ()); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = tmp_flag; SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -5085,12 +5085,12 @@ SEM_FN_NAME (sh64_compact,subv_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm))); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } { BI opval = ((tmp_t) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -5119,7 +5119,7 @@ SEM_FN_NAME (sh64_compact,swapb_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (SLLSI (tmp_top_half, 16), ORSI (SLLSI (tmp_byte0, 8), tmp_byte1)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } } @@ -5141,7 +5141,7 @@ SEM_FN_NAME (sh64_compact,swapw_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (SRLSI (GET_H_GRC (FLD (f_rm)), 16), SLLSI (GET_H_GRC (FLD (f_rm)), 16)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -5165,13 +5165,13 @@ SEM_FN_NAME (sh64_compact,tasb_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = ((EQQI (tmp_byte, 0)) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } tmp_byte = ORQI (tmp_byte, 128); { UQI opval = tmp_byte; SETMEMUQI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } @@ -5210,7 +5210,7 @@ SEM_FN_NAME (sh64_compact,tst_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = ((EQSI (ANDSI (GET_H_GRC (FLD (f_rm)), GET_H_GRC (FLD (f_rn))), 0)) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } return vpc; @@ -5231,7 +5231,7 @@ SEM_FN_NAME (sh64_compact,tsti_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = ((EQSI (ANDSI (GET_H_GRC (((UINT) 0)), ZEXTSISI (FLD (f_imm8))), 0)) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } return vpc; @@ -5255,7 +5255,7 @@ SEM_FN_NAME (sh64_compact,tstb_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = ((EQQI (ANDQI (GETMEMUQI (current_cpu, pc, tmp_addr), FLD (f_imm8)), 0)) ? (1) : (0)); SET_H_TBIT (opval); - TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval); } } @@ -5277,7 +5277,7 @@ SEM_FN_NAME (sh64_compact,xor_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = XORDI (GET_H_GR (FLD (f_rn)), GET_H_GR (FLD (f_rm))); SET_H_GR (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -5298,7 +5298,7 @@ SEM_FN_NAME (sh64_compact,xori_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = XORSI (GET_H_GRC (((UINT) 0)), ZEXTSIDI (FLD (f_imm8))); SET_H_GRC (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; @@ -5324,7 +5324,7 @@ SEM_FN_NAME (sh64_compact,xorb_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = tmp_data; SETMEMUQI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } @@ -5346,7 +5346,7 @@ SEM_FN_NAME (sh64_compact,xtrct_compact) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (SLLSI (GET_H_GRC (FLD (f_rm)), 16), SRLSI (GET_H_GRC (FLD (f_rn)), 16)); SET_H_GRC (FLD (f_rn), opval); - TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval); } return vpc; diff --git a/sim/sh64/sem-media-switch.c b/sim/sh64/sem-media-switch.c index 9aadc92..717a521 100644 --- a/sim/sh64/sem-media-switch.c +++ b/sim/sh64/sem-media-switch.c @@ -265,13 +265,13 @@ This file is part of the GNU simulators. /* If hyper-fast [well not unnecessarily slow] execution is selected, turn off frills like tracing and profiling. */ -/* FIXME: A better way would be to have TRACE_RESULT check for something +/* FIXME: A better way would be to have CGEN_TRACE_RESULT check for something that can cause it to be optimized out. Another way would be to emit special handlers into the instruction "stream". */ #if FAST_P -#undef TRACE_RESULT -#define TRACE_RESULT(cpu, abuf, name, type, val) +#undef CGEN_TRACE_RESULT +#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val) #endif #undef GET_ATTR @@ -456,7 +456,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { DI opval = ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -475,7 +475,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { DI opval = ADDSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SUBWORDDISI (GET_H_GR (FLD (f_right)), 1)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -494,7 +494,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { DI opval = ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -513,7 +513,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { DI opval = EXTSIDI (ADDSI (EXTSISI (FLD (f_disp10)), SUBWORDDISI (GET_H_GR (FLD (f_left)), 1))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -532,7 +532,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { DI opval = ZEXTSIDI (ADDSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SUBWORDDISI (GET_H_GR (FLD (f_right)), 1))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -552,7 +552,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { DI opval = GET_H_GR (FLD (f_left)); SET_H_GR (FLD (f_left), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } ((void) 0); /*nop*/ } @@ -573,7 +573,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { DI opval = ANDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -592,7 +592,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { DI opval = ANDDI (GET_H_GR (FLD (f_left)), INVDI (GET_H_GR (FLD (f_right)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -611,7 +611,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { DI opval = ANDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -635,7 +635,7 @@ if (EQDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) { UDI opval = CPU (h_tr[FLD (f_tra)]); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -663,7 +663,7 @@ if (EQDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_imm6)))) { UDI opval = CPU (h_tr[FLD (f_tra)]); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -691,7 +691,7 @@ if (GEDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) { UDI opval = CPU (h_tr[FLD (f_tra)]); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -719,7 +719,7 @@ if (GEUDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) { UDI opval = CPU (h_tr[FLD (f_tra)]); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -747,7 +747,7 @@ if (GTDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) { UDI opval = CPU (h_tr[FLD (f_tra)]); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -775,7 +775,7 @@ if (GTUDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) { UDI opval = CPU (h_tr[FLD (f_tra)]); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -800,12 +800,12 @@ if (GTUDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) { { DI opval = ORDI (ADDDI (pc, 4), 1); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } { UDI opval = CPU (h_tr[FLD (f_trb)]); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } if (EQSI (FLD (f_dest), 63)) { ((void) 0); /*nop*/ @@ -836,7 +836,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) { UDI opval = CPU (h_tr[FLD (f_tra)]); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -864,7 +864,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_imm6)))) { UDI opval = CPU (h_tr[FLD (f_tra)]); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -939,7 +939,7 @@ sh64_break (current_cpu, pc); { DI opval = tmp_result; SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -959,7 +959,7 @@ sh64_break (current_cpu, pc); { DI opval = ((EQDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) ? (1) : (0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -978,7 +978,7 @@ sh64_break (current_cpu, pc); { DI opval = ((GTDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) ? (1) : (0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -997,7 +997,7 @@ sh64_break (current_cpu, pc); { DI opval = ((GTUDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) ? (1) : (0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -1018,7 +1018,7 @@ if (EQDI (GET_H_GR (FLD (f_left)), 0)) { DI opval = GET_H_GR (FLD (f_right)); SET_H_GR (FLD (f_dest), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -1041,7 +1041,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), 0)) { DI opval = GET_H_GR (FLD (f_right)); SET_H_GR (FLD (f_dest), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -1062,7 +1062,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), 0)) { { DF opval = sh64_fabsd (current_cpu, GET_H_DR (FLD (f_left_right))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } #undef FLD @@ -1081,7 +1081,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), 0)) { { SF opval = sh64_fabss (current_cpu, CPU (h_fr[FLD (f_left_right)])); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } #undef FLD @@ -1100,7 +1100,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), 0)) { { DF opval = sh64_faddd (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } #undef FLD @@ -1119,7 +1119,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), 0)) { { SF opval = sh64_fadds (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)])); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } #undef FLD @@ -1138,7 +1138,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), 0)) { { DI opval = ZEXTBIDI (sh64_fcmpeqd (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -1157,7 +1157,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), 0)) { { DI opval = ZEXTBIDI (sh64_fcmpeqs (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)]))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -1176,7 +1176,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), 0)) { { DI opval = ZEXTBIDI (sh64_fcmpged (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -1195,7 +1195,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), 0)) { { DI opval = ZEXTBIDI (sh64_fcmpges (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)]))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -1214,7 +1214,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), 0)) { { DI opval = ZEXTBIDI (sh64_fcmpgtd (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -1233,7 +1233,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), 0)) { { DI opval = ZEXTBIDI (sh64_fcmpgts (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)]))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -1252,7 +1252,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), 0)) { { DI opval = ZEXTBIDI (sh64_fcmpund (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -1271,7 +1271,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), 0)) { { DI opval = ZEXTBIDI (sh64_fcmpuns (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)]))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -1290,7 +1290,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), 0)) { { SF opval = sh64_fcnvds (current_cpu, GET_H_DR (FLD (f_left_right))); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } #undef FLD @@ -1309,7 +1309,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), 0)) { { DF opval = sh64_fcnvsd (current_cpu, CPU (h_fr[FLD (f_left_right)])); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } #undef FLD @@ -1328,7 +1328,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), 0)) { { DF opval = sh64_fdivd (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } #undef FLD @@ -1347,7 +1347,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), 0)) { { SF opval = sh64_fdivs (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)])); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } #undef FLD @@ -1366,7 +1366,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), 0)) { { SF opval = SUBWORDSISF (CPU (h_fpscr)); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } #undef FLD @@ -1386,17 +1386,17 @@ if (NEDI (GET_H_GR (FLD (f_left)), 0)) { { SF opval = GET_H_FV (FLD (f_left)); SET_H_FV (FLD (f_left), opval); - TRACE_RESULT (current_cpu, abuf, "fv", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fv", 'f', opval); } { SF opval = GET_H_FV (FLD (f_right)); SET_H_FV (FLD (f_right), opval); - TRACE_RESULT (current_cpu, abuf, "fv", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fv", 'f', opval); } { SF opval = sh64_fiprs (current_cpu, FLD (f_left), FLD (f_right)); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -1416,7 +1416,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), 0)) { { DF opval = GETMEMDF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp10x8))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } #undef FLD @@ -1436,7 +1436,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), 0)) { { SF opval = GET_H_FP (FLD (f_dest)); SET_H_FP (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "fp", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fp", 'f', opval); } sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), FLD (f_disp10x8), FLD (f_dest)); } @@ -1457,7 +1457,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), FLD (f_disp10x8), FLD (f_de { SF opval = GETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp10x4))); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } #undef FLD @@ -1476,7 +1476,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), FLD (f_disp10x8), FLD (f_de { DF opval = GETMEMDF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } #undef FLD @@ -1496,7 +1496,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), FLD (f_disp10x8), FLD (f_de { SF opval = GET_H_FP (FLD (f_dest)); SET_H_FP (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "fp", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fp", 'f', opval); } sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), FLD (f_dest)); } @@ -1517,7 +1517,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { SF opval = GETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } #undef FLD @@ -1536,7 +1536,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { DF opval = sh64_floatld (current_cpu, CPU (h_fr[FLD (f_left_right)])); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } #undef FLD @@ -1555,7 +1555,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { SF opval = sh64_floatls (current_cpu, CPU (h_fr[FLD (f_left_right)])); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } #undef FLD @@ -1574,7 +1574,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { DF opval = sh64_floatqd (current_cpu, GET_H_DR (FLD (f_left_right))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } #undef FLD @@ -1593,7 +1593,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { SF opval = sh64_floatqs (current_cpu, GET_H_DR (FLD (f_left_right))); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } #undef FLD @@ -1612,7 +1612,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { SF opval = sh64_fadds (current_cpu, CPU (h_fr[FLD (f_dest)]), sh64_fmuls (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)]))); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } #undef FLD @@ -1631,7 +1631,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { DF opval = GET_H_DR (FLD (f_left_right)); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } #undef FLD @@ -1650,7 +1650,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { DI opval = SUBWORDDFDI (GET_H_DR (FLD (f_left_right))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -1669,7 +1669,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { SF opval = SUBWORDSISF (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } #undef FLD @@ -1688,7 +1688,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { DF opval = SUBWORDDIDF (GET_H_GR (FLD (f_left))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } #undef FLD @@ -1707,7 +1707,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { SF opval = CPU (h_fr[FLD (f_left_right)]); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } #undef FLD @@ -1726,7 +1726,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { DI opval = EXTSIDI (SUBWORDSFSI (CPU (h_fr[FLD (f_left_right)]))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -1745,7 +1745,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { DF opval = sh64_fmuld (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } #undef FLD @@ -1764,7 +1764,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { SF opval = sh64_fmuls (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)])); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } #undef FLD @@ -1783,7 +1783,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { DF opval = sh64_fnegd (current_cpu, GET_H_DR (FLD (f_left_right))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } #undef FLD @@ -1802,7 +1802,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { SF opval = sh64_fnegs (current_cpu, CPU (h_fr[FLD (f_left_right)])); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } #undef FLD @@ -1821,7 +1821,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { SI opval = SUBWORDSFSI (CPU (h_fr[FLD (f_left_right)])); CPU (h_fpscr) = opval; - TRACE_RESULT (current_cpu, abuf, "fpscr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fpscr", 'x', opval); } #undef FLD @@ -1840,7 +1840,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { DF opval = sh64_fsqrtd (current_cpu, GET_H_DR (FLD (f_left_right))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } #undef FLD @@ -1859,7 +1859,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { SF opval = sh64_fsqrts (current_cpu, CPU (h_fr[FLD (f_left_right)])); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } #undef FLD @@ -1878,7 +1878,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { DF opval = GET_H_DR (FLD (f_dest)); SETMEMDF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp10x8)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } #undef FLD @@ -1898,7 +1898,7 @@ sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { SF opval = GET_H_FP (FLD (f_dest)); SET_H_FP (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "fp", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fp", 'f', opval); } sh64_fstp (current_cpu, pc, GET_H_GR (FLD (f_left)), FLD (f_disp10x8), FLD (f_dest)); } @@ -1919,7 +1919,7 @@ sh64_fstp (current_cpu, pc, GET_H_GR (FLD (f_left)), FLD (f_disp10x8), FLD (f_de { SF opval = CPU (h_fr[FLD (f_dest)]); SETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp10x4)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } #undef FLD @@ -1938,7 +1938,7 @@ sh64_fstp (current_cpu, pc, GET_H_GR (FLD (f_left)), FLD (f_disp10x8), FLD (f_de { DF opval = GET_H_DR (FLD (f_dest)); SETMEMDF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } #undef FLD @@ -1958,7 +1958,7 @@ sh64_fstp (current_cpu, pc, GET_H_GR (FLD (f_left)), FLD (f_disp10x8), FLD (f_de { SF opval = GET_H_FP (FLD (f_dest)); SET_H_FP (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "fp", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fp", 'f', opval); } sh64_fstp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), FLD (f_dest)); } @@ -1979,7 +1979,7 @@ sh64_fstp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { SF opval = CPU (h_fr[FLD (f_dest)]); SETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } #undef FLD @@ -1998,7 +1998,7 @@ sh64_fstp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { DF opval = sh64_fsubd (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } #undef FLD @@ -2017,7 +2017,7 @@ sh64_fstp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { SF opval = sh64_fsubs (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)])); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } #undef FLD @@ -2036,7 +2036,7 @@ sh64_fstp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { SF opval = sh64_ftrcdl (current_cpu, GET_H_DR (FLD (f_left_right))); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } #undef FLD @@ -2055,7 +2055,7 @@ sh64_fstp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { SF opval = sh64_ftrcsl (current_cpu, CPU (h_fr[FLD (f_left_right)])); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } #undef FLD @@ -2074,7 +2074,7 @@ sh64_fstp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { DF opval = sh64_ftrcdq (current_cpu, GET_H_DR (FLD (f_left_right))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } #undef FLD @@ -2093,7 +2093,7 @@ sh64_fstp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { DF opval = sh64_ftrcsq (current_cpu, CPU (h_fr[FLD (f_left_right)])); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } #undef FLD @@ -2113,17 +2113,17 @@ sh64_fstp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), F { SF opval = GET_H_FMTX (FLD (f_left)); SET_H_FMTX (FLD (f_left), opval); - TRACE_RESULT (current_cpu, abuf, "fmtx", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fmtx", 'f', opval); } { SF opval = GET_H_FV (FLD (f_right)); SET_H_FV (FLD (f_right), opval); - TRACE_RESULT (current_cpu, abuf, "fv", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fv", 'f', opval); } { SF opval = GET_H_FV (FLD (f_dest)); SET_H_FV (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "fv", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fv", 'f', opval); } sh64_ftrvs (current_cpu, FLD (f_left), FLD (f_right), FLD (f_dest)); } @@ -2148,7 +2148,7 @@ sh64_ftrvs (current_cpu, FLD (f_left), FLD (f_right), FLD (f_dest)); { DI opval = GETMEMSI (current_cpu, pc, tmp_address); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -2168,7 +2168,7 @@ sh64_ftrvs (current_cpu, FLD (f_left), FLD (f_right), FLD (f_dest)); { DI opval = GET_H_CR (FLD (f_left)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -2187,7 +2187,7 @@ sh64_ftrvs (current_cpu, FLD (f_left), FLD (f_right), FLD (f_dest)); { DI opval = CPU (h_tr[FLD (f_trb)]); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -2207,7 +2207,7 @@ sh64_ftrvs (current_cpu, FLD (f_left), FLD (f_right), FLD (f_dest)); { DI opval = GET_H_GR (FLD (f_left)); SET_H_GR (FLD (f_left), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } ((void) 0); /*nop*/ } @@ -2228,7 +2228,7 @@ sh64_ftrvs (current_cpu, FLD (f_left), FLD (f_right), FLD (f_dest)); { DI opval = EXTQIDI (GETMEMQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -2247,7 +2247,7 @@ sh64_ftrvs (current_cpu, FLD (f_left), FLD (f_right), FLD (f_dest)); { DI opval = EXTSIDI (GETMEMSI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x4))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -2266,7 +2266,7 @@ sh64_ftrvs (current_cpu, FLD (f_left), FLD (f_right), FLD (f_dest)); { DI opval = GETMEMDI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x8)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -2285,7 +2285,7 @@ sh64_ftrvs (current_cpu, FLD (f_left), FLD (f_right), FLD (f_dest)); { DI opval = ZEXTQIDI (GETMEMQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -2304,7 +2304,7 @@ sh64_ftrvs (current_cpu, FLD (f_left), FLD (f_right), FLD (f_dest)); { DI opval = ZEXTHIDI (GETMEMHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x2))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -2323,7 +2323,7 @@ sh64_ftrvs (current_cpu, FLD (f_left), FLD (f_right), FLD (f_dest)); { DI opval = EXTHIDI (GETMEMHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x2))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -2351,7 +2351,7 @@ if (ANDQI (tmp_bytecount, 4)) { DI opval = EXTSIDI (GETMEMSI (current_cpu, pc, ANDDI (tmp_addr, -4))); SET_H_GR (FLD (f_dest), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } else { if (GET_H_ENDIAN ()) { @@ -2366,7 +2366,7 @@ if (ANDQI (tmp_bytecount, 1)) { DI opval = EXTSIDI (tmp_val); SET_H_GR (FLD (f_dest), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } } else { @@ -2381,7 +2381,7 @@ if (ANDQI (tmp_bytecount, 2)) { DI opval = EXTSIDI (SLLSI (tmp_val, SUBSI (32, MULSI (8, tmp_bytecount)))); SET_H_GR (FLD (f_dest), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } } @@ -2414,7 +2414,7 @@ if (ANDQI (tmp_bytecount, 8)) { DI opval = GETMEMDI (current_cpu, pc, ANDDI (tmp_addr, -8)); SET_H_GR (FLD (f_dest), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } else { if (GET_H_ENDIAN ()) { @@ -2432,7 +2432,7 @@ if (ANDQI (tmp_bytecount, 1)) { DI opval = tmp_val; SET_H_GR (FLD (f_dest), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } } else { @@ -2450,7 +2450,7 @@ if (ANDQI (tmp_bytecount, 4)) { DI opval = SLLDI (tmp_val, SUBSI (64, MULSI (8, tmp_bytecount))); SET_H_GR (FLD (f_dest), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } } @@ -2483,7 +2483,7 @@ if (ANDQI (tmp_bytecount, 4)) { DI opval = EXTSIDI (GETMEMSI (current_cpu, pc, tmp_addr)); SET_H_GR (FLD (f_dest), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } else { if (GET_H_ENDIAN ()) { @@ -2498,7 +2498,7 @@ if (ANDQI (tmp_bytecount, 2)) { DI opval = EXTSIDI (SLLSI (tmp_val, SUBSI (32, MULSI (8, tmp_bytecount)))); SET_H_GR (FLD (f_dest), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } } else { @@ -2513,7 +2513,7 @@ if (ANDQI (tmp_bytecount, 1)) { DI opval = EXTSIDI (tmp_val); SET_H_GR (FLD (f_dest), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } } @@ -2546,7 +2546,7 @@ if (ANDQI (tmp_bytecount, 8)) { DI opval = GETMEMDI (current_cpu, pc, tmp_addr); SET_H_GR (FLD (f_dest), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } else { if (GET_H_ENDIAN ()) { @@ -2564,7 +2564,7 @@ if (ANDQI (tmp_bytecount, 4)) { DI opval = SLLDI (tmp_val, SUBSI (64, MULSI (8, tmp_bytecount))); SET_H_GR (FLD (f_dest), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } } else { @@ -2582,7 +2582,7 @@ if (ANDQI (tmp_bytecount, 1)) { DI opval = tmp_val; SET_H_GR (FLD (f_dest), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } } @@ -2606,7 +2606,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = EXTQIDI (GETMEMQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -2625,7 +2625,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = EXTSIDI (GETMEMSI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -2644,7 +2644,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = GETMEMDI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -2663,7 +2663,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ZEXTQIDI (GETMEMUQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -2682,7 +2682,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ZEXTHIDI (GETMEMUHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -2701,7 +2701,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = EXTHIDI (GETMEMHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -2725,7 +2725,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -2754,7 +2754,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -2779,7 +2779,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -2808,7 +2808,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -2833,7 +2833,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -2870,7 +2870,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0)))))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -2899,7 +2899,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -2936,7 +2936,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0)))))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -2961,7 +2961,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -2990,7 +2990,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3015,7 +3015,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3052,7 +3052,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0)))))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3081,7 +3081,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3101,7 +3101,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (ANDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), ANDDI (GET_H_GR (FLD (f_dest)), INVDI (GET_H_GR (FLD (f_right))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -3129,7 +3129,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3166,7 +3166,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0)))))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3203,7 +3203,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0)))))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3232,7 +3232,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3261,7 +3261,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3290,7 +3290,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3319,7 +3319,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3348,7 +3348,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3377,7 +3377,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3406,7 +3406,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3438,7 +3438,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3470,7 +3470,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3495,7 +3495,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3524,7 +3524,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3552,7 +3552,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3586,7 +3586,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3622,7 +3622,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3647,7 +3647,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3672,7 +3672,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3698,7 +3698,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ADDDI (GET_H_GR (FLD (f_dest)), tmp_acc); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3718,7 +3718,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = EXTSIDI (FLD (f_imm16)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -3748,7 +3748,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3778,7 +3778,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ADDDI (GET_H_GR (FLD (f_dest)), tmp_acc); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3803,7 +3803,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3832,7 +3832,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3857,7 +3857,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3886,7 +3886,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3906,7 +3906,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ((LTDI (SRADI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63)), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGDI (SLLDI (1, SUBSI (16, 1)))) : (((LTDI (SRADI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63)), SLLDI (1, SUBSI (16, 1)))) ? (SRADI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63))) : (SUBDI (SLLDI (1, SUBSI (16, 1)), 1))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -3942,7 +3942,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0)))))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3967,7 +3967,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3996,7 +3996,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4033,7 +4033,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0)))))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4058,7 +4058,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4087,7 +4087,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4112,7 +4112,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4141,7 +4141,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4166,7 +4166,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4195,7 +4195,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4220,7 +4220,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4249,7 +4249,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4274,7 +4274,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4311,7 +4311,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0)))))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4348,7 +4348,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0)))))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4368,7 +4368,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = MULDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -4387,7 +4387,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = MULDI (ZEXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)), ZEXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -4421,7 +4421,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = sh64_nsb (current_cpu, GET_H_GR (FLD (f_left))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -4441,7 +4441,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = GET_H_GR (FLD (f_left)); SET_H_GR (FLD (f_left), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } ((void) 0); /*nop*/ } @@ -4463,7 +4463,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = GET_H_GR (FLD (f_left)); SET_H_GR (FLD (f_left), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } ((void) 0); /*nop*/ } @@ -4485,7 +4485,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = GET_H_GR (FLD (f_left)); SET_H_GR (FLD (f_left), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } ((void) 0); /*nop*/ } @@ -4506,7 +4506,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -4525,7 +4525,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_imm10))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -4545,7 +4545,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = GET_H_GR (FLD (f_left)); SET_H_GR (FLD (f_left), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } ((void) 0); /*nop*/ } @@ -4568,7 +4568,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ADDSI (FLD (f_disp16), 1); CPU (h_tr[FLD (f_tra)]) = opval; - TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval); } } @@ -4590,7 +4590,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = GET_H_GR (FLD (f_right)); CPU (h_tr[FLD (f_tra)]) = opval; - TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval); } } @@ -4612,7 +4612,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = FLD (f_disp16); CPU (h_tr[FLD (f_tra)]) = opval; - TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval); } } @@ -4634,7 +4634,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ADDDI (pc, GET_H_GR (FLD (f_right))); CPU (h_tr[FLD (f_tra)]) = opval; - TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval); } } @@ -4658,7 +4658,7 @@ if (ANDQI (tmp_bytecount, 1)) { { SI opval = GET_H_GR (FLD (f_dest)); SETMEMSI (current_cpu, pc, tmp_address, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } @@ -4678,7 +4678,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = GET_H_GR (FLD (f_left)); SET_H_CR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "cr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'D', opval); } #undef FLD @@ -4712,7 +4712,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = SRADI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -4731,7 +4731,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = EXTSIDI (SRASI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 63))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -4750,7 +4750,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = SRADI (GET_H_GR (FLD (f_left)), FLD (f_uimm6)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -4769,7 +4769,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = EXTSIDI (SRASI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDSI (FLD (f_uimm6), 63))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -4788,7 +4788,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = SLLDI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -4807,7 +4807,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = EXTSIDI (SLLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 63))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -4826,7 +4826,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = SLLDI (GET_H_GR (FLD (f_left)), FLD (f_uimm6)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -4845,7 +4845,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = EXTSIDI (SLLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDSI (FLD (f_uimm6), 63))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -4864,7 +4864,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = SRLDI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -4883,7 +4883,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = EXTSIDI (SRLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 63))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -4902,7 +4902,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = SRLDI (GET_H_GR (FLD (f_left)), FLD (f_uimm6)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -4921,7 +4921,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = EXTSIDI (SRLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDSI (FLD (f_uimm6), 63))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -4940,7 +4940,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = ORDI (SLLDI (GET_H_GR (FLD (f_dest)), 16), ZEXTSIDI (FLD (f_uimm16))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -4974,7 +4974,7 @@ if (ANDQI (tmp_bytecount, 1)) { { UQI opval = ANDQI (GET_H_GR (FLD (f_dest)), 255); SETMEMUQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -4993,7 +4993,7 @@ if (ANDQI (tmp_bytecount, 1)) { { SI opval = ANDSI (GET_H_GR (FLD (f_dest)), 0xffffffff); SETMEMSI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x4))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -5012,7 +5012,7 @@ if (ANDQI (tmp_bytecount, 1)) { { DI opval = GET_H_GR (FLD (f_dest)); SETMEMDI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x8))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval); } #undef FLD @@ -5031,7 +5031,7 @@ if (ANDQI (tmp_bytecount, 1)) { { HI opval = ANDHI (GET_H_GR (FLD (f_dest)), 65535); SETMEMHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x2))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -5058,7 +5058,7 @@ if (ANDQI (tmp_bytecount, 4)) { SI opval = GET_H_GR (FLD (f_dest)); SETMEMSI (current_cpu, pc, ANDDI (tmp_addr, -4), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } else { if (GET_H_ENDIAN ()) { @@ -5070,7 +5070,7 @@ if (ANDQI (tmp_bytecount, 1)) { UQI opval = ANDQI (tmp_val, 255); SETMEMUQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 8); } @@ -5081,7 +5081,7 @@ if (ANDQI (tmp_bytecount, 2)) { HI opval = ANDHI (tmp_val, 65535); SETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 16); } @@ -5096,7 +5096,7 @@ if (ANDQI (tmp_bytecount, 2)) { HI opval = ANDHI (tmp_val, 65535); SETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 16); } @@ -5107,7 +5107,7 @@ if (ANDQI (tmp_bytecount, 1)) { UQI opval = ANDQI (tmp_val, 255); SETMEMUQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 8); } @@ -5142,7 +5142,7 @@ if (ANDQI (tmp_bytecount, 8)) { DI opval = GET_H_GR (FLD (f_dest)); SETMEMDI (current_cpu, pc, ANDDI (tmp_addr, -8), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval); } } else { if (GET_H_ENDIAN ()) { @@ -5154,7 +5154,7 @@ if (ANDQI (tmp_bytecount, 1)) { UQI opval = ANDQI (tmp_val, 255); SETMEMUQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 8); } @@ -5165,7 +5165,7 @@ if (ANDQI (tmp_bytecount, 2)) { HI opval = ANDHI (tmp_val, 65535); SETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 16); } @@ -5176,7 +5176,7 @@ if (ANDQI (tmp_bytecount, 4)) { SI opval = ANDSI (tmp_val, 0xffffffff); SETMEMSI (current_cpu, pc, ANDDI (tmp_addr, -8), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 32); } @@ -5191,7 +5191,7 @@ if (ANDQI (tmp_bytecount, 4)) { SI opval = ANDSI (tmp_val, 0xffffffff); SETMEMSI (current_cpu, pc, ANDDI (tmp_addr, -8), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 32); } @@ -5202,7 +5202,7 @@ if (ANDQI (tmp_bytecount, 2)) { HI opval = ANDHI (tmp_val, 65535); SETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 16); } @@ -5213,7 +5213,7 @@ if (ANDQI (tmp_bytecount, 1)) { UQI opval = ANDQI (tmp_val, 255); SETMEMUQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 8); } @@ -5248,7 +5248,7 @@ if (ANDQI (tmp_bytecount, 4)) { USI opval = GET_H_GR (FLD (f_dest)); SETMEMUSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } else { if (GET_H_ENDIAN ()) { @@ -5260,7 +5260,7 @@ if (ANDQI (tmp_bytecount, 2)) { UHI opval = ANDHI (tmp_val, 65535); SETMEMUHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 16); } @@ -5271,7 +5271,7 @@ if (ANDQI (tmp_bytecount, 1)) { UQI opval = ANDQI (tmp_val, 255); SETMEMUQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 8); } @@ -5286,7 +5286,7 @@ if (ANDQI (tmp_bytecount, 1)) { UQI opval = ANDQI (tmp_val, 255); SETMEMUQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 8); } @@ -5297,7 +5297,7 @@ if (ANDQI (tmp_bytecount, 2)) { UHI opval = ANDHI (tmp_val, 65535); SETMEMUHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 16); } @@ -5332,7 +5332,7 @@ if (ANDQI (tmp_bytecount, 8)) { UDI opval = GET_H_GR (FLD (f_dest)); SETMEMUDI (current_cpu, pc, tmp_addr, opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval); } } else { if (GET_H_ENDIAN ()) { @@ -5344,7 +5344,7 @@ if (ANDQI (tmp_bytecount, 4)) { USI opval = ANDSI (tmp_val, 0xffffffff); SETMEMUSI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 3), -4), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 32); } @@ -5355,7 +5355,7 @@ if (ANDQI (tmp_bytecount, 2)) { UHI opval = ANDHI (tmp_val, 65535); SETMEMUHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 16); } @@ -5366,7 +5366,7 @@ if (ANDQI (tmp_bytecount, 1)) { UQI opval = ANDQI (tmp_val, 255); SETMEMUQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 8); } @@ -5381,7 +5381,7 @@ if (ANDQI (tmp_bytecount, 1)) { UQI opval = ANDQI (tmp_val, 255); SETMEMUQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 8); } @@ -5392,7 +5392,7 @@ if (ANDQI (tmp_bytecount, 2)) { UHI opval = ANDHI (tmp_val, 65535); SETMEMUHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 16); } @@ -5403,7 +5403,7 @@ if (ANDQI (tmp_bytecount, 4)) { USI opval = ANDSI (tmp_val, 0xffffffff); SETMEMUSI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 3), -4), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 32); } @@ -5430,7 +5430,7 @@ if (ANDQI (tmp_bytecount, 4)) { { UQI opval = SUBWORDDIQI (GET_H_GR (FLD (f_dest)), 7); SETMEMUQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -5449,7 +5449,7 @@ if (ANDQI (tmp_bytecount, 4)) { { SI opval = SUBWORDDISI (GET_H_GR (FLD (f_dest)), 1); SETMEMSI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -5468,7 +5468,7 @@ if (ANDQI (tmp_bytecount, 4)) { { DI opval = GET_H_GR (FLD (f_dest)); SETMEMDI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval); } #undef FLD @@ -5487,7 +5487,7 @@ if (ANDQI (tmp_bytecount, 4)) { { HI opval = SUBWORDDIHI (GET_H_GR (FLD (f_dest)), 3); SETMEMHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } #undef FLD @@ -5506,7 +5506,7 @@ if (ANDQI (tmp_bytecount, 4)) { { DI opval = SUBDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -5525,7 +5525,7 @@ if (ANDQI (tmp_bytecount, 4)) { { DI opval = EXTSIDI (SUBSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SUBWORDDISI (GET_H_GR (FLD (f_right)), 1))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -5549,12 +5549,12 @@ if (ANDQI (tmp_bytecount, 4)) { { DI opval = GET_H_GR (FLD (f_dest)); SETMEMDI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval); } { DI opval = tmp_temp; SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -5619,7 +5619,7 @@ sh64_trapa (current_cpu, GET_H_GR (FLD (f_left)), pc); { DI opval = XORDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD @@ -5638,7 +5638,7 @@ sh64_trapa (current_cpu, GET_H_GR (FLD (f_left)), pc); { DI opval = XORDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_imm6))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } #undef FLD diff --git a/sim/sh64/sem-media.c b/sim/sh64/sem-media.c index ba20a81..2e0e25a 100644 --- a/sim/sh64/sem-media.c +++ b/sim/sh64/sem-media.c @@ -36,8 +36,8 @@ This file is part of the GNU simulators. FAST_P, when desired, is defined on the command line, -DFAST_P=1. */ #if FAST_P #define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_semf_,fn) -#undef TRACE_RESULT -#define TRACE_RESULT(cpu, abuf, name, type, val) +#undef CGEN_TRACE_RESULT +#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val) #else #define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_sem_,fn) #endif @@ -210,7 +210,7 @@ SEM_FN_NAME (sh64_media,add) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -231,7 +231,7 @@ SEM_FN_NAME (sh64_media,addl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ADDSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SUBWORDDISI (GET_H_GR (FLD (f_right)), 1)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -252,7 +252,7 @@ SEM_FN_NAME (sh64_media,addi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -273,7 +273,7 @@ SEM_FN_NAME (sh64_media,addil) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = EXTSIDI (ADDSI (EXTSISI (FLD (f_disp10)), SUBWORDDISI (GET_H_GR (FLD (f_left)), 1))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -294,7 +294,7 @@ SEM_FN_NAME (sh64_media,addzl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ZEXTSIDI (ADDSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SUBWORDDISI (GET_H_GR (FLD (f_right)), 1))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -316,7 +316,7 @@ SEM_FN_NAME (sh64_media,alloco) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = GET_H_GR (FLD (f_left)); SET_H_GR (FLD (f_left), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } ((void) 0); /*nop*/ } @@ -339,7 +339,7 @@ SEM_FN_NAME (sh64_media,and) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ANDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -360,7 +360,7 @@ SEM_FN_NAME (sh64_media,andc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ANDDI (GET_H_GR (FLD (f_left)), INVDI (GET_H_GR (FLD (f_right)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -381,7 +381,7 @@ SEM_FN_NAME (sh64_media,andi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ANDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -407,7 +407,7 @@ if (EQDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) { UDI opval = CPU (h_tr[FLD (f_tra)]); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -437,7 +437,7 @@ if (EQDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_imm6)))) { UDI opval = CPU (h_tr[FLD (f_tra)]); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -467,7 +467,7 @@ if (GEDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) { UDI opval = CPU (h_tr[FLD (f_tra)]); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -497,7 +497,7 @@ if (GEUDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) { UDI opval = CPU (h_tr[FLD (f_tra)]); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -527,7 +527,7 @@ if (GTDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) { UDI opval = CPU (h_tr[FLD (f_tra)]); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -557,7 +557,7 @@ if (GTUDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) { UDI opval = CPU (h_tr[FLD (f_tra)]); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -584,12 +584,12 @@ SEM_FN_NAME (sh64_media,blink) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (ADDDI (pc, 4), 1); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } { UDI opval = CPU (h_tr[FLD (f_trb)]); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } if (EQSI (FLD (f_dest), 63)) { ((void) 0); /*nop*/ @@ -622,7 +622,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) { UDI opval = CPU (h_tr[FLD (f_tra)]); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -652,7 +652,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_imm6)))) { UDI opval = CPU (h_tr[FLD (f_tra)]); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc); written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval); } } } @@ -731,7 +731,7 @@ SEM_FN_NAME (sh64_media,byterev) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = tmp_result; SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -753,7 +753,7 @@ SEM_FN_NAME (sh64_media,cmpeq) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ((EQDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) ? (1) : (0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -774,7 +774,7 @@ SEM_FN_NAME (sh64_media,cmpgt) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ((GTDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) ? (1) : (0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -795,7 +795,7 @@ SEM_FN_NAME (sh64_media,cmpgtu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ((GTUDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))) ? (1) : (0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -818,7 +818,7 @@ if (EQDI (GET_H_GR (FLD (f_left)), 0)) { DI opval = GET_H_GR (FLD (f_right)); SET_H_GR (FLD (f_dest), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -843,7 +843,7 @@ if (NEDI (GET_H_GR (FLD (f_left)), 0)) { DI opval = GET_H_GR (FLD (f_right)); SET_H_GR (FLD (f_dest), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -866,7 +866,7 @@ SEM_FN_NAME (sh64_media,fabsd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = sh64_fabsd (current_cpu, GET_H_DR (FLD (f_left_right))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } return vpc; @@ -887,7 +887,7 @@ SEM_FN_NAME (sh64_media,fabss) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = sh64_fabss (current_cpu, CPU (h_fr[FLD (f_left_right)])); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -908,7 +908,7 @@ SEM_FN_NAME (sh64_media,faddd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = sh64_faddd (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } return vpc; @@ -929,7 +929,7 @@ SEM_FN_NAME (sh64_media,fadds) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = sh64_fadds (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)])); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -950,7 +950,7 @@ SEM_FN_NAME (sh64_media,fcmpeqd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ZEXTBIDI (sh64_fcmpeqd (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -971,7 +971,7 @@ SEM_FN_NAME (sh64_media,fcmpeqs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ZEXTBIDI (sh64_fcmpeqs (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)]))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -992,7 +992,7 @@ SEM_FN_NAME (sh64_media,fcmpged) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ZEXTBIDI (sh64_fcmpged (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -1013,7 +1013,7 @@ SEM_FN_NAME (sh64_media,fcmpges) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ZEXTBIDI (sh64_fcmpges (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)]))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -1034,7 +1034,7 @@ SEM_FN_NAME (sh64_media,fcmpgtd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ZEXTBIDI (sh64_fcmpgtd (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -1055,7 +1055,7 @@ SEM_FN_NAME (sh64_media,fcmpgts) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ZEXTBIDI (sh64_fcmpgts (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)]))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -1076,7 +1076,7 @@ SEM_FN_NAME (sh64_media,fcmpund) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ZEXTBIDI (sh64_fcmpund (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -1097,7 +1097,7 @@ SEM_FN_NAME (sh64_media,fcmpuns) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ZEXTBIDI (sh64_fcmpuns (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)]))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -1118,7 +1118,7 @@ SEM_FN_NAME (sh64_media,fcnvds) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = sh64_fcnvds (current_cpu, GET_H_DR (FLD (f_left_right))); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -1139,7 +1139,7 @@ SEM_FN_NAME (sh64_media,fcnvsd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = sh64_fcnvsd (current_cpu, CPU (h_fr[FLD (f_left_right)])); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } return vpc; @@ -1160,7 +1160,7 @@ SEM_FN_NAME (sh64_media,fdivd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = sh64_fdivd (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } return vpc; @@ -1181,7 +1181,7 @@ SEM_FN_NAME (sh64_media,fdivs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = sh64_fdivs (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)])); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -1202,7 +1202,7 @@ SEM_FN_NAME (sh64_media,fgetscr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = SUBWORDSISF (CPU (h_fpscr)); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -1224,17 +1224,17 @@ SEM_FN_NAME (sh64_media,fiprs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = GET_H_FV (FLD (f_left)); SET_H_FV (FLD (f_left), opval); - TRACE_RESULT (current_cpu, abuf, "fv", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fv", 'f', opval); } { SF opval = GET_H_FV (FLD (f_right)); SET_H_FV (FLD (f_right), opval); - TRACE_RESULT (current_cpu, abuf, "fv", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fv", 'f', opval); } { SF opval = sh64_fiprs (current_cpu, FLD (f_left), FLD (f_right)); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } } @@ -1256,7 +1256,7 @@ SEM_FN_NAME (sh64_media,fldd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = GETMEMDF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp10x8))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } return vpc; @@ -1278,7 +1278,7 @@ SEM_FN_NAME (sh64_media,fldp) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = GET_H_FP (FLD (f_dest)); SET_H_FP (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "fp", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fp", 'f', opval); } sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), FLD (f_disp10x8), FLD (f_dest)); } @@ -1301,7 +1301,7 @@ SEM_FN_NAME (sh64_media,flds) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = GETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp10x4))); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -1322,7 +1322,7 @@ SEM_FN_NAME (sh64_media,fldxd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = GETMEMDF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } return vpc; @@ -1344,7 +1344,7 @@ SEM_FN_NAME (sh64_media,fldxp) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = GET_H_FP (FLD (f_dest)); SET_H_FP (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "fp", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fp", 'f', opval); } sh64_fldp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), FLD (f_dest)); } @@ -1367,7 +1367,7 @@ SEM_FN_NAME (sh64_media,fldxs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = GETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -1388,7 +1388,7 @@ SEM_FN_NAME (sh64_media,floatld) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = sh64_floatld (current_cpu, CPU (h_fr[FLD (f_left_right)])); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } return vpc; @@ -1409,7 +1409,7 @@ SEM_FN_NAME (sh64_media,floatls) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = sh64_floatls (current_cpu, CPU (h_fr[FLD (f_left_right)])); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -1430,7 +1430,7 @@ SEM_FN_NAME (sh64_media,floatqd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = sh64_floatqd (current_cpu, GET_H_DR (FLD (f_left_right))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } return vpc; @@ -1451,7 +1451,7 @@ SEM_FN_NAME (sh64_media,floatqs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = sh64_floatqs (current_cpu, GET_H_DR (FLD (f_left_right))); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -1472,7 +1472,7 @@ SEM_FN_NAME (sh64_media,fmacs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = sh64_fadds (current_cpu, CPU (h_fr[FLD (f_dest)]), sh64_fmuls (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)]))); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -1493,7 +1493,7 @@ SEM_FN_NAME (sh64_media,fmovd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = GET_H_DR (FLD (f_left_right)); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } return vpc; @@ -1514,7 +1514,7 @@ SEM_FN_NAME (sh64_media,fmovdq) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = SUBWORDDFDI (GET_H_DR (FLD (f_left_right))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -1535,7 +1535,7 @@ SEM_FN_NAME (sh64_media,fmovls) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = SUBWORDSISF (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -1556,7 +1556,7 @@ SEM_FN_NAME (sh64_media,fmovqd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = SUBWORDDIDF (GET_H_GR (FLD (f_left))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } return vpc; @@ -1577,7 +1577,7 @@ SEM_FN_NAME (sh64_media,fmovs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CPU (h_fr[FLD (f_left_right)]); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -1598,7 +1598,7 @@ SEM_FN_NAME (sh64_media,fmovsl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = EXTSIDI (SUBWORDSFSI (CPU (h_fr[FLD (f_left_right)]))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -1619,7 +1619,7 @@ SEM_FN_NAME (sh64_media,fmuld) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = sh64_fmuld (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } return vpc; @@ -1640,7 +1640,7 @@ SEM_FN_NAME (sh64_media,fmuls) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = sh64_fmuls (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)])); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -1661,7 +1661,7 @@ SEM_FN_NAME (sh64_media,fnegd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = sh64_fnegd (current_cpu, GET_H_DR (FLD (f_left_right))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } return vpc; @@ -1682,7 +1682,7 @@ SEM_FN_NAME (sh64_media,fnegs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = sh64_fnegs (current_cpu, CPU (h_fr[FLD (f_left_right)])); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -1703,7 +1703,7 @@ SEM_FN_NAME (sh64_media,fputscr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBWORDSFSI (CPU (h_fr[FLD (f_left_right)])); CPU (h_fpscr) = opval; - TRACE_RESULT (current_cpu, abuf, "fpscr", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fpscr", 'x', opval); } return vpc; @@ -1724,7 +1724,7 @@ SEM_FN_NAME (sh64_media,fsqrtd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = sh64_fsqrtd (current_cpu, GET_H_DR (FLD (f_left_right))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } return vpc; @@ -1745,7 +1745,7 @@ SEM_FN_NAME (sh64_media,fsqrts) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = sh64_fsqrts (current_cpu, CPU (h_fr[FLD (f_left_right)])); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -1766,7 +1766,7 @@ SEM_FN_NAME (sh64_media,fstd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = GET_H_DR (FLD (f_dest)); SETMEMDF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp10x8)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } return vpc; @@ -1788,7 +1788,7 @@ SEM_FN_NAME (sh64_media,fstp) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = GET_H_FP (FLD (f_dest)); SET_H_FP (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "fp", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fp", 'f', opval); } sh64_fstp (current_cpu, pc, GET_H_GR (FLD (f_left)), FLD (f_disp10x8), FLD (f_dest)); } @@ -1811,7 +1811,7 @@ SEM_FN_NAME (sh64_media,fsts) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CPU (h_fr[FLD (f_dest)]); SETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), FLD (f_disp10x4)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } return vpc; @@ -1832,7 +1832,7 @@ SEM_FN_NAME (sh64_media,fstxd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = GET_H_DR (FLD (f_dest)); SETMEMDF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } return vpc; @@ -1854,7 +1854,7 @@ SEM_FN_NAME (sh64_media,fstxp) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = GET_H_FP (FLD (f_dest)); SET_H_FP (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "fp", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fp", 'f', opval); } sh64_fstp (current_cpu, pc, GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)), FLD (f_dest)); } @@ -1877,7 +1877,7 @@ SEM_FN_NAME (sh64_media,fstxs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = CPU (h_fr[FLD (f_dest)]); SETMEMSF (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval); } return vpc; @@ -1898,7 +1898,7 @@ SEM_FN_NAME (sh64_media,fsubd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = sh64_fsubd (current_cpu, GET_H_DR (FLD (f_left)), GET_H_DR (FLD (f_right))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } return vpc; @@ -1919,7 +1919,7 @@ SEM_FN_NAME (sh64_media,fsubs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = sh64_fsubs (current_cpu, CPU (h_fr[FLD (f_left)]), CPU (h_fr[FLD (f_right)])); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -1940,7 +1940,7 @@ SEM_FN_NAME (sh64_media,ftrcdl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = sh64_ftrcdl (current_cpu, GET_H_DR (FLD (f_left_right))); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -1961,7 +1961,7 @@ SEM_FN_NAME (sh64_media,ftrcsl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = sh64_ftrcsl (current_cpu, CPU (h_fr[FLD (f_left_right)])); CPU (h_fr[FLD (f_dest)]) = opval; - TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval); } return vpc; @@ -1982,7 +1982,7 @@ SEM_FN_NAME (sh64_media,ftrcdq) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = sh64_ftrcdq (current_cpu, GET_H_DR (FLD (f_left_right))); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } return vpc; @@ -2003,7 +2003,7 @@ SEM_FN_NAME (sh64_media,ftrcsq) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DF opval = sh64_ftrcsq (current_cpu, CPU (h_fr[FLD (f_left_right)])); SET_H_DR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "dr", 'f', opval); } return vpc; @@ -2025,17 +2025,17 @@ SEM_FN_NAME (sh64_media,ftrvs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SF opval = GET_H_FMTX (FLD (f_left)); SET_H_FMTX (FLD (f_left), opval); - TRACE_RESULT (current_cpu, abuf, "fmtx", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fmtx", 'f', opval); } { SF opval = GET_H_FV (FLD (f_right)); SET_H_FV (FLD (f_right), opval); - TRACE_RESULT (current_cpu, abuf, "fv", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fv", 'f', opval); } { SF opval = GET_H_FV (FLD (f_dest)); SET_H_FV (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "fv", 'f', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "fv", 'f', opval); } sh64_ftrvs (current_cpu, FLD (f_left), FLD (f_right), FLD (f_dest)); } @@ -2062,7 +2062,7 @@ SEM_FN_NAME (sh64_media,getcfg) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = GETMEMSI (current_cpu, pc, tmp_address); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -2084,7 +2084,7 @@ SEM_FN_NAME (sh64_media,getcon) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = GET_H_CR (FLD (f_left)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -2105,7 +2105,7 @@ SEM_FN_NAME (sh64_media,gettr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = CPU (h_tr[FLD (f_trb)]); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -2127,7 +2127,7 @@ SEM_FN_NAME (sh64_media,icbi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = GET_H_GR (FLD (f_left)); SET_H_GR (FLD (f_left), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } ((void) 0); /*nop*/ } @@ -2150,7 +2150,7 @@ SEM_FN_NAME (sh64_media,ldb) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = EXTQIDI (GETMEMQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -2171,7 +2171,7 @@ SEM_FN_NAME (sh64_media,ldl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = EXTSIDI (GETMEMSI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x4))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -2192,7 +2192,7 @@ SEM_FN_NAME (sh64_media,ldq) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = GETMEMDI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x8)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -2213,7 +2213,7 @@ SEM_FN_NAME (sh64_media,ldub) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ZEXTQIDI (GETMEMQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -2234,7 +2234,7 @@ SEM_FN_NAME (sh64_media,lduw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ZEXTHIDI (GETMEMHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x2))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -2255,7 +2255,7 @@ SEM_FN_NAME (sh64_media,ldw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = EXTHIDI (GETMEMHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x2))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -2285,7 +2285,7 @@ if (ANDQI (tmp_bytecount, 4)) { DI opval = EXTSIDI (GETMEMSI (current_cpu, pc, ANDDI (tmp_addr, -4))); SET_H_GR (FLD (f_dest), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } else { if (GET_H_ENDIAN ()) { @@ -2300,7 +2300,7 @@ if (ANDQI (tmp_bytecount, 1)) { DI opval = EXTSIDI (tmp_val); SET_H_GR (FLD (f_dest), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } } else { @@ -2315,7 +2315,7 @@ if (ANDQI (tmp_bytecount, 2)) { DI opval = EXTSIDI (SLLSI (tmp_val, SUBSI (32, MULSI (8, tmp_bytecount)))); SET_H_GR (FLD (f_dest), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } } @@ -2350,7 +2350,7 @@ if (ANDQI (tmp_bytecount, 8)) { DI opval = GETMEMDI (current_cpu, pc, ANDDI (tmp_addr, -8)); SET_H_GR (FLD (f_dest), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } else { if (GET_H_ENDIAN ()) { @@ -2368,7 +2368,7 @@ if (ANDQI (tmp_bytecount, 1)) { DI opval = tmp_val; SET_H_GR (FLD (f_dest), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } } else { @@ -2386,7 +2386,7 @@ if (ANDQI (tmp_bytecount, 4)) { DI opval = SLLDI (tmp_val, SUBSI (64, MULSI (8, tmp_bytecount))); SET_H_GR (FLD (f_dest), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } } @@ -2421,7 +2421,7 @@ if (ANDQI (tmp_bytecount, 4)) { DI opval = EXTSIDI (GETMEMSI (current_cpu, pc, tmp_addr)); SET_H_GR (FLD (f_dest), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } else { if (GET_H_ENDIAN ()) { @@ -2436,7 +2436,7 @@ if (ANDQI (tmp_bytecount, 2)) { DI opval = EXTSIDI (SLLSI (tmp_val, SUBSI (32, MULSI (8, tmp_bytecount)))); SET_H_GR (FLD (f_dest), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } } else { @@ -2451,7 +2451,7 @@ if (ANDQI (tmp_bytecount, 1)) { DI opval = EXTSIDI (tmp_val); SET_H_GR (FLD (f_dest), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } } @@ -2486,7 +2486,7 @@ if (ANDQI (tmp_bytecount, 8)) { DI opval = GETMEMDI (current_cpu, pc, tmp_addr); SET_H_GR (FLD (f_dest), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } else { if (GET_H_ENDIAN ()) { @@ -2504,7 +2504,7 @@ if (ANDQI (tmp_bytecount, 4)) { DI opval = SLLDI (tmp_val, SUBSI (64, MULSI (8, tmp_bytecount))); SET_H_GR (FLD (f_dest), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } } else { @@ -2522,7 +2522,7 @@ if (ANDQI (tmp_bytecount, 1)) { DI opval = tmp_val; SET_H_GR (FLD (f_dest), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } } @@ -2548,7 +2548,7 @@ SEM_FN_NAME (sh64_media,ldxb) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = EXTQIDI (GETMEMQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -2569,7 +2569,7 @@ SEM_FN_NAME (sh64_media,ldxl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = EXTSIDI (GETMEMSI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -2590,7 +2590,7 @@ SEM_FN_NAME (sh64_media,ldxq) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = GETMEMDI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -2611,7 +2611,7 @@ SEM_FN_NAME (sh64_media,ldxub) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ZEXTQIDI (GETMEMUQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -2632,7 +2632,7 @@ SEM_FN_NAME (sh64_media,ldxuw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ZEXTHIDI (GETMEMUHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -2653,7 +2653,7 @@ SEM_FN_NAME (sh64_media,ldxw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = EXTHIDI (GETMEMHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -2679,7 +2679,7 @@ SEM_FN_NAME (sh64_media,mabsl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -2710,7 +2710,7 @@ SEM_FN_NAME (sh64_media,mabsw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -2737,7 +2737,7 @@ SEM_FN_NAME (sh64_media,maddl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -2768,7 +2768,7 @@ SEM_FN_NAME (sh64_media,maddw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -2795,7 +2795,7 @@ SEM_FN_NAME (sh64_media,maddsl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -2834,7 +2834,7 @@ SEM_FN_NAME (sh64_media,maddsub) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0)))))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -2865,7 +2865,7 @@ SEM_FN_NAME (sh64_media,maddsw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -2904,7 +2904,7 @@ SEM_FN_NAME (sh64_media,mcmpeqb) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0)))))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -2931,7 +2931,7 @@ SEM_FN_NAME (sh64_media,mcmpeql) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -2962,7 +2962,7 @@ SEM_FN_NAME (sh64_media,mcmpeqw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -2989,7 +2989,7 @@ SEM_FN_NAME (sh64_media,mcmpgtl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3028,7 +3028,7 @@ SEM_FN_NAME (sh64_media,mcmpgtub) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0)))))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3059,7 +3059,7 @@ SEM_FN_NAME (sh64_media,mcmpgtw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3081,7 +3081,7 @@ SEM_FN_NAME (sh64_media,mcmv) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (ANDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), ANDDI (GET_H_GR (FLD (f_dest)), INVDI (GET_H_GR (FLD (f_right))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -3111,7 +3111,7 @@ SEM_FN_NAME (sh64_media,mcnvslw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3150,7 +3150,7 @@ SEM_FN_NAME (sh64_media,mcnvswb) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0)))))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3189,7 +3189,7 @@ SEM_FN_NAME (sh64_media,mcnvswub) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0)))))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3220,7 +3220,7 @@ SEM_FN_NAME (sh64_media,mextr1) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3251,7 +3251,7 @@ SEM_FN_NAME (sh64_media,mextr2) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3282,7 +3282,7 @@ SEM_FN_NAME (sh64_media,mextr3) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3313,7 +3313,7 @@ SEM_FN_NAME (sh64_media,mextr4) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3344,7 +3344,7 @@ SEM_FN_NAME (sh64_media,mextr5) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3375,7 +3375,7 @@ SEM_FN_NAME (sh64_media,mextr6) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3406,7 +3406,7 @@ SEM_FN_NAME (sh64_media,mextr7) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (tmp_rhs, SLLDI (ANDDI (GET_H_GR (FLD (f_right)), tmp_mask), tmp_count)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3440,7 +3440,7 @@ SEM_FN_NAME (sh64_media,mmacfxwl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3474,7 +3474,7 @@ SEM_FN_NAME (sh64_media,mmacnfx_wl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3501,7 +3501,7 @@ SEM_FN_NAME (sh64_media,mmull) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3532,7 +3532,7 @@ SEM_FN_NAME (sh64_media,mmulw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3562,7 +3562,7 @@ SEM_FN_NAME (sh64_media,mmulfxl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3598,7 +3598,7 @@ SEM_FN_NAME (sh64_media,mmulfxw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3636,7 +3636,7 @@ SEM_FN_NAME (sh64_media,mmulfxrpw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3663,7 +3663,7 @@ SEM_FN_NAME (sh64_media,mmulhiwl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3690,7 +3690,7 @@ SEM_FN_NAME (sh64_media,mmullowl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3718,7 +3718,7 @@ SEM_FN_NAME (sh64_media,mmulsumwq) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ADDDI (GET_H_GR (FLD (f_dest)), tmp_acc); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3740,7 +3740,7 @@ SEM_FN_NAME (sh64_media,movi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = EXTSIDI (FLD (f_imm16)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -3772,7 +3772,7 @@ SEM_FN_NAME (sh64_media,mpermw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3804,7 +3804,7 @@ SEM_FN_NAME (sh64_media,msadubq) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ADDDI (GET_H_GR (FLD (f_dest)), tmp_acc); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3831,7 +3831,7 @@ SEM_FN_NAME (sh64_media,mshaldsl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3862,7 +3862,7 @@ SEM_FN_NAME (sh64_media,mshaldsw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3889,7 +3889,7 @@ SEM_FN_NAME (sh64_media,mshardl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3920,7 +3920,7 @@ SEM_FN_NAME (sh64_media,mshardw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -3942,7 +3942,7 @@ SEM_FN_NAME (sh64_media,mshardsq) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ((LTDI (SRADI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63)), NEGDI (SLLDI (1, SUBSI (16, 1))))) ? (NEGDI (SLLDI (1, SUBSI (16, 1)))) : (((LTDI (SRADI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63)), SLLDI (1, SUBSI (16, 1)))) ? (SRADI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63))) : (SUBDI (SLLDI (1, SUBSI (16, 1)), 1))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -3980,7 +3980,7 @@ SEM_FN_NAME (sh64_media,mshfhib) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0)))))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4007,7 +4007,7 @@ SEM_FN_NAME (sh64_media,mshfhil) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4038,7 +4038,7 @@ SEM_FN_NAME (sh64_media,mshfhiw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4077,7 +4077,7 @@ SEM_FN_NAME (sh64_media,mshflob) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0)))))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4104,7 +4104,7 @@ SEM_FN_NAME (sh64_media,mshflol) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4135,7 +4135,7 @@ SEM_FN_NAME (sh64_media,mshflow) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4162,7 +4162,7 @@ SEM_FN_NAME (sh64_media,mshlldl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4193,7 +4193,7 @@ SEM_FN_NAME (sh64_media,mshlldw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4220,7 +4220,7 @@ SEM_FN_NAME (sh64_media,mshlrdl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4251,7 +4251,7 @@ SEM_FN_NAME (sh64_media,mshlrdw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4278,7 +4278,7 @@ SEM_FN_NAME (sh64_media,msubl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4309,7 +4309,7 @@ SEM_FN_NAME (sh64_media,msubw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTHIDI (tmp_result3), 48), ORDI (SLLDI (ZEXTHIDI (tmp_result2), 32), ORDI (SLLDI (ZEXTHIDI (tmp_result1), 16), ZEXTHIDI (tmp_result0)))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4336,7 +4336,7 @@ SEM_FN_NAME (sh64_media,msubsl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTSIDI (tmp_result1), 32), ZEXTSIDI (tmp_result0)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4375,7 +4375,7 @@ SEM_FN_NAME (sh64_media,msubsub) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0)))))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4414,7 +4414,7 @@ SEM_FN_NAME (sh64_media,msubsw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (ZEXTQIDI (tmp_result7), 56), ORDI (SLLDI (ZEXTQIDI (tmp_result6), 48), ORDI (SLLDI (ZEXTQIDI (tmp_result5), 40), ORDI (SLLDI (ZEXTQIDI (tmp_result4), 32), ORDI (SLLDI (ZEXTQIDI (tmp_result3), 24), ORDI (SLLDI (ZEXTQIDI (tmp_result2), 16), ORDI (SLLDI (ZEXTQIDI (tmp_result1), 8), ZEXTQIDI (tmp_result0)))))))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -4436,7 +4436,7 @@ SEM_FN_NAME (sh64_media,mulsl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = MULDI (EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)), EXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -4457,7 +4457,7 @@ SEM_FN_NAME (sh64_media,mulul) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = MULDI (ZEXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1)), ZEXTSIDI (SUBWORDDISI (GET_H_GR (FLD (f_right)), 1))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -4495,7 +4495,7 @@ SEM_FN_NAME (sh64_media,nsb) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = sh64_nsb (current_cpu, GET_H_GR (FLD (f_left))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -4517,7 +4517,7 @@ SEM_FN_NAME (sh64_media,ocbi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = GET_H_GR (FLD (f_left)); SET_H_GR (FLD (f_left), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } ((void) 0); /*nop*/ } @@ -4541,7 +4541,7 @@ SEM_FN_NAME (sh64_media,ocbp) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = GET_H_GR (FLD (f_left)); SET_H_GR (FLD (f_left), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } ((void) 0); /*nop*/ } @@ -4565,7 +4565,7 @@ SEM_FN_NAME (sh64_media,ocbwb) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = GET_H_GR (FLD (f_left)); SET_H_GR (FLD (f_left), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } ((void) 0); /*nop*/ } @@ -4588,7 +4588,7 @@ SEM_FN_NAME (sh64_media,or) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -4609,7 +4609,7 @@ SEM_FN_NAME (sh64_media,ori) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_imm10))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -4631,7 +4631,7 @@ SEM_FN_NAME (sh64_media,prefi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = GET_H_GR (FLD (f_left)); SET_H_GR (FLD (f_left), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } ((void) 0); /*nop*/ } @@ -4656,7 +4656,7 @@ SEM_FN_NAME (sh64_media,pta) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ADDSI (FLD (f_disp16), 1); CPU (h_tr[FLD (f_tra)]) = opval; - TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval); } } @@ -4680,7 +4680,7 @@ SEM_FN_NAME (sh64_media,ptabs) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = GET_H_GR (FLD (f_right)); CPU (h_tr[FLD (f_tra)]) = opval; - TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval); } } @@ -4704,7 +4704,7 @@ SEM_FN_NAME (sh64_media,ptb) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = FLD (f_disp16); CPU (h_tr[FLD (f_tra)]) = opval; - TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval); } } @@ -4728,7 +4728,7 @@ SEM_FN_NAME (sh64_media,ptrel) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ADDDI (pc, GET_H_GR (FLD (f_right))); CPU (h_tr[FLD (f_tra)]) = opval; - TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "tr", 'D', opval); } } @@ -4754,7 +4754,7 @@ SEM_FN_NAME (sh64_media,putcfg) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GET_H_GR (FLD (f_dest)); SETMEMSI (current_cpu, pc, tmp_address, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } @@ -4776,7 +4776,7 @@ SEM_FN_NAME (sh64_media,putcon) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = GET_H_GR (FLD (f_left)); SET_H_CR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "cr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "cr", 'D', opval); } return vpc; @@ -4814,7 +4814,7 @@ SEM_FN_NAME (sh64_media,shard) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = SRADI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -4835,7 +4835,7 @@ SEM_FN_NAME (sh64_media,shardl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = EXTSIDI (SRASI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 63))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -4856,7 +4856,7 @@ SEM_FN_NAME (sh64_media,shari) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = SRADI (GET_H_GR (FLD (f_left)), FLD (f_uimm6)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -4877,7 +4877,7 @@ SEM_FN_NAME (sh64_media,sharil) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = EXTSIDI (SRASI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDSI (FLD (f_uimm6), 63))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -4898,7 +4898,7 @@ SEM_FN_NAME (sh64_media,shlld) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = SLLDI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -4919,7 +4919,7 @@ SEM_FN_NAME (sh64_media,shlldl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = EXTSIDI (SLLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 63))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -4940,7 +4940,7 @@ SEM_FN_NAME (sh64_media,shlli) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = SLLDI (GET_H_GR (FLD (f_left)), FLD (f_uimm6)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -4961,7 +4961,7 @@ SEM_FN_NAME (sh64_media,shllil) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = EXTSIDI (SLLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDSI (FLD (f_uimm6), 63))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -4982,7 +4982,7 @@ SEM_FN_NAME (sh64_media,shlrd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = SRLDI (GET_H_GR (FLD (f_left)), ANDDI (GET_H_GR (FLD (f_right)), 63)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -5003,7 +5003,7 @@ SEM_FN_NAME (sh64_media,shlrdl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = EXTSIDI (SRLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDDI (GET_H_GR (FLD (f_right)), 63))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -5024,7 +5024,7 @@ SEM_FN_NAME (sh64_media,shlri) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = SRLDI (GET_H_GR (FLD (f_left)), FLD (f_uimm6)); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -5045,7 +5045,7 @@ SEM_FN_NAME (sh64_media,shlril) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = EXTSIDI (SRLSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), ANDSI (FLD (f_uimm6), 63))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -5066,7 +5066,7 @@ SEM_FN_NAME (sh64_media,shori) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = ORDI (SLLDI (GET_H_GR (FLD (f_dest)), 16), ZEXTSIDI (FLD (f_uimm16))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -5104,7 +5104,7 @@ SEM_FN_NAME (sh64_media,stb) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = ANDQI (GET_H_GR (FLD (f_dest)), 255); SETMEMUQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -5125,7 +5125,7 @@ SEM_FN_NAME (sh64_media,stl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ANDSI (GET_H_GR (FLD (f_dest)), 0xffffffff); SETMEMSI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x4))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -5146,7 +5146,7 @@ SEM_FN_NAME (sh64_media,stq) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = GET_H_GR (FLD (f_dest)); SETMEMDI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x8))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval); } return vpc; @@ -5167,7 +5167,7 @@ SEM_FN_NAME (sh64_media,stw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { HI opval = ANDHI (GET_H_GR (FLD (f_dest)), 65535); SETMEMHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_disp10x2))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -5196,7 +5196,7 @@ if (ANDQI (tmp_bytecount, 4)) { SI opval = GET_H_GR (FLD (f_dest)); SETMEMSI (current_cpu, pc, ANDDI (tmp_addr, -4), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } else { if (GET_H_ENDIAN ()) { @@ -5208,7 +5208,7 @@ if (ANDQI (tmp_bytecount, 1)) { UQI opval = ANDQI (tmp_val, 255); SETMEMUQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 8); } @@ -5219,7 +5219,7 @@ if (ANDQI (tmp_bytecount, 2)) { HI opval = ANDHI (tmp_val, 65535); SETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 16); } @@ -5234,7 +5234,7 @@ if (ANDQI (tmp_bytecount, 2)) { HI opval = ANDHI (tmp_val, 65535); SETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 16); } @@ -5245,7 +5245,7 @@ if (ANDQI (tmp_bytecount, 1)) { UQI opval = ANDQI (tmp_val, 255); SETMEMUQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 8); } @@ -5282,7 +5282,7 @@ if (ANDQI (tmp_bytecount, 8)) { DI opval = GET_H_GR (FLD (f_dest)); SETMEMDI (current_cpu, pc, ANDDI (tmp_addr, -8), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval); } } else { if (GET_H_ENDIAN ()) { @@ -5294,7 +5294,7 @@ if (ANDQI (tmp_bytecount, 1)) { UQI opval = ANDQI (tmp_val, 255); SETMEMUQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 8); } @@ -5305,7 +5305,7 @@ if (ANDQI (tmp_bytecount, 2)) { HI opval = ANDHI (tmp_val, 65535); SETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 16); } @@ -5316,7 +5316,7 @@ if (ANDQI (tmp_bytecount, 4)) { SI opval = ANDSI (tmp_val, 0xffffffff); SETMEMSI (current_cpu, pc, ANDDI (tmp_addr, -8), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 32); } @@ -5331,7 +5331,7 @@ if (ANDQI (tmp_bytecount, 4)) { SI opval = ANDSI (tmp_val, 0xffffffff); SETMEMSI (current_cpu, pc, ANDDI (tmp_addr, -8), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 32); } @@ -5342,7 +5342,7 @@ if (ANDQI (tmp_bytecount, 2)) { HI opval = ANDHI (tmp_val, 65535); SETMEMHI (current_cpu, pc, ANDDI (tmp_addr, -4), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 16); } @@ -5353,7 +5353,7 @@ if (ANDQI (tmp_bytecount, 1)) { UQI opval = ANDQI (tmp_val, 255); SETMEMUQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 8); } @@ -5390,7 +5390,7 @@ if (ANDQI (tmp_bytecount, 4)) { USI opval = GET_H_GR (FLD (f_dest)); SETMEMUSI (current_cpu, pc, tmp_addr, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } else { if (GET_H_ENDIAN ()) { @@ -5402,7 +5402,7 @@ if (ANDQI (tmp_bytecount, 2)) { UHI opval = ANDHI (tmp_val, 65535); SETMEMUHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 16); } @@ -5413,7 +5413,7 @@ if (ANDQI (tmp_bytecount, 1)) { UQI opval = ANDQI (tmp_val, 255); SETMEMUQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 8); } @@ -5428,7 +5428,7 @@ if (ANDQI (tmp_bytecount, 1)) { UQI opval = ANDQI (tmp_val, 255); SETMEMUQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 8); } @@ -5439,7 +5439,7 @@ if (ANDQI (tmp_bytecount, 2)) { UHI opval = ANDHI (tmp_val, 65535); SETMEMUHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 16); } @@ -5476,7 +5476,7 @@ if (ANDQI (tmp_bytecount, 8)) { UDI opval = GET_H_GR (FLD (f_dest)); SETMEMUDI (current_cpu, pc, tmp_addr, opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval); } } else { if (GET_H_ENDIAN ()) { @@ -5488,7 +5488,7 @@ if (ANDQI (tmp_bytecount, 4)) { USI opval = ANDSI (tmp_val, 0xffffffff); SETMEMUSI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 3), -4), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 32); } @@ -5499,7 +5499,7 @@ if (ANDQI (tmp_bytecount, 2)) { UHI opval = ANDHI (tmp_val, 65535); SETMEMUHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 16); } @@ -5510,7 +5510,7 @@ if (ANDQI (tmp_bytecount, 1)) { UQI opval = ANDQI (tmp_val, 255); SETMEMUQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 8); } @@ -5525,7 +5525,7 @@ if (ANDQI (tmp_bytecount, 1)) { UQI opval = ANDQI (tmp_val, 255); SETMEMUQI (current_cpu, pc, tmp_addr, opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 8); } @@ -5536,7 +5536,7 @@ if (ANDQI (tmp_bytecount, 2)) { UHI opval = ANDHI (tmp_val, 65535); SETMEMUHI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 1), -2), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 16); } @@ -5547,7 +5547,7 @@ if (ANDQI (tmp_bytecount, 4)) { USI opval = ANDSI (tmp_val, 0xffffffff); SETMEMUSI (current_cpu, pc, ANDDI (ADDDI (tmp_addr, 3), -4), opval); written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } tmp_val = SRLDI (tmp_val, 32); } @@ -5576,7 +5576,7 @@ SEM_FN_NAME (sh64_media,stxb) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { UQI opval = SUBWORDDIQI (GET_H_GR (FLD (f_dest)), 7); SETMEMUQI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -5597,7 +5597,7 @@ SEM_FN_NAME (sh64_media,stxl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBWORDDISI (GET_H_GR (FLD (f_dest)), 1); SETMEMSI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -5618,7 +5618,7 @@ SEM_FN_NAME (sh64_media,stxq) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = GET_H_GR (FLD (f_dest)); SETMEMDI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval); } return vpc; @@ -5639,7 +5639,7 @@ SEM_FN_NAME (sh64_media,stxw) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { HI opval = SUBWORDDIHI (GET_H_GR (FLD (f_dest)), 3); SETMEMHI (current_cpu, pc, ADDDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } return vpc; @@ -5660,7 +5660,7 @@ SEM_FN_NAME (sh64_media,sub) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = SUBDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -5681,7 +5681,7 @@ SEM_FN_NAME (sh64_media,subl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = EXTSIDI (SUBSI (SUBWORDDISI (GET_H_GR (FLD (f_left)), 1), SUBWORDDISI (GET_H_GR (FLD (f_right)), 1))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -5707,12 +5707,12 @@ SEM_FN_NAME (sh64_media,swapq) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = GET_H_GR (FLD (f_dest)); SETMEMDI (current_cpu, pc, tmp_addr, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'D', opval); } { DI opval = tmp_temp; SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } } @@ -5785,7 +5785,7 @@ SEM_FN_NAME (sh64_media,xor) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = XORDI (GET_H_GR (FLD (f_left)), GET_H_GR (FLD (f_right))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; @@ -5806,7 +5806,7 @@ SEM_FN_NAME (sh64_media,xori) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { DI opval = XORDI (GET_H_GR (FLD (f_left)), EXTSIDI (FLD (f_imm6))); SET_H_GR (FLD (f_dest), opval); - TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); + CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval); } return vpc; |