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

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

1 files changed, 1199 insertions, 558 deletions

diff --git a/sim/m32r/sem-switch.c b/sim/m32r/sem-switch.c
index d3cff92..3cb0f7e 100644
--- a/sim/m32r/sem-switch.c
+++ b/sim/m32r/sem-switch.c
@@ -1,4 +1,4 @@
-/* Simulator instruction semantics for m32rb.
+/* Simulator instruction semantics for m32rbf.
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #ifdef DEFINE_LABELS
-#undef DEFINE_LABELS
 
   /* The labels have the case they have because the enum of insn types
      is all uppercase and in the non-stdc case the insn symbol is built
@@ -33,122 +32,132 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     int index;
     void *label;
   } labels[] = {
-    { M32RB_XINSN_ILLEGAL, && case_sem_INSN_ILLEGAL },
-    { M32RB_XINSN_ADD, && case_sem_INSN_ADD },
-    { M32RB_XINSN_ADD3, && case_sem_INSN_ADD3 },
-    { M32RB_XINSN_AND, && case_sem_INSN_AND },
-    { M32RB_XINSN_AND3, && case_sem_INSN_AND3 },
-    { M32RB_XINSN_OR, && case_sem_INSN_OR },
-    { M32RB_XINSN_OR3, && case_sem_INSN_OR3 },
-    { M32RB_XINSN_XOR, && case_sem_INSN_XOR },
-    { M32RB_XINSN_XOR3, && case_sem_INSN_XOR3 },
-    { M32RB_XINSN_ADDI, && case_sem_INSN_ADDI },
-    { M32RB_XINSN_ADDV, && case_sem_INSN_ADDV },
-    { M32RB_XINSN_ADDV3, && case_sem_INSN_ADDV3 },
-    { M32RB_XINSN_ADDX, && case_sem_INSN_ADDX },
-    { M32RB_XINSN_BC8, && case_sem_INSN_BC8 },
-    { M32RB_XINSN_BC24, && case_sem_INSN_BC24 },
-    { M32RB_XINSN_BEQ, && case_sem_INSN_BEQ },
-    { M32RB_XINSN_BEQZ, && case_sem_INSN_BEQZ },
-    { M32RB_XINSN_BGEZ, && case_sem_INSN_BGEZ },
-    { M32RB_XINSN_BGTZ, && case_sem_INSN_BGTZ },
-    { M32RB_XINSN_BLEZ, && case_sem_INSN_BLEZ },
-    { M32RB_XINSN_BLTZ, && case_sem_INSN_BLTZ },
-    { M32RB_XINSN_BNEZ, && case_sem_INSN_BNEZ },
-    { M32RB_XINSN_BL8, && case_sem_INSN_BL8 },
-    { M32RB_XINSN_BL24, && case_sem_INSN_BL24 },
-    { M32RB_XINSN_BNC8, && case_sem_INSN_BNC8 },
-    { M32RB_XINSN_BNC24, && case_sem_INSN_BNC24 },
-    { M32RB_XINSN_BNE, && case_sem_INSN_BNE },
-    { M32RB_XINSN_BRA8, && case_sem_INSN_BRA8 },
-    { M32RB_XINSN_BRA24, && case_sem_INSN_BRA24 },
-    { M32RB_XINSN_CMP, && case_sem_INSN_CMP },
-    { M32RB_XINSN_CMPI, && case_sem_INSN_CMPI },
-    { M32RB_XINSN_CMPU, && case_sem_INSN_CMPU },
-    { M32RB_XINSN_CMPUI, && case_sem_INSN_CMPUI },
-    { M32RB_XINSN_DIV, && case_sem_INSN_DIV },
-    { M32RB_XINSN_DIVU, && case_sem_INSN_DIVU },
-    { M32RB_XINSN_REM, && case_sem_INSN_REM },
-    { M32RB_XINSN_REMU, && case_sem_INSN_REMU },
-    { M32RB_XINSN_JL, && case_sem_INSN_JL },
-    { M32RB_XINSN_JMP, && case_sem_INSN_JMP },
-    { M32RB_XINSN_LD, && case_sem_INSN_LD },
-    { M32RB_XINSN_LD_D, && case_sem_INSN_LD_D },
-    { M32RB_XINSN_LDB, && case_sem_INSN_LDB },
-    { M32RB_XINSN_LDB_D, && case_sem_INSN_LDB_D },
-    { M32RB_XINSN_LDH, && case_sem_INSN_LDH },
-    { M32RB_XINSN_LDH_D, && case_sem_INSN_LDH_D },
-    { M32RB_XINSN_LDUB, && case_sem_INSN_LDUB },
-    { M32RB_XINSN_LDUB_D, && case_sem_INSN_LDUB_D },
-    { M32RB_XINSN_LDUH, && case_sem_INSN_LDUH },
-    { M32RB_XINSN_LDUH_D, && case_sem_INSN_LDUH_D },
-    { M32RB_XINSN_LD_PLUS, && case_sem_INSN_LD_PLUS },
-    { M32RB_XINSN_LD24, && case_sem_INSN_LD24 },
-    { M32RB_XINSN_LDI8, && case_sem_INSN_LDI8 },
-    { M32RB_XINSN_LDI16, && case_sem_INSN_LDI16 },
-    { M32RB_XINSN_LOCK, && case_sem_INSN_LOCK },
-    { M32RB_XINSN_MACHI, && case_sem_INSN_MACHI },
-    { M32RB_XINSN_MACLO, && case_sem_INSN_MACLO },
-    { M32RB_XINSN_MACWHI, && case_sem_INSN_MACWHI },
-    { M32RB_XINSN_MACWLO, && case_sem_INSN_MACWLO },
-    { M32RB_XINSN_MUL, && case_sem_INSN_MUL },
-    { M32RB_XINSN_MULHI, && case_sem_INSN_MULHI },
-    { M32RB_XINSN_MULLO, && case_sem_INSN_MULLO },
-    { M32RB_XINSN_MULWHI, && case_sem_INSN_MULWHI },
-    { M32RB_XINSN_MULWLO, && case_sem_INSN_MULWLO },
-    { M32RB_XINSN_MV, && case_sem_INSN_MV },
-    { M32RB_XINSN_MVFACHI, && case_sem_INSN_MVFACHI },
-    { M32RB_XINSN_MVFACLO, && case_sem_INSN_MVFACLO },
-    { M32RB_XINSN_MVFACMI, && case_sem_INSN_MVFACMI },
-    { M32RB_XINSN_MVFC, && case_sem_INSN_MVFC },
-    { M32RB_XINSN_MVTACHI, && case_sem_INSN_MVTACHI },
-    { M32RB_XINSN_MVTACLO, && case_sem_INSN_MVTACLO },
-    { M32RB_XINSN_MVTC, && case_sem_INSN_MVTC },
-    { M32RB_XINSN_NEG, && case_sem_INSN_NEG },
-    { M32RB_XINSN_NOP, && case_sem_INSN_NOP },
-    { M32RB_XINSN_NOT, && case_sem_INSN_NOT },
-    { M32RB_XINSN_RAC, && case_sem_INSN_RAC },
-    { M32RB_XINSN_RACH, && case_sem_INSN_RACH },
-    { M32RB_XINSN_RTE, && case_sem_INSN_RTE },
-    { M32RB_XINSN_SETH, && case_sem_INSN_SETH },
-    { M32RB_XINSN_SLL, && case_sem_INSN_SLL },
-    { M32RB_XINSN_SLL3, && case_sem_INSN_SLL3 },
-    { M32RB_XINSN_SLLI, && case_sem_INSN_SLLI },
-    { M32RB_XINSN_SRA, && case_sem_INSN_SRA },
-    { M32RB_XINSN_SRA3, && case_sem_INSN_SRA3 },
-    { M32RB_XINSN_SRAI, && case_sem_INSN_SRAI },
-    { M32RB_XINSN_SRL, && case_sem_INSN_SRL },
-    { M32RB_XINSN_SRL3, && case_sem_INSN_SRL3 },
-    { M32RB_XINSN_SRLI, && case_sem_INSN_SRLI },
-    { M32RB_XINSN_ST, && case_sem_INSN_ST },
-    { M32RB_XINSN_ST_D, && case_sem_INSN_ST_D },
-    { M32RB_XINSN_STB, && case_sem_INSN_STB },
-    { M32RB_XINSN_STB_D, && case_sem_INSN_STB_D },
-    { M32RB_XINSN_STH, && case_sem_INSN_STH },
-    { M32RB_XINSN_STH_D, && case_sem_INSN_STH_D },
-    { M32RB_XINSN_ST_PLUS, && case_sem_INSN_ST_PLUS },
-    { M32RB_XINSN_ST_MINUS, && case_sem_INSN_ST_MINUS },
-    { M32RB_XINSN_SUB, && case_sem_INSN_SUB },
-    { M32RB_XINSN_SUBV, && case_sem_INSN_SUBV },
-    { M32RB_XINSN_SUBX, && case_sem_INSN_SUBX },
-    { M32RB_XINSN_TRAP, && case_sem_INSN_TRAP },
-    { M32RB_XINSN_UNLOCK, && case_sem_INSN_UNLOCK },
+    { M32RBF_INSN_X_INVALID, && case_sem_INSN_X_INVALID },
+    { M32RBF_INSN_X_AFTER, && case_sem_INSN_X_AFTER },
+    { M32RBF_INSN_X_BEFORE, && case_sem_INSN_X_BEFORE },
+    { M32RBF_INSN_X_CTI_CHAIN, && case_sem_INSN_X_CTI_CHAIN },
+    { M32RBF_INSN_X_CHAIN, && case_sem_INSN_X_CHAIN },
+    { M32RBF_INSN_X_BEGIN, && case_sem_INSN_X_BEGIN },
+    { M32RBF_INSN_ADD, && case_sem_INSN_ADD },
+    { M32RBF_INSN_ADD3, && case_sem_INSN_ADD3 },
+    { M32RBF_INSN_AND, && case_sem_INSN_AND },
+    { M32RBF_INSN_AND3, && case_sem_INSN_AND3 },
+    { M32RBF_INSN_OR, && case_sem_INSN_OR },
+    { M32RBF_INSN_OR3, && case_sem_INSN_OR3 },
+    { M32RBF_INSN_XOR, && case_sem_INSN_XOR },
+    { M32RBF_INSN_XOR3, && case_sem_INSN_XOR3 },
+    { M32RBF_INSN_ADDI, && case_sem_INSN_ADDI },
+    { M32RBF_INSN_ADDV, && case_sem_INSN_ADDV },
+    { M32RBF_INSN_ADDV3, && case_sem_INSN_ADDV3 },
+    { M32RBF_INSN_ADDX, && case_sem_INSN_ADDX },
+    { M32RBF_INSN_BC8, && case_sem_INSN_BC8 },
+    { M32RBF_INSN_BC24, && case_sem_INSN_BC24 },
+    { M32RBF_INSN_BEQ, && case_sem_INSN_BEQ },
+    { M32RBF_INSN_BEQZ, && case_sem_INSN_BEQZ },
+    { M32RBF_INSN_BGEZ, && case_sem_INSN_BGEZ },
+    { M32RBF_INSN_BGTZ, && case_sem_INSN_BGTZ },
+    { M32RBF_INSN_BLEZ, && case_sem_INSN_BLEZ },
+    { M32RBF_INSN_BLTZ, && case_sem_INSN_BLTZ },
+    { M32RBF_INSN_BNEZ, && case_sem_INSN_BNEZ },
+    { M32RBF_INSN_BL8, && case_sem_INSN_BL8 },
+    { M32RBF_INSN_BL24, && case_sem_INSN_BL24 },
+    { M32RBF_INSN_BNC8, && case_sem_INSN_BNC8 },
+    { M32RBF_INSN_BNC24, && case_sem_INSN_BNC24 },
+    { M32RBF_INSN_BNE, && case_sem_INSN_BNE },
+    { M32RBF_INSN_BRA8, && case_sem_INSN_BRA8 },
+    { M32RBF_INSN_BRA24, && case_sem_INSN_BRA24 },
+    { M32RBF_INSN_CMP, && case_sem_INSN_CMP },
+    { M32RBF_INSN_CMPI, && case_sem_INSN_CMPI },
+    { M32RBF_INSN_CMPU, && case_sem_INSN_CMPU },
+    { M32RBF_INSN_CMPUI, && case_sem_INSN_CMPUI },
+    { M32RBF_INSN_DIV, && case_sem_INSN_DIV },
+    { M32RBF_INSN_DIVU, && case_sem_INSN_DIVU },
+    { M32RBF_INSN_REM, && case_sem_INSN_REM },
+    { M32RBF_INSN_REMU, && case_sem_INSN_REMU },
+    { M32RBF_INSN_JL, && case_sem_INSN_JL },
+    { M32RBF_INSN_JMP, && case_sem_INSN_JMP },
+    { M32RBF_INSN_LD, && case_sem_INSN_LD },
+    { M32RBF_INSN_LD_D, && case_sem_INSN_LD_D },
+    { M32RBF_INSN_LDB, && case_sem_INSN_LDB },
+    { M32RBF_INSN_LDB_D, && case_sem_INSN_LDB_D },
+    { M32RBF_INSN_LDH, && case_sem_INSN_LDH },
+    { M32RBF_INSN_LDH_D, && case_sem_INSN_LDH_D },
+    { M32RBF_INSN_LDUB, && case_sem_INSN_LDUB },
+    { M32RBF_INSN_LDUB_D, && case_sem_INSN_LDUB_D },
+    { M32RBF_INSN_LDUH, && case_sem_INSN_LDUH },
+    { M32RBF_INSN_LDUH_D, && case_sem_INSN_LDUH_D },
+    { M32RBF_INSN_LD_PLUS, && case_sem_INSN_LD_PLUS },
+    { M32RBF_INSN_LD24, && case_sem_INSN_LD24 },
+    { M32RBF_INSN_LDI8, && case_sem_INSN_LDI8 },
+    { M32RBF_INSN_LDI16, && case_sem_INSN_LDI16 },
+    { M32RBF_INSN_LOCK, && case_sem_INSN_LOCK },
+    { M32RBF_INSN_MACHI, && case_sem_INSN_MACHI },
+    { M32RBF_INSN_MACLO, && case_sem_INSN_MACLO },
+    { M32RBF_INSN_MACWHI, && case_sem_INSN_MACWHI },
+    { M32RBF_INSN_MACWLO, && case_sem_INSN_MACWLO },
+    { M32RBF_INSN_MUL, && case_sem_INSN_MUL },
+    { M32RBF_INSN_MULHI, && case_sem_INSN_MULHI },
+    { M32RBF_INSN_MULLO, && case_sem_INSN_MULLO },
+    { M32RBF_INSN_MULWHI, && case_sem_INSN_MULWHI },
+    { M32RBF_INSN_MULWLO, && case_sem_INSN_MULWLO },
+    { M32RBF_INSN_MV, && case_sem_INSN_MV },
+    { M32RBF_INSN_MVFACHI, && case_sem_INSN_MVFACHI },
+    { M32RBF_INSN_MVFACLO, && case_sem_INSN_MVFACLO },
+    { M32RBF_INSN_MVFACMI, && case_sem_INSN_MVFACMI },
+    { M32RBF_INSN_MVFC, && case_sem_INSN_MVFC },
+    { M32RBF_INSN_MVTACHI, && case_sem_INSN_MVTACHI },
+    { M32RBF_INSN_MVTACLO, && case_sem_INSN_MVTACLO },
+    { M32RBF_INSN_MVTC, && case_sem_INSN_MVTC },
+    { M32RBF_INSN_NEG, && case_sem_INSN_NEG },
+    { M32RBF_INSN_NOP, && case_sem_INSN_NOP },
+    { M32RBF_INSN_NOT, && case_sem_INSN_NOT },
+    { M32RBF_INSN_RAC, && case_sem_INSN_RAC },
+    { M32RBF_INSN_RACH, && case_sem_INSN_RACH },
+    { M32RBF_INSN_RTE, && case_sem_INSN_RTE },
+    { M32RBF_INSN_SETH, && case_sem_INSN_SETH },
+    { M32RBF_INSN_SLL, && case_sem_INSN_SLL },
+    { M32RBF_INSN_SLL3, && case_sem_INSN_SLL3 },
+    { M32RBF_INSN_SLLI, && case_sem_INSN_SLLI },
+    { M32RBF_INSN_SRA, && case_sem_INSN_SRA },
+    { M32RBF_INSN_SRA3, && case_sem_INSN_SRA3 },
+    { M32RBF_INSN_SRAI, && case_sem_INSN_SRAI },
+    { M32RBF_INSN_SRL, && case_sem_INSN_SRL },
+    { M32RBF_INSN_SRL3, && case_sem_INSN_SRL3 },
+    { M32RBF_INSN_SRLI, && case_sem_INSN_SRLI },
+    { M32RBF_INSN_ST, && case_sem_INSN_ST },
+    { M32RBF_INSN_ST_D, && case_sem_INSN_ST_D },
+    { M32RBF_INSN_STB, && case_sem_INSN_STB },
+    { M32RBF_INSN_STB_D, && case_sem_INSN_STB_D },
+    { M32RBF_INSN_STH, && case_sem_INSN_STH },
+    { M32RBF_INSN_STH_D, && case_sem_INSN_STH_D },
+    { M32RBF_INSN_ST_PLUS, && case_sem_INSN_ST_PLUS },
+    { M32RBF_INSN_ST_MINUS, && case_sem_INSN_ST_MINUS },
+    { M32RBF_INSN_SUB, && case_sem_INSN_SUB },
+    { M32RBF_INSN_SUBV, && case_sem_INSN_SUBV },
+    { M32RBF_INSN_SUBX, && case_sem_INSN_SUBX },
+    { M32RBF_INSN_TRAP, && case_sem_INSN_TRAP },
+    { M32RBF_INSN_UNLOCK, && case_sem_INSN_UNLOCK },
     { 0, 0 }
   };
   int i;
 
   for (i = 0; labels[i].label != 0; ++i)
+#if FAST_P
     CPU_IDESC (current_cpu) [labels[i].index].sem_fast_lab = labels[i].label;
+#else
+    CPU_IDESC (current_cpu) [labels[i].index].sem_full_lab = labels[i].label;
+#endif
 
+#undef DEFINE_LABELS
 #endif /* DEFINE_LABELS */
 
 #ifdef DEFINE_SWITCH
