From db7858e227f3951c665410314fca62c77349ac24 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 12 Jun 2015 13:29:02 +0545 Subject: 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. --- sim/sh64/ChangeLog | 16 ++ sim/sh64/decode-compact.c | 274 +++++++++---------- sim/sh64/decode-media.c | 170 ++++++------ sim/sh64/mloop-compact.c | 14 +- sim/sh64/mloop-media.c | 14 +- sim/sh64/sem-compact-switch.c | 600 +++++++++++++++++++++--------------------- sim/sh64/sem-compact.c | 598 ++++++++++++++++++++--------------------- sim/sh64/sem-media-switch.c | 476 ++++++++++++++++----------------- sim/sh64/sem-media.c | 474 ++++++++++++++++----------------- 9 files changed, 1326 insertions(+), 1310 deletions(-) (limited to 'sim/sh64') 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 + + * 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 * 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; -- cgit v1.1