diff options
Diffstat (limited to 'sim/m32r/sem.c')
-rw-r--r-- | sim/m32r/sem.c | 148 |
1 files changed, 76 insertions, 72 deletions
diff --git a/sim/m32r/sem.c b/sim/m32r/sem.c index cea7b58..3fa4f59 100644 --- a/sim/m32r/sem.c +++ b/sim/m32r/sem.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU Simulators. @@ -30,7 +30,11 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "cgen-ops.h" #undef GET_ATTR +#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE) #define GET_ATTR(cpu, num, attr) CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_##attr) +#else +#define GET_ATTR(cpu, num, attr) CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_/**/attr) +#endif /* This is used so that we can compile two copies of the semantic code, one with full feature support and one without that runs fast(er). @@ -211,7 +215,7 @@ SEM_FN_NAME (m32rbf,add) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -232,7 +236,7 @@ SEM_FN_NAME (m32rbf,add3) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (* FLD (i_sr), FLD (f_simm16)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -253,7 +257,7 @@ SEM_FN_NAME (m32rbf,and) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ANDSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -274,7 +278,7 @@ SEM_FN_NAME (m32rbf,and3) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ANDSI (* FLD (i_sr), FLD (f_uimm16)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -295,7 +299,7 @@ SEM_FN_NAME (m32rbf,or) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -316,7 +320,7 @@ SEM_FN_NAME (m32rbf,or3) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (* FLD (i_sr), FLD (f_uimm16)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -337,7 +341,7 @@ SEM_FN_NAME (m32rbf,xor) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = XORSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -358,7 +362,7 @@ SEM_FN_NAME (m32rbf,xor3) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = XORSI (* FLD (i_sr), FLD (f_uimm16)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -379,7 +383,7 @@ SEM_FN_NAME (m32rbf,addi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (* FLD (i_dr), FLD (f_simm8)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -404,12 +408,12 @@ SEM_FN_NAME (m32rbf,addv) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -435,12 +439,12 @@ SEM_FN_NAME (m32rbf,addv3) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -466,12 +470,12 @@ SEM_FN_NAME (m32rbf,addx) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -738,7 +742,7 @@ SEM_FN_NAME (m32rbf,bl8) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (ANDSI (pc, -4), 4); CPU (h_gr[((UINT) 14)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp8); @@ -768,7 +772,7 @@ SEM_FN_NAME (m32rbf,bl24) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (pc, 4); CPU (h_gr[((UINT) 14)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = FLD (i_disp24); @@ -923,7 +927,7 @@ SEM_FN_NAME (m32rbf,cmp) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = LTSI (* FLD (i_src1), * FLD (i_src2)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } return vpc; @@ -944,7 +948,7 @@ SEM_FN_NAME (m32rbf,cmpi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = LTSI (* FLD (i_src2), FLD (f_simm16)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } return vpc; @@ -965,7 +969,7 @@ SEM_FN_NAME (m32rbf,cmpu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = LTUSI (* FLD (i_src1), * FLD (i_src2)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } return vpc; @@ -986,7 +990,7 @@ SEM_FN_NAME (m32rbf,cmpui) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { BI opval = LTUSI (* FLD (i_src2), FLD (f_simm16)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } return vpc; @@ -1009,7 +1013,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = DIVSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1034,7 +1038,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = UDIVSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1059,7 +1063,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = MODSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1084,7 +1088,7 @@ if (NESI (* FLD (i_sr), 0)) { SI opval = UMODSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1112,7 +1116,7 @@ SEM_FN_NAME (m32rbf,jl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = temp0; CPU (h_gr[((UINT) 14)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { USI opval = temp1; @@ -1163,7 +1167,7 @@ SEM_FN_NAME (m32rbf,ld) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1184,7 +1188,7 @@ SEM_FN_NAME (m32rbf,ld_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMSI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1205,7 +1209,7 @@ SEM_FN_NAME (m32rbf,ldb) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTQISI (GETMEMQI (current_cpu, pc, * FLD (i_sr))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1226,7 +1230,7 @@ SEM_FN_NAME (m32rbf,ldb_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1247,7 +1251,7 @@ SEM_FN_NAME (m32rbf,ldh) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, * FLD (i_sr))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1268,7 +1272,7 @@ SEM_FN_NAME (m32rbf,ldh_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1289,7 +1293,7 @@ SEM_FN_NAME (m32rbf,ldub) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ZEXTQISI (GETMEMQI (current_cpu, pc, * FLD (i_sr))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1310,7 +1314,7 @@ SEM_FN_NAME (m32rbf,ldub_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ZEXTQISI (GETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1331,7 +1335,7 @@ SEM_FN_NAME (m32rbf,lduh) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ZEXTHISI (GETMEMHI (current_cpu, pc, * FLD (i_sr))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1352,7 +1356,7 @@ SEM_FN_NAME (m32rbf,lduh_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ZEXTHISI (GETMEMHI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1377,12 +1381,12 @@ SEM_FN_NAME (m32rbf,ld_plus) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = temp1; * FLD (i_sr) = opval; - TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1404,7 +1408,7 @@ SEM_FN_NAME (m32rbf,ld24) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = FLD (i_uimm24); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1425,7 +1429,7 @@ SEM_FN_NAME (m32rbf,ldi8) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = FLD (f_simm8); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1446,7 +1450,7 @@ SEM_FN_NAME (m32rbf,ldi16) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = FLD (f_simm16); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1473,7 +1477,7 @@ SEM_FN_NAME (m32rbf,lock) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -1579,7 +1583,7 @@ SEM_FN_NAME (m32rbf,mul) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = MULSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1684,7 +1688,7 @@ SEM_FN_NAME (m32rbf,mv) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = * FLD (i_sr); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1705,7 +1709,7 @@ SEM_FN_NAME (m32rbf,mvfachi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = TRUNCDISI (SRADI (GET_H_ACCUM (), 32)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1726,7 +1730,7 @@ SEM_FN_NAME (m32rbf,mvfaclo) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = TRUNCDISI (GET_H_ACCUM ()); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1747,7 +1751,7 @@ SEM_FN_NAME (m32rbf,mvfacmi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = TRUNCDISI (SRADI (GET_H_ACCUM (), 16)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1768,7 +1772,7 @@ SEM_FN_NAME (m32rbf,mvfc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GET_H_CR (FLD (f_r2)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1831,7 +1835,7 @@ SEM_FN_NAME (m32rbf,mvtc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { USI opval = * FLD (i_sr); SET_H_CR (FLD (f_r1), opval); - TRACE_RESULT (current_cpu, abuf, "dcr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } return vpc; @@ -1852,7 +1856,7 @@ SEM_FN_NAME (m32rbf,neg) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = NEGSI (* FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1890,7 +1894,7 @@ SEM_FN_NAME (m32rbf,not) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = INVSI (* FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -1979,7 +1983,7 @@ SEM_FN_NAME (m32rbf,rte) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { USI opval = GET_H_CR (((UINT) 14)); SET_H_CR (((UINT) 6), opval); - TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { UQI opval = CPU (h_bpsw); @@ -2012,7 +2016,7 @@ SEM_FN_NAME (m32rbf,seth) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SLLSI (FLD (f_hi16), 16); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2033,7 +2037,7 @@ SEM_FN_NAME (m32rbf,sll) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SLLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2054,7 +2058,7 @@ SEM_FN_NAME (m32rbf,sll3) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SLLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2075,7 +2079,7 @@ SEM_FN_NAME (m32rbf,slli) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SLLSI (* FLD (i_dr), FLD (f_uimm5)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2096,7 +2100,7 @@ SEM_FN_NAME (m32rbf,sra) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRASI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2117,7 +2121,7 @@ SEM_FN_NAME (m32rbf,sra3) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRASI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2138,7 +2142,7 @@ SEM_FN_NAME (m32rbf,srai) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRASI (* FLD (i_dr), FLD (f_uimm5)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2159,7 +2163,7 @@ SEM_FN_NAME (m32rbf,srl) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2180,7 +2184,7 @@ SEM_FN_NAME (m32rbf,srl3) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2201,7 +2205,7 @@ SEM_FN_NAME (m32rbf,srli) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SRLSI (* FLD (i_dr), FLD (f_uimm5)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2356,7 +2360,7 @@ SEM_FN_NAME (m32rbf,st_plus) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = tmp_new_src2; * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2386,7 +2390,7 @@ SEM_FN_NAME (m32rbf,st_minus) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = tmp_new_src2; * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2408,7 +2412,7 @@ SEM_FN_NAME (m32rbf,sub) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2433,12 +2437,12 @@ SEM_FN_NAME (m32rbf,subv) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -2464,12 +2468,12 @@ SEM_FN_NAME (m32rbf,subx) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); } } @@ -2493,12 +2497,12 @@ SEM_FN_NAME (m32rbf,trap) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { USI opval = GET_H_CR (((UINT) 6)); SET_H_CR (((UINT) 14), opval); - TRACE_RESULT (current_cpu, abuf, "cr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { USI opval = ADDSI (pc, 4); SET_H_CR (((UINT) 6), opval); - TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); } { UQI opval = CPU (h_bpsw); |