aboutsummaryrefslogtreecommitdiff
path: root/sim/iq2000
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-06-12 13:29:02 +0545
committerMike Frysinger <vapier@gentoo.org>2015-06-12 04:19:45 -0400
commitdb7858e227f3951c665410314fca62c77349ac24 (patch)
tree01fb8b93600bc89ef86a7e883ca17e3df8387174 /sim/iq2000
parent966f0aefa6a96df2c45ec36a7ecc02419e3842db (diff)
downloadgdb-db7858e227f3951c665410314fca62c77349ac24.zip
gdb-db7858e227f3951c665410314fca62c77349ac24.tar.gz
gdb-db7858e227f3951c665410314fca62c77349ac24.tar.bz2
sim: cgen: namespace custom trace functions
The cgen code declares some macros/funcs using the trace_xxx prefix, but the code isn't generic and only works with cgen targets. This is blocking the creation of new common trace functions. Let's blindly add cgen_xxx prefixes to all these symbols. Some already use this convention to avoid conflicts, so it makes sense to align them. In the future we might want to move some to the common trace core, but one thing at a time.
Diffstat (limited to 'sim/iq2000')
-rw-r--r--sim/iq2000/ChangeLog8
-rw-r--r--sim/iq2000/decode.c60
-rw-r--r--sim/iq2000/mloop.in6
-rw-r--r--sim/iq2000/sem-switch.c176
-rw-r--r--sim/iq2000/sem.c174
5 files changed, 216 insertions, 208 deletions
diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index e55b6f6..1f9ab27 100644
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,11 @@
+2015-06-12 Mike Frysinger <vapier@gentoo.org>
+
+ * decode.c (frvbf_decode): Change TRACE_EXTRACT to CGEN_TRACE_EXTRACT.
+ * mloop.in (execute): Change TRACE_INSN_INIT to CGEN_TRACE_INSN_INIT,
+ TRACE_INSN to CGEN_TRACE_INSN, and TRACE_INSN_FINI to CGEN_TRACE_INSN_FINI.
+ * sem.c: Rename TRACE_RESULT to CGEN_TRACE_RESULT.
+ * sem-switch.c: Likewise.
+
2015-04-18 Mike Frysinger <vapier@gentoo.org>
* sim-main.h (USING_SIM_BASE_H): Delete.
diff --git a/sim/iq2000/decode.c b/sim/iq2000/decode.c
index 6edeb2d..3e881ba 100644
--- a/sim/iq2000/decode.c
+++ b/sim/iq2000/decode.c
@@ -883,7 +883,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
/* Record the fields for the semantic handler. */
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_empty", (char *) 0));
#undef FLD
return idesc;
@@ -906,7 +906,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
FLD (f_rs) = f_rs;
FLD (f_rt) = f_rt;
FLD (f_rd) = f_rd;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_rd 0x%x", 'x', f_rd, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_add", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_rd 0x%x", 'x', f_rd, (char *) 0));
#undef FLD
return idesc;
@@ -929,7 +929,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
FLD (f_imm) = f_imm;
FLD (f_rs) = f_rs;
FLD (f_rt) = f_rt;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi", "f_imm 0x%x", 'x', f_imm, "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_addi", "f_imm 0x%x", 'x', f_imm, "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, (char *) 0));
#undef FLD
return idesc;
@@ -958,7 +958,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
FLD (f_rd) = f_rd;
FLD (f_rt) = f_rt;
FLD (f_shamt) = f_shamt;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ram", "f_maskl 0x%x", 'x', f_maskl, "f_rs 0x%x", 'x', f_rs, "f_rd 0x%x", 'x', f_rd, "f_rt 0x%x", 'x', f_rt, "f_shamt 0x%x", 'x', f_shamt, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ram", "f_maskl 0x%x", 'x', f_maskl, "f_rs 0x%x", 'x', f_rs, "f_rd 0x%x", 'x', f_rd, "f_rt 0x%x", 'x', f_rt, "f_shamt 0x%x", 'x', f_shamt, (char *) 0));
#undef FLD
return idesc;
@@ -981,7 +981,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
FLD (f_rt) = f_rt;
FLD (f_shamt) = f_shamt;
FLD (f_rd) = f_rd;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sll", "f_rt 0x%x", 'x', f_rt, "f_shamt 0x%x", 'x', f_shamt, "f_rd 0x%x", 'x', f_rd, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sll", "f_rt 0x%x", 'x', f_rt, "f_shamt 0x%x", 'x', f_shamt, "f_rd 0x%x", 'x', f_rd, (char *) 0));
#undef FLD
return idesc;
@@ -1007,7 +1007,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
FLD (f_rt) = f_rt;
FLD (f_shamt) = f_shamt;
FLD (f_rd) = f_rd;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_slmv", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_shamt 0x%x", 'x', f_shamt, "f_rd 0x%x", 'x', f_rd, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_slmv", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_shamt 0x%x", 'x', f_shamt, "f_rd 0x%x", 'x', f_rd, (char *) 0));
#undef FLD
return idesc;
@@ -1030,7 +1030,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
FLD (f_rs) = f_rs;
FLD (f_rt) = f_rt;
FLD (f_rd) = f_rd;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_slt", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_rd 0x%x", 'x', f_rd, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_slt", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_rd 0x%x", 'x', f_rd, (char *) 0));
#undef FLD
return idesc;
@@ -1053,7 +1053,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
FLD (f_imm) = f_imm;
FLD (f_rs) = f_rs;
FLD (f_rt) = f_rt;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_slti", "f_imm 0x%x", 'x', f_imm, "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_slti", "f_imm 0x%x", 'x', f_imm, "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, (char *) 0));
#undef FLD
return idesc;
@@ -1076,7 +1076,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
FLD (f_rt) = f_rt;
FLD (f_rs) = f_rs;
FLD (i_offset) = f_offset;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bbi", "f_rt 0x%x", 'x', f_rt, "f_rs 0x%x", 'x', f_rs, "offset 0x%x", 'x', f_offset, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bbi", "f_rt 0x%x", 'x', f_rt, "f_rs 0x%x", 'x', f_rs, "offset 0x%x", 'x', f_offset, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1105,7 +1105,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
FLD (f_rs) = f_rs;
FLD (f_rt) = f_rt;
FLD (i_offset) = f_offset;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bbv", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "offset 0x%x", 'x', f_offset, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bbv", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "offset 0x%x", 'x', f_offset, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1131,7 +1131,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_rs) = f_rs;
FLD (i_offset) = f_offset;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bgez", "f_rs 0x%x", 'x', f_rs, "offset 0x%x", 'x', f_offset, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bgez", "f_rs 0x%x", 'x', f_rs, "offset 0x%x", 'x', f_offset, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1157,7 +1157,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_rs) = f_rs;
FLD (i_offset) = f_offset;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bgezal", "f_rs 0x%x", 'x', f_rs, "offset 0x%x", 'x', f_offset, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bgezal", "f_rs 0x%x", 'x', f_rs, "offset 0x%x", 'x', f_offset, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1183,7 +1183,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_rs) = f_rs;
FLD (f_rd) = f_rd;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jalr", "f_rs 0x%x", 'x', f_rs, "f_rd 0x%x", 'x', f_rd, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jalr", "f_rs 0x%x", 'x', f_rs, "f_rd 0x%x", 'x', f_rd, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1206,7 +1206,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_rs) = f_rs;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jr", "f_rs 0x%x", 'x', f_rs, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jr", "f_rs 0x%x", 'x', f_rs, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1235,7 +1235,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
FLD (f_rs) = f_rs;
FLD (f_imm) = f_imm;
FLD (f_rt) = f_rt;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lb", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lb", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0));
#undef FLD
return idesc;
@@ -1258,7 +1258,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
FLD (f_rs) = f_rs;
FLD (f_imm) = f_imm;
FLD (f_rt) = f_rt;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lh", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lh", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0));
#undef FLD
return idesc;
@@ -1278,7 +1278,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_imm) = f_imm;
FLD (f_rt) = f_rt;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lui", "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lui", "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0));
#undef FLD
return idesc;
@@ -1301,7 +1301,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
FLD (f_rs) = f_rs;
FLD (f_imm) = f_imm;
FLD (f_rt) = f_rt;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lw", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_lw", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0));
#undef FLD
return idesc;
@@ -1324,7 +1324,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
FLD (f_rs) = f_rs;
FLD (f_imm) = f_imm;
FLD (f_rt) = f_rt;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sb", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sb", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0));
#undef FLD
return idesc;
@@ -1347,7 +1347,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
FLD (f_rs) = f_rs;
FLD (f_imm) = f_imm;
FLD (f_rt) = f_rt;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sh", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sh", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0));
#undef FLD
return idesc;
@@ -1370,7 +1370,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
FLD (f_rs) = f_rs;
FLD (f_imm) = f_imm;
FLD (f_rt) = f_rt;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sw", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sw", "f_rs 0x%x", 'x', f_rs, "f_imm 0x%x", 'x', f_imm, "f_rt 0x%x", 'x', f_rt, (char *) 0));
#undef FLD
return idesc;
@@ -1383,7 +1383,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
/* Record the fields for the semantic handler. */
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_break", (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_break", (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1402,7 +1402,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
/* Record the fields for the semantic handler. */
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_syscall", (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_syscall", (char *) 0));
#undef FLD
return idesc;
@@ -1425,7 +1425,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
FLD (f_imm) = f_imm;
FLD (f_rs) = f_rs;
FLD (f_rt) = f_rt;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andoui", "f_imm 0x%x", 'x', f_imm, "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_andoui", "f_imm 0x%x", 'x', f_imm, "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, (char *) 0));
#undef FLD
return idesc;
@@ -1451,7 +1451,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
FLD (f_rs) = f_rs;
FLD (f_rt) = f_rt;
FLD (f_rd) = f_rd;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mrgb", "f_mask 0x%x", 'x', f_mask, "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_rd 0x%x", 'x', f_rd, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_mrgb", "f_mask 0x%x", 'x', f_mask, "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_rd 0x%x", 'x', f_rd, (char *) 0));
#undef FLD
return idesc;
@@ -1464,7 +1464,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
/* Record the fields for the semantic handler. */
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bctxt", (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_bctxt", (char *) 0));
#undef FLD
return idesc;
@@ -1487,7 +1487,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
FLD (f_rs) = f_rs;
FLD (f_rt) = f_rt;
FLD (f_imm) = f_imm;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldw", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_imm 0x%x", 'x', f_imm, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_ldw", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_imm 0x%x", 'x', f_imm, (char *) 0));
#undef FLD
return idesc;
@@ -1510,7 +1510,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
FLD (f_rs) = f_rs;
FLD (f_rt) = f_rt;
FLD (f_imm) = f_imm;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sdw", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_imm 0x%x", 'x', f_imm, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_sdw", "f_rs 0x%x", 'x', f_rs, "f_rt 0x%x", 'x', f_rt, "f_imm 0x%x", 'x', f_imm, (char *) 0));
#undef FLD
return idesc;
@@ -1527,7 +1527,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_jmptarg) = f_jtarg;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_j", "jmptarg 0x%x", 'x', f_jtarg, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_j", "jmptarg 0x%x", 'x', f_jtarg, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1550,7 +1550,7 @@ iq2000bf_decode (SIM_CPU *current_cpu, IADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_jmptarg) = f_jtarg;
- TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jal", "jmptarg 0x%x", 'x', f_jtarg, (char *) 0));
+ CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_jal", "jmptarg 0x%x", 'x', f_jtarg, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
diff --git a/sim/iq2000/mloop.in b/sim/iq2000/mloop.in
index 7fc7020..094a656 100644
--- a/sim/iq2000/mloop.in
+++ b/sim/iq2000/mloop.in
@@ -96,8 +96,8 @@ execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p)
if (PROFILE_MODEL_P (current_cpu)
&& ARGBUF_PROFILE_P (abuf))
@cpu@_model_insn_before (current_cpu, 1 /*first_p*/);
- TRACE_INSN_INIT (current_cpu, abuf, 1);
- TRACE_INSN (current_cpu, idesc->idata,
+ CGEN_TRACE_INSN_INIT (current_cpu, abuf, 1);
+ CGEN_TRACE_INSN (current_cpu, idesc->idata,
(const struct argbuf *) abuf, abuf->addr);
}
#if WITH_SCACHE
@@ -116,7 +116,7 @@ execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p)
cycles = (*idesc->timing->model_fn) (current_cpu, sc);
@cpu@_model_insn_after (current_cpu, 1 /*last_p*/, cycles);
}
- TRACE_INSN_FINI (current_cpu, abuf, 1);
+ CGEN_TRACE_INSN_FINI (current_cpu, abuf, 1);
}
#else
abort ();
diff --git a/sim/iq2000/sem-switch.c b/sim/iq2000/sem-switch.c
index b9d7853..7a6009f 100644
--- a/sim/iq2000/sem-switch.c
+++ b/sim/iq2000/sem-switch.c
@@ -201,13 +201,13 @@ This file is part of the GNU simulators.
/* If hyper-fast [well not unnecessarily slow] execution is selected, turn
off frills like tracing and profiling. */
-/* FIXME: A better way would be to have TRACE_RESULT check for something
+/* FIXME: A better way would be to have CGEN_TRACE_RESULT check for something
that can cause it to be optimized out. Another way would be to emit
special handlers into the instruction "stream". */
#if FAST_P
-#undef TRACE_RESULT
-#define TRACE_RESULT(cpu, abuf, name, type, val)
+#undef CGEN_TRACE_RESULT
+#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val)
#endif
#undef GET_ATTR
@@ -392,7 +392,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ADDSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -411,7 +411,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm))));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -430,7 +430,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm))));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -449,7 +449,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ADDSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -473,7 +473,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ORSI (SLLSI (tmp_high, 16), tmp_low);
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -493,7 +493,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ANDSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -512,7 +512,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ANDSI (GET_H_GR (FLD (f_rs)), ZEXTSISI (FLD (f_imm)));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -531,7 +531,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ANDSI (GET_H_GR (FLD (f_rs)), ORSI (0xffff0000, EXTHISI (TRUNCSIHI (FLD (f_imm)))));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -550,7 +550,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = INVSI (ORSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt))));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -569,7 +569,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ORSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -588,7 +588,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ORSI (GET_H_GR (FLD (f_rs)), ZEXTSISI (FLD (f_imm)));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -608,17 +608,17 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = RORSI (GET_H_GR (FLD (f_rt)), FLD (f_shamt));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
SI opval = ANDSI (GET_H_GR (FLD (f_rd)), SRLSI (0xffffffff, FLD (f_maskl)));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
SI opval = ANDSI (GET_H_GR (FLD (f_rd)), SLLSI (0xffffffff, FLD (f_rs)));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -638,7 +638,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = SLLSI (GET_H_GR (FLD (f_rt)), FLD (f_shamt));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -657,7 +657,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = SLLSI (GET_H_GR (FLD (f_rt)), ANDSI (GET_H_GR (FLD (f_rs)), 31));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -676,7 +676,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ANDSI (SLLSI (GET_H_GR (FLD (f_rt)), FLD (f_shamt)), SRLSI (0xffffffff, GET_H_GR (FLD (f_rs))));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -697,14 +697,14 @@ if (LTSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) {
SI opval = 1;
SET_H_GR (FLD (f_rd), opval);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
} else {
{
SI opval = 0;
SET_H_GR (FLD (f_rd), opval);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -727,14 +727,14 @@ if (LTSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm))))) {
SI opval = 1;
SET_H_GR (FLD (f_rt), opval);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
} else {
{
SI opval = 0;
SET_H_GR (FLD (f_rt), opval);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -757,14 +757,14 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm))))) {
SI opval = 1;
SET_H_GR (FLD (f_rt), opval);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
} else {
{
SI opval = 0;
SET_H_GR (FLD (f_rt), opval);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -787,14 +787,14 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) {
SI opval = 1;
SET_H_GR (FLD (f_rd), opval);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
} else {
{
SI opval = 0;
SET_H_GR (FLD (f_rd), opval);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -815,7 +815,7 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) {
{
SI opval = SRASI (GET_H_GR (FLD (f_rt)), FLD (f_shamt));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -834,7 +834,7 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) {
{
SI opval = SRASI (GET_H_GR (FLD (f_rt)), ANDSI (GET_H_GR (FLD (f_rs)), 31));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -853,7 +853,7 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) {
{
SI opval = SRLSI (GET_H_GR (FLD (f_rt)), FLD (f_shamt));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -872,7 +872,7 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) {
{
SI opval = SRLSI (GET_H_GR (FLD (f_rt)), ANDSI (GET_H_GR (FLD (f_rs)), 31));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -891,7 +891,7 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) {
{
SI opval = ANDSI (SRLSI (GET_H_GR (FLD (f_rt)), FLD (f_shamt)), SLLSI (0xffffffff, GET_H_GR (FLD (f_rs))));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -910,7 +910,7 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) {
{
SI opval = SUBSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -929,7 +929,7 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) {
{
SI opval = SUBSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -948,7 +948,7 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) {
{
SI opval = XORSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -967,7 +967,7 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) {
{
SI opval = XORSI (GET_H_GR (FLD (f_rs)), ZEXTSISI (FLD (f_imm)));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -990,7 +990,7 @@ if (ANDSI (GET_H_GR (FLD (f_rs)), SLLSI (1, FLD (f_rt)))) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1017,7 +1017,7 @@ if (NOTSI (ANDSI (GET_H_GR (FLD (f_rs)), SLLSI (1, FLD (f_rt))))) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1044,7 +1044,7 @@ if (ANDSI (GET_H_GR (FLD (f_rs)), SLLSI (1, ANDSI (GET_H_GR (FLD (f_rt)), 31))))
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1071,7 +1071,7 @@ if (NOTSI (ANDSI (GET_H_GR (FLD (f_rs)), SLLSI (1, ANDSI (GET_H_GR (FLD (f_rt)),
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1098,7 +1098,7 @@ if (EQSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1125,7 +1125,7 @@ if (EQSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
} else {
@@ -1155,7 +1155,7 @@ if (GESI (GET_H_GR (FLD (f_rs)), 0)) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1182,14 +1182,14 @@ if (GESI (GET_H_GR (FLD (f_rs)), 0)) {
SI opval = ADDSI (pc, 8);
SET_H_GR (((UINT) 31), opval);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
{
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 4);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1217,14 +1217,14 @@ if (GESI (GET_H_GR (FLD (f_rs)), 0)) {
SI opval = ADDSI (pc, 8);
SET_H_GR (((UINT) 31), opval);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
{
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 4);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1255,7 +1255,7 @@ if (GESI (GET_H_GR (FLD (f_rs)), 0)) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
} else {
@@ -1285,7 +1285,7 @@ if (LTSI (GET_H_GR (FLD (f_rs)), 0)) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1312,7 +1312,7 @@ if (LTSI (GET_H_GR (FLD (f_rs)), 0)) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
} else {
@@ -1342,14 +1342,14 @@ if (LTSI (GET_H_GR (FLD (f_rs)), 0)) {
SI opval = ADDSI (pc, 8);
SET_H_GR (((UINT) 31), opval);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
{
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 4);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1377,14 +1377,14 @@ if (LTSI (GET_H_GR (FLD (f_rs)), 0)) {
SI opval = ADDSI (pc, 8);
SET_H_GR (((UINT) 31), opval);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
{
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 4);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1415,7 +1415,7 @@ if (EQSI (ANDSI (GET_H_GR (FLD (f_rs)), 255), ANDSI (GET_H_GR (FLD (f_rt)), 255)
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1442,7 +1442,7 @@ if (EQSI (ANDSI (GET_H_GR (FLD (f_rs)), 65280), ANDSI (GET_H_GR (FLD (f_rt)), 65
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1469,7 +1469,7 @@ if (EQSI (ANDSI (GET_H_GR (FLD (f_rs)), 16711680), ANDSI (GET_H_GR (FLD (f_rt)),
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1496,7 +1496,7 @@ if (EQSI (ANDSI (GET_H_GR (FLD (f_rs)), 0xff000000), ANDSI (GET_H_GR (FLD (f_rt)
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1523,7 +1523,7 @@ if (NESI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1550,7 +1550,7 @@ if (NESI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
} else {
@@ -1579,12 +1579,12 @@ if (1)
{
SI opval = ADDSI (pc, 8);
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
USI opval = GET_H_GR (FLD (f_rs));
SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1608,7 +1608,7 @@ if (1)
{
USI opval = GET_H_GR (FLD (f_rs));
SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -1629,7 +1629,7 @@ if (1)
{
SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm))))));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -1648,7 +1648,7 @@ if (1)
{
SI opval = ZEXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm))))));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -1667,7 +1667,7 @@ if (1)
{
SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm))))));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -1686,7 +1686,7 @@ if (1)
{
SI opval = ZEXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm))))));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -1705,7 +1705,7 @@ if (1)
{
SI opval = SLLSI (FLD (f_imm), 16);
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -1724,7 +1724,7 @@ if (1)
{
SI opval = GETMEMSI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -1743,7 +1743,7 @@ if (1)
{
QI opval = ANDQI (GET_H_GR (FLD (f_rt)), 255);
SETMEMQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))), opval);
- TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
#undef FLD
@@ -1762,7 +1762,7 @@ if (1)
{
HI opval = ANDHI (GET_H_GR (FLD (f_rt)), 65535);
SETMEMHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))), opval);
- TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
#undef FLD
@@ -1781,7 +1781,7 @@ if (1)
{
SI opval = GET_H_GR (FLD (f_rt));
SETMEMSI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))), opval);
- TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
#undef FLD
@@ -1830,7 +1830,7 @@ do_syscall (current_cpu);
{
SI opval = ANDSI (GET_H_GR (FLD (f_rs)), ORSI (SLLSI (FLD (f_imm), 16), 65535));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -1849,7 +1849,7 @@ do_syscall (current_cpu);
{
SI opval = ORSI (GET_H_GR (FLD (f_rs)), SLLSI (FLD (f_imm), 16));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -1872,7 +1872,7 @@ if (GTSI (GET_H_GR (FLD (f_rs)), 0)) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1899,7 +1899,7 @@ if (GTSI (GET_H_GR (FLD (f_rs)), 0)) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
} else {
@@ -1929,7 +1929,7 @@ if (LESI (GET_H_GR (FLD (f_rs)), 0)) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1956,7 +1956,7 @@ if (LESI (GET_H_GR (FLD (f_rs)), 0)) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
} else {
@@ -2004,7 +2004,7 @@ if (NOTSI (ANDSI (FLD (f_mask), SLLSI (1, 3)))) {
{
SI opval = tmp_temp;
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -3112,12 +3112,12 @@ if (NOTSI (ANDSI (FLD (f_mask), SLLSI (1, 3)))) {
{
SI opval = GETMEMSI (current_cpu, pc, tmp_addr);
SET_H_GR (ADDSI (FLD (f_rt), 1), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
SI opval = GETMEMSI (current_cpu, pc, ADDSI (tmp_addr, 4));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -3140,12 +3140,12 @@ if (NOTSI (ANDSI (FLD (f_mask), SLLSI (1, 3)))) {
{
SI opval = GET_H_GR (FLD (f_rt));
SETMEMSI (current_cpu, pc, ADDSI (tmp_addr, 4), opval);
- TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
{
SI opval = GET_H_GR (ADDSI (FLD (f_rt), 1));
SETMEMSI (current_cpu, pc, tmp_addr, opval);
- TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
}
@@ -3167,7 +3167,7 @@ if (NOTSI (ANDSI (FLD (f_mask), SLLSI (1, 3)))) {
{
USI opval = FLD (i_jmptarg);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -3191,12 +3191,12 @@ if (NOTSI (ANDSI (FLD (f_mask), SLLSI (1, 3)))) {
{
SI opval = ADDSI (pc, 8);
SET_H_GR (((UINT) 31), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
USI opval = FLD (i_jmptarg);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -3237,7 +3237,7 @@ if (tmp_branch_) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
diff --git a/sim/iq2000/sem.c b/sim/iq2000/sem.c
index ba069c6..446d8ac 100644
--- a/sim/iq2000/sem.c
+++ b/sim/iq2000/sem.c
@@ -36,8 +36,8 @@ This file is part of the GNU simulators.
FAST_P, when desired, is defined on the command line, -DFAST_P=1. */
#if FAST_P
#define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_semf_,fn)
-#undef TRACE_RESULT
-#define TRACE_RESULT(cpu, abuf, name, type, val)
+#undef CGEN_TRACE_RESULT
+#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val)
#else
#define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_sem_,fn)
#endif
@@ -210,7 +210,7 @@ SEM_FN_NAME (iq2000bf,add) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ADDSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -231,7 +231,7 @@ SEM_FN_NAME (iq2000bf,addi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm))));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -252,7 +252,7 @@ SEM_FN_NAME (iq2000bf,addiu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm))));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -273,7 +273,7 @@ SEM_FN_NAME (iq2000bf,addu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ADDSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -299,7 +299,7 @@ SEM_FN_NAME (iq2000bf,ado16) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ORSI (SLLSI (tmp_high, 16), tmp_low);
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -321,7 +321,7 @@ SEM_FN_NAME (iq2000bf,and) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ANDSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -342,7 +342,7 @@ SEM_FN_NAME (iq2000bf,andi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ANDSI (GET_H_GR (FLD (f_rs)), ZEXTSISI (FLD (f_imm)));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -363,7 +363,7 @@ SEM_FN_NAME (iq2000bf,andoi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ANDSI (GET_H_GR (FLD (f_rs)), ORSI (0xffff0000, EXTHISI (TRUNCSIHI (FLD (f_imm)))));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -384,7 +384,7 @@ SEM_FN_NAME (iq2000bf,nor) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = INVSI (ORSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt))));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -405,7 +405,7 @@ SEM_FN_NAME (iq2000bf,or) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ORSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -426,7 +426,7 @@ SEM_FN_NAME (iq2000bf,ori) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ORSI (GET_H_GR (FLD (f_rs)), ZEXTSISI (FLD (f_imm)));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -448,17 +448,17 @@ SEM_FN_NAME (iq2000bf,ram) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = RORSI (GET_H_GR (FLD (f_rt)), FLD (f_shamt));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
SI opval = ANDSI (GET_H_GR (FLD (f_rd)), SRLSI (0xffffffff, FLD (f_maskl)));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
SI opval = ANDSI (GET_H_GR (FLD (f_rd)), SLLSI (0xffffffff, FLD (f_rs)));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -480,7 +480,7 @@ SEM_FN_NAME (iq2000bf,sll) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = SLLSI (GET_H_GR (FLD (f_rt)), FLD (f_shamt));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -501,7 +501,7 @@ SEM_FN_NAME (iq2000bf,sllv) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = SLLSI (GET_H_GR (FLD (f_rt)), ANDSI (GET_H_GR (FLD (f_rs)), 31));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -522,7 +522,7 @@ SEM_FN_NAME (iq2000bf,slmv) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ANDSI (SLLSI (GET_H_GR (FLD (f_rt)), FLD (f_shamt)), SRLSI (0xffffffff, GET_H_GR (FLD (f_rs))));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -545,14 +545,14 @@ if (LTSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) {
SI opval = 1;
SET_H_GR (FLD (f_rd), opval);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
} else {
{
SI opval = 0;
SET_H_GR (FLD (f_rd), opval);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -577,14 +577,14 @@ if (LTSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm))))) {
SI opval = 1;
SET_H_GR (FLD (f_rt), opval);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
} else {
{
SI opval = 0;
SET_H_GR (FLD (f_rt), opval);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -609,14 +609,14 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm))))) {
SI opval = 1;
SET_H_GR (FLD (f_rt), opval);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
} else {
{
SI opval = 0;
SET_H_GR (FLD (f_rt), opval);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -641,14 +641,14 @@ if (LTUSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) {
SI opval = 1;
SET_H_GR (FLD (f_rd), opval);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
} else {
{
SI opval = 0;
SET_H_GR (FLD (f_rd), opval);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -671,7 +671,7 @@ SEM_FN_NAME (iq2000bf,sra) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = SRASI (GET_H_GR (FLD (f_rt)), FLD (f_shamt));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -692,7 +692,7 @@ SEM_FN_NAME (iq2000bf,srav) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = SRASI (GET_H_GR (FLD (f_rt)), ANDSI (GET_H_GR (FLD (f_rs)), 31));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -713,7 +713,7 @@ SEM_FN_NAME (iq2000bf,srl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = SRLSI (GET_H_GR (FLD (f_rt)), FLD (f_shamt));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -734,7 +734,7 @@ SEM_FN_NAME (iq2000bf,srlv) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = SRLSI (GET_H_GR (FLD (f_rt)), ANDSI (GET_H_GR (FLD (f_rs)), 31));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -755,7 +755,7 @@ SEM_FN_NAME (iq2000bf,srmv) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ANDSI (SRLSI (GET_H_GR (FLD (f_rt)), FLD (f_shamt)), SLLSI (0xffffffff, GET_H_GR (FLD (f_rs))));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -776,7 +776,7 @@ SEM_FN_NAME (iq2000bf,sub) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = SUBSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -797,7 +797,7 @@ SEM_FN_NAME (iq2000bf,subu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = SUBSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -818,7 +818,7 @@ SEM_FN_NAME (iq2000bf,xor) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = XORSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)));
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -839,7 +839,7 @@ SEM_FN_NAME (iq2000bf,xori) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = XORSI (GET_H_GR (FLD (f_rs)), ZEXTSISI (FLD (f_imm)));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -864,7 +864,7 @@ if (ANDSI (GET_H_GR (FLD (f_rs)), SLLSI (1, FLD (f_rt)))) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -893,7 +893,7 @@ if (NOTSI (ANDSI (GET_H_GR (FLD (f_rs)), SLLSI (1, FLD (f_rt))))) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -922,7 +922,7 @@ if (ANDSI (GET_H_GR (FLD (f_rs)), SLLSI (1, ANDSI (GET_H_GR (FLD (f_rt)), 31))))
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -951,7 +951,7 @@ if (NOTSI (ANDSI (GET_H_GR (FLD (f_rs)), SLLSI (1, ANDSI (GET_H_GR (FLD (f_rt)),
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -980,7 +980,7 @@ if (EQSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1009,7 +1009,7 @@ if (EQSI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
} else {
@@ -1041,7 +1041,7 @@ if (GESI (GET_H_GR (FLD (f_rs)), 0)) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1070,14 +1070,14 @@ if (GESI (GET_H_GR (FLD (f_rs)), 0)) {
SI opval = ADDSI (pc, 8);
SET_H_GR (((UINT) 31), opval);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
{
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 4);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1107,14 +1107,14 @@ if (GESI (GET_H_GR (FLD (f_rs)), 0)) {
SI opval = ADDSI (pc, 8);
SET_H_GR (((UINT) 31), opval);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
{
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 4);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1147,7 +1147,7 @@ if (GESI (GET_H_GR (FLD (f_rs)), 0)) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
} else {
@@ -1179,7 +1179,7 @@ if (LTSI (GET_H_GR (FLD (f_rs)), 0)) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1208,7 +1208,7 @@ if (LTSI (GET_H_GR (FLD (f_rs)), 0)) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
} else {
@@ -1240,14 +1240,14 @@ if (LTSI (GET_H_GR (FLD (f_rs)), 0)) {
SI opval = ADDSI (pc, 8);
SET_H_GR (((UINT) 31), opval);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
{
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 4);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1277,14 +1277,14 @@ if (LTSI (GET_H_GR (FLD (f_rs)), 0)) {
SI opval = ADDSI (pc, 8);
SET_H_GR (((UINT) 31), opval);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
{
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 4);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1317,7 +1317,7 @@ if (EQSI (ANDSI (GET_H_GR (FLD (f_rs)), 255), ANDSI (GET_H_GR (FLD (f_rt)), 255)
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1346,7 +1346,7 @@ if (EQSI (ANDSI (GET_H_GR (FLD (f_rs)), 65280), ANDSI (GET_H_GR (FLD (f_rt)), 65
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1375,7 +1375,7 @@ if (EQSI (ANDSI (GET_H_GR (FLD (f_rs)), 16711680), ANDSI (GET_H_GR (FLD (f_rt)),
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1404,7 +1404,7 @@ if (EQSI (ANDSI (GET_H_GR (FLD (f_rs)), 0xff000000), ANDSI (GET_H_GR (FLD (f_rt)
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1433,7 +1433,7 @@ if (NESI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1462,7 +1462,7 @@ if (NESI (GET_H_GR (FLD (f_rs)), GET_H_GR (FLD (f_rt)))) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
} else {
@@ -1493,12 +1493,12 @@ SEM_FN_NAME (iq2000bf,jalr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ADDSI (pc, 8);
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
USI opval = GET_H_GR (FLD (f_rs));
SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1524,7 +1524,7 @@ SEM_FN_NAME (iq2000bf,jr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
USI opval = GET_H_GR (FLD (f_rs));
SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -1547,7 +1547,7 @@ SEM_FN_NAME (iq2000bf,lb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm))))));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -1568,7 +1568,7 @@ SEM_FN_NAME (iq2000bf,lbu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ZEXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm))))));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -1589,7 +1589,7 @@ SEM_FN_NAME (iq2000bf,lh) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm))))));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -1610,7 +1610,7 @@ SEM_FN_NAME (iq2000bf,lhu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ZEXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm))))));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -1631,7 +1631,7 @@ SEM_FN_NAME (iq2000bf,lui) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = SLLSI (FLD (f_imm), 16);
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -1652,7 +1652,7 @@ SEM_FN_NAME (iq2000bf,lw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = GETMEMSI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -1673,7 +1673,7 @@ SEM_FN_NAME (iq2000bf,sb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
QI opval = ANDQI (GET_H_GR (FLD (f_rt)), 255);
SETMEMQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))), opval);
- TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
return vpc;
@@ -1694,7 +1694,7 @@ SEM_FN_NAME (iq2000bf,sh) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
HI opval = ANDHI (GET_H_GR (FLD (f_rt)), 65535);
SETMEMHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))), opval);
- TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
return vpc;
@@ -1715,7 +1715,7 @@ SEM_FN_NAME (iq2000bf,sw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = GET_H_GR (FLD (f_rt));
SETMEMSI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_rs)), EXTHISI (TRUNCSIHI (FLD (f_imm)))), opval);
- TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
return vpc;
@@ -1770,7 +1770,7 @@ SEM_FN_NAME (iq2000bf,andoui) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ANDSI (GET_H_GR (FLD (f_rs)), ORSI (SLLSI (FLD (f_imm), 16), 65535));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -1791,7 +1791,7 @@ SEM_FN_NAME (iq2000bf,orui) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ORSI (GET_H_GR (FLD (f_rs)), SLLSI (FLD (f_imm), 16));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
return vpc;
@@ -1816,7 +1816,7 @@ if (GTSI (GET_H_GR (FLD (f_rs)), 0)) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1845,7 +1845,7 @@ if (GTSI (GET_H_GR (FLD (f_rs)), 0)) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
} else {
@@ -1877,7 +1877,7 @@ if (LESI (GET_H_GR (FLD (f_rs)), 0)) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -1906,7 +1906,7 @@ if (LESI (GET_H_GR (FLD (f_rs)), 0)) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
} else {
@@ -1956,7 +1956,7 @@ if (NOTSI (ANDSI (FLD (f_mask), SLLSI (1, 3)))) {
{
SI opval = tmp_temp;
SET_H_GR (FLD (f_rd), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -3208,12 +3208,12 @@ SEM_FN_NAME (iq2000bf,ldw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = GETMEMSI (current_cpu, pc, tmp_addr);
SET_H_GR (ADDSI (FLD (f_rt), 1), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
SI opval = GETMEMSI (current_cpu, pc, ADDSI (tmp_addr, 4));
SET_H_GR (FLD (f_rt), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -3238,12 +3238,12 @@ SEM_FN_NAME (iq2000bf,sdw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = GET_H_GR (FLD (f_rt));
SETMEMSI (current_cpu, pc, ADDSI (tmp_addr, 4), opval);
- TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
{
SI opval = GET_H_GR (ADDSI (FLD (f_rt), 1));
SETMEMSI (current_cpu, pc, tmp_addr, opval);
- TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
}
@@ -3267,7 +3267,7 @@ SEM_FN_NAME (iq2000bf,j) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
USI opval = FLD (i_jmptarg);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -3293,12 +3293,12 @@ SEM_FN_NAME (iq2000bf,jal) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ADDSI (pc, 8);
SET_H_GR (((UINT) 31), opval);
- TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
USI opval = FLD (i_jmptarg);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}
@@ -3341,7 +3341,7 @@ if (tmp_branch_) {
USI opval = FLD (i_offset);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+ CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
}