* configure.in: Call SIM_AC_OPTION_INLINE.

* configure: Regenerate. * sim-main.h: Protect against multiple inclusion. Don't include cgen-scache.h,cgen-cpu.h,cgen-trace.h,cpuall.h. Done by cgen-sim.h now. * tconfig.in (SIM_HAVE_MODEL): Delete, moved to cgen-types.h. * cpuall.h: Regenerate. * cpu.h,decode.c,sem-switch.c,sem.c: Regenerate. * mloop.in (extract16): Make static inline again. Simplify with call to @cpu@_fill_argbuf,@cpu@_fill_argbuf_tp. (extract32): Ditto. Simplify with call to @cpu@_fill_argbuf,@cpu@_fill_argbuf_tp. (execute): Test ARGBUF_PROFILE_P before profiling. Update calls to TRACE_INSN_INIT,TRACE_INSN_FINI. * cpux.h,decodex.c,modelx.c,semx-switch.c: Regenerate. * mloopx.in: Rewrite.
1998-12-05 08:09:18 +00:00 · 1998-12-05 08:09:18 +00:00 · 0a18a6b8ad
commit 0a18a6b8ad
parent b61e2e146a
11 changed files with 1070 additions and 798 deletions
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@ -1,8 +1,22 @@
-Fri Dec  4 00:19:33 1998  Doug Evans  <devans@canuck.cygnus.com>
+1998-12-04  Doug Evans  <devans@casey.cygnus.com>
 	* configure.in: Call SIM_AC_OPTION_INLINE.
 	* configure: Regenerate.
 	* sim-main.h: Protect against multiple inclusion.
 	Don't include cgen-scache.h,cgen-cpu.h,cgen-trace.h,cpuall.h.
 	Done by cgen-sim.h now.
 	* tconfig.in (SIM_HAVE_MODEL): Delete, moved to cgen-types.h.
 	* cpuall.h: Regenerate.
 	* cpu.h,decode.c,sem-switch.c,sem.c: Regenerate.
 	* mloop.in (extract16): Make static inline again.
 	Simplify with call to @cpu@_fill_argbuf,@cpu@_fill_argbuf_tp.
 	(extract32): Ditto.
 	Simplify with call to @cpu@_fill_argbuf,@cpu@_fill_argbuf_tp.
 	(execute): Test ARGBUF_PROFILE_P before profiling.
 	Update calls to TRACE_INSN_INIT,TRACE_INSN_FINI.
 start-sanitize-m32rx
 	* cpux.h,decodex.c,modelx.c,semx-switch.c: Regenerate.
 	* mloopx.in: Rewrite.
 end-sanitize-m32rx
 1998-11-22  Doug Evans  <devans@tobor.to.cygnus.com>
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
--- a/sim/m32r/configure.in
+++ b/sim/m32r/configure.in
@ -14,6 +14,7 @@ SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL(m32r/d)
 SIM_AC_OPTION_ENVIRONMENT
 SIM_AC_OPTION_INLINE()
 cgen_maint=no
 # Default is to use one in build tree.
--- a/sim/m32r/cpu.h
+++ b/sim/m32r/cpu.h
@ -121,6 +121,8 @@ struct argbuf {
  /* These are the baseclass definitions.  */
  PCADDR addr;
  const IDESC *idesc;
  char trace_p;
  char profile_p;
  /* cpu specific data follows */
  union sem semantic;
  int written;
--- a/sim/m32r/cpux.h
+++ b/sim/m32r/cpux.h
@ -117,6 +117,8 @@ struct argbuf {
  /* These are the baseclass definitions.  */
  PCADDR addr;
  const IDESC *idesc;
  char trace_p;
  char profile_p;
  /* cpu specific data follows */
  union sem semantic;
  int written;
--- a/sim/m32r/decode.c
+++ b/sim/m32r/decode.c
@ -679,7 +679,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_dr) = & CPU (h_gr)[f_r1];
  FLD (i_sr) = & CPU (h_gr)[f_r2];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_add", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_add", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -706,7 +706,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (f_simm16) = f_simm16;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_add3", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_add3", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -732,7 +732,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (f_uimm16) = f_uimm16;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_and3", "sr 0x%x", 'x', f_r2, "uimm16 0x%x", 'x', f_uimm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_and3", "sr 0x%x", 'x', f_r2, "uimm16 0x%x", 'x', f_uimm16, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -758,7 +758,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (f_uimm16) = f_uimm16;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_or3", "sr 0x%x", 'x', f_r2, "ulo16 0x%x", 'x', f_uimm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_or3", "sr 0x%x", 'x', f_r2, "ulo16 0x%x", 'x', f_uimm16, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -783,7 +783,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_dr) = & CPU (h_gr)[f_r1];
  FLD (f_simm8) = f_simm8;
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_addi", "dr 0x%x", 'x', f_r1, "simm8 0x%x", 'x', f_simm8, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_addi", "dr 0x%x", 'x', f_r1, "simm8 0x%x", 'x', f_simm8, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -808,7 +808,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_dr) = & CPU (h_gr)[f_r1];
  FLD (i_sr) = & CPU (h_gr)[f_r2];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_addv", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_addv", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -835,7 +835,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (f_simm16) = f_simm16;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_addv3", "sr 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_addv3", "sr 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -860,7 +860,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_dr) = & CPU (h_gr)[f_r1];
  FLD (i_sr) = & CPU (h_gr)[f_r2];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_addx", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_addx", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -886,7 +886,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_disp8) = f_disp8;
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bc8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bc8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -909,7 +909,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_disp24) = f_disp24;
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bc24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bc24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -934,7 +934,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (f_disp16) = f_disp16;
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_beq", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_beq", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -960,7 +960,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (f_disp16) = f_disp16;
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_beqz", "src2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_beqz", "src2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -984,7 +984,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_disp8) = f_disp8;
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bl8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bl8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1008,7 +1008,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_disp24) = f_disp24;
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bl24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bl24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1032,7 +1032,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_disp8) = f_disp8;
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bra8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bra8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1055,7 +1055,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_disp24) = f_disp24;
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bra24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bra24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1078,7 +1078,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_src1) = & CPU (h_gr)[f_r1];
  FLD (i_src2) = & CPU (h_gr)[f_r2];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_cmp", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_cmp", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1103,7 +1103,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (f_simm16) = f_simm16;
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_cmpi", "src2 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_cmpi", "src2 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1127,7 +1127,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_div", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_div", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1153,7 +1153,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_jl", "sr 0x%x", 'x', f_r2, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_jl", "sr 0x%x", 'x', f_r2, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1178,7 +1178,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_jmp", "sr 0x%x", 'x', f_r2, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_jmp", "sr 0x%x", 'x', f_r2, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1202,7 +1202,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ld", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ld", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1228,7 +1228,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (f_simm16) = f_simm16;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ld_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ld_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1253,7 +1253,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldb", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldb", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1279,7 +1279,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (f_simm16) = f_simm16;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldb_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldb_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1304,7 +1304,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldh", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldh", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1330,7 +1330,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (f_simm16) = f_simm16;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldh_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldh_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1355,7 +1355,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ld_plus", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ld_plus", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1381,7 +1381,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_uimm24) = f_uimm24;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ld24", "uimm24 0x%x", 'x', f_uimm24, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ld24", "uimm24 0x%x", 'x', f_uimm24, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1405,7 +1405,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_simm8) = f_simm8;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldi8", "simm8 0x%x", 'x', f_simm8, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldi8", "simm8 0x%x", 'x', f_simm8, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1429,7 +1429,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_simm16) = f_simm16;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldi16", "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldi16", "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1453,7 +1453,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_lock", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_lock", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1478,7 +1478,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_src1) = & CPU (h_gr)[f_r1];
  FLD (i_src2) = & CPU (h_gr)[f_r2];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_machi", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_machi", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1503,7 +1503,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_src1) = & CPU (h_gr)[f_r1];
  FLD (i_src2) = & CPU (h_gr)[f_r2];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mulhi", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mulhi", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1528,7 +1528,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mv", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mv", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1552,7 +1552,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mvfachi", "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mvfachi", "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1576,7 +1576,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_r2) = f_r2;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mvfc", "scr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mvfc", "scr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1599,7 +1599,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_src1) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mvtachi", "src1 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mvtachi", "src1 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1623,7 +1623,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (f_r1) = f_r1;
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mvtc", "sr 0x%x", 'x', f_r2, "dcr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mvtc", "sr 0x%x", 'x', f_r2, "dcr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1645,7 +1645,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  EXTRACT_FMT_NOP_CODE
  /* Record the fields for the semantic handler.  */
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_nop", (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_nop", (char *) 0));
 #undef FLD
  BREAK (ex);
