From 6856106382de516d221c27136a556693394e7c24 Mon Sep 17 00:00:00 2001 From: fche Date: Mon, 29 Jan 2001 20:03:25 +0000 Subject: [PATCH] [arm7t/ChangeLog] 2001-01-26 Frank Ch. Eigler * arm-decode.h, -sem.cxx: Regenerated with more tracing improvements, * thumb-decode.h, -sem.cxx: Ditto. [m32r/ChangeLog] 2001-01-26 Frank Ch. Eigler * m32r-decode.h, -sem.cxx: Regenerated with more tracing improvements. --- sid/component/cgen-cpu/arm7t/ChangeLog | 5 + sid/component/cgen-cpu/arm7t/arm-decode.h | 5 +- sid/component/cgen-cpu/arm7t/arm-sem.cxx | 412 ++++++++++++++-------------- sid/component/cgen-cpu/arm7t/thumb-decode.h | 5 +- sid/component/cgen-cpu/arm7t/thumb-sem.cxx | 190 ++++++------- sid/component/cgen-cpu/m32r/ChangeLog | 4 + sid/component/cgen-cpu/m32r/m32r-decode.h | 5 +- sid/component/cgen-cpu/m32r/m32r-sem.cxx | 130 ++++----- 8 files changed, 378 insertions(+), 378 deletions(-) diff --git a/sid/component/cgen-cpu/arm7t/ChangeLog b/sid/component/cgen-cpu/arm7t/ChangeLog index d50c492cc9..2379bee5b2 100644 --- a/sid/component/cgen-cpu/arm7t/ChangeLog +++ b/sid/component/cgen-cpu/arm7t/ChangeLog @@ -1,3 +1,8 @@ +2001-01-26 Frank Ch. Eigler + + * arm-decode.h, -sem.cxx: Regenerated with more tracing improvements, + * thumb-decode.h, -sem.cxx: Ditto. + 2001-01-15 Frank Ch. Eigler * arm-sem.cxx, thumb-sem.cxx: Regenerated with tracing improvements. diff --git a/sid/component/cgen-cpu/arm7t/arm-decode.h b/sid/component/cgen-cpu/arm7t/arm-decode.h index 82939e96a3..3868446d73 100644 --- a/sid/component/cgen-cpu/arm7t/arm-decode.h +++ b/sid/component/cgen-cpu/arm7t/arm-decode.h @@ -234,10 +234,7 @@ struct arm_scache { // argument buffer arm_sem_fields fields; - // writeback flags - // Only used if profiling or parallel execution support enabled during - // file generation. - unsigned written; + // decode given instruction void decode (arm7f_cpu* current_cpu, PCADDR pc, arm_insn_word base_insn, arm_insn_word entire_insn); diff --git a/sid/component/cgen-cpu/arm7t/arm-sem.cxx b/sid/component/cgen-cpu/arm7t/arm-sem.cxx index 436eb8f3ab..83cbc21b55 100644 --- a/sid/component/cgen-cpu/arm7t/arm-sem.cxx +++ b/sid/component/cgen-cpu/arm7t/arm-sem.cxx @@ -154,7 +154,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = current_cpu->GETMEMSI (pc, tmp_addr); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = SUBSI (* FLD (i_rn), tmp_offset); @@ -162,7 +162,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -199,7 +199,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = current_cpu->GETMEMSI (pc, tmp_addr); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = SUBSI (* FLD (i_rn), tmp_offset); @@ -207,7 +207,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -244,7 +244,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = current_cpu->GETMEMSI (pc, tmp_addr); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = ADDSI (* FLD (i_rn), tmp_offset); @@ -252,7 +252,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -289,7 +289,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = current_cpu->GETMEMSI (pc, tmp_addr); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = ADDSI (* FLD (i_rn), tmp_offset); @@ -297,7 +297,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -334,7 +334,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = current_cpu->GETMEMSI (pc, tmp_addr); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = SUBSI (* FLD (i_rn), tmp_offset); @@ -342,7 +342,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -379,7 +379,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = current_cpu->GETMEMSI (pc, tmp_addr); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = SUBSI (* FLD (i_rn), tmp_offset); @@ -387,7 +387,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -424,7 +424,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = current_cpu->GETMEMSI (pc, tmp_addr); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = ADDSI (* FLD (i_rn), tmp_offset); @@ -432,7 +432,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -469,7 +469,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = current_cpu->GETMEMSI (pc, tmp_addr); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = ADDSI (* FLD (i_rn), tmp_offset); @@ -477,7 +477,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -514,7 +514,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = current_cpu->GETMEMSI (pc, tmp_addr); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -554,7 +554,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = current_cpu->GETMEMSI (pc, tmp_addr); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -594,7 +594,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = current_cpu->GETMEMSI (pc, tmp_addr); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -634,7 +634,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = current_cpu->GETMEMSI (pc, tmp_addr); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -674,7 +674,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = current_cpu->GETMEMSI (pc, tmp_addr); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -682,7 +682,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -719,7 +719,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = current_cpu->GETMEMSI (pc, tmp_addr); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -727,7 +727,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -764,7 +764,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = current_cpu->GETMEMSI (pc, tmp_addr); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -772,7 +772,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -809,7 +809,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = current_cpu->GETMEMSI (pc, tmp_addr); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -817,7 +817,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -854,7 +854,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = SUBSI (* FLD (i_rn), tmp_offset); @@ -862,7 +862,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -899,7 +899,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = SUBSI (* FLD (i_rn), tmp_offset); @@ -907,7 +907,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -944,7 +944,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = ADDSI (* FLD (i_rn), tmp_offset); @@ -952,7 +952,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -989,7 +989,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = ADDSI (* FLD (i_rn), tmp_offset); @@ -997,7 +997,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1034,7 +1034,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = SUBSI (* FLD (i_rn), tmp_offset); @@ -1042,7 +1042,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1079,7 +1079,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = SUBSI (* FLD (i_rn), tmp_offset); @@ -1087,7 +1087,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1124,7 +1124,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = ADDSI (* FLD (i_rn), tmp_offset); @@ -1132,7 +1132,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1169,7 +1169,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = ADDSI (* FLD (i_rn), tmp_offset); @@ -1177,7 +1177,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1214,7 +1214,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -1254,7 +1254,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -1294,7 +1294,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -1334,7 +1334,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -1374,7 +1374,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -1382,7 +1382,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1419,7 +1419,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -1427,7 +1427,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1464,7 +1464,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -1472,7 +1472,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1509,7 +1509,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -1517,7 +1517,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1553,7 +1553,7 @@ arm_sem_str_post_dec_imm_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1589,7 +1589,7 @@ arm_sem_str_post_dec_reg_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1625,7 +1625,7 @@ arm_sem_str_post_inc_imm_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1661,7 +1661,7 @@ arm_sem_str_post_inc_reg_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1697,7 +1697,7 @@ arm_sem_str_post_dec_nonpriv_imm_offset (arm7f_cpu* current_cpu, arm_scache* sem SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1733,7 +1733,7 @@ arm_sem_str_post_dec_nonpriv_reg_offset (arm7f_cpu* current_cpu, arm_scache* sem SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1769,7 +1769,7 @@ arm_sem_str_post_inc_nonpriv_imm_offset (arm7f_cpu* current_cpu, arm_scache* sem SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1805,7 +1805,7 @@ arm_sem_str_post_inc_nonpriv_reg_offset (arm7f_cpu* current_cpu, arm_scache* sem SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1965,7 +1965,7 @@ arm_sem_str_pre_dec_wb_imm_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2001,7 +2001,7 @@ arm_sem_str_pre_dec_wb_reg_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2037,7 +2037,7 @@ arm_sem_str_pre_inc_wb_imm_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2073,7 +2073,7 @@ arm_sem_str_pre_inc_wb_reg_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2109,7 +2109,7 @@ arm_sem_strb_post_dec_imm_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2145,7 +2145,7 @@ arm_sem_strb_post_dec_reg_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2181,7 +2181,7 @@ arm_sem_strb_post_inc_imm_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2217,7 +2217,7 @@ arm_sem_strb_post_inc_reg_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2253,7 +2253,7 @@ arm_sem_strb_post_dec_nonpriv_imm_offset (arm7f_cpu* current_cpu, arm_scache* se SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2289,7 +2289,7 @@ arm_sem_strb_post_dec_nonpriv_reg_offset (arm7f_cpu* current_cpu, arm_scache* se SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2325,7 +2325,7 @@ arm_sem_strb_post_inc_nonpriv_imm_offset (arm7f_cpu* current_cpu, arm_scache* se SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2361,7 +2361,7 @@ arm_sem_strb_post_inc_nonpriv_reg_offset (arm7f_cpu* current_cpu, arm_scache* se SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2521,7 +2521,7 @@ arm_sem_strb_pre_dec_wb_imm_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2557,7 +2557,7 @@ arm_sem_strb_pre_dec_wb_reg_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2593,7 +2593,7 @@ arm_sem_strb_pre_inc_wb_imm_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2629,7 +2629,7 @@ arm_sem_strb_pre_inc_wb_reg_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2789,7 +2789,7 @@ arm_sem_strh_pre_dec_wb_imm_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2825,7 +2825,7 @@ arm_sem_strh_pre_dec_wb_reg_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2861,7 +2861,7 @@ arm_sem_strh_pre_inc_wb_imm_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2897,7 +2897,7 @@ arm_sem_strh_pre_inc_wb_reg_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2933,7 +2933,7 @@ arm_sem_strh_post_dec_imm_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2969,7 +2969,7 @@ arm_sem_strh_post_dec_reg_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -3005,7 +3005,7 @@ arm_sem_strh_post_inc_imm_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -3041,7 +3041,7 @@ arm_sem_strh_post_inc_reg_offset (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -3078,7 +3078,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -3118,7 +3118,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -3158,7 +3158,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -3198,7 +3198,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -3238,7 +3238,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -3246,7 +3246,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -3283,7 +3283,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -3291,7 +3291,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -3328,7 +3328,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -3336,7 +3336,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -3373,7 +3373,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -3381,7 +3381,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -3418,7 +3418,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = SUBSI (* FLD (i_rn), tmp_offset); @@ -3426,7 +3426,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -3463,7 +3463,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = SUBSI (* FLD (i_rn), tmp_offset); @@ -3471,7 +3471,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -3508,7 +3508,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = ADDSI (* FLD (i_rn), tmp_offset); @@ -3516,7 +3516,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -3553,7 +3553,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTQISI (current_cpu->GETMEMQI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = ADDSI (* FLD (i_rn), tmp_offset); @@ -3561,7 +3561,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -3598,7 +3598,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -3638,7 +3638,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -3678,7 +3678,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -3718,7 +3718,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -3758,7 +3758,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -3766,7 +3766,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -3803,7 +3803,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -3811,7 +3811,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -3848,7 +3848,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -3856,7 +3856,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -3893,7 +3893,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -3901,7 +3901,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -3938,7 +3938,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = SUBSI (* FLD (i_rn), tmp_offset); @@ -3946,7 +3946,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -3983,7 +3983,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = SUBSI (* FLD (i_rn), tmp_offset); @@ -3991,7 +3991,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -4028,7 +4028,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = ADDSI (* FLD (i_rn), tmp_offset); @@ -4036,7 +4036,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -4073,7 +4073,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = ZEXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = ADDSI (* FLD (i_rn), tmp_offset); @@ -4081,7 +4081,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -4118,7 +4118,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -4158,7 +4158,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -4198,7 +4198,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -4238,7 +4238,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -4278,7 +4278,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -4286,7 +4286,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -4323,7 +4323,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -4331,7 +4331,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -4368,7 +4368,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -4376,7 +4376,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -4413,7 +4413,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } ((void) 0); /*nop*/ @@ -4421,7 +4421,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -4458,7 +4458,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = SUBSI (* FLD (i_rn), tmp_offset); @@ -4466,7 +4466,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -4503,7 +4503,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = SUBSI (* FLD (i_rn), tmp_offset); @@ -4511,7 +4511,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -4548,7 +4548,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = ADDSI (* FLD (i_rn), tmp_offset); @@ -4556,7 +4556,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -4593,7 +4593,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = EXTHISI (current_cpu->GETMEMHI (pc, tmp_addr)); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } tmp_addr = ADDSI (* FLD (i_rn), tmp_offset); @@ -4601,7 +4601,7 @@ if (EQSI (FLD (f_rd), 15)) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -4628,7 +4628,7 @@ arm_sem_mul (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_result; * FLD (i_mul_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "mul-rd" << '[' << FLD (f_mul_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_mul_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -4670,7 +4670,7 @@ arm_sem_mla (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = ADDSI (MULSI (* FLD (i_rm), * FLD (i_rs)), * FLD (i_mul_rn)); * FLD (i_mul_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "mul-rd" << '[' << FLD (f_mul_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_mul_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -4715,13 +4715,13 @@ arm_sem_umull (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = SUBWORDDISI (tmp_mul_result, 0); * FLD (i_rdhi) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rdhi" << '[' << FLD (f_rdhi) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rdhi) << ']' << ":=0x" << hex << opval << dec << " "; } { SI opval = SUBWORDDISI (tmp_mul_result, 1); * FLD (i_rdlo) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rdlo" << '[' << FLD (f_rdlo) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rdlo) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -4767,13 +4767,13 @@ arm_sem_umlal (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = SUBWORDDISI (tmp_mul_result, 0); * FLD (i_rdhi) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rdhi" << '[' << FLD (f_rdhi) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rdhi) << ']' << ":=0x" << hex << opval << dec << " "; } { SI opval = SUBWORDDISI (tmp_mul_result, 1); * FLD (i_rdlo) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rdlo" << '[' << FLD (f_rdlo) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rdlo) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -4818,13 +4818,13 @@ arm_sem_smull (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = SUBWORDDISI (tmp_mul_result, 0); * FLD (i_rdhi) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rdhi" << '[' << FLD (f_rdhi) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rdhi) << ']' << ":=0x" << hex << opval << dec << " "; } { SI opval = SUBWORDDISI (tmp_mul_result, 1); * FLD (i_rdlo) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rdlo" << '[' << FLD (f_rdlo) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rdlo) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -4870,13 +4870,13 @@ arm_sem_smlal (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = SUBWORDDISI (tmp_mul_result, 0); * FLD (i_rdhi) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rdhi" << '[' << FLD (f_rdhi) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rdhi) << ']' << ":=0x" << hex << opval << dec << " "; } { SI opval = SUBWORDDISI (tmp_mul_result, 1); * FLD (i_rdlo) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rdlo" << '[' << FLD (f_rdlo) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rdlo) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -4925,7 +4925,7 @@ arm_sem_swp (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_temp; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -4958,7 +4958,7 @@ arm_sem_swpb (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = tmp_temp; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -5031,7 +5031,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -5107,7 +5107,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -5179,7 +5179,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -5247,7 +5247,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -5323,7 +5323,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -5395,7 +5395,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -5463,7 +5463,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -5539,7 +5539,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -5611,7 +5611,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -5679,7 +5679,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -5755,7 +5755,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -5827,7 +5827,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -5895,7 +5895,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -5971,7 +5971,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -6043,7 +6043,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -6111,7 +6111,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -6187,7 +6187,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -6259,7 +6259,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -6329,7 +6329,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -6415,7 +6415,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -6527,7 +6527,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } } @@ -6581,7 +6581,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -6667,7 +6667,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -6779,7 +6779,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } } @@ -6833,7 +6833,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -6919,7 +6919,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -7031,7 +7031,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } } @@ -7085,7 +7085,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -7171,7 +7171,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -7283,7 +7283,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } } @@ -7337,7 +7337,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -7423,7 +7423,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -7535,7 +7535,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } } @@ -7589,7 +7589,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -7675,7 +7675,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } if (FLD (f_set_cc_)) { { @@ -7787,7 +7787,7 @@ if (FLD (f_set_cc_)) { SI opval = tmp_result; * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } } @@ -8841,7 +8841,7 @@ if (ANDSI (FLD (f_reg_list), SLLSI (1, 0))) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -9241,7 +9241,7 @@ if (ANDSI (FLD (f_reg_list), SLLSI (1, 15))) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -9641,7 +9641,7 @@ if (ANDSI (FLD (f_reg_list), SLLSI (1, 15))) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -10041,7 +10041,7 @@ if (ANDSI (FLD (f_reg_list), SLLSI (1, 0))) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -10441,7 +10441,7 @@ if (ANDSI (FLD (f_reg_list), SLLSI (1, 0))) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -10841,7 +10841,7 @@ if (ANDSI (FLD (f_reg_list), SLLSI (1, 15))) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -11241,7 +11241,7 @@ if (ANDSI (FLD (f_reg_list), SLLSI (1, 15))) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -11641,7 +11641,7 @@ if (ANDSI (FLD (f_reg_list), SLLSI (1, 0))) { SI opval = tmp_addr; * FLD (i_rn) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rn" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rn) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -11665,7 +11665,7 @@ arm_sem_mrs_c (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = current_cpu->h_cpsr_get (); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -11688,7 +11688,7 @@ arm_sem_mrs_s (arm7f_cpu* current_cpu, arm_scache* sem) SI opval = current_cpu->h_spsr_get (); * FLD (i_rd) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); diff --git a/sid/component/cgen-cpu/arm7t/thumb-decode.h b/sid/component/cgen-cpu/arm7t/thumb-decode.h index 7ca38668ab..671d654dbe 100644 --- a/sid/component/cgen-cpu/arm7t/thumb-decode.h +++ b/sid/component/cgen-cpu/arm7t/thumb-decode.h @@ -181,10 +181,7 @@ struct thumb_scache { // argument buffer thumb_sem_fields fields; - // writeback flags - // Only used if profiling or parallel execution support enabled during - // file generation. - unsigned written; + // decode given instruction void decode (arm7f_cpu* current_cpu, PCADDR pc, thumb_insn_word base_insn, thumb_insn_word entire_insn); diff --git a/sid/component/cgen-cpu/arm7t/thumb-sem.cxx b/sid/component/cgen-cpu/arm7t/thumb-sem.cxx index 4df7103522..d25fa406ca 100644 --- a/sid/component/cgen-cpu/arm7t/thumb-sem.cxx +++ b/sid/component/cgen-cpu/arm7t/thumb-sem.cxx @@ -57,7 +57,7 @@ thumb_sem_lsl (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = SLLSI (current_cpu->thumb_h_gr_t_get (FLD (f_rs)), FLD (f_offset5)); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } { { @@ -106,7 +106,7 @@ thumb_sem_lsr (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = SRLSI (current_cpu->thumb_h_gr_t_get (FLD (f_rs)), FLD (f_offset5)); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } { { @@ -155,7 +155,7 @@ thumb_sem_asr (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = SRASI (current_cpu->thumb_h_gr_t_get (FLD (f_rs)), FLD (f_offset5)); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } { { @@ -232,7 +232,7 @@ thumb_sem_add (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_rs)), current_cpu->thumb_h_gr_t_get (FLD (f_rn))); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -287,7 +287,7 @@ thumb_sem_addi (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_rs)), FLD (f_offset3)); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -342,7 +342,7 @@ thumb_sem_sub (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = SUBSI (current_cpu->thumb_h_gr_t_get (FLD (f_rs)), current_cpu->thumb_h_gr_t_get (FLD (f_rn))); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -397,7 +397,7 @@ thumb_sem_subi (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = SUBSI (current_cpu->thumb_h_gr_t_get (FLD (f_rs)), FLD (f_offset3)); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -422,7 +422,7 @@ thumb_sem_mov (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = FLD (f_offset8); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rd" << '[' << FLD (f_bit10_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rd) << ']' << ":=0x" << hex << opval << dec << " "; } { { @@ -538,7 +538,7 @@ thumb_sem_addi8 (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_bit10_rd)), FLD (f_offset8)); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rd" << '[' << FLD (f_bit10_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -593,7 +593,7 @@ thumb_sem_subi8 (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = SUBSI (current_cpu->thumb_h_gr_t_get (FLD (f_bit10_rd)), FLD (f_offset8)); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rd" << '[' << FLD (f_bit10_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -618,7 +618,7 @@ thumb_sem_alu_and (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = ANDSI (current_cpu->thumb_h_gr_t_get (FLD (f_rd)), current_cpu->thumb_h_gr_t_get (FLD (f_rs))); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } { { @@ -657,7 +657,7 @@ thumb_sem_alu_eor (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = XORSI (current_cpu->thumb_h_gr_t_get (FLD (f_rd)), current_cpu->thumb_h_gr_t_get (FLD (f_rs))); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } { { @@ -700,7 +700,7 @@ thumb_sem_alu_lsl (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = tmp_result; current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } { { @@ -751,7 +751,7 @@ thumb_sem_alu_lsr (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = tmp_result; current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } { { @@ -802,7 +802,7 @@ thumb_sem_alu_asr (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = tmp_result; current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } { { @@ -853,7 +853,7 @@ thumb_sem_alu_ror (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = tmp_result; current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } { { @@ -932,7 +932,7 @@ thumb_sem_alu_adc (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = tmp_result; current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -989,7 +989,7 @@ thumb_sem_alu_sbc (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = tmp_result; current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1081,7 +1081,7 @@ thumb_sem_alu_neg (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = tmp_result; current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1200,7 +1200,7 @@ thumb_sem_alu_orr (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = ORSI (current_cpu->thumb_h_gr_t_get (FLD (f_rd)), current_cpu->thumb_h_gr_t_get (FLD (f_rs))); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } { { @@ -1239,7 +1239,7 @@ thumb_sem_alu_mul (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = MULSI (current_cpu->thumb_h_gr_t_get (FLD (f_rd)), current_cpu->thumb_h_gr_t_get (FLD (f_rs))); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } { { @@ -1278,7 +1278,7 @@ thumb_sem_alu_bic (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = ANDSI (current_cpu->thumb_h_gr_t_get (FLD (f_rd)), INVSI (current_cpu->thumb_h_gr_t_get (FLD (f_rs)))); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } { { @@ -1317,7 +1317,7 @@ thumb_sem_alu_mvn (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = INVSI (current_cpu->thumb_h_gr_t_get (FLD (f_rs))); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } { { @@ -1355,7 +1355,7 @@ thumb_sem_add_rd_hs (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_rd)), current_cpu->thumb_h_hiregs_get (FLD (f_rs))); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1386,7 +1386,7 @@ if (EQSI (FLD (f_rd), 7)) { SI opval = ADDSI (current_cpu->thumb_h_hiregs_get (FLD (f_rd)), current_cpu->thumb_h_gr_t_get (FLD (f_rs))); current_cpu->thumb_h_hiregs_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "hd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "hiregs" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1418,7 +1418,7 @@ if (EQSI (FLD (f_rd), 7)) { SI opval = ADDSI (current_cpu->thumb_h_hiregs_get (FLD (f_rd)), current_cpu->thumb_h_hiregs_get (FLD (f_rs))); current_cpu->thumb_h_hiregs_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "hd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "hiregs" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1583,7 +1583,7 @@ thumb_sem_mov_rd_hs (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = current_cpu->thumb_h_hiregs_get (FLD (f_rs)); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1614,7 +1614,7 @@ if (EQSI (FLD (f_rd), 7)) { SI opval = current_cpu->thumb_h_gr_t_get (FLD (f_rs)); current_cpu->thumb_h_hiregs_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "hd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "hiregs" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1646,7 +1646,7 @@ if (EQSI (FLD (f_rd), 7)) { SI opval = current_cpu->thumb_h_hiregs_get (FLD (f_rs)); current_cpu->thumb_h_hiregs_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "hd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "hiregs" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1736,7 +1736,7 @@ thumb_sem_ldr_pc (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = current_cpu->GETMEMSI (pc, ADDSI (ANDSI (ADDSI (pc, 4), -4), FLD (f_word8))); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rd" << '[' << FLD (f_bit10_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rd) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1805,7 +1805,7 @@ thumb_sem_ldr (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = current_cpu->GETMEMSI (pc, ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_rb)), current_cpu->thumb_h_gr_t_get (FLD (f_ro)))); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1828,7 +1828,7 @@ thumb_sem_ldrb (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = ZEXTQISI (current_cpu->GETMEMQI (pc, ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_rb)), current_cpu->thumb_h_gr_t_get (FLD (f_ro))))); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1874,7 +1874,7 @@ thumb_sem_ldrh (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = ZEXTHISI (current_cpu->GETMEMHI (pc, ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_rb)), current_cpu->thumb_h_gr_t_get (FLD (f_ro))))); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1897,7 +1897,7 @@ thumb_sem_ldsb (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = EXTQISI (current_cpu->GETMEMQI (pc, ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_rb)), current_cpu->thumb_h_gr_t_get (FLD (f_ro))))); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1920,7 +1920,7 @@ thumb_sem_ldsh (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = EXTHISI (current_cpu->GETMEMHI (pc, ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_rb)), current_cpu->thumb_h_gr_t_get (FLD (f_ro))))); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1966,7 +1966,7 @@ thumb_sem_ldr_imm (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = current_cpu->GETMEMSI (pc, ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_rb)), FLD (f_offset5_7))); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -2012,7 +2012,7 @@ thumb_sem_ldrb_imm (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = ZEXTQISI (current_cpu->GETMEMQI (pc, ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_rb)), FLD (f_offset5)))); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -2058,7 +2058,7 @@ thumb_sem_ldrh_imm (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = ZEXTHISI (current_cpu->GETMEMHI (pc, ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_rb)), FLD (f_offset5_6)))); current_cpu->thumb_h_gr_t_set (FLD (f_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "rd" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_rd) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -2104,7 +2104,7 @@ thumb_sem_ldr_sprel (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = current_cpu->GETMEMSI (pc, ADDSI (current_cpu->thumb_h_sp_t_get (), FLD (f_word8))); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rd" << '[' << FLD (f_bit10_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rd) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -2127,7 +2127,7 @@ thumb_sem_lda_pc (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = ADDSI (ANDSI (ADDSI (pc, 4), -4), FLD (f_word8)); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rd" << '[' << FLD (f_bit10_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rd) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -2150,7 +2150,7 @@ thumb_sem_lda_sp (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = ADDSI (current_cpu->thumb_h_sp_t_get (), FLD (f_word8)); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rd), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rd" << '[' << FLD (f_bit10_rd) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rd) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -2173,7 +2173,7 @@ thumb_sem_add_sp (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = ADDSI (current_cpu->thumb_h_sp_t_get (), FLD (f_sword7)); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -2196,7 +2196,7 @@ thumb_sem_sub_sp (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = SUBSI (current_cpu->thumb_h_sp_t_get (), FLD (f_sword7)); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -2222,7 +2222,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 7))) { SI opval = SUBSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } { SI opval = current_cpu->thumb_h_gr_t_get (((UINT) 7)); @@ -2238,7 +2238,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 6))) { SI opval = SUBSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } { SI opval = current_cpu->thumb_h_gr_t_get (((UINT) 6)); @@ -2254,7 +2254,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 5))) { SI opval = SUBSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } { SI opval = current_cpu->thumb_h_gr_t_get (((UINT) 5)); @@ -2270,7 +2270,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 4))) { SI opval = SUBSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } { SI opval = current_cpu->thumb_h_gr_t_get (((UINT) 4)); @@ -2286,7 +2286,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 3))) { SI opval = SUBSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } { SI opval = current_cpu->thumb_h_gr_t_get (((UINT) 3)); @@ -2302,7 +2302,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 2))) { SI opval = SUBSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } { SI opval = current_cpu->thumb_h_gr_t_get (((UINT) 2)); @@ -2318,7 +2318,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 1))) { SI opval = SUBSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } { SI opval = current_cpu->thumb_h_gr_t_get (((UINT) 1)); @@ -2334,7 +2334,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 0))) { SI opval = SUBSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } { SI opval = current_cpu->thumb_h_gr_t_get (((UINT) 0)); @@ -2367,7 +2367,7 @@ thumb_sem_push_lr (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = SUBSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } { SI opval = current_cpu->thumb_h_lr_t_get (); @@ -2381,7 +2381,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 7))) { SI opval = SUBSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } { SI opval = current_cpu->thumb_h_gr_t_get (((UINT) 7)); @@ -2397,7 +2397,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 6))) { SI opval = SUBSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } { SI opval = current_cpu->thumb_h_gr_t_get (((UINT) 6)); @@ -2413,7 +2413,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 5))) { SI opval = SUBSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } { SI opval = current_cpu->thumb_h_gr_t_get (((UINT) 5)); @@ -2429,7 +2429,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 4))) { SI opval = SUBSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } { SI opval = current_cpu->thumb_h_gr_t_get (((UINT) 4)); @@ -2445,7 +2445,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 3))) { SI opval = SUBSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } { SI opval = current_cpu->thumb_h_gr_t_get (((UINT) 3)); @@ -2461,7 +2461,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 2))) { SI opval = SUBSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } { SI opval = current_cpu->thumb_h_gr_t_get (((UINT) 2)); @@ -2477,7 +2477,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 1))) { SI opval = SUBSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } { SI opval = current_cpu->thumb_h_gr_t_get (((UINT) 1)); @@ -2493,7 +2493,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 0))) { SI opval = SUBSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } { SI opval = current_cpu->thumb_h_gr_t_get (((UINT) 0)); @@ -2534,7 +2534,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 0))) { SI opval = ADDSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } } } @@ -2550,7 +2550,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 1))) { SI opval = ADDSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } } } @@ -2566,7 +2566,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 2))) { SI opval = ADDSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } } } @@ -2582,7 +2582,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 3))) { SI opval = ADDSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } } } @@ -2598,7 +2598,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 4))) { SI opval = ADDSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } } } @@ -2614,7 +2614,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 5))) { SI opval = ADDSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } } } @@ -2630,7 +2630,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 6))) { SI opval = ADDSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } } } @@ -2646,7 +2646,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 7))) { SI opval = ADDSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } } } @@ -2681,7 +2681,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 0))) { SI opval = ADDSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } } } @@ -2697,7 +2697,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 1))) { SI opval = ADDSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } } } @@ -2713,7 +2713,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 2))) { SI opval = ADDSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } } } @@ -2729,7 +2729,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 3))) { SI opval = ADDSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } } } @@ -2745,7 +2745,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 4))) { SI opval = ADDSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } } } @@ -2761,7 +2761,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 5))) { SI opval = ADDSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } } } @@ -2777,7 +2777,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 6))) { SI opval = ADDSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } } } @@ -2793,7 +2793,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 7))) { SI opval = ADDSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } } } @@ -2807,7 +2807,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 7))) { SI opval = ADDSI (current_cpu->thumb_h_sp_t_get (), 4); current_cpu->thumb_h_sp_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sp" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "sp-t" << ":=0x" << hex << opval << dec << " "; } } @@ -2840,7 +2840,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 0))) { SI opval = ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_bit10_rb)), 4); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rb), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rb" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; } } } @@ -2856,7 +2856,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 1))) { SI opval = ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_bit10_rb)), 4); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rb), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rb" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; } } } @@ -2872,7 +2872,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 2))) { SI opval = ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_bit10_rb)), 4); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rb), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rb" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; } } } @@ -2888,7 +2888,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 3))) { SI opval = ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_bit10_rb)), 4); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rb), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rb" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; } } } @@ -2904,7 +2904,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 4))) { SI opval = ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_bit10_rb)), 4); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rb), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rb" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; } } } @@ -2920,7 +2920,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 5))) { SI opval = ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_bit10_rb)), 4); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rb), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rb" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; } } } @@ -2936,7 +2936,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 6))) { SI opval = ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_bit10_rb)), 4); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rb), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rb" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; } } } @@ -2952,7 +2952,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 7))) { SI opval = ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_bit10_rb)), 4); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rb), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rb" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; } } } @@ -2987,7 +2987,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 0))) { SI opval = ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_bit10_rb)), 4); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rb), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rb" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; } } } @@ -3003,7 +3003,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 1))) { SI opval = ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_bit10_rb)), 4); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rb), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rb" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; } } } @@ -3019,7 +3019,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 2))) { SI opval = ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_bit10_rb)), 4); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rb), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rb" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; } } } @@ -3035,7 +3035,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 3))) { SI opval = ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_bit10_rb)), 4); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rb), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rb" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; } } } @@ -3051,7 +3051,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 4))) { SI opval = ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_bit10_rb)), 4); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rb), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rb" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; } } } @@ -3067,7 +3067,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 5))) { SI opval = ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_bit10_rb)), 4); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rb), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rb" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; } } } @@ -3083,7 +3083,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 6))) { SI opval = ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_bit10_rb)), 4); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rb), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rb" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; } } } @@ -3099,7 +3099,7 @@ if (ANDSI (FLD (f_rlist), SLLSI (1, 7))) { SI opval = ADDSI (current_cpu->thumb_h_gr_t_get (FLD (f_bit10_rb)), 4); current_cpu->thumb_h_gr_t_set (FLD (f_bit10_rb), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "bit10-rb" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr-t" << '[' << FLD (f_bit10_rb) << ']' << ":=0x" << hex << opval << dec << " "; } } } @@ -3521,7 +3521,7 @@ thumb_sem_bl_hi (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = ADDSI (ADDSI (pc, 4), SLLSI (FLD (f_lbwl_hi), 12)); current_cpu->thumb_h_lr_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "lr" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "lr-t" << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -3553,7 +3553,7 @@ thumb_sem_bl_lo (arm7f_cpu* current_cpu, thumb_scache* sem) SI opval = ORSI (ADDSI (tmp_cur_pc, 2), 1); current_cpu->thumb_h_lr_t_set (opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "lr" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "lr-t" << ":=0x" << hex << opval << dec << " "; } } diff --git a/sid/component/cgen-cpu/m32r/ChangeLog b/sid/component/cgen-cpu/m32r/ChangeLog index f17bba02ec..26f4a4efbb 100644 --- a/sid/component/cgen-cpu/m32r/ChangeLog +++ b/sid/component/cgen-cpu/m32r/ChangeLog @@ -1,3 +1,7 @@ +2001-01-26 Frank Ch. Eigler + + * m32r-decode.h, -sem.cxx: Regenerated with more tracing improvements. + 2001-01-15 Frank Ch. Eigler * m32r-sem.cxx: Regenerated with tracing improvements. diff --git a/sid/component/cgen-cpu/m32r/m32r-decode.h b/sid/component/cgen-cpu/m32r/m32r-decode.h index cac06ea628..2a6227d21f 100644 --- a/sid/component/cgen-cpu/m32r/m32r-decode.h +++ b/sid/component/cgen-cpu/m32r/m32r-decode.h @@ -169,10 +169,7 @@ struct m32rbf_scache { // argument buffer m32rbf_sem_fields fields; - // writeback flags - // Only used if profiling or parallel execution support enabled during - // file generation. - unsigned written; + // decode given instruction void decode (m32rbf_cpu* current_cpu, PCADDR pc, m32rbf_insn_word base_insn, m32rbf_insn_word entire_insn); diff --git a/sid/component/cgen-cpu/m32r/m32r-sem.cxx b/sid/component/cgen-cpu/m32r/m32r-sem.cxx index 8feb92c198..fd5c281c4f 100644 --- a/sid/component/cgen-cpu/m32r/m32r-sem.cxx +++ b/sid/component/cgen-cpu/m32r/m32r-sem.cxx @@ -54,7 +54,7 @@ m32rbf_sem_add (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = ADDSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -77,7 +77,7 @@ m32rbf_sem_add3 (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = ADDSI (* FLD (i_sr), FLD (f_simm16)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -100,7 +100,7 @@ m32rbf_sem_and (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = ANDSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -123,7 +123,7 @@ m32rbf_sem_and3 (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = ANDSI (* FLD (i_sr), FLD (f_uimm16)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -146,7 +146,7 @@ m32rbf_sem_or (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = ORSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -169,7 +169,7 @@ m32rbf_sem_or3 (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = ORSI (* FLD (i_sr), FLD (f_uimm16)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -192,7 +192,7 @@ m32rbf_sem_xor (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = XORSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -215,7 +215,7 @@ m32rbf_sem_xor3 (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = XORSI (* FLD (i_sr), FLD (f_uimm16)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -238,7 +238,7 @@ m32rbf_sem_addi (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = ADDSI (* FLD (i_dr), FLD (f_simm8)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -265,13 +265,13 @@ m32rbf_sem_addv (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = temp0; * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } { BI opval = temp1; current_cpu->hardware.h_cond = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "condbit" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "cond" << ":=0x" << hex << opval << dec << " "; } } @@ -299,13 +299,13 @@ m32rbf_sem_addv3 (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = temp0; * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } { BI opval = temp1; current_cpu->hardware.h_cond = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "condbit" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "cond" << ":=0x" << hex << opval << dec << " "; } } @@ -333,13 +333,13 @@ m32rbf_sem_addx (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = temp0; * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } { BI opval = temp1; current_cpu->hardware.h_cond = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "condbit" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "cond" << ":=0x" << hex << opval << dec << " "; } } @@ -771,7 +771,7 @@ m32rbf_sem_cmp (m32rbf_cpu* current_cpu, m32rbf_scache* sem) BI opval = LTSI (* FLD (i_src1), * FLD (i_src2)); current_cpu->hardware.h_cond = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "condbit" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "cond" << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -794,7 +794,7 @@ m32rbf_sem_cmpi (m32rbf_cpu* current_cpu, m32rbf_scache* sem) BI opval = LTSI (* FLD (i_src2), FLD (f_simm16)); current_cpu->hardware.h_cond = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "condbit" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "cond" << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -817,7 +817,7 @@ m32rbf_sem_cmpu (m32rbf_cpu* current_cpu, m32rbf_scache* sem) BI opval = LTUSI (* FLD (i_src1), * FLD (i_src2)); current_cpu->hardware.h_cond = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "condbit" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "cond" << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -840,7 +840,7 @@ m32rbf_sem_cmpui (m32rbf_cpu* current_cpu, m32rbf_scache* sem) BI opval = LTUSI (* FLD (i_src2), FLD (f_simm16)); current_cpu->hardware.h_cond = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "condbit" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "cond" << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -864,7 +864,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = DIVSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -889,7 +889,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = UDIVSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -914,7 +914,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = MODSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -939,7 +939,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = UMODSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1020,7 +1020,7 @@ m32rbf_sem_ld (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = current_cpu->GETMEMSI (pc, * FLD (i_sr)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1043,7 +1043,7 @@ m32rbf_sem_ld_d (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = current_cpu->GETMEMSI (pc, ADDSI (* FLD (i_sr), FLD (f_simm16))); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1066,7 +1066,7 @@ m32rbf_sem_ldb (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = EXTQISI (current_cpu->GETMEMQI (pc, * FLD (i_sr))); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1089,7 +1089,7 @@ m32rbf_sem_ldb_d (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = EXTQISI (current_cpu->GETMEMQI (pc, ADDSI (* FLD (i_sr), FLD (f_simm16)))); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1112,7 +1112,7 @@ m32rbf_sem_ldh (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = EXTHISI (current_cpu->GETMEMHI (pc, * FLD (i_sr))); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1135,7 +1135,7 @@ m32rbf_sem_ldh_d (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = EXTHISI (current_cpu->GETMEMHI (pc, ADDSI (* FLD (i_sr), FLD (f_simm16)))); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1158,7 +1158,7 @@ m32rbf_sem_ldub (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = ZEXTQISI (current_cpu->GETMEMQI (pc, * FLD (i_sr))); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1181,7 +1181,7 @@ m32rbf_sem_ldub_d (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = ZEXTQISI (current_cpu->GETMEMQI (pc, ADDSI (* FLD (i_sr), FLD (f_simm16)))); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1204,7 +1204,7 @@ m32rbf_sem_lduh (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = ZEXTHISI (current_cpu->GETMEMHI (pc, * FLD (i_sr))); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1227,7 +1227,7 @@ m32rbf_sem_lduh_d (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = ZEXTHISI (current_cpu->GETMEMHI (pc, ADDSI (* FLD (i_sr), FLD (f_simm16)))); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1254,13 +1254,13 @@ m32rbf_sem_ld_plus (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = temp0; * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } { SI opval = temp1; * FLD (i_sr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "sr" << '[' << FLD (f_r2) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r2) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1284,7 +1284,7 @@ m32rbf_sem_ld24 (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = FLD (i_uimm24); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1307,7 +1307,7 @@ m32rbf_sem_ldi8 (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = FLD (f_simm8); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1330,7 +1330,7 @@ m32rbf_sem_ldi16 (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = FLD (f_simm16); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1360,7 +1360,7 @@ m32rbf_sem_lock (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = current_cpu->GETMEMSI (pc, * FLD (i_sr)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -1476,7 +1476,7 @@ m32rbf_sem_mul (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = MULSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1591,7 +1591,7 @@ m32rbf_sem_mv (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = * FLD (i_sr); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1614,7 +1614,7 @@ m32rbf_sem_mvfachi (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = TRUNCDISI (SRADI (current_cpu->h_accum_get (), 32)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1637,7 +1637,7 @@ m32rbf_sem_mvfaclo (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = TRUNCDISI (current_cpu->h_accum_get ()); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1660,7 +1660,7 @@ m32rbf_sem_mvfacmi (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = TRUNCDISI (SRADI (current_cpu->h_accum_get (), 16)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1683,7 +1683,7 @@ m32rbf_sem_mvfc (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = current_cpu->h_cr_get (FLD (f_r2)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1752,7 +1752,7 @@ m32rbf_sem_mvtc (m32rbf_cpu* current_cpu, m32rbf_scache* sem) USI opval = * FLD (i_sr); current_cpu->h_cr_set (FLD (f_r1), opval); if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dcr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "cr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1775,7 +1775,7 @@ m32rbf_sem_neg (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = NEGSI (* FLD (i_sr)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1816,7 +1816,7 @@ m32rbf_sem_not (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = INVSI (* FLD (i_sr)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1947,7 +1947,7 @@ m32rbf_sem_seth (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = SLLSI (FLD (f_hi16), 16); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1970,7 +1970,7 @@ m32rbf_sem_sll (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = SLLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -1993,7 +1993,7 @@ m32rbf_sem_sll3 (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = SLLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -2016,7 +2016,7 @@ m32rbf_sem_slli (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = SLLSI (* FLD (i_dr), FLD (f_uimm5)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -2039,7 +2039,7 @@ m32rbf_sem_sra (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = SRASI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -2062,7 +2062,7 @@ m32rbf_sem_sra3 (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = SRASI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -2085,7 +2085,7 @@ m32rbf_sem_srai (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = SRASI (* FLD (i_dr), FLD (f_uimm5)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -2108,7 +2108,7 @@ m32rbf_sem_srl (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = SRLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -2131,7 +2131,7 @@ m32rbf_sem_srl3 (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = SRLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -2154,7 +2154,7 @@ m32rbf_sem_srli (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = SRLSI (* FLD (i_dr), FLD (f_uimm5)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -2324,7 +2324,7 @@ m32rbf_sem_st_plus (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = tmp_new_src2; * FLD (i_src2) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "src2" << '[' << FLD (f_r2) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r2) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2357,7 +2357,7 @@ m32rbf_sem_st_minus (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = tmp_new_src2; * FLD (i_src2) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "src2" << '[' << FLD (f_r2) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r2) << ']' << ":=0x" << hex << opval << dec << " "; } } @@ -2381,7 +2381,7 @@ m32rbf_sem_sub (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = SUBSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } current_cpu->done_insn (npc, status); @@ -2408,13 +2408,13 @@ m32rbf_sem_subv (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = temp0; * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } { BI opval = temp1; current_cpu->hardware.h_cond = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "condbit" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "cond" << ":=0x" << hex << opval << dec << " "; } } @@ -2442,13 +2442,13 @@ m32rbf_sem_subx (m32rbf_cpu* current_cpu, m32rbf_scache* sem) SI opval = temp0; * FLD (i_dr) = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "dr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "gr" << '[' << FLD (f_r1) << ']' << ":=0x" << hex << opval << dec << " "; } { BI opval = temp1; current_cpu->hardware.h_cond = opval; if (current_cpu->trace_result_p) - current_cpu->trace_stream << "condbit" << ":=0x" << hex << opval << dec << " "; + current_cpu->trace_stream << "cond" << ":=0x" << hex << opval << dec << " "; } } -- 2.11.0