-#undef DEFINE_SWITCH
 
 /* If hyper-fast [well not unnecessarily slow] execution is selected, turn
    off frills like tracing and profiling.  */
 /* FIXME: A better way would be to have TRACE_RESULT check for something
-   that can cause it to be optimized out.  */
+   that can cause it to be optimized out.  Another way would be to emit
+   special handlers into the instruction "stream".  */
 
 #if FAST_P
 #undef TRACE_RESULT
@@ -159,171 +168,357 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define GET_ATTR(cpu, num, attr) CGEN_INSN_ATTR (abuf->idesc->opcode, CGEN_INSN_##attr)
 
 {
-  SEM_ARG sem_arg = sc;
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  CIA new_pc;
 
-  SWITCH (sem, sem_arg->semantic.sem_case)
+#if WITH_SCACHE_PBB
+
+/* Branch to next handler without going around main loop.  */
+#define NEXT(vpc) goto * SEM_ARGBUF (vpc) -> semantic.sem_case
+SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
+
+#else /* ! WITH_SCACHE_PBB */
+
+#define NEXT(vpc) BREAK (sem)
+#ifdef __GNUC__
+#if FAST_P
+  SWITCH (sem, SEM_ARGBUF (sc) -> idesc->sem_fast_lab)
+#else
+  SWITCH (sem, SEM_ARGBUF (sc) -> idesc->sem_full_lab)
+#endif
+#else
+  SWITCH (sem, SEM_ARGBUF (sc) -> idesc->num)
+#endif
+
+#endif /* ! WITH_SCACHE_PBB */
+
     {
 
-  CASE (sem, INSN_ILLEGAL) :
+  CASE (sem, INSN_X_INVALID) : /* --invalid-- */
+{
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.fmt_empty.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
+
+  {
+#if WITH_SCACHE
+    /* Update the recorded pc in the cpu state struct.  */
+    SET_H_PC (pc);
+#endif
+    sim_engine_invalid_insn (current_cpu, pc);
+    sim_io_error (CPU_STATE (current_cpu), "invalid insn not handled\n");
+    /* NOTREACHED */
+  }
+
+#undef FLD
+}
+  NEXT (vpc);
+
+  CASE (sem, INSN_X_AFTER) : /* --after-- */
+{
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.fmt_empty.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
+
+  {
+#if WITH_SCACHE_PBB
+    m32rbf_pbb_after (current_cpu, sem_arg);
+#endif
+  }
+
+#undef FLD
+}
+  NEXT (vpc);
+
+  CASE (sem, INSN_X_BEFORE) : /* --before-- */
+{
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.fmt_empty.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
+
+  {
+#if WITH_SCACHE_PBB
+    m32rbf_pbb_before (current_cpu, sem_arg);
+#endif
+  }
+
+#undef FLD
+}
+  NEXT (vpc);
+
+  CASE (sem, INSN_X_CTI_CHAIN) : /* --cti-chain-- */
+{
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.fmt_empty.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
+
+  {
+#if WITH_SCACHE_PBB
+#ifdef DEFINE_SWITCH
+    vpc = m32rbf_pbb_cti_chain (current_cpu, sem_arg,
+			       pbb_br_npc_ptr, pbb_br_npc);
+    BREAK (sem);
+#else
+    /* FIXME: Allow provision of explicit ifmt spec in insn spec.  */
+    vpc = m32rbf_pbb_cti_chain (current_cpu, sem_arg,
+			       CPU_PBB_BR_NPC_PTR (current_cpu),
+			       CPU_PBB_BR_NPC (current_cpu));
+#endif
+#endif
+  }
+
+#undef FLD
+}
+  NEXT (vpc);
+
+  CASE (sem, INSN_X_CHAIN) : /* --chain-- */
 {
-  sim_engine_halt (CPU_STATE (current_cpu), current_cpu, NULL, NULL_CIA/*FIXME*/,
-		   sim_stopped, SIM_SIGILL);
-  BREAK (sem);
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.fmt_empty.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
+
+  {
+#if WITH_SCACHE_PBB
+    vpc = m32rbf_pbb_chain (current_cpu, sem_arg);
+#ifdef DEFINE_SWITCH
+    BREAK (sem);
+#endif
+#endif
+  }
+
+#undef FLD
 }
+  NEXT (vpc);
+
+  CASE (sem, INSN_X_BEGIN) : /* --begin-- */
+{
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.fmt_empty.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
+
+  {
+#if WITH_SCACHE_PBB
+#ifdef DEFINE_SWITCH
+    /* In the switch case FAST_P is a constant, allowing several optimizations
+       in any called inline functions.  */
+    vpc = m32rbf_pbb_begin (current_cpu, FAST_P);
+#else
+    vpc = m32rbf_pbb_begin (current_cpu, STATE_RUN_FAST_P (CPU_STATE (current_cpu)));
+#endif
+#endif
+  }
+
+#undef FLD
+}
+  NEXT (vpc);
 
   CASE (sem, INSN_ADD) : /* add $dr,$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_add.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = ADDSI (* FLD (f_r1), * FLD (f_r2));
-    * FLD (f_r1) = opval;
+    SI opval = ADDSI (* FLD (i_dr), * FLD (i_sr));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_ADD3) : /* add3 $dr,$sr,$hash$slo16 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_add3.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    SI opval = ADDSI (* FLD (f_r2), FLD (f_simm16));
-    * FLD (f_r1) = opval;
+    SI opval = ADDSI (* FLD (i_sr), FLD (f_simm16));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_AND) : /* and $dr,$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_add.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = ANDSI (* FLD (f_r1), * FLD (f_r2));
-    * FLD (f_r1) = opval;
+    SI opval = ANDSI (* FLD (i_dr), * FLD (i_sr));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_AND3) : /* and3 $dr,$sr,$uimm16 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_and3.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    SI opval = ANDSI (* FLD (f_r2), FLD (f_uimm16));
-    * FLD (f_r1) = opval;
+    SI opval = ANDSI (* FLD (i_sr), FLD (f_uimm16));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_OR) : /* or $dr,$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_add.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = ORSI (* FLD (f_r1), * FLD (f_r2));
-    * FLD (f_r1) = opval;
+    SI opval = ORSI (* FLD (i_dr), * FLD (i_sr));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_OR3) : /* or3 $dr,$sr,$hash$ulo16 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_or3.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    SI opval = ORSI (* FLD (f_r2), FLD (f_uimm16));
-    * FLD (f_r1) = opval;
+    SI opval = ORSI (* FLD (i_sr), FLD (f_uimm16));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_XOR) : /* xor $dr,$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_add.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = XORSI (* FLD (f_r1), * FLD (f_r2));
-    * FLD (f_r1) = opval;
+    SI opval = XORSI (* FLD (i_dr), * FLD (i_sr));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_XOR3) : /* xor3 $dr,$sr,$uimm16 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_and3.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    SI opval = XORSI (* FLD (f_r2), FLD (f_uimm16));
-    * FLD (f_r1) = opval;
+    SI opval = XORSI (* FLD (i_sr), FLD (f_uimm16));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_ADDI) : /* addi $dr,$simm8 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_addi.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = ADDSI (* FLD (f_r1), FLD (f_simm8));
-    * FLD (f_r1) = opval;
+    SI opval = ADDSI (* FLD (i_dr), FLD (f_simm8));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_ADDV) : /* addv $dr,$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_addv.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
 do {
-  UBI temp1;SI temp0;
-  temp0 = ADDSI (* FLD (f_r1), * FLD (f_r2));
-  temp1 = ADDOFSI (* FLD (f_r1), * FLD (f_r2), 0);
+  BI temp1;SI temp0;
+  temp0 = ADDSI (* FLD (i_dr), * FLD (i_sr));
+  temp1 = ADDOFSI (* FLD (i_dr), * FLD (i_sr), 0);
   {
     SI opval = temp0;
-    * FLD (f_r1) = opval;
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
   {
-    UBI opval = temp1;
+    BI opval = temp1;
     CPU (h_cond) = opval;
     TRACE_RESULT (current_cpu, "condbit", 'x', opval);
   }
@@ -331,24 +526,28 @@ do {
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_ADDV3) : /* addv3 $dr,$sr,$simm16 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_addv3.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
 do {
-  UBI temp1;SI temp0;
-  temp0 = ADDSI (* FLD (f_r2), FLD (f_simm16));
-  temp1 = ADDOFSI (* FLD (f_r2), FLD (f_simm16), 0);
+  BI temp1;SI temp0;
+  temp0 = ADDSI (* FLD (i_sr), FLD (f_simm16));
+  temp1 = ADDOFSI (* FLD (i_sr), FLD (f_simm16), 0);
   {
     SI opval = temp0;
-    * FLD (f_r1) = opval;
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
   {
-    UBI opval = temp1;
+    BI opval = temp1;
     CPU (h_cond) = opval;
     TRACE_RESULT (current_cpu, "condbit", 'x', opval);
   }
@@ -356,24 +555,28 @@ do {
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_ADDX) : /* addx $dr,$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_addx.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
 do {
-  UBI temp1;SI temp0;
-  temp0 = ADDCSI (* FLD (f_r1), * FLD (f_r2), CPU (h_cond));
-  temp1 = ADDCFSI (* FLD (f_r1), * FLD (f_r2), CPU (h_cond));
+  BI temp1;SI temp0;
+  temp0 = ADDCSI (* FLD (i_dr), * FLD (i_sr), CPU (h_cond));
+  temp1 = ADDCFSI (* FLD (i_dr), * FLD (i_sr), CPU (h_cond));
   {
     SI opval = temp0;
-    * FLD (f_r1) = opval;
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
   {
-    UBI opval = temp1;
+    BI opval = temp1;
     CPU (h_cond) = opval;
     TRACE_RESULT (current_cpu, "condbit", 'x', opval);
   }
@@ -381,1392 +584,1798 @@ do {
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_BC8) : /* bc.s $disp8 */
 {
-#define FLD(f) abuf->fields.fmt_bc8.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.cti.fields.fmt_bc8.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  SEM_BRANCH_INIT
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
 if (CPU (h_cond)) {
   {
     USI opval = FLD (f_disp8);
-    BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_CACHE (sem_arg, opval));
+    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
+    written |= (1 << 2);
     TRACE_RESULT (current_cpu, "pc", 'x', opval);
   }
 }
 
+  abuf->written = written;
+  SEM_BRANCH_FINI
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_BC24) : /* bc.l $disp24 */
 {
-#define FLD(f) abuf->fields.fmt_bc24.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.cti.fields.fmt_bc24.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  SEM_BRANCH_INIT
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
 if (CPU (h_cond)) {
   {
     USI opval = FLD (f_disp24);
-    BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_CACHE (sem_arg, opval));
+    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
+    written |= (1 << 2);
     TRACE_RESULT (current_cpu, "pc", 'x', opval);
   }
 }
 
+  abuf->written = written;
+  SEM_BRANCH_FINI
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_BEQ) : /* beq $src1,$src2,$disp16 */
 {
-#define FLD(f) abuf->fields.fmt_beq.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.cti.fields.fmt_beq.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  SEM_BRANCH_INIT
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
-if (EQSI (* FLD (f_r1), * FLD (f_r2))) {
+if (EQSI (* FLD (i_src1), * FLD (i_src2))) {
   {
     USI opval = FLD (f_disp16);
-    BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_CACHE (sem_arg, opval));
+    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
+    written |= (1 << 3);
     TRACE_RESULT (current_cpu, "pc", 'x', opval);
   }
 }
 
+  abuf->written = written;
+  SEM_BRANCH_FINI
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_BEQZ) : /* beqz $src2,$disp16 */
 {
-#define FLD(f) abuf->fields.fmt_beqz.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.cti.fields.fmt_beqz.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  SEM_BRANCH_INIT
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
-if (EQSI (* FLD (f_r2), 0)) {
+if (EQSI (* FLD (i_src2), 0)) {
   {
     USI opval = FLD (f_disp16);
-    BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_CACHE (sem_arg, opval));
+    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
+    written |= (1 << 2);
     TRACE_RESULT (current_cpu, "pc", 'x', opval);
   }
 }
 
+  abuf->written = written;
+  SEM_BRANCH_FINI
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_BGEZ) : /* bgez $src2,$disp16 */
 {
-#define FLD(f) abuf->fields.fmt_beqz.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.cti.fields.fmt_beqz.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  SEM_BRANCH_INIT
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
-if (GESI (* FLD (f_r2), 0)) {
+if (GESI (* FLD (i_src2), 0)) {
   {
     USI opval = FLD (f_disp16);
-    BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_CACHE (sem_arg, opval));
+    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
+    written |= (1 << 2);
     TRACE_RESULT (current_cpu, "pc", 'x', opval);
   }
 }
 
+  abuf->written = written;
+  SEM_BRANCH_FINI
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_BGTZ) : /* bgtz $src2,$disp16 */
 {
-#define FLD(f) abuf->fields.fmt_beqz.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.cti.fields.fmt_beqz.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  SEM_BRANCH_INIT
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
-if (GTSI (* FLD (f_r2), 0)) {
+if (GTSI (* FLD (i_src2), 0)) {
   {
     USI opval = FLD (f_disp16);
-    BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_CACHE (sem_arg, opval));
+    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
+    written |= (1 << 2);
     TRACE_RESULT (current_cpu, "pc", 'x', opval);
   }
 }
 
+  abuf->written = written;
+  SEM_BRANCH_FINI
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_BLEZ) : /* blez $src2,$disp16 */
 {
-#define FLD(f) abuf->fields.fmt_beqz.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.cti.fields.fmt_beqz.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  SEM_BRANCH_INIT
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
-if (LESI (* FLD (f_r2), 0)) {
+if (LESI (* FLD (i_src2), 0)) {
   {
     USI opval = FLD (f_disp16);
-    BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_CACHE (sem_arg, opval));
+    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
+    written |= (1 << 2);
     TRACE_RESULT (current_cpu, "pc", 'x', opval);
   }
 }
 
+  abuf->written = written;
+  SEM_BRANCH_FINI
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_BLTZ) : /* bltz $src2,$disp16 */
 {
-#define FLD(f) abuf->fields.fmt_beqz.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.cti.fields.fmt_beqz.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  SEM_BRANCH_INIT
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
-if (LTSI (* FLD (f_r2), 0)) {
+if (LTSI (* FLD (i_src2), 0)) {
   {
     USI opval = FLD (f_disp16);
-    BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_CACHE (sem_arg, opval));
+    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
+    written |= (1 << 2);
     TRACE_RESULT (current_cpu, "pc", 'x', opval);
   }
 }
 
+  abuf->written = written;
+  SEM_BRANCH_FINI
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_BNEZ) : /* bnez $src2,$disp16 */
 {
-#define FLD(f) abuf->fields.fmt_beqz.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.cti.fields.fmt_beqz.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  SEM_BRANCH_INIT
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
-if (NESI (* FLD (f_r2), 0)) {
+if (NESI (* FLD (i_src2), 0)) {
   {
     USI opval = FLD (f_disp16);
-    BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_CACHE (sem_arg, opval));
+    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
+    written |= (1 << 2);
     TRACE_RESULT (current_cpu, "pc", 'x', opval);
   }
 }
 
+  abuf->written = written;
+  SEM_BRANCH_FINI
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_BL8) : /* bl.s $disp8 */
 {
-#define FLD(f) abuf->fields.fmt_bl8.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.cti.fields.fmt_bl8.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  SEM_BRANCH_INIT
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
 do {
   {
-    SI opval = ADDSI (ANDSI (CPU (h_pc), -4), 4);
-    CPU (h_gr[((HOSTUINT) 14)]) = opval;
+    SI opval = ADDSI (ANDSI (pc, -4), 4);
+    CPU (h_gr[((UINT) 14)]) = opval;
     TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
   }
   {
     USI opval = FLD (f_disp8);
-    BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_CACHE (sem_arg, opval));
+    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
     TRACE_RESULT (current_cpu, "pc", 'x', opval);
   }
 } while (0);
 
+  SEM_BRANCH_FINI
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_BL24) : /* bl.l $disp24 */
 {
-#define FLD(f) abuf->fields.fmt_bl24.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.cti.fields.fmt_bl24.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  SEM_BRANCH_INIT
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
 do {
   {
-    SI opval = ADDSI (CPU (h_pc), 4);
-    CPU (h_gr[((HOSTUINT) 14)]) = opval;
+    SI opval = ADDSI (pc, 4);
+    CPU (h_gr[((UINT) 14)]) = opval;
     TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
   }
   {
     USI opval = FLD (f_disp24);
-    BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_CACHE (sem_arg, opval));
+    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
     TRACE_RESULT (current_cpu, "pc", 'x', opval);
   }
 } while (0);
 
