X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fmn10300%2Fmn10300.igen;h=c7b83ed141fc520ce8095404e37844c7a162b5cc;hb=465fb143c87076b6416a8d0d5dd79bb016060fe3;hp=aec7a43a72e399e5c59b659a6962e1ffc85f4bd3;hpb=e98fe4f7b54cbdf29aef9287bbb1bea8801dd05a;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/mn10300/mn10300.igen b/sim/mn10300/mn10300.igen
index aec7a43a72..c7b83ed141 100644
--- a/sim/mn10300/mn10300.igen
+++ b/sim/mn10300/mn10300.igen
@@ -4,22 +4,21 @@
 :option:::hi-bit-nr:7
 :model:::mn10300:mn10300:
 :model:::am33:am33:
+:model:::am33_2:am33_2:
 
 // What do we do with an illegal instruction?
 :internal::::illegal:
 {
-  sim_io_eprintf (SD, "Illegal instruction at address 0x%lx\n",
-		  (unsigned long) cia);
-  sim_engine_halt (SD, CPU, NULL, cia, sim_signalled, SIM_SIGILL);
+  PC = cia;
+  program_interrupt(SD, CPU, cia, SIM_SIGILL);
 }
 
 // 1000 DnDn imm8....; mov imm8,Dn (imm8 is sign extended)
 4.0x8,2.DM1,2.DN0=DM1+8.IMM8:S0i:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /*  OP_8000 (); */
   signed32 immed = EXTEND8 (IMM8);
@@ -31,9 +30,8 @@
 4.0x8,2.DM1,2.DN0!DM1:S0:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   PC = cia;
   /* OP_80 (); */
@@ -45,9 +43,8 @@
 8.0xf1+1110,2.DM1,2.AN0:D0:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_F1E0 (); */
   PC = cia;
@@ -59,9 +56,8 @@
 8.0xf1+1101,2.AM1,2.DN0:D0a:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_F1D0 (); */
   PC = cia;
@@ -73,9 +69,8 @@
 4.0x9,2.AM1,2.AN0=AM1+8.IMM8:S0ai:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
    PC = cia;
    /* OP_9000 (); */
@@ -87,9 +82,8 @@
 4.0x9,2.AM1,2.AN0!AM1:S0a:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
    PC = cia;
    /* OP_90 (); */
@@ -101,9 +95,8 @@
 4.0x3,11,2.AN0:S0b:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_3C (); */
   PC = cia;
@@ -115,9 +108,8 @@
 8.0xf2+4.0xf,2.AM1,00:D0b:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_F2F0 (); */
   PC = cia;
@@ -129,9 +121,8 @@
 8.0xf2+4.0xe,01,2.DN0:D0c:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_F2E4 (); */
   PC = cia;
@@ -143,9 +134,8 @@
 8.0xf2+4.0xf,2.DM1,11:D0d:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_F2F3 (); */
   PC = cia;
@@ -157,9 +147,8 @@
 8.0xf2+4.0xe,00,2.DN0:D0e:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_F2E0 (); */
   PC = cia;
@@ -171,9 +160,8 @@
 8.0xf2+4.0xf,2.DM1,10:D0f:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_F2F2 (); */
   PC = cia;
@@ -185,9 +173,8 @@
 4.0x7,2.DN1,2.AM0:S0c:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_70 (); */
   PC = cia;
@@ -199,9 +186,8 @@
 8.0xf8+4.0x0,2.DN1,2.AM0+8.D8:D1:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_F80000 (); */
   PC = cia;
@@ -214,9 +200,8 @@
 8.0xfa+4.0x0,2.DN1,2.AM0+8.D16A+8.D16B:D2:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_FA000000 (); */
   PC = cia;
@@ -229,9 +214,8 @@
 8.0xfc+4.0x0,2.DN1,2.AM0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_FC000000 (); */
   PC = cia;
@@ -245,9 +229,8 @@
 4.0x5,10,2.DN0+8.D8:S1:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_5800 (); */
   PC = cia;
@@ -259,9 +242,8 @@
 8.0xfa+4.0xb,01,2.DN0+8.IMM16A+8.IMM16B:D2a:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_FAB40000 (); */
   PC = cia;
@@ -274,9 +256,8 @@
 8.0xfc+4.0xb,01,2.DN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4a:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_FCB40000 (); */
   PC = cia;
@@ -289,9 +270,8 @@
 8.0xf3+00,2.DN2,2.DI,2.AM0:D0g:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_F300 (); */
   PC = cia;
@@ -304,9 +284,8 @@
 4.0x3,00,2.DN0+8.IMM16A+8.IMM16B:S2:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_300000 (); */
   PC = cia;
@@ -317,9 +296,8 @@
 8.0xfc+4.0xa,01,2.DN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4b:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_FCA40000 (); */
   PC = cia;
@@ -331,9 +309,8 @@
 8.0xf0+4.0x0,2.AN1,2.AM0:D0h:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_F000 (); */
   PC = cia;
@@ -345,9 +322,8 @@
 8.0xf8+4.0x2,2.AN1,2.AM0+8.D8:D1a:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_F82000 (); */
   PC = cia;
@@ -360,9 +336,8 @@
 8.0xfa+4.0x2,2.AN1,2.AM0+8.D16A+8.D16B:D2b:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_FA200000 (); */
   PC = cia;
@@ -376,9 +351,8 @@
 8.0xfc+4.0x2,2.AN1,2.AM0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4c:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_FC200000 (); */
   PC = cia;
@@ -392,9 +366,8 @@
 4.0x5,11,2.AN0+8.D8:S1a:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_5C00 (); */
   PC = cia;
@@ -407,9 +380,8 @@
 8.0xfa+4.0xb,00,2.AN0+8.IMM16A+8.IMM16B:D2c:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_FAB00000 (); */
   PC = cia;
@@ -422,9 +394,8 @@
 8.0xfc+4.0xb,00,2.AN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4d:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_FCB00000 (); */
   PC = cia;
@@ -438,9 +409,8 @@
 8.0xf3+10,2.AN2,2.DI,2.AM0:D0i:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_F380 (); */
   PC = cia;
@@ -454,9 +424,8 @@
 8.0xfa+4.0xa,00,2.AN0+8.IMM16A+8.IMM16B:D2d:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_FAA00000 (); */
   PC = cia;
@@ -468,9 +437,8 @@
 8.0xfc+4.0xa,00,2.AN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4e:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_FCA00000 (); */
   PC = cia;
