* cpu.h,decode.c,sem-switch.c,sem.c: Regenerate.

	* cpux.h,decodex.c,semx-switch.c: Regenerate.

1 files changed, 27 insertions, 27 deletions

diff --git a/sim/m32r/semx-switch.c b/sim/m32r/semx-switch.c
index 013abf1..979a732 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);