+  SEM_BRANCH_FINI
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_BNC8) : /* bnc.s $disp8 */
 {
-#define FLD(f) abuf->fields.fmt_bc8.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.cti.fields.fmt_bc8.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  SEM_BRANCH_INIT
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
 if (NOTBI (CPU (h_cond))) {
   {
     USI opval = FLD (f_disp8);
-    BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_CACHE (sem_arg, opval));
+    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
+    written |= (1 << 2);
     TRACE_RESULT (current_cpu, "pc", 'x', opval);
   }
 }
 
+  abuf->written = written;
+  SEM_BRANCH_FINI
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_BNC24) : /* bnc.l $disp24 */
 {
-#define FLD(f) abuf->fields.fmt_bc24.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.cti.fields.fmt_bc24.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  SEM_BRANCH_INIT
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
 if (NOTBI (CPU (h_cond))) {
   {
     USI opval = FLD (f_disp24);
-    BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_CACHE (sem_arg, opval));
+    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
+    written |= (1 << 2);
     TRACE_RESULT (current_cpu, "pc", 'x', opval);
   }
 }
 
+  abuf->written = written;
+  SEM_BRANCH_FINI
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_BNE) : /* bne $src1,$src2,$disp16 */
 {
-#define FLD(f) abuf->fields.fmt_beq.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.cti.fields.fmt_beq.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  SEM_BRANCH_INIT
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
-if (NESI (* FLD (f_r1), * FLD (f_r2))) {
+if (NESI (* FLD (i_src1), * FLD (i_src2))) {
   {
     USI opval = FLD (f_disp16);
-    BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_CACHE (sem_arg, opval));
+    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
+    written |= (1 << 3);
     TRACE_RESULT (current_cpu, "pc", 'x', opval);
   }
 }
 
+  abuf->written = written;
+  SEM_BRANCH_FINI
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_BRA8) : /* bra.s $disp8 */
 {
-#define FLD(f) abuf->fields.fmt_bra8.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.cti.fields.fmt_bra8.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  SEM_BRANCH_INIT
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
     USI opval = FLD (f_disp8);
-    BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_CACHE (sem_arg, opval));
+    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
     TRACE_RESULT (current_cpu, "pc", 'x', opval);
   }
 