@ -1660,7 +1660,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  EXTRACT_FMT_RAC_CODE
  /* Record the fields for the semantic handler.  */
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_rac", (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_rac", (char *) 0));
 #undef FLD
  BREAK (ex);
@ -1676,7 +1676,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_rte", (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_rte", (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1699,7 +1699,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_hi16) = f_hi16;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_seth", "hi16 0x%x", 'x', f_hi16, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_seth", "hi16 0x%x", 'x', f_hi16, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1724,7 +1724,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (f_simm16) = f_simm16;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_sll3", "sr 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_sll3", "sr 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1749,7 +1749,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_dr) = & CPU (h_gr)[f_r1];
  FLD (f_uimm5) = f_uimm5;
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_slli", "dr 0x%x", 'x', f_r1, "uimm5 0x%x", 'x', f_uimm5, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_slli", "dr 0x%x", 'x', f_r1, "uimm5 0x%x", 'x', f_uimm5, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1774,7 +1774,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (i_src1) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_st", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_st", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1800,7 +1800,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (f_simm16) = f_simm16;
  FLD (i_src1) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_st_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_st_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1825,7 +1825,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (i_src1) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_stb", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_stb", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1851,7 +1851,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (f_simm16) = f_simm16;
  FLD (i_src1) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_stb_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_stb_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1876,7 +1876,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (i_src1) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_sth", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_sth", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1902,7 +1902,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (f_simm16) = f_simm16;
  FLD (i_src1) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_sth_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_sth_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1927,7 +1927,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (i_src1) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_st_plus", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_st_plus", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1953,7 +1953,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_uimm4) = f_uimm4;
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_trap", "uimm4 0x%x", 'x', f_uimm4, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_trap", "uimm4 0x%x", 'x', f_uimm4, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1976,7 +1976,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (i_src1) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_unlock", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_unlock", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
--- a/sim/m32r/decodex.c
+++ b/sim/m32r/decodex.c
@ -858,7 +858,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_dr) = & CPU (h_gr)[f_r1];
  FLD (i_sr) = & CPU (h_gr)[f_r2];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_add", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_add", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -885,7 +885,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (f_simm16) = f_simm16;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_add3", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_add3", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -911,7 +911,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (f_uimm16) = f_uimm16;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_and3", "sr 0x%x", 'x', f_r2, "uimm16 0x%x", 'x', f_uimm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_and3", "sr 0x%x", 'x', f_r2, "uimm16 0x%x", 'x', f_uimm16, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -937,7 +937,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (f_uimm16) = f_uimm16;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_or3", "sr 0x%x", 'x', f_r2, "ulo16 0x%x", 'x', f_uimm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_or3", "sr 0x%x", 'x', f_r2, "ulo16 0x%x", 'x', f_uimm16, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -962,7 +962,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_dr) = & CPU (h_gr)[f_r1];
  FLD (f_simm8) = f_simm8;
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_addi", "dr 0x%x", 'x', f_r1, "simm8 0x%x", 'x', f_simm8, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_addi", "dr 0x%x", 'x', f_r1, "simm8 0x%x", 'x', f_simm8, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -987,7 +987,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_dr) = & CPU (h_gr)[f_r1];
  FLD (i_sr) = & CPU (h_gr)[f_r2];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_addv", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_addv", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1014,7 +1014,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (f_simm16) = f_simm16;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_addv3", "sr 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_addv3", "sr 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1039,7 +1039,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_dr) = & CPU (h_gr)[f_r1];
  FLD (i_sr) = & CPU (h_gr)[f_r2];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_addx", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_addx", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1065,7 +1065,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_disp8) = f_disp8;
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bc8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bc8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1088,7 +1088,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_disp24) = f_disp24;
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bc24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bc24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1113,7 +1113,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (f_disp16) = f_disp16;
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_beq", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_beq", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1139,7 +1139,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (f_disp16) = f_disp16;
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_beqz", "src2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_beqz", "src2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1163,7 +1163,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_disp8) = f_disp8;
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bl8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bl8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1187,7 +1187,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_disp24) = f_disp24;
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bl24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bl24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1211,7 +1211,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_disp8) = f_disp8;
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bcl8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bcl8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1235,7 +1235,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_disp24) = f_disp24;
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bcl24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bcl24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1259,7 +1259,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_disp8) = f_disp8;
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bra8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bra8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1282,7 +1282,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_disp24) = f_disp24;
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bra24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bra24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1305,7 +1305,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_src1) = & CPU (h_gr)[f_r1];
  FLD (i_src2) = & CPU (h_gr)[f_r2];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_cmp", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_cmp", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1330,7 +1330,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (f_simm16) = f_simm16;
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_cmpi", "src2 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_cmpi", "src2 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1353,7 +1353,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_src2) = & CPU (h_gr)[f_r2];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_cmpz", "src2 0x%x", 'x', f_r2, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_cmpz", "src2 0x%x", 'x', f_r2, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1377,7 +1377,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_div", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_div", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1403,7 +1403,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_jc", "sr 0x%x", 'x', f_r2, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_jc", "sr 0x%x", 'x', f_r2, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1427,7 +1427,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_jl", "sr 0x%x", 'x', f_r2, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_jl", "sr 0x%x", 'x', f_r2, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1452,7 +1452,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_jmp", "sr 0x%x", 'x', f_r2, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_jmp", "sr 0x%x", 'x', f_r2, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1476,7 +1476,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ld", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ld", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1502,7 +1502,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (f_simm16) = f_simm16;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ld_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ld_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1527,7 +1527,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldb", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldb", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1553,7 +1553,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (f_simm16) = f_simm16;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldb_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldb_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1578,7 +1578,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldh", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldh", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1604,7 +1604,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (f_simm16) = f_simm16;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldh_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldh_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1629,7 +1629,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ld_plus", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ld_plus", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1655,7 +1655,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_uimm24) = f_uimm24;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ld24", "uimm24 0x%x", 'x', f_uimm24, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ld24", "uimm24 0x%x", 'x', f_uimm24, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1679,7 +1679,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_simm8) = f_simm8;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldi8", "simm8 0x%x", 'x', f_simm8, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldi8", "simm8 0x%x", 'x', f_simm8, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1703,7 +1703,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_simm16) = f_simm16;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldi16", "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldi16", "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1727,7 +1727,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_lock", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_lock", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1753,7 +1753,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (f_acc) = f_acc;
  FLD (i_src1) = & CPU (h_gr)[f_r1];
  FLD (i_src2) = & CPU (h_gr)[f_r2];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_machi_a", "acc 0x%x", 'x', f_acc, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_machi_a", "acc 0x%x", 'x', f_acc, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1779,7 +1779,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_src1) = & CPU (h_gr)[f_r1];
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (f_acc) = f_acc;
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mulhi_a", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, "acc 0x%x", 'x', f_acc, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mulhi_a", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, "acc 0x%x", 'x', f_acc, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1804,7 +1804,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mv", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mv", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1829,7 +1829,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_accs) = f_accs;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mvfachi_a", "accs 0x%x", 'x', f_accs, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mvfachi_a", "accs 0x%x", 'x', f_accs, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1853,7 +1853,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_r2) = f_r2;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mvfc", "scr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mvfc", "scr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1877,7 +1877,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_accs) = f_accs;
  FLD (i_src1) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mvtachi_a", "accs 0x%x", 'x', f_accs, "src1 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mvtachi_a", "accs 0x%x", 'x', f_accs, "src1 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1901,7 +1901,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (f_r1) = f_r1;
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mvtc", "sr 0x%x", 'x', f_r2, "dcr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mvtc", "sr 0x%x", 'x', f_r2, "dcr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1923,7 +1923,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  EXTRACT_FMT_NOP_CODE
  /* Record the fields for the semantic handler.  */
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_nop", (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_nop", (char *) 0));
 #undef FLD
  BREAK (ex);