@@ -483,9 +451,8 @@
 8.0xf8+4.0xf,00,2.AM0+8.D8:D1b:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_F8F000 (); */
   PC = cia;
@@ -498,9 +465,8 @@
 4.0x6,2.DM1,2.AN0:S0d:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_60 (); */
   PC = cia;
@@ -512,9 +478,8 @@
 8.0xf8+4.0x1,2.DM1,2.AN0+8.D8:D1c:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_F81000 (); */
   PC = cia;
@@ -527,9 +492,8 @@
 8.0xfa+4.0x1,2.DM1,2.AN0+8.D16A+8.D16B:D2e:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_FA100000 (); */
   PC = cia;
@@ -542,9 +506,8 @@
 8.0xfc+4.0x1,2.DM1,2.AN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4f:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_FC100000 (); */
   PC = cia;
@@ -558,9 +521,8 @@
 4.0x4,2.DM1,10+8.D8:S1b:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_4200 (); */
   PC = cia;
@@ -572,9 +534,8 @@
 8.0xfa+4.0x9,2.DM1,01+8.IMM16A+8.IMM16B:D2f:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_FA910000 (); */
   PC = cia;
@@ -587,9 +548,8 @@
 8.0xfc+4.0x9,2.DM1,01+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4g:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_FC910000 (); */
   PC = cia;
@@ -602,9 +562,8 @@
 8.0xf3+01,2.DM2,2.DI,2.AN0:D0j:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_F340 (); */
   PC = cia;
@@ -617,9 +576,8 @@
 4.0x0,2.DM1,01+8.IMM16A+8.IMM16B:S2a:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_10000 (); */
   PC = cia;
@@ -631,9 +589,8 @@
 8.0xfc+4.0x8,2.DM1,01+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4h:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_FC810000 (); */
   PC = cia;
@@ -646,9 +603,8 @@
 8.0xf0+4.0x1,2.AM1,2.AN0:D0k:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_F010 (); */
   PC = cia;
@@ -660,9 +616,8 @@
 8.0xf8+4.0x3,2.AM1,2.AN0+8.D8:D1d:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_F83000 (); */
   PC = cia;
@@ -675,9 +630,8 @@
 8.0xfa+4.0x3,2.AM1,2.AN0+8.D16A+8.D16B:D2g:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_FA300000 (); */
   PC = cia;
@@ -690,9 +644,8 @@
 8.0xfc+4.0x3,2.AM1,2.AN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4i:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
 *am33