+  SEM_BRANCH_FINI
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_BRA24) : /* bra.l $disp24 */
 {
-#define FLD(f) abuf->fields.fmt_bra24.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.cti.fields.fmt_bra24.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  SEM_BRANCH_INIT
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
     USI opval = FLD (f_disp24);
-    BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_CACHE (sem_arg, opval));
+    SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
     TRACE_RESULT (current_cpu, "pc", 'x', opval);
   }
 
+  SEM_BRANCH_FINI
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_CMP) : /* cmp $src1,$src2 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_cmp.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    UBI opval = LTSI (* FLD (f_r1), * FLD (f_r2));
+    BI opval = LTSI (* FLD (i_src1), * FLD (i_src2));
     CPU (h_cond) = opval;
     TRACE_RESULT (current_cpu, "condbit", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_CMPI) : /* cmpi $src2,$simm16 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_cmpi.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    UBI opval = LTSI (* FLD (f_r2), FLD (f_simm16));
+    BI opval = LTSI (* FLD (i_src2), FLD (f_simm16));
     CPU (h_cond) = opval;
     TRACE_RESULT (current_cpu, "condbit", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_CMPU) : /* cmpu $src1,$src2 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_cmp.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    UBI opval = LTUSI (* FLD (f_r1), * FLD (f_r2));
+    BI opval = LTUSI (* FLD (i_src1), * FLD (i_src2));
     CPU (h_cond) = opval;
     TRACE_RESULT (current_cpu, "condbit", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_CMPUI) : /* cmpui $src2,$simm16 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_cmpi.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    UBI opval = LTUSI (* FLD (f_r2), FLD (f_simm16));
+    BI opval = LTUSI (* FLD (i_src2), FLD (f_simm16));
     CPU (h_cond) = opval;
     TRACE_RESULT (current_cpu, "condbit", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_DIV) : /* div $dr,$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_div.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
-if (NESI (* FLD (f_r2), 0)) {
+if (NESI (* FLD (i_sr), 0)) {
   {
-    SI opval = DIVSI (* FLD (f_r1), * FLD (f_r2));
-    * FLD (f_r1) = opval;
+    SI opval = DIVSI (* FLD (i_dr), * FLD (i_sr));
+    * FLD (i_dr) = opval;
+    written |= (1 << 2);
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 }
 
+  abuf->written = written;
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_DIVU) : /* divu $dr,$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_div.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
-if (NESI (* FLD (f_r2), 0)) {
+if (NESI (* FLD (i_sr), 0)) {
   {
-    SI opval = UDIVSI (* FLD (f_r1), * FLD (f_r2));
-    * FLD (f_r1) = opval;
+    SI opval = UDIVSI (* FLD (i_dr), * FLD (i_sr));
+    * FLD (i_dr) = opval;
+    written |= (1 << 2);
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 }
 
+  abuf->written = written;
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_REM) : /* rem $dr,$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_div.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
-if (NESI (* FLD (f_r2), 0)) {
+if (NESI (* FLD (i_sr), 0)) {
   {
-    SI opval = MODSI (* FLD (f_r1), * FLD (f_r2));
-    * FLD (f_r1) = opval;
+    SI opval = MODSI (* FLD (i_dr), * FLD (i_sr));
+    * FLD (i_dr) = opval;
+    written |= (1 << 2);
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 }
 
+  abuf->written = written;
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_REMU) : /* remu $dr,$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_div.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
-if (NESI (* FLD (f_r2), 0)) {
+if (NESI (* FLD (i_sr), 0)) {
   {
-    SI opval = UMODSI (* FLD (f_r1), * FLD (f_r2));
-    * FLD (f_r1) = opval;
+    SI opval = UMODSI (* FLD (i_dr), * FLD (i_sr));
+    * FLD (i_dr) = opval;
+    written |= (1 << 2);
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 }
 
+  abuf->written = written;
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_JL) : /* jl $sr */
 {
-#define FLD(f) abuf->fields.fmt_jl.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.cti.fields.fmt_jl.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  SEM_BRANCH_INIT
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
 do {
   USI temp1;SI temp0;
-  temp0 = ADDSI (ANDSI (CPU (h_pc), -4), 4);
-  temp1 = ANDSI (* FLD (f_r2), -4);
+  temp0 = ADDSI (ANDSI (pc, -4), 4);
+  temp1 = ANDSI (* FLD (i_sr), -4);
   {
     SI opval = temp0;
-    CPU (h_gr[((HOSTUINT) 14)]) = opval;
+    CPU (h_gr[((UINT) 14)]) = opval;
     TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
   }
   {
     USI opval = temp1;
-    BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_ADDR (sem_arg, opval));
+    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
     TRACE_RESULT (current_cpu, "pc", 'x', opval);
   }
 } while (0);
 
