diff options
Diffstat (limited to 'sim/fr30/sem.c')
-rw-r--r-- | sim/fr30/sem.c | 290 |
1 files changed, 147 insertions, 143 deletions
diff --git a/sim/fr30/sem.c b/sim/fr30/sem.c index f3a749b..fb5893c 100644 --- a/sim/fr30/sem.c +++ b/sim/fr30/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). @@ -222,7 +226,7 @@ SEM_FN_NAME (fr30bf,add) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (* FLD (i_Ri), * FLD (i_Rj)); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { @@ -267,7 +271,7 @@ SEM_FN_NAME (fr30bf,addi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (* FLD (i_Ri), FLD (f_u4)); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { @@ -312,7 +316,7 @@ SEM_FN_NAME (fr30bf,add2) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (* FLD (i_Ri), FLD (f_m4)); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { @@ -359,7 +363,7 @@ SEM_FN_NAME (fr30bf,addc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = tmp_tmp; * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { @@ -393,7 +397,7 @@ SEM_FN_NAME (fr30bf,addn) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (* FLD (i_Ri), * FLD (i_Rj)); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -414,7 +418,7 @@ SEM_FN_NAME (fr30bf,addni) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (* FLD (i_Ri), FLD (f_u4)); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -435,7 +439,7 @@ SEM_FN_NAME (fr30bf,addn2) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (* FLD (i_Ri), FLD (f_m4)); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -467,7 +471,7 @@ SEM_FN_NAME (fr30bf,sub) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBSI (* FLD (i_Ri), * FLD (i_Rj)); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { @@ -514,7 +518,7 @@ SEM_FN_NAME (fr30bf,subc) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = tmp_tmp; * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { @@ -548,7 +552,7 @@ SEM_FN_NAME (fr30bf,subn) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBSI (* FLD (i_Ri), * FLD (i_Rj)); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -696,7 +700,7 @@ SEM_FN_NAME (fr30bf,and) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ANDSI (* FLD (i_Ri), * FLD (i_Rj)); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { @@ -731,7 +735,7 @@ SEM_FN_NAME (fr30bf,or) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ORSI (* FLD (i_Ri), * FLD (i_Rj)); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { @@ -766,7 +770,7 @@ SEM_FN_NAME (fr30bf,eor) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = XORSI (* FLD (i_Ri), * FLD (i_Rj)); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { { @@ -1322,12 +1326,12 @@ SEM_FN_NAME (fr30bf,mul) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = TRUNCDISI (tmp_tmp); SET_H_DR (((UINT) 5), opval); - TRACE_RESULT (current_cpu, abuf, "dr-5", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { SI opval = TRUNCDISI (SRLDI (tmp_tmp, 32)); SET_H_DR (((UINT) 4), opval); - TRACE_RESULT (current_cpu, abuf, "dr-4", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { BI opval = LTSI (GET_H_DR (((UINT) 5)), 0); @@ -1367,12 +1371,12 @@ SEM_FN_NAME (fr30bf,mulu) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = TRUNCDISI (tmp_tmp); SET_H_DR (((UINT) 5), opval); - TRACE_RESULT (current_cpu, abuf, "dr-5", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { SI opval = TRUNCDISI (SRLDI (tmp_tmp, 32)); SET_H_DR (((UINT) 4), opval); - TRACE_RESULT (current_cpu, abuf, "dr-4", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { BI opval = LTSI (GET_H_DR (((UINT) 4)), 0); @@ -1410,7 +1414,7 @@ SEM_FN_NAME (fr30bf,mulh) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = MULHI (TRUNCSIHI (* FLD (i_Rj)), TRUNCSIHI (* FLD (i_Ri))); SET_H_DR (((UINT) 5), opval); - TRACE_RESULT (current_cpu, abuf, "dr-5", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { BI opval = LTSI (GET_H_DR (((UINT) 5)), 0); @@ -1443,7 +1447,7 @@ SEM_FN_NAME (fr30bf,muluh) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = MULSI (ANDSI (* FLD (i_Rj), 65535), ANDSI (* FLD (i_Ri), 65535)); SET_H_DR (((UINT) 5), opval); - TRACE_RESULT (current_cpu, abuf, "dr-5", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { BI opval = LTSI (GET_H_DR (((UINT) 5)), 0); @@ -1488,14 +1492,14 @@ if (NEBI (CPU (h_d0bit), 0)) { SI opval = 0xffffffff; SET_H_DR (((UINT) 4), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "dr-4", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } } else { { SI opval = 0; SET_H_DR (((UINT) 4), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "dr-4", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } } } @@ -1530,7 +1534,7 @@ SEM_FN_NAME (fr30bf,div0u) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = 0; SET_H_DR (((UINT) 4), opval); - TRACE_RESULT (current_cpu, abuf, "dr-4", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } } @@ -1554,19 +1558,19 @@ SEM_FN_NAME (fr30bf,div1) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SLLSI (GET_H_DR (((UINT) 4)), 1); SET_H_DR (((UINT) 4), opval); - TRACE_RESULT (current_cpu, abuf, "dr-4", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } if (LTSI (GET_H_DR (((UINT) 5)), 0)) { { SI opval = ADDSI (GET_H_DR (((UINT) 4)), 1); SET_H_DR (((UINT) 4), opval); - TRACE_RESULT (current_cpu, abuf, "dr-4", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } } { SI opval = SLLSI (GET_H_DR (((UINT) 5)), 1); SET_H_DR (((UINT) 5), opval); - TRACE_RESULT (current_cpu, abuf, "dr-5", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } if (EQBI (CPU (h_d1bit), 1)) { { @@ -1594,12 +1598,12 @@ if (NOTBI (XORBI (XORBI (CPU (h_d0bit), CPU (h_d1bit)), CPU (h_cbit)))) { { SI opval = tmp_tmp; SET_H_DR (((UINT) 4), opval); - TRACE_RESULT (current_cpu, abuf, "dr-4", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { SI opval = ORSI (GET_H_DR (((UINT) 5)), 1); SET_H_DR (((UINT) 5), opval); - TRACE_RESULT (current_cpu, abuf, "dr-5", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } } } @@ -1661,7 +1665,7 @@ if (EQSI (tmp_tmp, 0)) { SI opval = 0; SET_H_DR (((UINT) 4), opval); written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "dr-4", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } } } else { @@ -1695,7 +1699,7 @@ if (EQBI (CPU (h_zbit), 1)) { SI opval = ADDSI (GET_H_DR (((UINT) 5)), 1); SET_H_DR (((UINT) 5), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "dr-5", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } } @@ -1720,7 +1724,7 @@ if (EQBI (CPU (h_d1bit), 1)) { SI opval = NEGSI (GET_H_DR (((UINT) 5))); SET_H_DR (((UINT) 5), opval); written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "dr-5", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } } @@ -1755,7 +1759,7 @@ if (NESI (tmp_shift, 0)) { SI opval = SLLSI (* FLD (i_Ri), tmp_shift); * FLD (i_Ri) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } else { @@ -1809,7 +1813,7 @@ if (NESI (tmp_shift, 0)) { SI opval = SLLSI (* FLD (i_Ri), tmp_shift); * FLD (i_Ri) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } else { @@ -1863,7 +1867,7 @@ if (NESI (tmp_shift, 0)) { SI opval = SLLSI (* FLD (i_Ri), tmp_shift); * FLD (i_Ri) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } else { @@ -1917,7 +1921,7 @@ if (NESI (tmp_shift, 0)) { SI opval = SRLSI (* FLD (i_Ri), tmp_shift); * FLD (i_Ri) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } else { @@ -1971,7 +1975,7 @@ if (NESI (tmp_shift, 0)) { SI opval = SRLSI (* FLD (i_Ri), tmp_shift); * FLD (i_Ri) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } else { @@ -2025,7 +2029,7 @@ if (NESI (tmp_shift, 0)) { SI opval = SRLSI (* FLD (i_Ri), tmp_shift); * FLD (i_Ri) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } else { @@ -2079,7 +2083,7 @@ if (NESI (tmp_shift, 0)) { SI opval = SRASI (* FLD (i_Ri), tmp_shift); * FLD (i_Ri) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } else { @@ -2133,7 +2137,7 @@ if (NESI (tmp_shift, 0)) { SI opval = SRASI (* FLD (i_Ri), tmp_shift); * FLD (i_Ri) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } else { @@ -2187,7 +2191,7 @@ if (NESI (tmp_shift, 0)) { SI opval = SRASI (* FLD (i_Ri), tmp_shift); * FLD (i_Ri) = opval; written |= (1 << 2); - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } else { @@ -2229,7 +2233,7 @@ SEM_FN_NAME (fr30bf,ldi8) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = FLD (f_i8); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2250,7 +2254,7 @@ SEM_FN_NAME (fr30bf,ldi20) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = FLD (f_i20); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2271,7 +2275,7 @@ SEM_FN_NAME (fr30bf,ldi32) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = FLD (f_i32); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2292,7 +2296,7 @@ SEM_FN_NAME (fr30bf,ld) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMSI (current_cpu, pc, * FLD (i_Rj)); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2313,7 +2317,7 @@ SEM_FN_NAME (fr30bf,lduh) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMUHI (current_cpu, pc, * FLD (i_Rj)); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2334,7 +2338,7 @@ SEM_FN_NAME (fr30bf,ldub) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMUQI (current_cpu, pc, * FLD (i_Rj)); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2355,7 +2359,7 @@ SEM_FN_NAME (fr30bf,ldr13) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMSI (current_cpu, pc, ADDSI (* FLD (i_Rj), CPU (h_gr[((UINT) 13)]))); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2376,7 +2380,7 @@ SEM_FN_NAME (fr30bf,ldr13uh) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMUHI (current_cpu, pc, ADDSI (* FLD (i_Rj), CPU (h_gr[((UINT) 13)]))); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2397,7 +2401,7 @@ SEM_FN_NAME (fr30bf,ldr13ub) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMUQI (current_cpu, pc, ADDSI (* FLD (i_Rj), CPU (h_gr[((UINT) 13)]))); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2418,7 +2422,7 @@ SEM_FN_NAME (fr30bf,ldr14) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMSI (current_cpu, pc, ADDSI (FLD (f_disp10), CPU (h_gr[((UINT) 14)]))); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2439,7 +2443,7 @@ SEM_FN_NAME (fr30bf,ldr14uh) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMUHI (current_cpu, pc, ADDSI (FLD (f_disp9), CPU (h_gr[((UINT) 14)]))); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2460,7 +2464,7 @@ SEM_FN_NAME (fr30bf,ldr14ub) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMUQI (current_cpu, pc, ADDSI (FLD (f_disp8), CPU (h_gr[((UINT) 14)]))); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2481,7 +2485,7 @@ SEM_FN_NAME (fr30bf,ldr15) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMSI (current_cpu, pc, ADDSI (FLD (f_udisp6), CPU (h_gr[((UINT) 15)]))); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2503,14 +2507,14 @@ SEM_FN_NAME (fr30bf,ldr15gr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)])); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } if (NESI (FLD (f_Ri), 15)) { { SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -2537,12 +2541,12 @@ SEM_FN_NAME (fr30bf,ldr15dr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = tmp_tmp; SET_H_DR (FLD (f_Rs2), opval); - TRACE_RESULT (current_cpu, abuf, "Rs2", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } } @@ -2570,7 +2574,7 @@ SEM_FN_NAME (fr30bf,ldr15ps) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -2805,7 +2809,7 @@ SEM_FN_NAME (fr30bf,str15gr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = tmp_tmp; @@ -2835,7 +2839,7 @@ SEM_FN_NAME (fr30bf,str15dr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = tmp_tmp; @@ -2863,7 +2867,7 @@ SEM_FN_NAME (fr30bf,str15ps) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = GET_H_PS (); @@ -2890,7 +2894,7 @@ SEM_FN_NAME (fr30bf,mov) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = * FLD (i_Rj); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2911,7 +2915,7 @@ SEM_FN_NAME (fr30bf,movdr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GET_H_DR (FLD (f_Rs1)); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2932,7 +2936,7 @@ SEM_FN_NAME (fr30bf,movps) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GET_H_PS (); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -2953,7 +2957,7 @@ SEM_FN_NAME (fr30bf,mov2dr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = * FLD (i_Ri); SET_H_DR (FLD (f_Rs1), opval); - TRACE_RESULT (current_cpu, abuf, "Rs1", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } return vpc; @@ -3045,7 +3049,7 @@ SEM_FN_NAME (fr30bf,callr) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (pc, 2); SET_H_DR (((UINT) 1), opval); - TRACE_RESULT (current_cpu, abuf, "dr-1", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { USI opval = * FLD (i_Ri); @@ -3076,7 +3080,7 @@ SEM_FN_NAME (fr30bf,callrd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (pc, 4); SET_H_DR (((UINT) 1), opval); - TRACE_RESULT (current_cpu, abuf, "dr-1", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { USI opval = * FLD (i_Ri); @@ -3107,7 +3111,7 @@ SEM_FN_NAME (fr30bf,call) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (pc, 2); SET_H_DR (((UINT) 1), opval); - TRACE_RESULT (current_cpu, abuf, "dr-1", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { USI opval = FLD (i_label12); @@ -3138,7 +3142,7 @@ SEM_FN_NAME (fr30bf,calld) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (pc, 4); SET_H_DR (((UINT) 1), opval); - TRACE_RESULT (current_cpu, abuf, "dr-1", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { USI opval = FLD (i_label12); @@ -3281,7 +3285,7 @@ if (EQBI (GET_H_SBIT (), 0)) { SI opval = ADDSI (GET_H_DR (((UINT) 2)), 4); SET_H_DR (((UINT) 2), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "dr-2", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { SI opval = GETMEMSI (current_cpu, pc, GET_H_DR (((UINT) 2))); @@ -3293,7 +3297,7 @@ if (EQBI (GET_H_SBIT (), 0)) { SI opval = ADDSI (GET_H_DR (((UINT) 2)), 4); SET_H_DR (((UINT) 2), opval); written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "dr-2", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } } } else { @@ -3308,7 +3312,7 @@ if (EQBI (GET_H_SBIT (), 0)) { SI opval = ADDSI (GET_H_DR (((UINT) 3)), 4); SET_H_DR (((UINT) 3), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "dr-3", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { SI opval = GETMEMSI (current_cpu, pc, GET_H_DR (((UINT) 3))); @@ -3320,7 +3324,7 @@ if (EQBI (GET_H_SBIT (), 0)) { SI opval = ADDSI (GET_H_DR (((UINT) 3)), 4); SET_H_DR (((UINT) 3), opval); written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "dr-3", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } } } @@ -4282,7 +4286,7 @@ SEM_FN_NAME (fr30bf,dmovr13pi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (CPU (h_gr[((UINT) 13)]), 4); CPU (h_gr[((UINT) 13)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-13", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -4310,7 +4314,7 @@ SEM_FN_NAME (fr30bf,dmovr13pih) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (CPU (h_gr[((UINT) 13)]), 2); CPU (h_gr[((UINT) 13)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-13", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -4338,7 +4342,7 @@ SEM_FN_NAME (fr30bf,dmovr13pib) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (CPU (h_gr[((UINT) 13)]), 1); CPU (h_gr[((UINT) 13)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-13", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -4366,7 +4370,7 @@ SEM_FN_NAME (fr30bf,dmovr15pi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -4388,7 +4392,7 @@ SEM_FN_NAME (fr30bf,dmov2r13) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMSI (current_cpu, pc, FLD (f_dir10)); CPU (h_gr[((UINT) 13)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-13", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -4409,7 +4413,7 @@ SEM_FN_NAME (fr30bf,dmov2r13h) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMHI (current_cpu, pc, FLD (f_dir9)); CPU (h_gr[((UINT) 13)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-13", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -4430,7 +4434,7 @@ SEM_FN_NAME (fr30bf,dmov2r13b) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMQI (current_cpu, pc, FLD (f_dir8)); CPU (h_gr[((UINT) 13)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-13", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -4457,7 +4461,7 @@ SEM_FN_NAME (fr30bf,dmov2r13pi) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (CPU (h_gr[((UINT) 13)]), 4); CPU (h_gr[((UINT) 13)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-13", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -4485,7 +4489,7 @@ SEM_FN_NAME (fr30bf,dmov2r13pih) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (CPU (h_gr[((UINT) 13)]), 2); CPU (h_gr[((UINT) 13)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-13", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -4513,7 +4517,7 @@ SEM_FN_NAME (fr30bf,dmov2r13pib) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (CPU (h_gr[((UINT) 13)]), 1); CPU (h_gr[((UINT) 13)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-13", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -4536,7 +4540,7 @@ SEM_FN_NAME (fr30bf,dmov2r15pd) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = GETMEMSI (current_cpu, pc, FLD (f_dir10)); @@ -4563,7 +4567,7 @@ SEM_FN_NAME (fr30bf,ldres) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (* FLD (i_Ri), 4); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -4584,7 +4588,7 @@ SEM_FN_NAME (fr30bf,stres) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (* FLD (i_Ri), 4); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -4753,7 +4757,7 @@ SEM_FN_NAME (fr30bf,addsp) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), FLD (f_s10)); CPU (h_gr[((UINT) 15)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -4774,7 +4778,7 @@ SEM_FN_NAME (fr30bf,extsb) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTQISI (ANDQI (* FLD (i_Ri), 255)); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -4795,7 +4799,7 @@ SEM_FN_NAME (fr30bf,extub) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ZEXTQISI (ANDQI (* FLD (i_Ri), 255)); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -4816,7 +4820,7 @@ SEM_FN_NAME (fr30bf,extsh) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = EXTHISI (ANDHI (* FLD (i_Ri), 65535)); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -4837,7 +4841,7 @@ SEM_FN_NAME (fr30bf,extuh) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ZEXTHISI (ANDHI (* FLD (i_Ri), 65535)); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } return vpc; @@ -4862,13 +4866,13 @@ if (ANDSI (FLD (f_reglist_low_ld), 1)) { SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)])); CPU (h_gr[((UINT) 0)]) = opval; written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr-0", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4878,13 +4882,13 @@ if (ANDSI (FLD (f_reglist_low_ld), 2)) { SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)])); CPU (h_gr[((UINT) 1)]) = opval; written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr-1", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4894,13 +4898,13 @@ if (ANDSI (FLD (f_reglist_low_ld), 4)) { SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)])); CPU (h_gr[((UINT) 2)]) = opval; written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr-2", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4910,13 +4914,13 @@ if (ANDSI (FLD (f_reglist_low_ld), 8)) { SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)])); CPU (h_gr[((UINT) 3)]) = opval; written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr-3", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4926,13 +4930,13 @@ if (ANDSI (FLD (f_reglist_low_ld), 16)) { SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)])); CPU (h_gr[((UINT) 4)]) = opval; written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr-4", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4942,13 +4946,13 @@ if (ANDSI (FLD (f_reglist_low_ld), 32)) { SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)])); CPU (h_gr[((UINT) 5)]) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr-5", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4958,13 +4962,13 @@ if (ANDSI (FLD (f_reglist_low_ld), 64)) { SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)])); CPU (h_gr[((UINT) 6)]) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "gr-6", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -4974,13 +4978,13 @@ if (ANDSI (FLD (f_reglist_low_ld), 128)) { SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)])); CPU (h_gr[((UINT) 7)]) = opval; written |= (1 << 11); - TRACE_RESULT (current_cpu, abuf, "gr-7", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -5009,13 +5013,13 @@ if (ANDSI (FLD (f_reglist_hi_ld), 1)) { SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)])); CPU (h_gr[((UINT) 8)]) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr-8", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -5025,13 +5029,13 @@ if (ANDSI (FLD (f_reglist_hi_ld), 2)) { SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)])); CPU (h_gr[((UINT) 9)]) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "gr-9", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -5041,13 +5045,13 @@ if (ANDSI (FLD (f_reglist_hi_ld), 4)) { SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)])); CPU (h_gr[((UINT) 10)]) = opval; written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr-10", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -5057,13 +5061,13 @@ if (ANDSI (FLD (f_reglist_hi_ld), 8)) { SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)])); CPU (h_gr[((UINT) 11)]) = opval; written |= (1 << 4); - TRACE_RESULT (current_cpu, abuf, "gr-11", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -5073,13 +5077,13 @@ if (ANDSI (FLD (f_reglist_hi_ld), 16)) { SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)])); CPU (h_gr[((UINT) 12)]) = opval; written |= (1 << 5); - TRACE_RESULT (current_cpu, abuf, "gr-12", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -5089,13 +5093,13 @@ if (ANDSI (FLD (f_reglist_hi_ld), 32)) { SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)])); CPU (h_gr[((UINT) 13)]) = opval; written |= (1 << 6); - TRACE_RESULT (current_cpu, abuf, "gr-13", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -5105,13 +5109,13 @@ if (ANDSI (FLD (f_reglist_hi_ld), 64)) { SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)])); CPU (h_gr[((UINT) 14)]) = opval; written |= (1 << 7); - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -5120,7 +5124,7 @@ if (ANDSI (FLD (f_reglist_hi_ld), 128)) { SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)])); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 8); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } } @@ -5148,7 +5152,7 @@ if (ANDSI (FLD (f_reglist_low_st), 1)) { SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = CPU (h_gr[((UINT) 7)]); @@ -5164,7 +5168,7 @@ if (ANDSI (FLD (f_reglist_low_st), 2)) { SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = CPU (h_gr[((UINT) 6)]); @@ -5180,7 +5184,7 @@ if (ANDSI (FLD (f_reglist_low_st), 4)) { SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = CPU (h_gr[((UINT) 5)]); @@ -5196,7 +5200,7 @@ if (ANDSI (FLD (f_reglist_low_st), 8)) { SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = CPU (h_gr[((UINT) 4)]); @@ -5212,7 +5216,7 @@ if (ANDSI (FLD (f_reglist_low_st), 16)) { SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = CPU (h_gr[((UINT) 3)]); @@ -5228,7 +5232,7 @@ if (ANDSI (FLD (f_reglist_low_st), 32)) { SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = CPU (h_gr[((UINT) 2)]); @@ -5244,7 +5248,7 @@ if (ANDSI (FLD (f_reglist_low_st), 64)) { SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = CPU (h_gr[((UINT) 1)]); @@ -5260,7 +5264,7 @@ if (ANDSI (FLD (f_reglist_low_st), 128)) { SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 10); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = CPU (h_gr[((UINT) 0)]); @@ -5297,7 +5301,7 @@ if (ANDSI (FLD (f_reglist_hi_st), 1)) { SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = tmp_save_r15; @@ -5313,7 +5317,7 @@ if (ANDSI (FLD (f_reglist_hi_st), 2)) { SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = CPU (h_gr[((UINT) 14)]); @@ -5329,7 +5333,7 @@ if (ANDSI (FLD (f_reglist_hi_st), 4)) { SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = CPU (h_gr[((UINT) 13)]); @@ -5345,7 +5349,7 @@ if (ANDSI (FLD (f_reglist_hi_st), 8)) { SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = CPU (h_gr[((UINT) 12)]); @@ -5361,7 +5365,7 @@ if (ANDSI (FLD (f_reglist_hi_st), 16)) { SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = CPU (h_gr[((UINT) 11)]); @@ -5377,7 +5381,7 @@ if (ANDSI (FLD (f_reglist_hi_st), 32)) { SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = CPU (h_gr[((UINT) 10)]); @@ -5393,7 +5397,7 @@ if (ANDSI (FLD (f_reglist_hi_st), 64)) { SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = CPU (h_gr[((UINT) 9)]); @@ -5409,7 +5413,7 @@ if (ANDSI (FLD (f_reglist_hi_st), 128)) { SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4); CPU (h_gr[((UINT) 15)]) = opval; written |= (1 << 9); - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = CPU (h_gr[((UINT) 8)]); @@ -5448,12 +5452,12 @@ SEM_FN_NAME (fr30bf,enter) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = tmp_tmp; CPU (h_gr[((UINT) 14)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), FLD (f_u10)); CPU (h_gr[((UINT) 15)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -5476,12 +5480,12 @@ SEM_FN_NAME (fr30bf,leave) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = ADDSI (CPU (h_gr[((UINT) 14)]), 4); CPU (h_gr[((UINT) 15)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { SI opval = GETMEMSI (current_cpu, pc, SUBSI (CPU (h_gr[((UINT) 15)]), 4)); CPU (h_gr[((UINT) 14)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } } @@ -5506,7 +5510,7 @@ SEM_FN_NAME (fr30bf,xchb) (SIM_CPU *current_cpu, SEM_ARG sem_arg) { SI opval = GETMEMUQI (current_cpu, pc, * FLD (i_Rj)); * FLD (i_Ri) = opval; - TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); } { UQI opval = tmp_tmp; |