-// end-sanitize-am33
+*am33_2
 {
   /* OP_FC300000 (); */
   PC = cia;
@@ -706,9 +659,10 @@
 4.0x4,2.AM1,11+8.D8:S1c:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_4300 (); */
   PC = cia;
@@ -720,9 +674,10 @@
 8.0xfa+4.0x9,2.AM1,00+8.IMM16A+8.IMM16B:D2h:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FA900000 (); */
   PC = cia;
@@ -735,9 +690,10 @@
 8.0xfc+4.0x9,2.AM1,00+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4j:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FC900000 (); */
   PC = cia;
@@ -750,9 +706,10 @@
 8.0xf3+11,2.AM2,2.DI,2.AN0:D0l:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F3C0 (); */
   PC = cia;
@@ -765,9 +722,10 @@
 8.0xfa+4.0x8,2.AM1,00+8.IMM16A+8.IMM16B:D2i:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FA800000 (); */
   PC = cia;
@@ -780,9 +738,10 @@
 8.0xfc+4.0x8,2.AM1,00+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4k:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FC800000 (); */
   PC = cia;
@@ -795,9 +754,10 @@
 8.0xf8+4.0xf,01,2.AN0+8.D8:D1e:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F8F400 (); */
   PC = cia;
@@ -810,12 +770,13 @@
 4.0x2,11,2.DN0+8.IMM16A+8.IMM16B:S2b:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_2C0000 (); */
-  unsigned long value;
+  unsigned32 value;
 
   PC = cia;
   value = EXTEND16 (FETCH16(IMM16A, IMM16B));
@@ -827,12 +788,13 @@
 8.0xfc+4.0xc,11,2.DN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4l:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FCCC0000 (); */
-  unsigned long value;
+  unsigned32 value;
 
   PC = cia;
   value = FETCH32(IMM32A, IMM32B, IMM32C, IMM32D);
@@ -844,12 +806,13 @@
 4.0x2,01,2.AN0+8.IMM16A+8.IMM16B:S2c:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_240000 (); */
-  unsigned long value;
+  unsigned32 value;
 
   PC = cia;
   value = FETCH16(IMM16A, IMM16B);
@@ -861,9 +824,10 @@
 8.0xfc+4.0xd,11,2.AN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4m:::mov
 "mov"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
     /* OP_FCDC0000 (); */
     PC = cia;
@@ -875,9 +839,10 @@
 8.0xf0+4.0x4,2.DN1,2.AM0:D0:::movbu
 "movbu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F040 (); */
   PC = cia;
@@ -890,9 +855,10 @@
 8.0xf8+4.0x4,2.DN1,2.AM0+8.D8:D1f:::movbu
 "movbu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F84000 (); */
   PC = cia;
@@ -905,9 +871,10 @@
 8.0xfa+4.0x4,2.DN1,2.AM0+8.D16A+8.D16B:D2:::movbu
 "movbu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FA400000 (); */
   PC = cia;
@@ -921,9 +888,10 @@
 8.0xfc+4.0x4,2.DN1,2.AM0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4:::movbu
 "movbu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FC400000 (); */
   PC = cia;
@@ -937,9 +905,10 @@
 8.0xf8+4.0xb,10,2.DN0+8.D8:D1a:::movbu
 "movbu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F8B800 (); */
   PC = cia;
@@ -952,9 +921,10 @@
 8.0xfa+4.0xb,10,2.DN0+8.IMM16A+8.IMM16B:D2a:::movbu
 "movbu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FAB80000 (); */
   PC = cia;
@@ -968,9 +938,10 @@
 8.0xfc+4.0xb,10,2.DN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4a:::movbu
 "movbu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FCB80000 (); */
   PC = cia;
@@ -984,9 +955,10 @@
 8.0xf4+00,2.DN2,2.DI,2.AM0:D0a:::movbu
 "movbu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F400 (); */
   PC = cia;
@@ -1000,9 +972,10 @@
 4.0x3,01,2.DN0+8.IMM16A+8.IMM16B:S2:::movbu
 "movbu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_340000 (); */
   PC = cia;
@@ -1014,9 +987,10 @@
 8.0xfc+4.0xa,10,2.DN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4b:::movbu
 "movbu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FCA80000 (); */
   PC = cia;
@@ -1029,9 +1003,10 @@
 8.0xf0+4.0x5,2.DM1,2.AN0:D0b:::movbu
 "movbu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F050 (); */
   PC = cia;
@@ -1043,9 +1018,10 @@
 8.0xf8+4.0x5,2.DM1,2.AN0+8.D8:D1b:::movbu
 "movbu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F85000 (); */
   PC = cia;
@@ -1058,9 +1034,10 @@
 8.0xfa+4.0x5,2.DM1,2.AN0+8.D16A+8.D16B:D2b:::movbu
 "movbu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FA500000 (); */
   PC = cia;
@@ -1073,9 +1050,10 @@
 8.0xfc+4.0x5,2.DM1,2.AN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4c:::movbu
 "movbu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FC500000 (); */
   PC = cia;
@@ -1089,9 +1067,10 @@
 8.0xf8+4.0x9,2.DM1,10+8.D8:D1c:::movbu
 "movbu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F89200 (); */
   PC = cia;
@@ -1103,9 +1082,10 @@
 8.0xfa+4.0x9,2.DM1,10+8.IMM16A+8.IMM16B:D2c:::movbu
 "movbu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FA920000 (); */
   PC = cia;
@@ -1118,9 +1098,10 @@
 8.0xfc+4.0x9,2.DM1,10+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4d:::movbu
 "movbu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FC920000 (); */
   PC = cia;
@@ -1133,9 +1114,10 @@
 8.0xf4+01,2.DM2,2.DI,2.AN0:D0c:::movbu
 "movbu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F440 (); */
   PC = cia;
@@ -1148,9 +1130,10 @@
 4.0x0,2.DM1,10+8.IMM16A+8.IMM16B:S2a:::movbu
 "movbu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_20000 (); */
   PC = cia;
@@ -1163,9 +1146,10 @@
 8.0xfc+4.0x8,2.DM1,10+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4e:::movbu
 "movbu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FC820000 (); */
   PC = cia;
@@ -1178,9 +1162,10 @@
 8.0xf0+4.0x6,2.DN1,2.AM0:D0:::movhu
 "movhu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F060 (); */
   PC = cia;
@@ -1193,9 +1178,10 @@
 8.0xf8+4.0x6,2.DN1,2.AM0+8.D8:D1d:::movhu
 "movhu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F86000 (); */
   PC = cia;
@@ -1208,9 +1194,10 @@
 8.0xfa+4.0x6,2.DN1,2.AM0+8.D16A+8.D16B:D2:::movhu
 "movhu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FA600000 (); */
   PC = cia;
@@ -1224,9 +1211,10 @@
 8.0xfc+4.0x6,2.DN1,2.AM0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4:::movhu
 "movhu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FC600000 (); */
   PC = cia;
@@ -1240,9 +1228,10 @@
 8.0xf8+4.0xb,11,2.DN0+8.D8:D1a:::movhu
 "movhu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F8BC00 (); */
   PC = cia;
@@ -1255,9 +1244,10 @@
 8.0xfa+4.0xb,11,2.DN0+8.IMM16A+8.IMM16B:D2a:::movhu
 "movhu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FABC0000 (); */
   PC = cia;
@@ -1270,9 +1260,10 @@
 8.0xfc+4.0xb,11,2.DN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4a:::movhu
 "movhu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FCBC0000 (); */
   PC = cia;
@@ -1285,9 +1276,10 @@
 8.0xf4+10,2.DN2,2.DI,2.AM0:D0a:::movhu
 "movhu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F480 (); */
   PC = cia;
@@ -1300,9 +1292,10 @@
 4.0x3,10,2.DN0+8.IMM16A+8.IMM16B:S2:::movhu
 "movhu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_380000 (); */
   PC = cia;
@@ -1314,9 +1307,10 @@
 8.0xfc+4.0xa,11,2.DN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4b:::movhu
 "movhu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FCAC0000 (); */
   PC = cia;
@@ -1329,9 +1323,10 @@
 8.0xf0+4.0x7,2.DM1,2.AN0:D0b:::movhu
 "movhu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F070 (); */
   PC = cia;
@@ -1344,9 +1339,10 @@
 8.0xf8+4.0x7,2.DM1,2.AN0+8.D8:D1b:::movhu
 "movhu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F87000 (); */
   PC = cia;
@@ -1359,9 +1355,10 @@
 8.0xfa+4.0x7,2.DM1,2.AN0+8.D16A+8.D16B:D2b:::movhu
 "movhu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FA700000 (); */
   PC = cia;
@@ -1374,9 +1371,10 @@
 8.0xfc+4.0x7,2.DM1,2.AN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4c:::movhu
 "movhu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FC700000 (); */
   PC = cia;
@@ -1390,9 +1388,10 @@
 8.0xf8+4.0x9,2.DM1,11+8.D8:D1c:::movhu
 "movhu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F89300 (); */
   PC = cia;
@@ -1405,9 +1404,10 @@
 8.0xfa+4.0x9,2.DM1,11+8.IMM16A+8.IMM16B:D2c:::movhu
 "movhu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FA930000 (); */
   PC = cia;
@@ -1420,9 +1420,10 @@
 8.0xfc+4.0x9,2.DM1,11+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4d:::movhu
 "movhu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FC930000 (); */
   PC = cia;
@@ -1435,9 +1436,10 @@
 8.0xf4+11,2.DM2,2.DI,2.AN0:D0c:::movhu
 "movhu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F4C0 (); */
   PC = cia;
@@ -1450,9 +1452,10 @@
 4.0x0,2.DM1,11+8.IMM16A+8.IMM16B:S2a:::movhu
 "movhu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_30000 (); */
   PC = cia;
@@ -1464,9 +1467,10 @@
 8.0xfc+4.0x8,2.DM1,11+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4e:::movhu
 "movhu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FC830000 (); */
   PC = cia;
@@ -1479,9 +1483,10 @@
 8.0xf2+4.0xd,00,2.DN0:D0:::ext
 "ext"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F2D0 (); */
   PC = cia;
@@ -1496,9 +1501,10 @@
 4.0x1,00,2.DN0:S0:::extb
 "extb"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_10 (); */
   PC = cia;
@@ -1510,9 +1516,10 @@
 4.0x1,01,2.DN0:S0:::extbu
 "extbu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_14 (); */
   PC = cia;
@@ -1524,9 +1531,10 @@
 4.0x1,10,2.DN0:S0:::exth
 "exth"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_18 (); */
   PC = cia;
@@ -1538,9 +1546,10 @@
 4.0x1,11,2.DN0:S0:::exthu
 "exthu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_1C (); */
   PC = cia;
@@ -1552,9 +1561,10 @@
 4.0x0,2.DN1,00:S0:::clr
 "clr"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_0 (); */
   PC = cia;
@@ -1569,9 +1579,10 @@
 4.0xe,2.DM1,2.DN0:S0:::add
 "add"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_E0 (); */
   PC = cia;
@@ -1582,9 +1593,10 @@
 8.0xf1+4.0x6,2.DM1,2.AN0:D0:::add
 "add"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F160 (); */
   PC = cia;
@@ -1596,9 +1608,10 @@
 8.0xf1+4.0x5,2.AM1,2.DN0:D0a:::add
 "add"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F150 (); */
   PC = cia;
@@ -1610,9 +1623,10 @@
 8.0xf1+4.0x7,2.AM1,2.AN0:D0b:::add
 "add"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F170 (); */
   PC = cia;
@@ -1624,9 +1638,10 @@
 4.0x2,10,2.DN0+8.IMM8:S1:::add
 "add"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_2800 (); */
   PC = cia;
@@ -1638,9 +1653,10 @@
 8.0xfa+4.0xc,00,2.DN0+8.IMM16A+8.IMM16B:D2:::add
 "add"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FAC00000 (); */
   PC = cia;
@@ -1652,9 +1668,10 @@
 8.0xfc+4.0xc,00,2.DN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4:::add
 "add"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FCC00000 (); */
   PC = cia;
@@ -1666,9 +1683,10 @@
 4.0x2,00,2.AN0+8.IMM8:S1a:::add
 "add"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_2000 (); */
   PC = cia;
@@ -1680,9 +1698,10 @@
 8.0xfa+4.0xd,00,2.AN0+8.IMM16A+8.IMM16B:D2a:::add
 "add"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FAD00000 (); */
   PC = cia;
@@ -1694,9 +1713,10 @@
 8.0xfc+4.0xd,00,2.AN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4a:::add
 "add"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FCD00000 (); */
   PC = cia;
@@ -1708,12 +1728,13 @@
 8.0xf8+8.0xfe+8.IMM8:D1:::add
 "add"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F8FE00 (); */
-  unsigned long imm;
+  unsigned32 imm;
 
   /* Note: no PSW changes. */
   PC = cia;
@@ -1726,12 +1747,13 @@
 8.0xfa+8.0xfe+8.IMM16A+8.IMM16B:D2b:::add
 "add"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FAFE0000 (); */
-  unsigned long imm;
+  unsigned32 imm;
 
   /* Note: no PSW changes. */
   PC = cia;
@@ -1744,12 +1766,13 @@
 8.0xfc+8.0xfe+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4b:::add
 "add"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FCFE0000 (); */
-  unsigned long imm;
+  unsigned32 imm;
 
   /* Note: no PSW changes. */
   PC = cia;
@@ -1762,13 +1785,14 @@
 8.0xf1+4.0x4,2.DM1,2.DN0:D0:::addc
 "addc"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F140 (); */
   int z, c, n, v;
-  unsigned long reg1, reg2, sum;
+  unsigned32 reg1, reg2, sum;
 
   PC = cia;
   reg1 = State.regs[REG_D0 + DM1];
@@ -1792,9 +1816,10 @@
 8.0xf1+4.0x0,2.DM1,2.DN0:D0:::sub
 "sub"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F100 (); */
   PC = cia;
@@ -1805,9 +1830,10 @@
 8.0xf1+4.0x2,2.DM1,2.AN0:D0a:::sub
 "sub"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F120 (); */
   PC = cia;
@@ -1819,9 +1845,10 @@
 8.0xf1+4.0x1,2.AM1,2.DN0:D0b:::sub
 "sub"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F110 (); */
   PC = cia;
@@ -1833,9 +1860,10 @@
 8.0xf1+4.0x3,2.AM1,2.AN0:D0c:::sub
 "sub"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F130 (); */
   PC = cia;
@@ -1847,9 +1875,10 @@
 8.0xfc+4.0xc,01,2.DN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4:::sub
 "sub"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FCC40000 (); */
   PC = cia;
@@ -1861,9 +1890,10 @@
 8.0xfc+4.0xd,01,2.AN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4a:::sub
 "sub"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FCD40000 (); */
   PC = cia;
@@ -1875,13 +1905,14 @@
 8.0xf1+4.0x8,2.DM1,2.DN0:D0:::subc
 "subc"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F180 (); */
   int z, c, n, v;
-  unsigned long reg1, reg2, difference;
+  unsigned32 reg1, reg2, difference;
 
   PC = cia;
   reg1 = State.regs[REG_D0 + DM1];
@@ -1905,12 +1936,13 @@
 8.0xf2+4.0x4,2.DM1,2.DN0:D0:::mul
 "mul"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F240 (); */
-  unsigned long long temp;
+  unsigned64 temp;
   int n, z;
 
   PC = cia;
@@ -1929,12 +1961,13 @@
 8.0xf2+4.0x5,2.DM1,2.DN0:D0:::mulu
 "mulu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F250 (); */
-  unsigned long long temp;
+  unsigned64 temp;
   int n, z;
 
   PC = cia;
@@ -1953,9 +1986,10 @@
 8.0xf2+4.0x6,2.DM1,2.DN0:D0:::div
 "div"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F260 (); */
   signed64 temp;
@@ -1990,9 +2024,10 @@
 8.0xf2+4.0x7,2.DM1,2.DN0:D0:::divu
 "divu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F270 (); */
   unsigned64 temp;
@@ -2026,12 +2061,13 @@
 4.0x4,2.DN1,00:S0:::inc
 "inc"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_40 (); */
-  unsigned int imm;
+  unsigned32 imm;
 
   PC = cia;
   imm = 1;
@@ -2043,9 +2079,10 @@
 4.0x4,2.AN1,01:S0a:::inc
 "inc"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_41 (); */
   PC = cia;
@@ -2057,9 +2094,10 @@
 4.0x5,00,2.AN0:S0:::inc4
 "inc4"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_50 (); */
   PC = cia;
@@ -2071,9 +2109,10 @@
 4.0xa,2.DM1,2.DN0=DM1+IMM8:S0i:::cmp
 "cmp"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   PC = cia;
   /* OP_A000 (); */
@@ -2085,9 +2124,10 @@
 4.0xa,2.DM1,2.DN0!DM1:S0:::cmp
 "cmp"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   PC = cia;
   /* OP_A0 (); */
@@ -2099,9 +2139,10 @@
 8.0xf1+4.0xa,2.DM1,2.AN0:D0:::cmp
 "cmp"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F1A0 (); */
   PC = cia;
@@ -2113,9 +2154,10 @@
 8.0xf1+4.0x9,2.AM1,2.DN0:D0a:::cmp
 "cmp"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F190 (); */
   PC = cia;
@@ -2127,9 +2169,10 @@
 4.0xb,2.AM1,2.AN0=AM1+IMM8:S0ai:::cmp
 "cmp"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   PC = cia;
   /* OP_B000 (); */
@@ -2142,9 +2185,10 @@
 4.0xb,2.AM1,2.AN0!AM1:S0a:::cmp
 "cmp"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   PC = cia;
   /* OP_B0 (); */
@@ -2156,9 +2200,10 @@
 8.0xfa+4.0xc,10,2.DN0+8.IMM16A+8.IMM16B:D2:::cmp
 "cmp"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FAC80000 (); */
   PC = cia;
@@ -2171,9 +2216,10 @@
 8.0xfc+4.0xc,10,2.DN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4:::cmp
 "cmp"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FCC80000 (); */
   PC = cia;
@@ -2186,9 +2232,10 @@
 8.0xfa+4.0xd,10,2.AN0+8.IMM16A+8.IMM16B:D2a:::cmp
 "cmp"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FAD80000 (); */
   PC = cia;
@@ -2201,9 +2248,10 @@
 8.0xfc+4.0xd,10,2.AN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4a:::cmp
 "cmp"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FCD80000 (); */
   PC = cia;
@@ -2216,9 +2264,10 @@
 8.0xf2+4.0x0,2.DM1,2.DN0:D0:::and
 "and"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F200 (); */
   int n, z;
@@ -2236,9 +2285,10 @@
 8.0xf8+4.0xe,00,2.DN0+8.IMM8:D1:::and
 "and"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F8E000 (); */
   int n, z;
@@ -2256,9 +2306,10 @@
 8.0xfa+4.0xe,00,2.DN0+8.IMM16A+8.IMM16B:D2:::and
 "and"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FAE00000 (); */
   int n, z;
@@ -2276,9 +2327,10 @@
 8.0xfc+4.0xe,00,2.DN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4:::and
 "and"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FCE00000 (); */
   int n, z;
@@ -2297,9 +2349,10 @@
 8.0xfa+8.0xfc+8.IMM16A+8.IMM16B:D2a:::and
 "and"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FAFC0000 (); */
   PC = cia;
@@ -2312,9 +2365,10 @@
 8.0xf2+4.0x1,2.DM1,2.DN0:D0:::or
 "or"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F210 (); */
   PC = cia;
@@ -2326,9 +2380,10 @@
 8.0xf8+4.0xe,01,2.DN0+8.IMM8:D1:::or
 "or"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F8E400 (); */
   PC = cia;
@@ -2340,9 +2395,10 @@
 8.0xfa+4.0xe,01,2.DN0+8.IMM16A+8.IMM16B:D2:::or
 "or"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FAE40000 (); */
   PC = cia;
@@ -2354,9 +2410,10 @@
 8.0xfc+4.0xe,01,2.DN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4:::or
 "or"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FCE40000 (); */
   PC = cia;
@@ -2368,9 +2425,10 @@
 8.0xfa+8.0xfd+8.IMM16A+8.IMM16B:D2a:::or
 "or"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FAFD0000 (); */
   PC = cia;
@@ -2382,9 +2440,10 @@
 8.0xf2+4.0x2,2.DM1,2.DN0:D0:::xor
 "xor"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F220 (); */
   PC = cia;
@@ -2396,9 +2455,10 @@
 8.0xfa+4.0xe,10,2.DN0+8.IMM16A+8.IMM16B:D2:::xor
 "xor"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FAE80000 (); */
   PC = cia;
@@ -2410,9 +2470,10 @@
 8.0xfc+4.0xe,10,2.DN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4:::xor
 "xor"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FCE80000 (); */
   PC = cia;
@@ -2424,9 +2485,10 @@
 8.0xf2+4.0x3,00,2.DN0:D0:::not
 "not"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F230 (); */
   int n, z;
@@ -2444,9 +2506,10 @@
 8.0xf8+4.0xe,11,2.DN0+8.IMM8:D1:::btst
 "btst"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F8EC00 (); */
   PC = cia;
@@ -2458,9 +2521,10 @@
 8.0xfa+4.0xe,11,2.DN0+8.IMM16A+8.IMM16B:D2:::btst
 "btst"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FAEC0000 (); */
   PC = cia;
@@ -2472,9 +2536,10 @@
 8.0xfc+4.0xe,11,2.DN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4:::btst
 "btst"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FCEC0000 (); */
   PC = cia;
@@ -2487,9 +2552,10 @@
 8.0xfe+8.0x02+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D+8.IMM8:D5:::btst
 "btst"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FE020000 (); */
   PC = cia;
@@ -2503,9 +2569,10 @@
 8.0xfa+4.0xf,10,2.AN0+8.D8+8.IMM8:D2a:::btst
 "btst"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FAF80000 (); */
   PC = cia;
@@ -2518,12 +2585,13 @@
 8.0xf0+4.8,2.DM1,2.AN0:D0:::bset
 "bset"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F080 (); */
-  unsigned long temp;
+  unsigned32 temp;
   int z;
 
   PC = cia;
@@ -2541,12 +2609,13 @@
 8.0xfe+8.0x00+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D+8.IMM8:D5:::bset
 "bset"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FE000000 (); */
-  unsigned long temp;
+  unsigned32 temp;
   int z;
 
   PC = cia;
@@ -2564,12 +2633,13 @@
 8.0xfa+4.0xf,00,2.AN0+8.D8+8.IMM8:D2:::bset
 "bset"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FAF00000 (); */
-  unsigned long temp;
+  unsigned32 temp;
   int z;
 
   PC = cia;
@@ -2586,12 +2656,13 @@
 8.0xf0+4.0x9,2.DM1,2.AN0:D0:::bclr
 "bclr"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F090 (); */
-  unsigned long temp;
+  unsigned32 temp;
   int z;
 
   PC = cia;
@@ -2609,12 +2680,13 @@
 8.0xfe+8.0x01+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D+8.IMM8:D5:::bclr
 "bclr"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FE010000 (); */
-  unsigned long temp;
+  unsigned32 temp;
   int z;
 
   PC = cia;
@@ -2632,12 +2704,13 @@
 8.0xfa+4.0xf,01,2.AN0+8.D8+8.IMM8:D2:::bclr
 "bclr"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FAF40000 (); */
-  unsigned long temp;
+  unsigned32 temp;
   int z;
 
   PC = cia;
@@ -2654,12 +2727,13 @@
 8.0xf2+4.0xb,2.DM1,2.DN0:D0:::asr
 "asr"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F2B0 (); */
-  long temp;
+  signed32 temp;
   int z, n, c;
 
   PC = cia;
@@ -2678,12 +2752,13 @@
 8.0xf8+4.0xc,10,2.DN0+8.IMM8:D1:::asr
 "asr"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F8C800 (); */
-  long temp;
+  signed32 temp;
   int z, n, c;
 
   PC = cia;
@@ -2702,9 +2777,10 @@
 8.0xf2+4.0xa,2.DM1,2.DN0:D0:::lsr
 "lsr"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F2A0 (); */
   int z, n, c;
@@ -2724,9 +2800,10 @@
 8.0xf8+4.0xc,01,2.DN0+8.IMM8:D1:::lsr
 "lsr"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F8C400 (); */
   int z, n, c;
@@ -2745,9 +2822,10 @@
 8.0xf2+4.0x9,2.DM1,2.DN0:D0:::asl
 "asl"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F290 (); */
   int n, z;
@@ -2766,9 +2844,10 @@
 8.0xf8+4.0xc,00,2.DN0+8.IMM8:D1:::asl
 "asl"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F8C000 (); */
   int n, z;
@@ -2786,9 +2865,10 @@
 4.0x5,01,2.DN0:S0:::asl2
 "asl2"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_54 (); */
   int n, z;
@@ -2806,12 +2886,13 @@
 8.0xf2+4.0x8,01,2.DN0:D0:::ror
 "ror"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F284 (); */
-  unsigned long value;
+  unsigned32 value;
   int c,n,z;
 
   PC = cia;
@@ -2832,12 +2913,13 @@
 8.0xf2+4.0x8,00,2.DN0:D0:::rol
 "rol"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F280 (); */
-  unsigned long value;
+  unsigned32 value;
   int c,n,z;
 
   PC = cia;
@@ -2858,9 +2940,10 @@
 8.0xc8+8.D8:S1:::beq
 "beq"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_C800 (); */
   PC = cia;
@@ -2876,9 +2959,10 @@
 8.0xc9+8.D8:S1:::bne
 "bne"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_C900 (); */
   PC = cia;
@@ -2894,9 +2978,10 @@
 8.0xc1+8.D8:S1:::bgt
 "bgt"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_C100 (); */
   PC = cia;
@@ -2913,9 +2998,10 @@
 8.0xc2+8.D8:S1:::bge
 "bge"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_C200 (); */
   PC = cia;
@@ -2931,9 +3017,10 @@
 8.0xc3+8.D8:S1:::ble
 "ble"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_C300 (); */
   PC = cia;
@@ -2950,9 +3037,10 @@
 8.0xc0+8.D8:S1:::blt
 "blt"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_C000 (); */
   PC = cia;
@@ -2968,9 +3056,10 @@
 8.0xc5+8.D8:S1:::bhi
 "bhi"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_C500 (); */
   PC = cia;
@@ -2986,9 +3075,10 @@
 8.0xc6+8.D8:S1:::bcc
 "bcc"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_C600 (); */
   PC = cia;
@@ -3004,9 +3094,10 @@
 8.0xc7+8.D8:S1:::bls
 "bls"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_C700 (); */
   PC = cia;
@@ -3022,9 +3113,10 @@
 8.0xc4+8.D8:S1:::bcs
 "bcs"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_C400 (); */
   PC = cia;
@@ -3040,9 +3132,10 @@
 8.0xf8+8.0xe8+8.D8:D1:::bvc
 "bvc"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F8E800 (); */
   PC = cia;
@@ -3058,9 +3151,10 @@
 8.0xf8+8.0xe9+8.D8:D1:::bvs
 "bvs"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F8E900 (); */
   PC = cia;
@@ -3076,9 +3170,10 @@
 8.0xf8+8.0xea+8.D8:D1:::bnc
 "bnc"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F8EA00 (); */
   PC = cia;
@@ -3094,9 +3189,10 @@
 8.0xf8+8.0xeb+8.D8:D1:::bns
 "bns"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F8EB00 (); */
   PC = cia;
@@ -3112,9 +3208,10 @@
 8.0xca+8.D8:S1:::bra
 "bra"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_CA00 (); */
   PC = cia;
@@ -3127,9 +3224,10 @@
 8.0xd8:S0:::leq
 "leq"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_D8 (); */
   PC = cia;
@@ -3145,9 +3243,10 @@
 8.0xd9:S0:::lne
 "lne"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_D9 (); */
   PC = cia;
@@ -3163,9 +3262,10 @@
 8.0xd1:S0:::lgt
 "lgt"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_D1 (); */
   PC = cia;
@@ -3182,9 +3282,10 @@
 8.0xd2:S0:::lge
 "lge"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_D2 (); */
   PC = cia;
@@ -3200,9 +3301,10 @@
 8.0xd3:S0:::lle
 "lle"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_D3 (); */
   PC = cia;
@@ -3219,9 +3321,10 @@
 8.0xd0:S0:::llt
 "llt"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_D0 (); */
   PC = cia;
@@ -3237,9 +3340,10 @@
 8.0xd5:S0:::lhi
 "lhi"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_D5 (); */
   PC = cia;
@@ -3255,9 +3359,10 @@
 8.0xd6:S0:::lcc
 "lcc"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_D6 (); */
   PC = cia;
@@ -3273,9 +3378,10 @@
 8.0xd7:S0:::lls
 "lls"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_D7 (); */
   PC = cia;
@@ -3291,9 +3397,10 @@
 8.0xd4:S0:::lcs
 "lcs"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_D4 (); */
   PC = cia;
@@ -3309,9 +3416,10 @@
 8.0xda:S0:::lra
 "lra"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_DA (); */
   PC = cia;
@@ -3324,9 +3432,10 @@
 8.0xdb:S0:::setlb
 "setlb"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_DB (); */
   PC = cia;
@@ -3339,9 +3448,10 @@
 8.0xf0+4.0xf,01,2.AN0:D0:::jmp
 "jmp"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F0F4 (); */
   PC = State.regs[REG_A0 + AN0];
@@ -3353,9 +3463,10 @@
 8.0xcc+8.D16A+8.D16B:S2:::jmp
 "jmp"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_CC0000 (); */
   PC = cia + EXTEND16(FETCH16(D16A, D16B));
@@ -3367,9 +3478,10 @@
 8.0xdc+8.D32A+8.D32B+8.D32C+8.D32D:S4:::jmp
 "jmp"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_DC000000 (); */
   PC = cia + FETCH32(D32A, D32B, D32C, D32D);
@@ -3381,12 +3493,13 @@
 8.0xf0+4.0xf,00,2.AN0:D0:::calls
 "calls"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F0F0 (); */
-  unsigned int next_pc, sp;
+  unsigned32 next_pc, sp;
 
   PC = cia;
   sp = State.regs[REG_SP];
@@ -3402,12 +3515,13 @@
 8.0xfa+8.0xff+8.D16A+8.D16B:D2:::calls
 "calls"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FAFF0000 (); */
-  unsigned int next_pc, sp;
+  unsigned32 next_pc, sp;
 
   PC = cia;
   sp = State.regs[REG_SP];
@@ -3423,12 +3537,13 @@
 8.0xfc+8.0xff+8.D32A+8.D32B+8.D32C+8.D32D:D4:::calls
 "calls"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FCFF0000 (); */
-  unsigned int next_pc, sp;
+  unsigned32 next_pc, sp;
 
   PC = cia;
   sp = State.regs[REG_SP];
@@ -3444,12 +3559,13 @@
 8.0xf0+8.0xfc:D0:::rets
 "rets"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F0FC (); */
-  unsigned int sp;
+  unsigned32 sp;
 
   sp = State.regs[REG_SP];
   State.regs[REG_PC] = load_word(sp);
@@ -3461,12 +3577,13 @@
 8.0xf0+8.0xfd:D0:::rti
 "rti"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F0FD (); */
-  unsigned int sp;
+  unsigned32 sp;
 
   sp = State.regs[REG_SP];
   PSW = load_half(sp);
@@ -3480,12 +3597,13 @@
 8.0xf0+8.0xfe:D0:::trap
 "trap"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F0FE (); */
-  unsigned int sp, next_pc;
+  unsigned32 sp, next_pc;
 
   PC = cia;
   sp = State.regs[REG_SP];
@@ -3499,9 +3617,10 @@
 8.0xf0+8.0xff:D0:::rtm
 "rtm"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F0FF (); */
   PC = cia;
@@ -3513,9 +3632,10 @@
 8.0xcb:S0:::nop
 "nop"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_CB (); */
   PC = cia;
@@ -3537,9 +3657,10 @@
 8.0xf6+4.0xf,2.DM1,2.DN0:D0:::getx
 "getx"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F6F0 (); */
   int z, n;
@@ -3558,12 +3679,13 @@
 8.0xf6+4.0x0,2.DM1,2.DN0:D0:::mulq
 "mulq"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F600 (); */
-  unsigned long long temp;
+  unsigned64 temp;
   int n, z;
 
   PC = cia;
@@ -3582,12 +3704,13 @@
 8.0xf9+4.0x,00,2.DN0+8.IMM8:D1:::mulq
 "mulq"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F90000 (); */
-  unsigned long long temp;
+  unsigned64 temp;
   int n, z;
 
   PC = cia;
@@ -3606,12 +3729,13 @@
 8.0xfb+4.0x0,00,2.DN0+8.IMM16A+8.IMM16B:D2:::mulq
 "mulq"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FB000000 (); */
-  unsigned long long temp;
+  unsigned64 temp;
   int n, z;
 
   PC = cia;
@@ -3630,12 +3754,13 @@
 8.0xfd+4.0x0,00,2.DN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4:::mulq
 "mulq"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FD000000 (); */
-  unsigned long long temp;
+  unsigned64 temp;
   int n, z;
 
   PC = cia;
@@ -3654,12 +3779,13 @@
 8.0xf6+4.0x1,2.DM1,2.DN0:D0:::mulqu
 "mulqu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F610 (); */
-  unsigned long long temp;
+  unsigned64 temp;
   int n, z;
 
   PC = cia;
@@ -3678,12 +3804,13 @@
 8.0xf9+4.0x1,01,2.DN0+8.IMM8:D1:::mulqu
 "mulqu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F91400 (); */
-  unsigned long long temp;
+  unsigned64 temp;
   int n, z;
 
   PC = cia;
@@ -3702,12 +3829,13 @@
 8.0xfb+4.0x1,01,2.DN0+8.IMM16A+8.IMM16B:D2:::mulqu
 "mulqu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FB140000 (); */
-  unsigned long long temp;
+  unsigned64 temp;
   int n, z;
 
   PC = cia;
@@ -3726,12 +3854,13 @@
 8.0xfd+4.0x1,01,2.DN0+8.IMM32A+8.IMM32B+8.IMM32C+8.IMM32D:D4:::mulqu
 "mulqu"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FD140000 (); */
-  unsigned long long temp;
+  unsigned64 temp;
   int n, z;
 
   PC = cia;
@@ -3750,9 +3879,10 @@
 8.0xf6+4.0x4,2.DM1,2.DN0:D0:::sat16
 "sat16"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F640 (); */
   int temp;
@@ -3769,9 +3899,10 @@
 8.0xf6+4.0x5,2.DM1,2.DN0:D0:::sat24
 "sat24"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F650 (); */
   int temp;
@@ -3788,9 +3919,10 @@
 8.0xf6+4.0x7,2.DM1,2.DN0:D0:::bsch
 "bsch"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F670 (); */
   int temp, c;
@@ -3808,9 +3940,10 @@
 8.0xf0+8.0xc0:D0:::syscall
 "syscall"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_F0C0 (); */
   PC = cia;
@@ -3822,27 +3955,28 @@
 8.0xff:S0:::break
 "break"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_FF (); */
   PC = cia;
-  sim_engine_halt (SD, CPU, NULL, cia, sim_stopped, SIM_SIGTRAP);
-  PC -= 1;
+  program_interrupt(SD, CPU, cia, SIM_SIGTRAP);
 }
 
 // 1100 1110 regs....; movm (SP),regs
 8.0xce+8.REGS:S1:::movm
 "movm"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_CE00 (); */