+  SEM_BRANCH_FINI
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_JMP) : /* jmp $sr */
 {
-#define FLD(f) abuf->fields.fmt_jmp.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.cti.fields.fmt_jmp.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  SEM_BRANCH_INIT
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    USI opval = ANDSI (* FLD (f_r2), -4);
-    BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_ADDR (sem_arg, opval));
+    USI opval = ANDSI (* FLD (i_sr), -4);
+    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
     TRACE_RESULT (current_cpu, "pc", 'x', opval);
   }
 
+  SEM_BRANCH_FINI
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_LD) : /* ld $dr,@$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_ld.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = GETMEMSI (current_cpu, * FLD (f_r2));
-    * FLD (f_r1) = opval;
+    SI opval = GETMEMSI (current_cpu, * FLD (i_sr));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_LD_D) : /* ld $dr,@($slo16,$sr) */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_ld_d.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    SI opval = GETMEMSI (current_cpu, ADDSI (* FLD (f_r2), FLD (f_simm16)));
-    * FLD (f_r1) = opval;
+    SI opval = GETMEMSI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16)));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_LDB) : /* ldb $dr,@$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_ldb.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = EXTQISI (GETMEMQI (current_cpu, * FLD (f_r2)));
-    * FLD (f_r1) = opval;
+    SI opval = EXTQISI (GETMEMQI (current_cpu, * FLD (i_sr)));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_LDB_D) : /* ldb $dr,@($slo16,$sr) */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_ldb_d.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    SI opval = EXTQISI (GETMEMQI (current_cpu, ADDSI (* FLD (f_r2), FLD (f_simm16))));
-    * FLD (f_r1) = opval;
+    SI opval = EXTQISI (GETMEMQI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_LDH) : /* ldh $dr,@$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_ldh.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = EXTHISI (GETMEMHI (current_cpu, * FLD (f_r2)));
-    * FLD (f_r1) = opval;
+    SI opval = EXTHISI (GETMEMHI (current_cpu, * FLD (i_sr)));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_LDH_D) : /* ldh $dr,@($slo16,$sr) */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_ldh_d.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    SI opval = EXTHISI (GETMEMHI (current_cpu, ADDSI (* FLD (f_r2), FLD (f_simm16))));
-    * FLD (f_r1) = opval;
+    SI opval = EXTHISI (GETMEMHI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_LDUB) : /* ldub $dr,@$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_ldb.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = ZEXTQISI (GETMEMQI (current_cpu, * FLD (f_r2)));
-    * FLD (f_r1) = opval;
+    SI opval = ZEXTQISI (GETMEMQI (current_cpu, * FLD (i_sr)));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_LDUB_D) : /* ldub $dr,@($slo16,$sr) */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_ldb_d.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    SI opval = ZEXTQISI (GETMEMQI (current_cpu, ADDSI (* FLD (f_r2), FLD (f_simm16))));
-    * FLD (f_r1) = opval;
+    SI opval = ZEXTQISI (GETMEMQI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_LDUH) : /* lduh $dr,@$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_ldh.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = ZEXTHISI (GETMEMHI (current_cpu, * FLD (f_r2)));
-    * FLD (f_r1) = opval;
+    SI opval = ZEXTHISI (GETMEMHI (current_cpu, * FLD (i_sr)));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_LDUH_D) : /* lduh $dr,@($slo16,$sr) */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_ldh_d.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    SI opval = ZEXTHISI (GETMEMHI (current_cpu, ADDSI (* FLD (f_r2), FLD (f_simm16))));
-    * FLD (f_r1) = opval;
+    SI opval = ZEXTHISI (GETMEMHI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_LD_PLUS) : /* ld $dr,@$sr+ */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_ld_plus.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
 do {
   SI temp1;SI temp0;
-  temp0 = GETMEMSI (current_cpu, * FLD (f_r2));
-  temp1 = ADDSI (* FLD (f_r2), 4);
+  temp0 = GETMEMSI (current_cpu, * FLD (i_sr));
+  temp1 = ADDSI (* FLD (i_sr), 4);
   {
     SI opval = temp0;
-    * FLD (f_r1) = opval;
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
   {
     SI opval = temp1;
-    * FLD (f_r2) = opval;
+    * FLD (i_sr) = opval;
     TRACE_RESULT (current_cpu, "sr", 'x', opval);
   }
 } while (0);
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_LD24) : /* ld24 $dr,$uimm24 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_ld24.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
     SI opval = FLD (f_uimm24);
-    * FLD (f_r1) = opval;
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_LDI8) : /* ldi8 $dr,$simm8 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_ldi8.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
     SI opval = FLD (f_simm8);
-    * FLD (f_r1) = opval;
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_LDI16) : /* ldi16 $dr,$hash$slo16 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_ldi16.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
     SI opval = FLD (f_simm16);
-    * FLD (f_r1) = opval;
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_LOCK) : /* lock $dr,@$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_lock.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
 do {
   {
-    UBI opval = 1;
+    BI opval = 1;
     CPU (h_lock) = opval;
     TRACE_RESULT (current_cpu, "lock-0", 'x', opval);
   }
   {
-    SI opval = GETMEMSI (current_cpu, * FLD (f_r2));
-    * FLD (f_r1) = opval;
+    SI opval = GETMEMSI (current_cpu, * FLD (i_sr));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 } while (0);
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_MACHI) : /* machi $src1,$src2 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_machi.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    DI opval = SRADI (SLLDI (ADDDI (m32rb_h_accum_get (current_cpu), MULDI (EXTSIDI (ANDSI (* FLD (f_r1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (f_r2), 16))))), 8), 8);
-    m32rb_h_accum_set (current_cpu, opval);
+    DI opval = SRADI (SLLDI (ADDDI (m32rbf_h_accum_get (current_cpu), MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))))), 8), 8);
+    m32rbf_h_accum_set (current_cpu, opval);
     TRACE_RESULT (current_cpu, "accum", 'D', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_MACLO) : /* maclo $src1,$src2 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_machi.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    DI opval = SRADI (SLLDI (ADDDI (m32rb_h_accum_get (current_cpu), MULDI (EXTSIDI (SLLSI (* FLD (f_r1), 16)), EXTHIDI (TRUNCSIHI (* FLD (f_r2))))), 8), 8);
-    m32rb_h_accum_set (current_cpu, opval);
+    DI opval = SRADI (SLLDI (ADDDI (m32rbf_h_accum_get (current_cpu), MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))))), 8), 8);
+    m32rbf_h_accum_set (current_cpu, opval);
     TRACE_RESULT (current_cpu, "accum", 'D', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_MACWHI) : /* macwhi $src1,$src2 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_machi.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    DI opval = SRADI (SLLDI (ADDDI (m32rb_h_accum_get (current_cpu), MULDI (EXTSIDI (* FLD (f_r1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (f_r2), 16))))), 8), 8);
-    m32rb_h_accum_set (current_cpu, opval);
+    DI opval = SRADI (SLLDI (ADDDI (m32rbf_h_accum_get (current_cpu), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))))), 8), 8);
+    m32rbf_h_accum_set (current_cpu, opval);
     TRACE_RESULT (current_cpu, "accum", 'D', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_MACWLO) : /* macwlo $src1,$src2 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_machi.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    DI opval = SRADI (SLLDI (ADDDI (m32rb_h_accum_get (current_cpu), MULDI (EXTSIDI (* FLD (f_r1)), EXTHIDI (TRUNCSIHI (* FLD (f_r2))))), 8), 8);
-    m32rb_h_accum_set (current_cpu, opval);
+    DI opval = SRADI (SLLDI (ADDDI (m32rbf_h_accum_get (current_cpu), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))))), 8), 8);
+    m32rbf_h_accum_set (current_cpu, opval);
     TRACE_RESULT (current_cpu, "accum", 'D', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_MUL) : /* mul $dr,$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_add.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = MULSI (* FLD (f_r1), * FLD (f_r2));
-    * FLD (f_r1) = opval;
+    SI opval = MULSI (* FLD (i_dr), * FLD (i_sr));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_MULHI) : /* mulhi $src1,$src2 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_mulhi.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    DI opval = SRADI (SLLDI (MULDI (EXTSIDI (ANDSI (* FLD (f_r1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (f_r2), 16)))), 16), 16);
-    m32rb_h_accum_set (current_cpu, opval);
+    DI opval = SRADI (SLLDI (MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))), 16), 16);
+    m32rbf_h_accum_set (current_cpu, opval);
     TRACE_RESULT (current_cpu, "accum", 'D', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_MULLO) : /* mullo $src1,$src2 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_mulhi.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    DI opval = SRADI (SLLDI (MULDI (EXTSIDI (SLLSI (* FLD (f_r1), 16)), EXTHIDI (TRUNCSIHI (* FLD (f_r2)))), 16), 16);
-    m32rb_h_accum_set (current_cpu, opval);
+    DI opval = SRADI (SLLDI (MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 16), 16);
+    m32rbf_h_accum_set (current_cpu, opval);
     TRACE_RESULT (current_cpu, "accum", 'D', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_MULWHI) : /* mulwhi $src1,$src2 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_mulhi.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    DI opval = SRADI (SLLDI (MULDI (EXTSIDI (* FLD (f_r1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (f_r2), 16)))), 8), 8);
-    m32rb_h_accum_set (current_cpu, opval);
+    DI opval = SRADI (SLLDI (MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))), 8), 8);
+    m32rbf_h_accum_set (current_cpu, opval);
     TRACE_RESULT (current_cpu, "accum", 'D', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_MULWLO) : /* mulwlo $src1,$src2 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_mulhi.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    DI opval = SRADI (SLLDI (MULDI (EXTSIDI (* FLD (f_r1)), EXTHIDI (TRUNCSIHI (* FLD (f_r2)))), 8), 8);
-    m32rb_h_accum_set (current_cpu, opval);
+    DI opval = SRADI (SLLDI (MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 8), 8);
+    m32rbf_h_accum_set (current_cpu, opval);
     TRACE_RESULT (current_cpu, "accum", 'D', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_MV) : /* mv $dr,$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_mv.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = * FLD (f_r2);
-    * FLD (f_r1) = opval;
+    SI opval = * FLD (i_sr);
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_MVFACHI) : /* mvfachi $dr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_mvfachi.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = TRUNCDISI (SRADI (m32rb_h_accum_get (current_cpu), 32));
-    * FLD (f_r1) = opval;
+    SI opval = TRUNCDISI (SRADI (m32rbf_h_accum_get (current_cpu), 32));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_MVFACLO) : /* mvfaclo $dr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_mvfachi.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = TRUNCDISI (m32rb_h_accum_get (current_cpu));
-    * FLD (f_r1) = opval;
+    SI opval = TRUNCDISI (m32rbf_h_accum_get (current_cpu));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_MVFACMI) : /* mvfacmi $dr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_mvfachi.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = TRUNCDISI (SRADI (m32rb_h_accum_get (current_cpu), 16));
-    * FLD (f_r1) = opval;
+    SI opval = TRUNCDISI (SRADI (m32rbf_h_accum_get (current_cpu), 16));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_MVFC) : /* mvfc $dr,$scr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_mvfc.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = m32rb_h_cr_get (current_cpu, FLD (f_r2));
-    * FLD (f_r1) = opval;
+    SI opval = m32rbf_h_cr_get (current_cpu, FLD (f_r2));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_MVTACHI) : /* mvtachi $src1 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_mvtachi.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    DI opval = ORDI (ANDDI (m32rb_h_accum_get (current_cpu), MAKEDI (0, 0xffffffff)), SLLDI (EXTSIDI (* FLD (f_r1)), 32));
-    m32rb_h_accum_set (current_cpu, opval);
+    DI opval = ORDI (ANDDI (m32rbf_h_accum_get (current_cpu), MAKEDI (0, 0xffffffff)), SLLDI (EXTSIDI (* FLD (i_src1)), 32));
+    m32rbf_h_accum_set (current_cpu, opval);
     TRACE_RESULT (current_cpu, "accum", 'D', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_MVTACLO) : /* mvtaclo $src1 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_mvtachi.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    DI opval = ORDI (ANDDI (m32rb_h_accum_get (current_cpu), MAKEDI (0xffffffff, 0)), ZEXTSIDI (* FLD (f_r1)));
-    m32rb_h_accum_set (current_cpu, opval);
+    DI opval = ORDI (ANDDI (m32rbf_h_accum_get (current_cpu), MAKEDI (0xffffffff, 0)), ZEXTSIDI (* FLD (i_src1)));
+    m32rbf_h_accum_set (current_cpu, opval);
     TRACE_RESULT (current_cpu, "accum", 'D', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_MVTC) : /* mvtc $sr,$dcr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_mvtc.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    USI opval = * FLD (f_r2);
-    m32rb_h_cr_set (current_cpu, FLD (f_r1), opval);
+    USI opval = * FLD (i_sr);
+    m32rbf_h_cr_set (current_cpu, FLD (f_r1), opval);
     TRACE_RESULT (current_cpu, "dcr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_NEG) : /* neg $dr,$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_mv.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = NEGSI (* FLD (f_r2));
-    * FLD (f_r1) = opval;
+    SI opval = NEGSI (* FLD (i_sr));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_NOP) : /* nop */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_nop.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
 PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_NOT) : /* not $dr,$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_mv.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = INVSI (* FLD (f_r2));
-    * FLD (f_r1) = opval;
+    SI opval = INVSI (* FLD (i_sr));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_RAC) : /* rac */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_rac.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
 do {
   DI tmp_tmp1;
-  tmp_tmp1 = SLLDI (m32rb_h_accum_get (current_cpu), 1);
+  tmp_tmp1 = SLLDI (m32rbf_h_accum_get (current_cpu), 1);
   tmp_tmp1 = ADDDI (tmp_tmp1, MAKEDI (0, 32768));
   {
     DI opval = (GTDI (tmp_tmp1, MAKEDI (32767, 0xffff0000))) ? (MAKEDI (32767, 0xffff0000)) : (LTDI (tmp_tmp1, MAKEDI (0xffff8000, 0))) ? (MAKEDI (0xffff8000, 0)) : (ANDDI (tmp_tmp1, MAKEDI (0xffffffff, 0xffff0000)));
-    m32rb_h_accum_set (current_cpu, opval);
+    m32rbf_h_accum_set (current_cpu, opval);
     TRACE_RESULT (current_cpu, "accum", 'D', opval);
   }
 } while (0);
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_RACH) : /* rach */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_rac.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
 do {
   DI tmp_tmp1;
-  tmp_tmp1 = ANDDI (m32rb_h_accum_get (current_cpu), MAKEDI (16777215, 0xffffffff));
+  tmp_tmp1 = ANDDI (m32rbf_h_accum_get (current_cpu), MAKEDI (16777215, 0xffffffff));
 if (ANDIF (GEDI (tmp_tmp1, MAKEDI (16383, 0x80000000)), LEDI (tmp_tmp1, MAKEDI (8388607, 0xffffffff)))) {
   tmp_tmp1 = MAKEDI (16383, 0x80000000);
 } else {
 if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (16760832, 0)))) {
   tmp_tmp1 = MAKEDI (16760832, 0);
 } else {
-  tmp_tmp1 = ANDDI (ADDDI (m32rb_h_accum_get (current_cpu), MAKEDI (0, 1073741824)), MAKEDI (0xffffffff, 0x80000000));
+  tmp_tmp1 = ANDDI (ADDDI (m32rbf_h_accum_get (current_cpu), MAKEDI (0, 1073741824)), MAKEDI (0xffffffff, 0x80000000));
 }
 }
   tmp_tmp1 = SLLDI (tmp_tmp1, 1);
   {
     DI opval = SRADI (SLLDI (tmp_tmp1, 7), 7);
-    m32rb_h_accum_set (current_cpu, opval);
+    m32rbf_h_accum_set (current_cpu, opval);
     TRACE_RESULT (current_cpu, "accum", 'D', opval);
   }
 } while (0);
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_RTE) : /* rte */
 {
-#define FLD(f) abuf->fields.fmt_rte.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.cti.fields.fmt_rte.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  SEM_BRANCH_INIT
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
 do {
   {
-    UBI opval = CPU (h_bsm);
-    CPU (h_sm) = opval;
-    TRACE_RESULT (current_cpu, "sm-0", 'x', opval);
+    USI opval = ANDSI (m32rbf_h_cr_get (current_cpu, ((UINT) 6)), -4);
+    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
+    TRACE_RESULT (current_cpu, "pc", 'x', opval);
   }
   {
-    UBI opval = CPU (h_bie);
-    CPU (h_ie) = opval;
-    TRACE_RESULT (current_cpu, "ie-0", 'x', opval);
+    USI opval = m32rbf_h_cr_get (current_cpu, ((UINT) 14));
+    m32rbf_h_cr_set (current_cpu, ((UINT) 6), opval);
+    TRACE_RESULT (current_cpu, "cr-6", 'x', opval);
   }
   {
-    UBI opval = CPU (h_bcond);
-    CPU (h_cond) = opval;
-    TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+    UQI opval = CPU (h_bpsw);
+    m32rbf_h_psw_set (current_cpu, opval);
+    TRACE_RESULT (current_cpu, "psw-0", 'x', opval);
   }
   {
-    USI opval = ANDSI (CPU (h_bpc), -4);
-    BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_ADDR (sem_arg, opval));
-    TRACE_RESULT (current_cpu, "pc", 'x', opval);
+    UQI opval = CPU (h_bbpsw);
+    CPU (h_bpsw) = opval;
+    TRACE_RESULT (current_cpu, "bpsw-0", 'x', opval);
   }
 } while (0);
 
