* 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.

1 files changed, 119 insertions, 119 deletions

diff --git a/sim/m32r/sem.c b/sim/m32r/sem.c
index a08c88e..3ccb4db 100644
--- 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);