@ -1941,7 +1941,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (f_accs) = f_accs;
  FLD (f_imm1) = f_imm1;
  FLD (f_accd) = f_accd;
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_rac_dsi", "accs 0x%x", 'x', f_accs, "imm1 0x%x", 'x', f_imm1, "accd 0x%x", 'x', f_accd, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_rac_dsi", "accs 0x%x", 'x', f_accs, "imm1 0x%x", 'x', f_imm1, "accd 0x%x", 'x', f_accd, (char *) 0));
 #undef FLD
  BREAK (ex);
@ -1957,7 +1957,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_rte", (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_rte", (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -1980,7 +1980,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_hi16) = f_hi16;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_seth", "hi16 0x%x", 'x', f_hi16, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_seth", "hi16 0x%x", 'x', f_hi16, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -2005,7 +2005,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (f_simm16) = f_simm16;
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_sll3", "sr 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_sll3", "sr 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -2030,7 +2030,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_dr) = & CPU (h_gr)[f_r1];
  FLD (f_uimm5) = f_uimm5;
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_slli", "dr 0x%x", 'x', f_r1, "uimm5 0x%x", 'x', f_uimm5, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_slli", "dr 0x%x", 'x', f_r1, "uimm5 0x%x", 'x', f_uimm5, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -2055,7 +2055,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (i_src1) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_st", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_st", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -2081,7 +2081,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (f_simm16) = f_simm16;
  FLD (i_src1) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_st_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_st_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -2106,7 +2106,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (i_src1) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_stb", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_stb", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -2132,7 +2132,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (f_simm16) = f_simm16;
  FLD (i_src1) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_stb_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_stb_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -2157,7 +2157,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (i_src1) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_sth", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_sth", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -2183,7 +2183,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (f_simm16) = f_simm16;
  FLD (i_src1) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_sth_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_sth_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -2208,7 +2208,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (i_src1) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_st_plus", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_st_plus", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -2234,7 +2234,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (f_uimm4) = f_uimm4;
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_trap", "uimm4 0x%x", 'x', f_uimm4, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_trap", "uimm4 0x%x", 'x', f_uimm4, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -2257,7 +2257,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_src2) = & CPU (h_gr)[f_r2];
  FLD (i_src1) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_unlock", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_unlock", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -2282,7 +2282,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_satb", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_satb", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -2307,7 +2307,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_sr) = & CPU (h_gr)[f_r2];
  FLD (i_dr) = & CPU (h_gr)[f_r1];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_sat", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_sat", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -2330,7 +2330,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  EXTRACT_FMT_SADD_CODE
  /* Record the fields for the semantic handler.  */
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_sadd", (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_sadd", (char *) 0));
 #undef FLD
  BREAK (ex);
@ -2347,7 +2347,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_src1) = & CPU (h_gr)[f_r1];
  FLD (i_src2) = & CPU (h_gr)[f_r2];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_macwu1", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_macwu1", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -2372,7 +2372,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_src1) = & CPU (h_gr)[f_r1];
  FLD (i_src2) = & CPU (h_gr)[f_r2];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_msblo", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_msblo", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -2397,7 +2397,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  FLD (i_src1) = & CPU (h_gr)[f_r1];
  FLD (i_src2) = & CPU (h_gr)[f_r2];
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mulwu1", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mulwu1", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
 #if WITH_PROFILE_MODEL_P
  /* Record the fields for profiling.  */
@ -2421,7 +2421,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
  /* Record the fields for the semantic handler.  */
  SEM_BRANCH_INIT_EXTRACT (abuf);
-  TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_sc", (char *) 0));
+  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_sc", (char *) 0));
 #undef FLD
  BREAK (ex);
--- a/sim/m32r/sem-switch.c
+++ b/sim/m32r/sem-switch.c
@ -161,7 +161,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #if FAST_P
 #undef TRACE_RESULT
-#define TRACE_RESULT(cpu, name, type, val)
+#define TRACE_RESULT(cpu, abuf, name, type, val)
 #endif
 #undef GET_ATTR