+  SEM_BRANCH_FINI
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_SETH) : /* seth $dr,$hash$hi16 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_seth.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
     SI opval = SLLSI (FLD (f_hi16), 16);
-    * FLD (f_r1) = opval;
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_SLL) : /* sll $dr,$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_add.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = SLLSI (* FLD (f_r1), ANDSI (* FLD (f_r2), 31));
-    * FLD (f_r1) = opval;
+    SI opval = SLLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_SLL3) : /* sll3 $dr,$sr,$simm16 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_sll3.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    SI opval = SLLSI (* FLD (f_r2), ANDSI (FLD (f_simm16), 31));
-    * FLD (f_r1) = opval;
+    SI opval = SLLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_SLLI) : /* slli $dr,$uimm5 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_slli.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = SLLSI (* FLD (f_r1), FLD (f_uimm5));
-    * FLD (f_r1) = opval;
+    SI opval = SLLSI (* FLD (i_dr), FLD (f_uimm5));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_SRA) : /* sra $dr,$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_add.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = SRASI (* FLD (f_r1), ANDSI (* FLD (f_r2), 31));
-    * FLD (f_r1) = opval;
+    SI opval = SRASI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_SRA3) : /* sra3 $dr,$sr,$simm16 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_sll3.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    SI opval = SRASI (* FLD (f_r2), ANDSI (FLD (f_simm16), 31));
-    * FLD (f_r1) = opval;
+    SI opval = SRASI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_SRAI) : /* srai $dr,$uimm5 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_slli.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = SRASI (* FLD (f_r1), FLD (f_uimm5));
-    * FLD (f_r1) = opval;
+    SI opval = SRASI (* FLD (i_dr), FLD (f_uimm5));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_SRL) : /* srl $dr,$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_add.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = SRLSI (* FLD (f_r1), ANDSI (* FLD (f_r2), 31));
-    * FLD (f_r1) = opval;
+    SI opval = SRLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_SRL3) : /* srl3 $dr,$sr,$simm16 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_sll3.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    SI opval = SRLSI (* FLD (f_r2), ANDSI (FLD (f_simm16), 31));
-    * FLD (f_r1) = opval;
+    SI opval = SRLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_SRLI) : /* srli $dr,$uimm5 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_slli.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = SRLSI (* FLD (f_r1), FLD (f_uimm5));
-    * FLD (f_r1) = opval;
+    SI opval = SRLSI (* FLD (i_dr), FLD (f_uimm5));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_ST) : /* st $src1,@$src2 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_st.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = * FLD (f_r1);
-    SETMEMSI (current_cpu, * FLD (f_r2), opval);
+    SI opval = * FLD (i_src1);
+    SETMEMSI (current_cpu, * FLD (i_src2), opval);
     TRACE_RESULT (current_cpu, "memory", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_ST_D) : /* st $src1,@($slo16,$src2) */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_st_d.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    SI opval = * FLD (f_r1);