-  unsigned long sp = State.regs[REG_SP];
-  unsigned long mask;
+  unsigned32 sp = State.regs[REG_SP];
+  unsigned32 mask;
 
   PC = cia;
   mask = REGS;
@@ -3890,12 +4024,13 @@
       sp += 4;
     }
 
-  /* start-sanitize-am33 */
-  if (STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33)
+  if (STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33
+      || STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33_2
+      )
     {
       if (mask & 0x1)
 	{
-	  /* Need to restore MDQR, MCRH, MCRL, and MCVF */
+	  /* Need to restore MDRQ, MCRH, MCRL, and MCVF */
 	  sp += 16;
 	  State.regs[REG_E0 + 1] = load_word (sp);
 	  sp += 4;
@@ -3923,7 +4058,6 @@
 	  sp += 4;
 	}
     }
-  /* end-sanitize-am33 */
 
   /* And make sure to update the stack pointer.  */
   State.regs[REG_SP] = sp;
@@ -3934,19 +4068,21 @@
 8.0xcf+8.REGS:S1a:::movm
 "movm"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_CF00 (); */
-  unsigned long sp = State.regs[REG_SP];
-  unsigned long mask;
+  unsigned32 sp = State.regs[REG_SP];
+  unsigned32 mask;
 
   PC = cia;
   mask = REGS;
 