@ -340,7 +340,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
  {
    SI opval = ADDSI (* FLD (i_dr), * FLD (i_sr));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -359,7 +359,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
  {
    SI opval = ADDSI (* FLD (i_sr), FLD (f_simm16));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -378,7 +378,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
  {
    SI opval = ANDSI (* FLD (i_dr), * FLD (i_sr));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -397,7 +397,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
  {
    SI opval = ANDSI (* FLD (i_sr), FLD (f_uimm16));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -416,7 +416,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
  {
    SI opval = ORSI (* FLD (i_dr), * FLD (i_sr));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -435,7 +435,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
  {
    SI opval = ORSI (* FLD (i_sr), FLD (f_uimm16));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -454,7 +454,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
  {
    SI opval = XORSI (* FLD (i_dr), * FLD (i_sr));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -473,7 +473,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
  {
    SI opval = XORSI (* FLD (i_sr), FLD (f_uimm16));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -492,7 +492,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
  {
    SI opval = ADDSI (* FLD (i_dr), FLD (f_simm8));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -515,12 +515,12 @@ do {
  {
    SI opval = temp0;
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  {
    BI opval = temp1;
    CPU (h_cond) = opval;
-    TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
  }
 } while (0);
@ -544,12 +544,12 @@ do {
  {
    SI opval = temp0;
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  {
    BI opval = temp1;
    CPU (h_cond) = opval;
-    TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
  }
 } while (0);
@ -573,12 +573,12 @@ do {
  {
    SI opval = temp0;
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  {
    BI opval = temp1;
    CPU (h_cond) = opval;
-    TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
  }
 } while (0);
@ -601,7 +601,7 @@ if (CPU (h_cond)) {
    USI opval = FLD (f_disp8);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -626,7 +626,7 @@ if (CPU (h_cond)) {
    USI opval = FLD (f_disp24);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -651,7 +651,7 @@ if (EQSI (* FLD (i_src1), * FLD (i_src2))) {
    USI opval = FLD (f_disp16);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -676,7 +676,7 @@ if (EQSI (* FLD (i_src2), 0)) {
    USI opval = FLD (f_disp16);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -701,7 +701,7 @@ if (GESI (* FLD (i_src2), 0)) {
    USI opval = FLD (f_disp16);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -726,7 +726,7 @@ if (GTSI (* FLD (i_src2), 0)) {
    USI opval = FLD (f_disp16);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -751,7 +751,7 @@ if (LESI (* FLD (i_src2), 0)) {
    USI opval = FLD (f_disp16);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -776,7 +776,7 @@ if (LTSI (* FLD (i_src2), 0)) {
    USI opval = FLD (f_disp16);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -801,7 +801,7 @@ if (NESI (* FLD (i_src2), 0)) {
    USI opval = FLD (f_disp16);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -825,12 +825,12 @@ do {
  {
    SI opval = ADDSI (ANDSI (pc, -4), 4);
    CPU (h_gr[((UINT) 14)]) = opval;
-    TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
  }
  {
    USI opval = FLD (f_disp8);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 } while (0);
@ -853,12 +853,12 @@ do {
  {
    SI opval = ADDSI (pc, 4);
    CPU (h_gr[((UINT) 14)]) = opval;
-    TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
  }
  {
    USI opval = FLD (f_disp24);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 } while (0);
@ -882,7 +882,7 @@ if (NOTBI (CPU (h_cond))) {
    USI opval = FLD (f_disp8);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -907,7 +907,7 @@ if (NOTBI (CPU (h_cond))) {
    USI opval = FLD (f_disp24);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -932,7 +932,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) {
    USI opval = FLD (f_disp16);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -955,7 +955,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) {
  {
    USI opval = FLD (f_disp8);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
  SEM_BRANCH_FINI
@ -976,7 +976,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) {
  {
    USI opval = FLD (f_disp24);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
  SEM_BRANCH_FINI
@ -996,7 +996,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) {
  {
    BI opval = LTSI (* FLD (i_src1), * FLD (i_src2));
    CPU (h_cond) = opval;
-    TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
  }
 #undef FLD
@ -1015,7 +1015,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) {
  {
    BI opval = LTSI (* FLD (i_src2), FLD (f_simm16));
    CPU (h_cond) = opval;
-    TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
  }
 #undef FLD
@ -1034,7 +1034,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) {
  {
    BI opval = LTUSI (* FLD (i_src1), * FLD (i_src2));
    CPU (h_cond) = opval;
-    TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
  }
 #undef FLD
@ -1053,7 +1053,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) {
  {
    BI opval = LTUSI (* FLD (i_src2), FLD (f_simm16));
    CPU (h_cond) = opval;
-    TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
  }
 #undef FLD
@ -1074,7 +1074,7 @@ if (NESI (* FLD (i_sr), 0)) {
    SI opval = DIVSI (* FLD (i_dr), * FLD (i_sr));
    * FLD (i_dr) = opval;
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 }
@ -1097,7 +1097,7 @@ if (NESI (* FLD (i_sr), 0)) {
    SI opval = UDIVSI (* FLD (i_dr), * FLD (i_sr));
    * FLD (i_dr) = opval;
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 }
@ -1120,7 +1120,7 @@ if (NESI (* FLD (i_sr), 0)) {
    SI opval = MODSI (* FLD (i_dr), * FLD (i_sr));
    * FLD (i_dr) = opval;
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 }
@ -1143,7 +1143,7 @@ if (NESI (* FLD (i_sr), 0)) {
    SI opval = UMODSI (* FLD (i_dr), * FLD (i_sr));
    * FLD (i_dr) = opval;
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 }
@ -1169,12 +1169,12 @@ do {
  {
    SI opval = temp0;
    CPU (h_gr[((UINT) 14)]) = opval;
-    TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
  }
  {
    USI opval = temp1;
    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 } while (0);
@ -1196,7 +1196,7 @@ do {
  {
    USI opval = ANDSI (* FLD (i_sr), -4);
    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
  SEM_BRANCH_FINI
@ -1216,7 +1216,7 @@ do {
  {
    SI opval = GETMEMSI (current_cpu, * FLD (i_sr));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -1235,7 +1235,7 @@ do {
  {
    SI opval = GETMEMSI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16)));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -1254,7 +1254,7 @@ do {
  {
    SI opval = EXTQISI (GETMEMQI (current_cpu, * FLD (i_sr)));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -1273,7 +1273,7 @@ do {
  {
    SI opval = EXTQISI (GETMEMQI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -1292,7 +1292,7 @@ do {
  {
    SI opval = EXTHISI (GETMEMHI (current_cpu, * FLD (i_sr)));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -1311,7 +1311,7 @@ do {
  {
    SI opval = EXTHISI (GETMEMHI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -1330,7 +1330,7 @@ do {
  {
    SI opval = ZEXTQISI (GETMEMQI (current_cpu, * FLD (i_sr)));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -1349,7 +1349,7 @@ do {
  {
    SI opval = ZEXTQISI (GETMEMQI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -1368,7 +1368,7 @@ do {
  {
    SI opval = ZEXTHISI (GETMEMHI (current_cpu, * FLD (i_sr)));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -1387,7 +1387,7 @@ do {
  {
    SI opval = ZEXTHISI (GETMEMHI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -1410,12 +1410,12 @@ do {
  {
    SI opval = temp0;
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  {
    SI opval = temp1;
    * FLD (i_sr) = opval;
-    TRACE_RESULT (current_cpu, "sr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
  }
 } while (0);
@ -1435,7 +1435,7 @@ do {
  {
    SI opval = FLD (f_uimm24);
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -1454,7 +1454,7 @@ do {
  {
    SI opval = FLD (f_simm8);
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -1473,7 +1473,7 @@ do {
  {
    SI opval = FLD (f_simm16);
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -1493,12 +1493,12 @@ do {
  {
    BI opval = 1;
    CPU (h_lock) = opval;
-    TRACE_RESULT (current_cpu, "lock-0", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "lock-0", 'x', opval);
  }
  {
    SI opval = GETMEMSI (current_cpu, * FLD (i_sr));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 } while (0);
@ -1518,7 +1518,7 @@ do {
  {
    DI opval = SRADI (SLLDI (ADDDI (m32rbf_h_accum_get (current_cpu), MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))))), 8), 8);
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
 #undef FLD
@ -1537,7 +1537,7 @@ do {
  {
    DI opval = SRADI (SLLDI (ADDDI (m32rbf_h_accum_get (current_cpu), MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))))), 8), 8);
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
 #undef FLD
@ -1556,7 +1556,7 @@ do {
  {
    DI opval = SRADI (SLLDI (ADDDI (m32rbf_h_accum_get (current_cpu), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))))), 8), 8);
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
 #undef FLD
@ -1575,7 +1575,7 @@ do {
  {
    DI opval = SRADI (SLLDI (ADDDI (m32rbf_h_accum_get (current_cpu), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))))), 8), 8);
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
 #undef FLD
@ -1594,7 +1594,7 @@ do {
  {
    SI opval = MULSI (* FLD (i_dr), * FLD (i_sr));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -1613,7 +1613,7 @@ do {
  {
    DI opval = SRADI (SLLDI (MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))), 16), 16);
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
 #undef FLD
@ -1632,7 +1632,7 @@ do {
  {
    DI opval = SRADI (SLLDI (MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 16), 16);
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
 #undef FLD
@ -1651,7 +1651,7 @@ do {
  {
    DI opval = SRADI (SLLDI (MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))), 8), 8);
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
 #undef FLD
@ -1670,7 +1670,7 @@ do {
  {
    DI opval = SRADI (SLLDI (MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 8), 8);
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
 #undef FLD
@ -1689,7 +1689,7 @@ do {
  {
    SI opval = * FLD (i_sr);
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -1708,7 +1708,7 @@ do {
  {
    SI opval = TRUNCDISI (SRADI (m32rbf_h_accum_get (current_cpu), 32));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -1727,7 +1727,7 @@ do {
  {
    SI opval = TRUNCDISI (m32rbf_h_accum_get (current_cpu));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -1746,7 +1746,7 @@ do {
  {
    SI opval = TRUNCDISI (SRADI (m32rbf_h_accum_get (current_cpu), 16));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -1765,7 +1765,7 @@ do {
  {
    SI opval = m32rbf_h_cr_get (current_cpu, FLD (f_r2));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -1784,7 +1784,7 @@ do {
  {
    DI opval = ORDI (ANDDI (m32rbf_h_accum_get (current_cpu), MAKEDI (0, 0xffffffff)), SLLDI (EXTSIDI (* FLD (i_src1)), 32));
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
 #undef FLD
@ -1803,7 +1803,7 @@ do {
  {
    DI opval = ORDI (ANDDI (m32rbf_h_accum_get (current_cpu), MAKEDI (0xffffffff, 0)), ZEXTSIDI (* FLD (i_src1)));
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
 #undef FLD
@ -1822,7 +1822,7 @@ do {
  {
    USI opval = * FLD (i_sr);
    m32rbf_h_cr_set (current_cpu, FLD (f_r1), opval);
-    TRACE_RESULT (current_cpu, "dcr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dcr", 'x', opval);
  }
 #undef FLD
@ -1841,7 +1841,7 @@ do {
  {
    SI opval = NEGSI (* FLD (i_sr));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -1875,7 +1875,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
  {
    SI opval = INVSI (* FLD (i_sr));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -1898,7 +1898,7 @@ do {
  {
    DI opval = (GTDI (tmp_tmp1, MAKEDI (32767, 0xffff0000))) ? (MAKEDI (32767, 0xffff0000)) : (LTDI (tmp_tmp1, MAKEDI (0xffff8000, 0))) ? (MAKEDI (0xffff8000, 0)) : (ANDDI (tmp_tmp1, MAKEDI (0xffffffff, 0xffff0000)));
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
 } while (0);
@ -1931,7 +1931,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083
  {
    DI opval = SRADI (SLLDI (tmp_tmp1, 7), 7);
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
 } while (0);
@ -1953,22 +1953,22 @@ do {
  {
    USI opval = ANDSI (m32rbf_h_cr_get (current_cpu, ((UINT) 6)), -4);
    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
  {
    USI opval = m32rbf_h_cr_get (current_cpu, ((UINT) 14));
    m32rbf_h_cr_set (current_cpu, ((UINT) 6), opval);
-    TRACE_RESULT (current_cpu, "cr-6", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval);
  }
  {
    UQI opval = CPU (h_bpsw);
    m32rbf_h_psw_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "psw-0", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "psw-0", 'x', opval);
  }
  {
    UQI opval = CPU (h_bbpsw);
    CPU (h_bpsw) = opval;
-    TRACE_RESULT (current_cpu, "bpsw-0", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "bpsw-0", 'x', opval);
  }
 } while (0);
@ -1989,7 +1989,7 @@ do {
  {
    SI opval = SLLSI (FLD (f_hi16), 16);
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -2008,7 +2008,7 @@ do {
  {
    SI opval = SLLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -2027,7 +2027,7 @@ do {
  {
    SI opval = SLLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -2046,7 +2046,7 @@ do {
  {
    SI opval = SLLSI (* FLD (i_dr), FLD (f_uimm5));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -2065,7 +2065,7 @@ do {
  {
    SI opval = SRASI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -2084,7 +2084,7 @@ do {
  {
    SI opval = SRASI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -2103,7 +2103,7 @@ do {
  {
    SI opval = SRASI (* FLD (i_dr), FLD (f_uimm5));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -2122,7 +2122,7 @@ do {
  {
    SI opval = SRLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -2141,7 +2141,7 @@ do {
  {
    SI opval = SRLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -2160,7 +2160,7 @@ do {
  {
    SI opval = SRLSI (* FLD (i_dr), FLD (f_uimm5));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -2179,7 +2179,7 @@ do {
  {
    SI opval = * FLD (i_src1);
    SETMEMSI (current_cpu, * FLD (i_src2), opval);
-    TRACE_RESULT (current_cpu, "memory", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
  }
 #undef FLD
@ -2198,7 +2198,7 @@ do {
  {
    SI opval = * FLD (i_src1);
    SETMEMSI (current_cpu, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
-    TRACE_RESULT (current_cpu, "memory", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
  }
 #undef FLD
@ -2217,7 +2217,7 @@ do {
  {
    QI opval = * FLD (i_src1);
    SETMEMQI (current_cpu, * FLD (i_src2), opval);
-    TRACE_RESULT (current_cpu, "memory", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
  }
 #undef FLD
@ -2236,7 +2236,7 @@ do {
  {
    QI opval = * FLD (i_src1);
    SETMEMQI (current_cpu, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
-    TRACE_RESULT (current_cpu, "memory", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
  }
 #undef FLD
@ -2255,7 +2255,7 @@ do {
  {
    HI opval = * FLD (i_src1);
    SETMEMHI (current_cpu, * FLD (i_src2), opval);
-    TRACE_RESULT (current_cpu, "memory", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
  }
 #undef FLD
@ -2274,7 +2274,7 @@ do {
  {
    HI opval = * FLD (i_src1);
    SETMEMHI (current_cpu, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
-    TRACE_RESULT (current_cpu, "memory", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
  }
 #undef FLD
@ -2296,12 +2296,12 @@ do {
  {
    SI opval = * FLD (i_src1);
    SETMEMSI (current_cpu, tmp_new_src2, opval);
-    TRACE_RESULT (current_cpu, "memory", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
  }
  {
    SI opval = tmp_new_src2;
    * FLD (i_src2) = opval;
-    TRACE_RESULT (current_cpu, "src2", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval);
  }
 } while (0);
@ -2324,12 +2324,12 @@ do {
  {
    SI opval = * FLD (i_src1);
    SETMEMSI (current_cpu, tmp_new_src2, opval);
-    TRACE_RESULT (current_cpu, "memory", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
  }
  {
    SI opval = tmp_new_src2;
    * FLD (i_src2) = opval;
-    TRACE_RESULT (current_cpu, "src2", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval);
  }
 } while (0);
@ -2349,7 +2349,7 @@ do {
  {
    SI opval = SUBSI (* FLD (i_dr), * FLD (i_sr));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 #undef FLD
@ -2372,12 +2372,12 @@ do {
  {
    SI opval = temp0;
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  {
    BI opval = temp1;
    CPU (h_cond) = opval;
-    TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
  }
 } while (0);
@ -2401,12 +2401,12 @@ do {
  {
    SI opval = temp0;
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  {
    BI opval = temp1;
    CPU (h_cond) = opval;
-    TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
  }
 } while (0);
@ -2428,32 +2428,32 @@ do {
  {
    USI opval = m32rbf_h_cr_get (current_cpu, ((UINT) 6));
    m32rbf_h_cr_set (current_cpu, ((UINT) 14), opval);
-    TRACE_RESULT (current_cpu, "cr-14", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "cr-14", 'x', opval);
  }
  {
    USI opval = ADDSI (pc, 4);
    m32rbf_h_cr_set (current_cpu, ((UINT) 6), opval);
-    TRACE_RESULT (current_cpu, "cr-6", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval);
  }
  {
    UQI opval = CPU (h_bpsw);
    CPU (h_bbpsw) = opval;
-    TRACE_RESULT (current_cpu, "bbpsw-0", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "bbpsw-0", 'x', opval);
  }
  {
    UQI opval = m32rbf_h_psw_get (current_cpu);
    CPU (h_bpsw) = opval;
-    TRACE_RESULT (current_cpu, "bpsw-0", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "bpsw-0", 'x', opval);
  }
  {
    UQI opval = ANDQI (m32rbf_h_psw_get (current_cpu), 128);
    m32rbf_h_psw_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "psw-0", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "psw-0", 'x', opval);
  }
  {
    SI opval = m32r_trap (current_cpu, pc, FLD (f_uimm4));
    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 } while (0);
@ -2477,13 +2477,13 @@ if (CPU (h_lock)) {
    SI opval = * FLD (i_src1);
    SETMEMSI (current_cpu, * FLD (i_src2), opval);
    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, "memory", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
  }
 }
  {
    BI opval = 0;
    CPU (h_lock) = opval;
-    TRACE_RESULT (current_cpu, "lock-0", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "lock-0", 'x', opval);
  }
 } while (0);
--- a/sim/m32r/sem.c
+++ b/sim/m32r/sem.c
@ -194,7 +194,7 @@ SEM_FN_NAME (m32rbf,add) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = ADDSI (* FLD (i_dr), * FLD (i_sr));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -215,7 +215,7 @@ SEM_FN_NAME (m32rbf,add3) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = ADDSI (* FLD (i_sr), FLD (f_simm16));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -236,7 +236,7 @@ SEM_FN_NAME (m32rbf,and) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = ANDSI (* FLD (i_dr), * FLD (i_sr));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -257,7 +257,7 @@ SEM_FN_NAME (m32rbf,and3) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = ANDSI (* FLD (i_sr), FLD (f_uimm16));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -278,7 +278,7 @@ SEM_FN_NAME (m32rbf,or) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = ORSI (* FLD (i_dr), * FLD (i_sr));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -299,7 +299,7 @@ SEM_FN_NAME (m32rbf,or3) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = ORSI (* FLD (i_sr), FLD (f_uimm16));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -320,7 +320,7 @@ SEM_FN_NAME (m32rbf,xor) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = XORSI (* FLD (i_dr), * FLD (i_sr));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -341,7 +341,7 @@ SEM_FN_NAME (m32rbf,xor3) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = XORSI (* FLD (i_sr), FLD (f_uimm16));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -362,7 +362,7 @@ SEM_FN_NAME (m32rbf,addi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = ADDSI (* FLD (i_dr), FLD (f_simm8));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -387,12 +387,12 @@ do {
  {
    SI opval = temp0;
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  {
    BI opval = temp1;
    CPU (h_cond) = opval;
-    TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
  }
 } while (0);
@ -418,12 +418,12 @@ do {
  {
    SI opval = temp0;
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  {
    BI opval = temp1;
    CPU (h_cond) = opval;
-    TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
  }
 } while (0);
@ -449,12 +449,12 @@ do {
  {
    SI opval = temp0;
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  {
    BI opval = temp1;
    CPU (h_cond) = opval;
-    TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
  }
 } while (0);
@ -479,7 +479,7 @@ if (CPU (h_cond)) {
    USI opval = FLD (f_disp8);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -506,7 +506,7 @@ if (CPU (h_cond)) {
    USI opval = FLD (f_disp24);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -533,7 +533,7 @@ if (EQSI (* FLD (i_src1), * FLD (i_src2))) {
    USI opval = FLD (f_disp16);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -560,7 +560,7 @@ if (EQSI (* FLD (i_src2), 0)) {
    USI opval = FLD (f_disp16);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -587,7 +587,7 @@ if (GESI (* FLD (i_src2), 0)) {
    USI opval = FLD (f_disp16);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -614,7 +614,7 @@ if (GTSI (* FLD (i_src2), 0)) {
    USI opval = FLD (f_disp16);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -641,7 +641,7 @@ if (LESI (* FLD (i_src2), 0)) {
    USI opval = FLD (f_disp16);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -668,7 +668,7 @@ if (LTSI (* FLD (i_src2), 0)) {
    USI opval = FLD (f_disp16);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -695,7 +695,7 @@ if (NESI (* FLD (i_src2), 0)) {
    USI opval = FLD (f_disp16);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -721,12 +721,12 @@ do {
  {
    SI opval = ADDSI (ANDSI (pc, -4), 4);
    CPU (h_gr[((UINT) 14)]) = opval;
-    TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
  }
  {
    USI opval = FLD (f_disp8);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 } while (0);
@ -751,12 +751,12 @@ do {
  {
    SI opval = ADDSI (pc, 4);
    CPU (h_gr[((UINT) 14)]) = opval;
-    TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
  }
  {
    USI opval = FLD (f_disp24);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 } while (0);
@ -782,7 +782,7 @@ if (NOTBI (CPU (h_cond))) {
    USI opval = FLD (f_disp8);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -809,7 +809,7 @@ if (NOTBI (CPU (h_cond))) {
    USI opval = FLD (f_disp24);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -836,7 +836,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) {
    USI opval = FLD (f_disp16);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 }
@ -861,7 +861,7 @@ SEM_FN_NAME (m32rbf,bra8) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    USI opval = FLD (f_disp8);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
  SEM_BRANCH_FINI
@ -884,7 +884,7 @@ SEM_FN_NAME (m32rbf,bra24) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    USI opval = FLD (f_disp24);
    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
  SEM_BRANCH_FINI
@ -906,7 +906,7 @@ SEM_FN_NAME (m32rbf,cmp) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    BI opval = LTSI (* FLD (i_src1), * FLD (i_src2));
    CPU (h_cond) = opval;
-    TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
  }
  return vpc;
@ -927,7 +927,7 @@ SEM_FN_NAME (m32rbf,cmpi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    BI opval = LTSI (* FLD (i_src2), FLD (f_simm16));
    CPU (h_cond) = opval;
-    TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
  }
  return vpc;
@ -948,7 +948,7 @@ SEM_FN_NAME (m32rbf,cmpu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    BI opval = LTUSI (* FLD (i_src1), * FLD (i_src2));
    CPU (h_cond) = opval;
-    TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
  }
  return vpc;
@ -969,7 +969,7 @@ SEM_FN_NAME (m32rbf,cmpui) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    BI opval = LTUSI (* FLD (i_src2), FLD (f_simm16));
    CPU (h_cond) = opval;
-    TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
  }
  return vpc;
@ -992,7 +992,7 @@ if (NESI (* FLD (i_sr), 0)) {
    SI opval = DIVSI (* FLD (i_dr), * FLD (i_sr));
    * FLD (i_dr) = opval;
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 }
@ -1017,7 +1017,7 @@ if (NESI (* FLD (i_sr), 0)) {
    SI opval = UDIVSI (* FLD (i_dr), * FLD (i_sr));
    * FLD (i_dr) = opval;
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 }
@ -1042,7 +1042,7 @@ if (NESI (* FLD (i_sr), 0)) {
    SI opval = MODSI (* FLD (i_dr), * FLD (i_sr));
    * FLD (i_dr) = opval;
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 }
@ -1067,7 +1067,7 @@ if (NESI (* FLD (i_sr), 0)) {
    SI opval = UMODSI (* FLD (i_dr), * FLD (i_sr));
    * FLD (i_dr) = opval;
    written |= (1 << 2);
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 }
@ -1095,12 +1095,12 @@ do {
  {
    SI opval = temp0;
    CPU (h_gr[((UINT) 14)]) = opval;
-    TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
  }
  {
    USI opval = temp1;
    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 } while (0);
@ -1124,7 +1124,7 @@ SEM_FN_NAME (m32rbf,jmp) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    USI opval = ANDSI (* FLD (i_sr), -4);
    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
  SEM_BRANCH_FINI
@ -1146,7 +1146,7 @@ SEM_FN_NAME (m32rbf,ld) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = GETMEMSI (current_cpu, * FLD (i_sr));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -1167,7 +1167,7 @@ SEM_FN_NAME (m32rbf,ld_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = GETMEMSI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16)));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -1188,7 +1188,7 @@ SEM_FN_NAME (m32rbf,ldb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = EXTQISI (GETMEMQI (current_cpu, * FLD (i_sr)));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -1209,7 +1209,7 @@ SEM_FN_NAME (m32rbf,ldb_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = EXTQISI (GETMEMQI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -1230,7 +1230,7 @@ SEM_FN_NAME (m32rbf,ldh) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = EXTHISI (GETMEMHI (current_cpu, * FLD (i_sr)));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -1251,7 +1251,7 @@ SEM_FN_NAME (m32rbf,ldh_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = EXTHISI (GETMEMHI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -1272,7 +1272,7 @@ SEM_FN_NAME (m32rbf,ldub) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = ZEXTQISI (GETMEMQI (current_cpu, * FLD (i_sr)));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -1293,7 +1293,7 @@ SEM_FN_NAME (m32rbf,ldub_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = ZEXTQISI (GETMEMQI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -1314,7 +1314,7 @@ SEM_FN_NAME (m32rbf,lduh) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = ZEXTHISI (GETMEMHI (current_cpu, * FLD (i_sr)));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -1335,7 +1335,7 @@ SEM_FN_NAME (m32rbf,lduh_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = ZEXTHISI (GETMEMHI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -1360,12 +1360,12 @@ do {
  {
    SI opval = temp0;
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  {
    SI opval = temp1;
    * FLD (i_sr) = opval;
-    TRACE_RESULT (current_cpu, "sr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
  }
 } while (0);
@ -1387,7 +1387,7 @@ SEM_FN_NAME (m32rbf,ld24) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = FLD (f_uimm24);
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -1408,7 +1408,7 @@ SEM_FN_NAME (m32rbf,ldi8) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = FLD (f_simm8);
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -1429,7 +1429,7 @@ SEM_FN_NAME (m32rbf,ldi16) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = FLD (f_simm16);
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -1451,12 +1451,12 @@ do {
  {
    BI opval = 1;
    CPU (h_lock) = opval;
-    TRACE_RESULT (current_cpu, "lock-0", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "lock-0", 'x', opval);
  }
  {
    SI opval = GETMEMSI (current_cpu, * FLD (i_sr));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
 } while (0);
@ -1478,7 +1478,7 @@ SEM_FN_NAME (m32rbf,machi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    DI opval = SRADI (SLLDI (ADDDI (m32rbf_h_accum_get (current_cpu), MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))))), 8), 8);
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
  return vpc;
@ -1499,7 +1499,7 @@ SEM_FN_NAME (m32rbf,maclo) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    DI opval = SRADI (SLLDI (ADDDI (m32rbf_h_accum_get (current_cpu), MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))))), 8), 8);
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
  return vpc;
@ -1520,7 +1520,7 @@ SEM_FN_NAME (m32rbf,macwhi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    DI opval = SRADI (SLLDI (ADDDI (m32rbf_h_accum_get (current_cpu), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))))), 8), 8);
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
  return vpc;
@ -1541,7 +1541,7 @@ SEM_FN_NAME (m32rbf,macwlo) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    DI opval = SRADI (SLLDI (ADDDI (m32rbf_h_accum_get (current_cpu), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))))), 8), 8);
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
  return vpc;
@ -1562,7 +1562,7 @@ SEM_FN_NAME (m32rbf,mul) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = MULSI (* FLD (i_dr), * FLD (i_sr));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -1583,7 +1583,7 @@ SEM_FN_NAME (m32rbf,mulhi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    DI opval = SRADI (SLLDI (MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))), 16), 16);
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
  return vpc;
@ -1604,7 +1604,7 @@ SEM_FN_NAME (m32rbf,mullo) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    DI opval = SRADI (SLLDI (MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 16), 16);
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
  return vpc;
@ -1625,7 +1625,7 @@ SEM_FN_NAME (m32rbf,mulwhi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    DI opval = SRADI (SLLDI (MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))), 8), 8);
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
  return vpc;
@ -1646,7 +1646,7 @@ SEM_FN_NAME (m32rbf,mulwlo) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    DI opval = SRADI (SLLDI (MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 8), 8);
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
  return vpc;
@ -1667,7 +1667,7 @@ SEM_FN_NAME (m32rbf,mv) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = * FLD (i_sr);
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -1688,7 +1688,7 @@ SEM_FN_NAME (m32rbf,mvfachi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = TRUNCDISI (SRADI (m32rbf_h_accum_get (current_cpu), 32));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -1709,7 +1709,7 @@ SEM_FN_NAME (m32rbf,mvfaclo) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = TRUNCDISI (m32rbf_h_accum_get (current_cpu));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -1730,7 +1730,7 @@ SEM_FN_NAME (m32rbf,mvfacmi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = TRUNCDISI (SRADI (m32rbf_h_accum_get (current_cpu), 16));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -1751,7 +1751,7 @@ SEM_FN_NAME (m32rbf,mvfc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = m32rbf_h_cr_get (current_cpu, FLD (f_r2));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -1772,7 +1772,7 @@ SEM_FN_NAME (m32rbf,mvtachi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    DI opval = ORDI (ANDDI (m32rbf_h_accum_get (current_cpu), MAKEDI (0, 0xffffffff)), SLLDI (EXTSIDI (* FLD (i_src1)), 32));
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
  return vpc;
@ -1793,7 +1793,7 @@ SEM_FN_NAME (m32rbf,mvtaclo) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    DI opval = ORDI (ANDDI (m32rbf_h_accum_get (current_cpu), MAKEDI (0xffffffff, 0)), ZEXTSIDI (* FLD (i_src1)));
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
  return vpc;
@ -1814,7 +1814,7 @@ SEM_FN_NAME (m32rbf,mvtc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    USI opval = * FLD (i_sr);
    m32rbf_h_cr_set (current_cpu, FLD (f_r1), opval);
-    TRACE_RESULT (current_cpu, "dcr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dcr", 'x', opval);
  }
  return vpc;
@ -1835,7 +1835,7 @@ SEM_FN_NAME (m32rbf,neg) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = NEGSI (* FLD (i_sr));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -1873,7 +1873,7 @@ SEM_FN_NAME (m32rbf,not) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = INVSI (* FLD (i_sr));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -1898,7 +1898,7 @@ do {
  {
    DI opval = (GTDI (tmp_tmp1, MAKEDI (32767, 0xffff0000))) ? (MAKEDI (32767, 0xffff0000)) : (LTDI (tmp_tmp1, MAKEDI (0xffff8000, 0))) ? (MAKEDI (0xffff8000, 0)) : (ANDDI (tmp_tmp1, MAKEDI (0xffffffff, 0xffff0000)));
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
 } while (0);
@ -1933,7 +1933,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083
  {
    DI opval = SRADI (SLLDI (tmp_tmp1, 7), 7);
    m32rbf_h_accum_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "accum", 'D', opval);
+    TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
  }
 } while (0);
@ -1957,22 +1957,22 @@ do {
  {
    USI opval = ANDSI (m32rbf_h_cr_get (current_cpu, ((UINT) 6)), -4);
    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
  {
    USI opval = m32rbf_h_cr_get (current_cpu, ((UINT) 14));
    m32rbf_h_cr_set (current_cpu, ((UINT) 6), opval);
-    TRACE_RESULT (current_cpu, "cr-6", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval);
  }
  {
    UQI opval = CPU (h_bpsw);
    m32rbf_h_psw_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "psw-0", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "psw-0", 'x', opval);
  }
  {
    UQI opval = CPU (h_bbpsw);
    CPU (h_bpsw) = opval;
-    TRACE_RESULT (current_cpu, "bpsw-0", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "bpsw-0", 'x', opval);
  }
 } while (0);
@ -1995,7 +1995,7 @@ SEM_FN_NAME (m32rbf,seth) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = SLLSI (FLD (f_hi16), 16);
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -2016,7 +2016,7 @@ SEM_FN_NAME (m32rbf,sll) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = SLLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -2037,7 +2037,7 @@ SEM_FN_NAME (m32rbf,sll3) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = SLLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -2058,7 +2058,7 @@ SEM_FN_NAME (m32rbf,slli) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = SLLSI (* FLD (i_dr), FLD (f_uimm5));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -2079,7 +2079,7 @@ SEM_FN_NAME (m32rbf,sra) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = SRASI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -2100,7 +2100,7 @@ SEM_FN_NAME (m32rbf,sra3) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = SRASI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -2121,7 +2121,7 @@ SEM_FN_NAME (m32rbf,srai) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = SRASI (* FLD (i_dr), FLD (f_uimm5));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -2142,7 +2142,7 @@ SEM_FN_NAME (m32rbf,srl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = SRLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -2163,7 +2163,7 @@ SEM_FN_NAME (m32rbf,srl3) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = SRLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -2184,7 +2184,7 @@ SEM_FN_NAME (m32rbf,srli) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = SRLSI (* FLD (i_dr), FLD (f_uimm5));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -2205,7 +2205,7 @@ SEM_FN_NAME (m32rbf,st) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = * FLD (i_src1);
    SETMEMSI (current_cpu, * FLD (i_src2), opval);
-    TRACE_RESULT (current_cpu, "memory", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
  }
  return vpc;
@ -2226,7 +2226,7 @@ SEM_FN_NAME (m32rbf,st_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = * FLD (i_src1);
    SETMEMSI (current_cpu, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
-    TRACE_RESULT (current_cpu, "memory", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
  }
  return vpc;
@ -2247,7 +2247,7 @@ SEM_FN_NAME (m32rbf,stb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    QI opval = * FLD (i_src1);
    SETMEMQI (current_cpu, * FLD (i_src2), opval);
-    TRACE_RESULT (current_cpu, "memory", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
  }
  return vpc;
@ -2268,7 +2268,7 @@ SEM_FN_NAME (m32rbf,stb_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    QI opval = * FLD (i_src1);
    SETMEMQI (current_cpu, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
-    TRACE_RESULT (current_cpu, "memory", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
  }
  return vpc;
@ -2289,7 +2289,7 @@ SEM_FN_NAME (m32rbf,sth) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    HI opval = * FLD (i_src1);
    SETMEMHI (current_cpu, * FLD (i_src2), opval);
-    TRACE_RESULT (current_cpu, "memory", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
  }
  return vpc;
@ -2310,7 +2310,7 @@ SEM_FN_NAME (m32rbf,sth_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    HI opval = * FLD (i_src1);
    SETMEMHI (current_cpu, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
-    TRACE_RESULT (current_cpu, "memory", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
  }
  return vpc;
@ -2334,12 +2334,12 @@ do {
  {
    SI opval = * FLD (i_src1);
    SETMEMSI (current_cpu, tmp_new_src2, opval);
-    TRACE_RESULT (current_cpu, "memory", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
  }
  {
    SI opval = tmp_new_src2;
    * FLD (i_src2) = opval;
-    TRACE_RESULT (current_cpu, "src2", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval);
  }
 } while (0);
@ -2364,12 +2364,12 @@ do {
  {
    SI opval = * FLD (i_src1);
    SETMEMSI (current_cpu, tmp_new_src2, opval);
-    TRACE_RESULT (current_cpu, "memory", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
  }
  {
    SI opval = tmp_new_src2;
    * FLD (i_src2) = opval;
-    TRACE_RESULT (current_cpu, "src2", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval);
  }
 } while (0);
@ -2391,7 +2391,7 @@ SEM_FN_NAME (m32rbf,sub) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
  {
    SI opval = SUBSI (* FLD (i_dr), * FLD (i_sr));
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  return vpc;
@ -2416,12 +2416,12 @@ do {
  {
    SI opval = temp0;
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  {
    BI opval = temp1;
    CPU (h_cond) = opval;
-    TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
  }
 } while (0);
@ -2447,12 +2447,12 @@ do {
  {
    SI opval = temp0;
    * FLD (i_dr) = opval;
-    TRACE_RESULT (current_cpu, "dr", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
  }
  {
    BI opval = temp1;
    CPU (h_cond) = opval;
-    TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
  }
 } while (0);
@ -2476,32 +2476,32 @@ do {
  {
    USI opval = m32rbf_h_cr_get (current_cpu, ((UINT) 6));
    m32rbf_h_cr_set (current_cpu, ((UINT) 14), opval);
-    TRACE_RESULT (current_cpu, "cr-14", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "cr-14", 'x', opval);
  }
  {
    USI opval = ADDSI (pc, 4);
    m32rbf_h_cr_set (current_cpu, ((UINT) 6), opval);
-    TRACE_RESULT (current_cpu, "cr-6", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval);
  }
  {
    UQI opval = CPU (h_bpsw);
    CPU (h_bbpsw) = opval;
-    TRACE_RESULT (current_cpu, "bbpsw-0", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "bbpsw-0", 'x', opval);
  }
  {
    UQI opval = m32rbf_h_psw_get (current_cpu);
    CPU (h_bpsw) = opval;
-    TRACE_RESULT (current_cpu, "bpsw-0", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "bpsw-0", 'x', opval);
  }
  {
    UQI opval = ANDQI (m32rbf_h_psw_get (current_cpu), 128);
    m32rbf_h_psw_set (current_cpu, opval);
-    TRACE_RESULT (current_cpu, "psw-0", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "psw-0", 'x', opval);
  }
  {
    SI opval = m32r_trap (current_cpu, pc, FLD (f_uimm4));
    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
  }
 } while (0);
@ -2527,13 +2527,13 @@ if (CPU (h_lock)) {
    SI opval = * FLD (i_src1);
    SETMEMSI (current_cpu, * FLD (i_src2), opval);
    written |= (1 << 3);
-    TRACE_RESULT (current_cpu, "memory", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
  }
 }
  {
    BI opval = 0;
    CPU (h_lock) = opval;
-    TRACE_RESULT (current_cpu, "lock-0", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "lock-0", 'x', opval);
  }
 } while (0);
--- a/sim/m32r/semx-switch.c
+++ b/sim/m32r/semx-switch.c
--- a/sim/m32r/sim-main.h
+++ b/sim/m32r/sim-main.h
@ -1,19 +1,19 @@
 /* Main header for the m32r.  */
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 #define USING_SIM_BASE_H /* FIXME: quick hack */
 struct _sim_cpu; /* FIXME: should be in sim-basics.h */
 typedef struct _sim_cpu SIM_CPU;
 /* sim-basics.h includes config.h but cgen-types.h must be included before
   sim-basics.h and cgen-types.h needs config.h.  */
 #include "config.h"
 #include "ansidecl.h"
 #include "symcat.h"
 #include "cgen-types.h"
 #include "arch.h"
 #include "sim-basics.h"
 #include "cgen-types.h"
 #include "cpu-opc.h"
 #include "arch.h"
 /* These must be defined before sim-base.h.  */
 typedef USI sim_cia;
@ -23,11 +23,7 @@ typedef USI sim_cia;
 #include "sim-base.h"
 #include "cgen-sim.h"
 #include "cgen-scache.h"
 #include "cgen-cpu.h"
 #include "cgen-trace.h"
 #include "cpu-sim.h"
 #include "cpuall.h"
 /* The _sim_cpu struct.  */
@ -78,3 +74,5 @@ m32r_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), \
 /* Default memory size.  */
 #define M32R_DEFAULT_MEM_SIZE 0x800000 /* 8M */
 #endif /* SIM_MAIN_H */