-    SETMEMSI (current_cpu, ADDSI (* FLD (f_r2), FLD (f_simm16)), opval);
+    SI opval = * FLD (i_src1);
+    SETMEMSI (current_cpu, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
     TRACE_RESULT (current_cpu, "memory", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_STB) : /* stb $src1,@$src2 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_stb.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    QI opval = * FLD (f_r1);
-    SETMEMQI (current_cpu, * FLD (f_r2), opval);
+    QI opval = * FLD (i_src1);
+    SETMEMQI (current_cpu, * FLD (i_src2), opval);
     TRACE_RESULT (current_cpu, "memory", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_STB_D) : /* stb $src1,@($slo16,$src2) */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_stb_d.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    QI opval = * FLD (f_r1);
-    SETMEMQI (current_cpu, ADDSI (* FLD (f_r2), FLD (f_simm16)), opval);
+    QI opval = * FLD (i_src1);
+    SETMEMQI (current_cpu, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
     TRACE_RESULT (current_cpu, "memory", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_STH) : /* sth $src1,@$src2 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_sth.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    HI opval = * FLD (f_r1);
-    SETMEMHI (current_cpu, * FLD (f_r2), opval);
+    HI opval = * FLD (i_src1);
+    SETMEMHI (current_cpu, * FLD (i_src2), opval);
     TRACE_RESULT (current_cpu, "memory", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_STH_D) : /* sth $src1,@($slo16,$src2) */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_sth_d.f
-  new_pc = SEM_NEXT_PC (sem_arg, 4);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    HI opval = * FLD (f_r1);
-    SETMEMHI (current_cpu, ADDSI (* FLD (f_r2), FLD (f_simm16)), opval);
+    HI opval = * FLD (i_src1);
+    SETMEMHI (current_cpu, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
     TRACE_RESULT (current_cpu, "memory", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_ST_PLUS) : /* st $src1,@+$src2 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_st_plus.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
 do {
   SI tmp_new_src2;
-  tmp_new_src2 = ADDSI (* FLD (f_r2), 4);
+  tmp_new_src2 = ADDSI (* FLD (i_src2), 4);
   {
-    SI opval = * FLD (f_r1);
+    SI opval = * FLD (i_src1);
     SETMEMSI (current_cpu, tmp_new_src2, opval);
     TRACE_RESULT (current_cpu, "memory", 'x', opval);
   }
   {
     SI opval = tmp_new_src2;
-    * FLD (f_r2) = opval;
+    * FLD (i_src2) = opval;
     TRACE_RESULT (current_cpu, "src2", 'x', opval);
   }
 } while (0);
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_ST_MINUS) : /* st $src1,@-$src2 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_st_plus.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
 do {
   SI tmp_new_src2;
-  tmp_new_src2 = SUBSI (* FLD (f_r2), 4);
+  tmp_new_src2 = SUBSI (* FLD (i_src2), 4);
   {
-    SI opval = * FLD (f_r1);
+    SI opval = * FLD (i_src1);
     SETMEMSI (current_cpu, tmp_new_src2, opval);
     TRACE_RESULT (current_cpu, "memory", 'x', opval);
   }
   {
     SI opval = tmp_new_src2;
-    * FLD (f_r2) = opval;
+    * FLD (i_src2) = opval;
     TRACE_RESULT (current_cpu, "src2", 'x', opval);
   }
 } while (0);
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_SUB) : /* sub $dr,$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_add.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
   {
-    SI opval = SUBSI (* FLD (f_r1), * FLD (f_r2));
-    * FLD (f_r1) = opval;
+    SI opval = SUBSI (* FLD (i_dr), * FLD (i_sr));
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_SUBV) : /* subv $dr,$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_addv.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
 do {
-  UBI temp1;SI temp0;
-  temp0 = SUBSI (* FLD (f_r1), * FLD (f_r2));
-  temp1 = SUBOFSI (* FLD (f_r1), * FLD (f_r2), 0);
+  BI temp1;SI temp0;
+  temp0 = SUBSI (* FLD (i_dr), * FLD (i_sr));
+  temp1 = SUBOFSI (* FLD (i_dr), * FLD (i_sr), 0);
   {
     SI opval = temp0;
-    * FLD (f_r1) = opval;
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
   {
-    UBI opval = temp1;
+    BI opval = temp1;
     CPU (h_cond) = opval;
     TRACE_RESULT (current_cpu, "condbit", 'x', opval);
   }
@@ -1774,24 +2383,28 @@ do {
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_SUBX) : /* subx $dr,$sr */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_addx.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
 do {
-  UBI temp1;SI temp0;
-  temp0 = SUBCSI (* FLD (f_r1), * FLD (f_r2), CPU (h_cond));
-  temp1 = SUBCFSI (* FLD (f_r1), * FLD (f_r2), CPU (h_cond));
+  BI temp1;SI temp0;
+  temp0 = SUBCSI (* FLD (i_dr), * FLD (i_sr), CPU (h_cond));
+  temp1 = SUBCFSI (* FLD (i_dr), * FLD (i_sr), CPU (h_cond));
   {
     SI opval = temp0;
-    * FLD (f_r1) = opval;
+    * FLD (i_dr) = opval;
     TRACE_RESULT (current_cpu, "dr", 'x', opval);
   }
   {
-    UBI opval = temp1;
+    BI opval = temp1;
     CPU (h_cond) = opval;
     TRACE_RESULT (current_cpu, "condbit", 'x', opval);
   }
@@ -1799,64 +2412,92 @@ do {
 
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_TRAP) : /* trap $uimm4 */
 {
-#define FLD(f) abuf->fields.fmt_trap.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+#define FLD(f) abuf->fields.cti.fields.fmt_trap.f
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  SEM_BRANCH_INIT
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
 do {
   {
-    USI opval = ADDSI (CPU (h_pc), 4);
-    m32rb_h_cr_set (current_cpu, ((HOSTUINT) 6), opval);
+    USI opval = m32rbf_h_cr_get (current_cpu, ((UINT) 6));
+    m32rbf_h_cr_set (current_cpu, ((UINT) 14), opval);
+    TRACE_RESULT (current_cpu, "cr-14", 'x', opval);
+  }
+  {
+    USI opval = ADDSI (pc, 4);
+    m32rbf_h_cr_set (current_cpu, ((UINT) 6), opval);
     TRACE_RESULT (current_cpu, "cr-6", 'x', opval);
   }
   {
-    USI opval = ANDSI (SLLSI (m32rb_h_cr_get (current_cpu, ((HOSTUINT) 0)), 8), 65408);
-    m32rb_h_cr_set (current_cpu, ((HOSTUINT) 0), opval);
-    TRACE_RESULT (current_cpu, "cr-0", 'x', opval);
+    UQI opval = CPU (h_bpsw);
+    CPU (h_bbpsw) = opval;
+    TRACE_RESULT (current_cpu, "bbpsw-0", 'x', opval);
   }
   {
-    SI opval = m32r_trap (current_cpu, CPU (h_pc), FLD (f_uimm4));
-    BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_ADDR (sem_arg, opval));
+    UQI opval = m32rbf_h_psw_get (current_cpu);
+    CPU (h_bpsw) = opval;
+    TRACE_RESULT (current_cpu, "bpsw-0", 'x', opval);
+  }
+  {
+    UQI opval = ANDQI (m32rbf_h_psw_get (current_cpu), 128);
+    m32rbf_h_psw_set (current_cpu, opval);
+    TRACE_RESULT (current_cpu, "psw-0", 'x', opval);
+  }
+  {
+    SI opval = m32r_trap (current_cpu, pc, FLD (f_uimm4));
+    SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
     TRACE_RESULT (current_cpu, "pc", 'x', opval);
   }
 } while (0);
 
+  SEM_BRANCH_FINI
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
   CASE (sem, INSN_UNLOCK) : /* unlock $src1,@$src2 */
 {
+  SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
 #define FLD(f) abuf->fields.fmt_unlock.f
-  new_pc = SEM_NEXT_PC (sem_arg, 2);
+  int UNUSED written = 0;
+  PCADDR UNUSED pc = abuf->addr;
+  vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
 do {
 if (CPU (h_lock)) {
   {
-    SI opval = * FLD (f_r1);
-    SETMEMSI (current_cpu, * FLD (f_r2), opval);
+    SI opval = * FLD (i_src1);
+    SETMEMSI (current_cpu, * FLD (i_src2), opval);
+    written |= (1 << 3);
     TRACE_RESULT (current_cpu, "memory", 'x', opval);
   }
 }
   {
-    UBI opval = 0;
+    BI opval = 0;
     CPU (h_lock) = opval;
     TRACE_RESULT (current_cpu, "lock-0", 'x', opval);
   }
 } while (0);
 
+  abuf->written = written;
 #undef FLD
 }
-  BREAK (sem);
+  NEXT (vpc);
 
 
     }
   ENDSWITCH (sem) /* End of semantic switch.  */
 
-  PC = new_pc;
+  /* At this point `vpc' contains the next insn to execute.  */
 }
 
+#undef DEFINE_SWITCH
 #endif /* DEFINE_SWITCH */