-  /* start-sanitize-am33 */
-  if (STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33)
+  if (STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33
+      || STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33_2
+      )
     {
       if (mask & 0x4)
 	{
@@ -3975,10 +4111,9 @@
 	  sp -= 4;
 	  store_word (sp, State.regs[REG_E0 + 1]);
 	  sp -= 16;
-	  /* Need to save MDQR, MCRH, MCRL, and MCVF */
+	  /* Need to save MDRQ, MCRH, MCRL, and MCVF */
 	}
     }
-  /* end-sanitize-am33 */
 
   if (mask & 0x80)
     {
@@ -4032,13 +4167,14 @@
 8.0xcd+8.D16A+8.D16B+8.REGS+8.IMM8:S4:::call
 "call"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_CD000000 (); */
-  unsigned int next_pc, sp;
-  unsigned long mask;
+  unsigned32 next_pc, sp;
+  unsigned32 mask;
 
   PC = cia;
   sp = State.regs[REG_SP];
@@ -4047,8 +4183,9 @@
 
   mask = REGS;
 
-  /* start-sanitize-am33 */
-  if (STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33)
+  if (STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33
+      || STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33_2
+      )
     {
       if (mask & 0x4)
 	{
@@ -4077,10 +4214,9 @@
 	  sp -= 4;
 	  store_word (sp, State.regs[REG_E0 + 1]);
 	  sp -= 16;
-	  /* Need to save MDQR, MCRH, MCRL, and MCVF */
+	  /* Need to save MDRQ, MCRH, MCRL, and MCVF */
 	}
     }
-  /* end-sanitize-am33 */
 
   if (mask & 0x80)
     {
@@ -4140,13 +4276,14 @@
 8.0xdd+8.D32A+8.D32B+8.D32C+8.D32D+8.REGS+8.IMM8:S6:::call
 "call"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_DD000000 (); */
-  unsigned int next_pc, sp;
-  unsigned long mask;
+  unsigned32 next_pc, sp;
+  unsigned32 mask;
 
   PC = cia;
   sp = State.regs[REG_SP];
@@ -4156,8 +4293,9 @@
 
   mask = REGS;
 
-  /* start-sanitize-am33 */
-  if (STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33)
+  if (STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33
+      || STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33_2
+      )
     {
       if (mask & 0x4)
 	{
@@ -4186,10 +4324,9 @@
 	  sp -= 4;
 	  store_word (sp, State.regs[REG_E0 + 1]);
 	  sp -= 16;
-	  /* Need to save MDQR, MCRH, MCRL, and MCVF */
+	  /* Need to save MDRQ, MCRH, MCRL, and MCVF */
 	}
     }
-  /* end-sanitize-am33 */
 
   if (mask & 0x80)
     {
@@ -4248,13 +4385,14 @@
 8.0xdf+8.REGS+8.IMM8:S2:::ret
 "ret"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_DF0000 (); */
-  unsigned int sp, offset;
-  unsigned long mask;
+  unsigned32 sp, offset;
+  unsigned32 mask;
 
   PC = cia;
   State.regs[REG_SP] += IMM8;
@@ -4263,7 +4401,9 @@
   offset = -4;
   mask = REGS;
 
-  if (STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33)
+  if (STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33
+      || STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33_2
+      )
     {
 
       if (mask & 0x4)
@@ -4288,7 +4428,7 @@
 
       if (mask & 0x1)
 	{
-	  /* Need to restore MDQR, MCRH, MCRL, and MCVF */
+	  /* Need to restore MDRQ, MCRH, MCRL, and MCVF */
 	  offset -= 16;
 	  State.regs[REG_E0 + 0] = load_word (sp + offset);
 	  offset -= 4;
@@ -4350,23 +4490,26 @@
 8.0xde+8.REGS+8.IMM8:S2:::retf
 "retf"
 *mn10300
-// start-sanitize-am33
+
 *am33
-// end-sanitize-am33
+*am33_2
+
 {
   /* OP_DE0000 (); */
-  unsigned int sp, offset;
-  unsigned long mask;
+  unsigned32 sp, offset;
+  unsigned32 mask;
 
   PC = cia;
   State.regs[REG_SP] += IMM8;
   sp = State.regs[REG_SP];
-  State.regs[REG_PC] = State.regs[REG_MDR] - 3;
+  State.regs[REG_PC] = State.regs[REG_MDR];
 
   offset = -4;
   mask = REGS;
 
-  if (STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33)
+  if (STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33
+      || STATE_ARCHITECTURE (sd)->mach == bfd_mach_am33_2
+      )
     {
 
       if (mask & 0x4)
@@ -4391,7 +4534,7 @@
 
       if (mask & 0x1)
 	{
-	  /* Need to restore MDQR, MCRH, MCRL, and MCVF */
+	  /* Need to restore MDRQ, MCRH, MCRL, and MCVF */
 	  offset -= 16;
 	  State.regs[REG_E0 + 0] = load_word (sp + offset);
 	  offset -= 4;
@@ -4442,8 +4585,9 @@
       State.regs[REG_LAR] = load_word (sp + offset);
       offset -= 4;
     }
+  nia = PC;
 }
 
-// start-sanitize-am33
+
 :include::am33:am33.igen
-// end-sanitize-am33
+