diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index 36a6feeebd5..9374053b967 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/ChangeLog @@ -1,5 +1,10 @@ 1998-12-09 Doug Evans + * cpu.h,decode.c,sem-switch.c,sem.c: Regenerate. +start-sanitize-m32rx + * cpux.h,decodex.c,semx-switch.c: Regenerate. +end-sanitize-m32rx + * sim-if.c: Include string.h or strings.h if present. 1998-12-04 Doug Evans diff --git a/sim/m32r/sem-switch.c b/sim/m32r/sem-switch.c index dce64a63b8a..ab26112213a 100644 --- a/sim/m32r/sem-switch.c +++ b/sim/m32r/sem-switch.c @@ -598,7 +598,7 @@ do { if (CPU (h_cond)) { { - USI opval = FLD (f_disp8); + USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -623,7 +623,7 @@ if (CPU (h_cond)) { if (CPU (h_cond)) { { - USI opval = FLD (f_disp24); + USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -648,7 +648,7 @@ if (CPU (h_cond)) { if (EQSI (* FLD (i_src1), * FLD (i_src2))) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 3); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -673,7 +673,7 @@ if (EQSI (* FLD (i_src1), * FLD (i_src2))) { if (EQSI (* FLD (i_src2), 0)) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -698,7 +698,7 @@ if (EQSI (* FLD (i_src2), 0)) { if (GESI (* FLD (i_src2), 0)) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -723,7 +723,7 @@ if (GESI (* FLD (i_src2), 0)) { if (GTSI (* FLD (i_src2), 0)) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -748,7 +748,7 @@ if (GTSI (* FLD (i_src2), 0)) { if (LESI (* FLD (i_src2), 0)) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -773,7 +773,7 @@ if (LESI (* FLD (i_src2), 0)) { if (LTSI (* FLD (i_src2), 0)) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -798,7 +798,7 @@ if (LTSI (* FLD (i_src2), 0)) { if (NESI (* FLD (i_src2), 0)) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -828,7 +828,7 @@ do { TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { - USI opval = FLD (f_disp8); + USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } @@ -856,7 +856,7 @@ do { TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { - USI opval = FLD (f_disp24); + USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } @@ -879,7 +879,7 @@ do { if (NOTBI (CPU (h_cond))) { { - USI opval = FLD (f_disp8); + USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -904,7 +904,7 @@ if (NOTBI (CPU (h_cond))) { if (NOTBI (CPU (h_cond))) { { - USI opval = FLD (f_disp24); + USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -929,7 +929,7 @@ if (NOTBI (CPU (h_cond))) { if (NESI (* FLD (i_src1), * FLD (i_src2))) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 3); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -953,7 +953,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) { vpc = SEM_NEXT_VPC (sem_arg, pc, 2); { - USI opval = FLD (f_disp8); + USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } @@ -974,7 +974,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) { vpc = SEM_NEXT_VPC (sem_arg, pc, 4); { - USI opval = FLD (f_disp24); + USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } @@ -1433,7 +1433,7 @@ do { vpc = SEM_NEXT_VPC (sem_arg, pc, 4); { - SI opval = FLD (f_uimm24); + SI opval = FLD (i_uimm24); * FLD (i_dr) = opval; TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } diff --git a/sim/m32r/sem.c b/sim/m32r/sem.c index 3ccb4dbb1d9..1a201743af0 100644 --- a/sim/m32r/sem.c +++ b/sim/m32r/sem.c @@ -476,7 +476,7 @@ SEM_FN_NAME (m32rbf,bc8) (SIM_CPU *current_cpu, SEM_ARG sem_arg) if (CPU (h_cond)) { { - USI opval = FLD (f_disp8); + USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -503,7 +503,7 @@ SEM_FN_NAME (m32rbf,bc24) (SIM_CPU *current_cpu, SEM_ARG sem_arg) if (CPU (h_cond)) { { - USI opval = FLD (f_disp24); + USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -530,7 +530,7 @@ SEM_FN_NAME (m32rbf,beq) (SIM_CPU *current_cpu, SEM_ARG sem_arg) if (EQSI (* FLD (i_src1), * FLD (i_src2))) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 3); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -557,7 +557,7 @@ SEM_FN_NAME (m32rbf,beqz) (SIM_CPU *current_cpu, SEM_ARG sem_arg) if (EQSI (* FLD (i_src2), 0)) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -584,7 +584,7 @@ SEM_FN_NAME (m32rbf,bgez) (SIM_CPU *current_cpu, SEM_ARG sem_arg) if (GESI (* FLD (i_src2), 0)) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -611,7 +611,7 @@ SEM_FN_NAME (m32rbf,bgtz) (SIM_CPU *current_cpu, SEM_ARG sem_arg) if (GTSI (* FLD (i_src2), 0)) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -638,7 +638,7 @@ SEM_FN_NAME (m32rbf,blez) (SIM_CPU *current_cpu, SEM_ARG sem_arg) if (LESI (* FLD (i_src2), 0)) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -665,7 +665,7 @@ SEM_FN_NAME (m32rbf,bltz) (SIM_CPU *current_cpu, SEM_ARG sem_arg) if (LTSI (* FLD (i_src2), 0)) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -692,7 +692,7 @@ SEM_FN_NAME (m32rbf,bnez) (SIM_CPU *current_cpu, SEM_ARG sem_arg) if (NESI (* FLD (i_src2), 0)) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -724,7 +724,7 @@ do { TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { - USI opval = FLD (f_disp8); + USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } @@ -754,7 +754,7 @@ do { TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { - USI opval = FLD (f_disp24); + USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } @@ -779,7 +779,7 @@ SEM_FN_NAME (m32rbf,bnc8) (SIM_CPU *current_cpu, SEM_ARG sem_arg) if (NOTBI (CPU (h_cond))) { { - USI opval = FLD (f_disp8); + USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -806,7 +806,7 @@ SEM_FN_NAME (m32rbf,bnc24) (SIM_CPU *current_cpu, SEM_ARG sem_arg) if (NOTBI (CPU (h_cond))) { { - USI opval = FLD (f_disp24); + USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -833,7 +833,7 @@ SEM_FN_NAME (m32rbf,bne) (SIM_CPU *current_cpu, SEM_ARG sem_arg) if (NESI (* FLD (i_src1), * FLD (i_src2))) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 3); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -859,7 +859,7 @@ SEM_FN_NAME (m32rbf,bra8) (SIM_CPU *current_cpu, SEM_ARG sem_arg) SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 2); { - USI opval = FLD (f_disp8); + USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } @@ -882,7 +882,7 @@ SEM_FN_NAME (m32rbf,bra24) (SIM_CPU *current_cpu, SEM_ARG sem_arg) SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4); { - USI opval = FLD (f_disp24); + USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } @@ -1385,7 +1385,7 @@ SEM_FN_NAME (m32rbf,ld24) (SIM_CPU *current_cpu, SEM_ARG sem_arg) SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4); { - SI opval = FLD (f_uimm24); + SI opval = FLD (i_uimm24); * FLD (i_dr) = opval; TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } diff --git a/sim/m32r/semx-switch.c b/sim/m32r/semx-switch.c index 013abf1832a..979a732e902 100644 --- a/sim/m32r/semx-switch.c +++ b/sim/m32r/semx-switch.c @@ -770,7 +770,7 @@ do { if (CPU (h_cond)) { { - USI opval = FLD (f_disp8); + USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -795,7 +795,7 @@ if (CPU (h_cond)) { if (CPU (h_cond)) { { - USI opval = FLD (f_disp24); + USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -820,7 +820,7 @@ if (CPU (h_cond)) { if (EQSI (* FLD (i_src1), * FLD (i_src2))) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 3); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -845,7 +845,7 @@ if (EQSI (* FLD (i_src1), * FLD (i_src2))) { if (EQSI (* FLD (i_src2), 0)) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -870,7 +870,7 @@ if (EQSI (* FLD (i_src2), 0)) { if (GESI (* FLD (i_src2), 0)) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -895,7 +895,7 @@ if (GESI (* FLD (i_src2), 0)) { if (GTSI (* FLD (i_src2), 0)) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -920,7 +920,7 @@ if (GTSI (* FLD (i_src2), 0)) { if (LESI (* FLD (i_src2), 0)) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -945,7 +945,7 @@ if (LESI (* FLD (i_src2), 0)) { if (LTSI (* FLD (i_src2), 0)) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -970,7 +970,7 @@ if (LTSI (* FLD (i_src2), 0)) { if (NESI (* FLD (i_src2), 0)) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -1000,7 +1000,7 @@ do { TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { - USI opval = FLD (f_disp8); + USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } @@ -1028,7 +1028,7 @@ do { TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { - USI opval = FLD (f_disp24); + USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } @@ -1058,7 +1058,7 @@ do { TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { - USI opval = FLD (f_disp8); + USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 4); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -1091,7 +1091,7 @@ do { TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { - USI opval = FLD (f_disp24); + USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 4); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -1117,7 +1117,7 @@ do { if (NOTBI (CPU (h_cond))) { { - USI opval = FLD (f_disp8); + USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -1142,7 +1142,7 @@ if (NOTBI (CPU (h_cond))) { if (NOTBI (CPU (h_cond))) { { - USI opval = FLD (f_disp24); + USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -1167,7 +1167,7 @@ if (NOTBI (CPU (h_cond))) { if (NESI (* FLD (i_src1), * FLD (i_src2))) { { - USI opval = FLD (f_disp16); + USI opval = FLD (i_disp16); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 3); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -1191,7 +1191,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) { vpc = SEM_NEXT_VPC (sem_arg, pc, 2); { - USI opval = FLD (f_disp8); + USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } @@ -1212,7 +1212,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) { vpc = SEM_NEXT_VPC (sem_arg, pc, 4); { - USI opval = FLD (f_disp24); + USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } @@ -1241,7 +1241,7 @@ do { TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { - USI opval = FLD (f_disp8); + USI opval = FLD (i_disp8); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 4); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -1274,7 +1274,7 @@ do { TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { - USI opval = FLD (f_disp24); + USI opval = FLD (i_disp24); SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg)); written |= (1 << 4); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -1848,7 +1848,7 @@ do { vpc = SEM_NEXT_VPC (sem_arg, pc, 4); { - SI opval = FLD (f_uimm24); + SI opval = FLD (i_uimm24); * FLD (i_dr) = opval; TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } @@ -3407,7 +3407,7 @@ do { if (CPU (h_cond)) { { - USI opval = FLD (f_disp8); + USI opval = FLD (i_disp8); OPRND (pc) = opval; written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -3459,7 +3459,7 @@ do { TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { - USI opval = FLD (f_disp8); + USI opval = FLD (i_disp8); OPRND (pc) = opval; TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } @@ -3509,7 +3509,7 @@ do { TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { - USI opval = FLD (f_disp8); + USI opval = FLD (i_disp8); OPRND (pc) = opval; written |= (1 << 4); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -3561,7 +3561,7 @@ do { if (NOTBI (CPU (h_cond))) { { - USI opval = FLD (f_disp8); + USI opval = FLD (i_disp8); OPRND (pc) = opval; written |= (1 << 2); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); @@ -3607,7 +3607,7 @@ if (NOTBI (CPU (h_cond))) { vpc = SEM_NEXT_VPC (sem_arg, pc, 2); { - USI opval = FLD (f_disp8); + USI opval = FLD (i_disp8); OPRND (pc) = opval; TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval); } @@ -3655,7 +3655,7 @@ do { TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { - USI opval = FLD (f_disp8); + USI opval = FLD (i_disp8); OPRND (pc) = opval; written |= (1 << 4); TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);