--- uae/src/gencpu.c	2018/04/24 16:44:39	1.1.1.6
+++ uae/src/gencpu.c	2018/04/24 16:51:18	1.1.1.10
@@ -195,13 +195,6 @@ static void fill_prefetch_2 (void)
 	printf ("fill_prefetch_2 ();\n");
 }
 
-static void swap_opcode (void)
-{
-  printf ("#ifdef HAVE_GET_WORD_UNSWAPPED\n");
-  printf ("\topcode = ((opcode << 8) & 0xFF00) | ((opcode >> 8) & 0xFF);\n");
-  printf ("#endif\n");
-}
-
 static void sync_m68k_pc (void)
 {
     if (m68k_pc_offset == 0)
@@ -233,7 +226,7 @@ static void genamode (amodes mode, char
 	if (getv == 1)
 	    switch (size) {
 	     case sz_byte:
-#ifdef AMIGA
+#if defined(AMIGA) && !defined(WARPUP)
 		/* sam: I don't know why gcc.2.7.2.1 produces a code worse */
 		/* if it is not done like that: */
 		printf ("\tuae_s8 %s = ((uae_u8*)&m68k_dreg(regs, %s))[3];\n", name, reg);
@@ -242,7 +235,7 @@ static void genamode (amodes mode, char
 #endif
 		break;
 	     case sz_word:
-#ifdef AMIGA
+#if defined(AMIGA) && !defined(WARPUP)
 		printf ("\tuae_s16 %s = ((uae_s16*)&m68k_dreg(regs, %s))[1];\n", name, reg);
 #else
 		printf ("\tuae_s16 %s = m68k_dreg(regs, %s);\n", name, reg);
@@ -562,8 +555,13 @@ static void genmovemle (uae_u16 opcode)
     }
 }
 
+static void duplicate_carry (void)
+{
+    printf ("\tCOPY_CARRY;\n");
+}
+
 typedef enum {
-    flag_logical, flag_add, flag_sub, flag_cmp, flag_addx, flag_subx, flag_zn,
+    flag_logical_noclobber, flag_logical, flag_add, flag_sub, flag_cmp, flag_addx, flag_subx, flag_zn,
     flag_av, flag_sv
 } flagtypes;
 
@@ -615,6 +613,7 @@ static void genflags_normal (flagtypes t
     strcat (unsstr, "))");
 
     switch (type) {
+     case flag_logical_noclobber:
      case flag_logical:
      case flag_zn:
      case flag_av:
@@ -634,8 +633,8 @@ static void genflags_normal (flagtypes t
 	break;
     }
 
-
     switch (type) {
+     case flag_logical_noclobber:
      case flag_logical:
      case flag_zn:
 	break;
@@ -656,55 +655,53 @@ static void genflags_normal (flagtypes t
 
     switch (type) {
      case flag_logical:
-	printf ("\tVFLG = CFLG = 0;\n");
-	printf ("\tZFLG = %s == 0;\n", vstr);
-	printf ("\tNFLG = %s < 0;\n", vstr);
+	printf ("\tCLEAR_CZNV;\n");
+	printf ("\tSET_ZFLG (%s == 0);\n", vstr);
+	printf ("\tSET_NFLG (%s < 0);\n", vstr);
+	break;
+     case flag_logical_noclobber:
+	printf ("\tSET_ZFLG (%s == 0);\n", vstr);
+	printf ("\tSET_NFLG (%s < 0);\n", vstr);
 	break;
      case flag_av:
-	printf ("\tVFLG = (flgs ^ flgn) & (flgo ^ flgn);\n");
+	printf ("\tSET_VFLG ((flgs ^ flgn) & (flgo ^ flgn));\n");
 	break;
      case flag_sv:
-	printf ("\tVFLG = (flgs ^ flgo) & (flgn ^ flgo);\n");
+	printf ("\tSET_VFLG ((flgs ^ flgo) & (flgn ^ flgo));\n");
 	break;
      case flag_zn:
-	printf ("\tif (%s != 0) ZFLG = 0;\n", vstr);
-	printf ("\tNFLG = %s < 0;\n", vstr);
+	printf ("\tSET_ZFLG (GET_ZFLG & (%s == 0));\n", vstr);
+	printf ("\tSET_NFLG (%s < 0);\n", vstr);
 	break;
      case flag_add:
-	printf ("\tZFLG = %s == 0;\n", vstr);
-	printf ("\tVFLG = (flgs ^ flgn) & (flgo ^ flgn);\n");
-	printf ("\tCFLG = XFLG = %s < %s;\n", undstr, usstr);
-	printf ("\tNFLG = flgn != 0;\n");
+	printf ("\tSET_ZFLG (%s == 0);\n", vstr);
+	printf ("\tSET_VFLG ((flgs ^ flgn) & (flgo ^ flgn));\n");
+	printf ("\tSET_CFLG (%s < %s);\n", undstr, usstr);
+	duplicate_carry ();
+	printf ("\tSET_NFLG (flgn != 0);\n");
 	break;
      case flag_sub:
-	printf ("\tZFLG = %s == 0;\n", vstr);
-	printf ("\tVFLG = (flgs ^ flgo) & (flgn ^ flgo);\n");
-	printf ("\tCFLG = XFLG = %s > %s;\n", usstr, udstr);
-	printf ("\tNFLG = flgn != 0;\n");
+	printf ("\tSET_ZFLG (%s == 0);\n", vstr);
+	printf ("\tSET_VFLG ((flgs ^ flgo) & (flgn ^ flgo));\n");
+	printf ("\tSET_CFLG (%s > %s);\n", usstr, udstr);
+	duplicate_carry ();
+	printf ("\tSET_NFLG (flgn != 0);\n");
 	break;
      case flag_addx:
-#if 0
-	printf ("\tVFLG = (flgs && flgo && !flgn) || (!flgs && !flgo && flgn);\n"); /* minterm SON: 0x42 */
-	printf ("\tXFLG = CFLG = (flgs && flgo) || (!flgn && (flgo || flgs));\n"); /* minterm SON: 0xD4 */
-#else
-	printf ("\tVFLG = (flgs ^ flgn) & (flgo ^ flgn);\n"); /* minterm SON: 0x42 */
-	printf ("\tXFLG = CFLG = flgs ^ ((flgs ^ flgo) & (flgo ^ flgn));\n"); /* minterm SON: 0xD4 */
-#endif
+	printf ("\tSET_VFLG ((flgs ^ flgn) & (flgo ^ flgn));\n"); /* minterm SON: 0x42 */
+	printf ("\tSET_CFLG (flgs ^ ((flgs ^ flgo) & (flgo ^ flgn)));\n"); /* minterm SON: 0xD4 */
+	duplicate_carry ();
 	break;
      case flag_subx:
-#if 0
-	printf ("\tVFLG = (!flgs && flgo && !flgn) || (flgs && !flgo && flgn);\n"); /* minterm SON: 0x24 */
-	printf ("\tXFLG = CFLG = (flgs && !flgo) || (flgn && (!flgo || flgs));\n"); /* minterm SON: 0xB2 */
-#else
-	printf ("\tVFLG = (flgs ^ flgo) & (flgo ^ flgn);\n"); /* minterm SON: 0x24 */
-	printf ("\tXFLG = CFLG = flgs ^ ((flgs ^ flgn) & (flgo ^ flgn));\n"); /* minterm SON: 0xB2 */
-#endif
+	printf ("\tSET_VFLG ((flgs ^ flgo) & (flgo ^ flgn));\n"); /* minterm SON: 0x24 */
+	printf ("\tSET_CFLG (flgs ^ ((flgs ^ flgn) & (flgo ^ flgn)));\n"); /* minterm SON: 0xB2 */
+	duplicate_carry ();
 	break;
      case flag_cmp:
-	printf ("\tZFLG = %s == 0;\n", vstr);
-	printf ("\tVFLG = (flgs != flgo) && (flgn != flgo);\n");
-	printf ("\tCFLG = %s > %s;\n", usstr, udstr);
-	printf ("\tNFLG = flgn != 0;\n");
+	printf ("\tSET_ZFLG (%s == 0);\n", vstr);
+	printf ("\tSET_VFLG ((flgs != flgo) && (flgn != flgo));\n");
+	printf ("\tSET_CFLG (%s > %s);\n", usstr, udstr);
+	printf ("\tSET_NFLG (flgn != 0);\n");
 	break;
     }
 }
@@ -712,8 +709,6 @@ static void genflags_normal (flagtypes t
 static void genflags (flagtypes type, wordsizes size, char *value, char *src, char *dst)
 {
 #ifdef X86_ASSEMBLY
-    start_brace ();
-    printf ("\tuae_u32 scratch;\n");
     switch (type) {
      case flag_add:
      case flag_sub:
@@ -727,9 +722,23 @@ static void genflags (flagtypes type, wo
 
     /* At least some of those casts are fairly important! */
     switch (type) {
+     case flag_logical_noclobber:
+	printf ("\t{uae_u32 oldcznv = regflags.cznv & ~0xC0;\n");
+	if (strcmp (value, "0") == 0) {
+	    printf ("\tregflags.cznv = olcznv | 64;\n");
+	} else {
+	    switch (size) {
+	     case sz_byte: printf ("\tx86_flag_testb ((uae_s8)(%s));\n", value); break;
+	     case sz_word: printf ("\tx86_flag_testw ((uae_s16)(%s));\n", value); break;
+	     case sz_long: printf ("\tx86_flag_testl ((uae_s32)(%s));\n", value); break;
+	    }
+	    printf ("\tregflags.cznv |= oldcznv;\n");
+	}
+	printf ("\t}\n");
+	return;
      case flag_logical:
 	if (strcmp (value, "0") == 0) {
-	    printf ("\t*(uae_u32 *)&regflags = 64;\n");
+	    printf ("\tregflags.cznv = 64;\n");
 	} else {
 	    switch (size) {
 	     case sz_byte: printf ("\tx86_flag_testb ((uae_s8)(%s));\n", value); break;
@@ -943,8 +952,43 @@ static void genflags (flagtypes type, wo
     genflags_normal (type, size, value, src, dst);
 }
 
+static void force_range_for_rox (const char *var, wordsizes size)
+{
+    /* Could do a modulo operation here... which one is faster? */
+    switch (size) {
+     case sz_long:
+	printf ("\tif (%s >= 33) %s -= 33;\n", var, var);
+	break;
+     case sz_word:
+	printf ("\tif (%s >= 34) %s -= 34;\n", var, var);
+	printf ("\tif (%s >= 17) %s -= 17;\n", var, var);
+	break;
+     case sz_byte:
+	printf ("\tif (%s >= 36) %s -= 36;\n", var, var);
+	printf ("\tif (%s >= 18) %s -= 18;\n", var, var);
+	printf ("\tif (%s >= 9) %s -= 9;\n", var, var);
+	break;
+    }
+}
+
+static const char *cmask (wordsizes size)
+{
+    switch (size) {
+     case sz_byte: return "0x80";
+     case sz_word: return "0x8000";
+     case sz_long: return "0x80000000";
+     default: abort ();
+    }
+}
+
+static int source_is_imm1_8 (struct instr *i)
+{
+    return i->stype == 3;
+}
+
 static void gen_opcode (unsigned long int opcode)
 {
+    struct instr *curi = table68k + opcode;
     insn_n_cycles = 2;
 
     start_brace ();
@@ -952,7 +996,7 @@ static void gen_opcode (unsigned long in
     printf ("uae_u8 *m68k_pc = regs.pc_p;\n");
 #endif
     m68k_pc_offset = 2;
-    switch (table68k[opcode].plev) {
+    switch (curi->plev) {
      case 0: /* not privileged */
 	break;
      case 1: /* unprivileged only on 68000 */
@@ -968,244 +1012,230 @@ static void gen_opcode (unsigned long in
 	start_brace ();
 	break;
      case 3: /* privileged if size == word */
-	if (table68k[opcode].size == sz_byte)
+	if (curi->size == sz_byte)
 	    break;
 	printf ("if (!regs.s) { Exception(8,0); goto %s; }\n", endlabelstr);
 	need_endlabel = 1;
 	start_brace ();
 	break;
     }
-    switch (table68k[opcode].mnemo) {
+    switch (curi->mnemo) {
      case i_OR:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0);
-	printf ("\tsrc |= dst;\n");
-	genflags (flag_logical, table68k[opcode].size, "src", "", "");
-	genastore ("src", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst");
-	break;
      case i_AND:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0);
-	printf ("\tsrc &= dst;\n");
-	genflags (flag_logical, table68k[opcode].size, "src", "", "");
-	genastore ("src", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst");
-	break;
      case i_EOR:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0);
-	printf ("\tsrc ^= dst;\n");
-	genflags (flag_logical, table68k[opcode].size, "src", "", "");
-	genastore ("src", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst");
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0);
+	printf ("\tsrc %c= dst;\n", curi->mnemo == i_OR ? '|' : curi->mnemo == i_AND ? '&' : '^');
+	genflags (flag_logical, curi->size, "src", "", "");
+	genastore ("src", curi->dmode, "dstreg", curi->size, "dst");
 	break;
      case i_ORSR:
+     case i_EORSR:
 	printf ("\tMakeSR();\n");
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	if (table68k[opcode].size == sz_byte) {
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	if (curi->size == sz_byte) {
 	    printf ("\tsrc &= 0xFF;\n");
 	}
-	printf ("\tregs.sr |= src;\n");
+	printf ("\tregs.sr %c= src;\n", curi->mnemo == i_EORSR ? '^' : '|');
 	printf ("\tMakeFromSR();\n");
 	break;
      case i_ANDSR:
 	printf ("\tMakeSR();\n");
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	if (table68k[opcode].size == sz_byte) {
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	if (curi->size == sz_byte) {
 	    printf ("\tsrc |= 0xFF00;\n");
 	}
 	printf ("\tregs.sr &= src;\n");
 	printf ("\tMakeFromSR();\n");
 	break;
-     case i_EORSR:
-	printf ("\tMakeSR();\n");
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	if (table68k[opcode].size == sz_byte) {
-	    printf ("\tsrc &= 0xFF;\n");
-	}
-	printf ("\tregs.sr ^= src;\n");
-	printf ("\tMakeFromSR();\n");
-	break;
      case i_SUB:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0);
 	start_brace ();
-	genflags (flag_sub, table68k[opcode].size, "newv", "src", "dst");
-	genastore ("newv", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst");
+	genflags (flag_sub, curi->size, "newv", "src", "dst");
+	genastore ("newv", curi->dmode, "dstreg", curi->size, "dst");
 	break;
      case i_SUBA:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", sz_long, "dst", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", sz_long, "dst", 1, 0);
 	start_brace ();
 	printf ("\tuae_u32 newv = dst - src;\n");
-	genastore ("newv", table68k[opcode].dmode, "dstreg", sz_long, "dst");
+	genastore ("newv", curi->dmode, "dstreg", sz_long, "dst");
 	break;
      case i_SUBX:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0);
 	start_brace ();
-	printf ("\tuae_u32 newv = dst - src - (XFLG ? 1 : 0);\n");
-	genflags (flag_subx, table68k[opcode].size, "newv", "src", "dst");
-	genflags (flag_zn, table68k[opcode].size, "newv", "", "");
-	genastore ("newv", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst");
+	printf ("\tuae_u32 newv = dst - src - (GET_XFLG ? 1 : 0);\n");
+	genflags (flag_subx, curi->size, "newv", "src", "dst");
+	genflags (flag_zn, curi->size, "newv", "", "");
+	genastore ("newv", curi->dmode, "dstreg", curi->size, "dst");
 	break;
      case i_SBCD:
 	/* Let's hope this works... */
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0);
 	start_brace ();
-	printf ("\tuae_u16 newv_lo = (dst & 0xF) - (src & 0xF) - (XFLG ? 1 : 0);\n");
+	printf ("\tuae_u16 newv_lo = (dst & 0xF) - (src & 0xF) - (GET_XFLG ? 1 : 0);\n");
 	printf ("\tuae_u16 newv_hi = (dst & 0xF0) - (src & 0xF0);\n");
 	printf ("\tuae_u16 newv;\n");
+	printf ("\tint cflg;\n");
 	printf ("\tif (newv_lo > 9) { newv_lo-=6; newv_hi-=0x10; }\n");
 	printf ("\tnewv = newv_hi + (newv_lo & 0xF);");
-	printf ("\tCFLG = XFLG = (newv_hi & 0x1F0) > 0x90;\n");
-	printf ("\tif (CFLG) newv -= 0x60;\n");
-	genflags (flag_zn, table68k[opcode].size, "newv", "", "");
-	genflags (flag_sv, table68k[opcode].size, "newv", "src", "dst");
-	genastore ("newv", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst");
+	printf ("\tSET_CFLG (cflg = (newv_hi & 0x1F0) > 0x90);\n");
+	duplicate_carry ();
+	printf ("\tif (cflg) newv -= 0x60;\n");
+	genflags (flag_zn, curi->size, "newv", "", "");
+	genflags (flag_sv, curi->size, "newv", "src", "dst");
+	genastore ("newv", curi->dmode, "dstreg", curi->size, "dst");
 	break;
      case i_ADD:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0);
 	start_brace ();
-	genflags (flag_add, table68k[opcode].size, "newv", "src", "dst");
-	genastore ("newv", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst");
+	genflags (flag_add, curi->size, "newv", "src", "dst");
+	genastore ("newv", curi->dmode, "dstreg", curi->size, "dst");
 	break;
      case i_ADDA:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", sz_long, "dst", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", sz_long, "dst", 1, 0);
 	start_brace ();
 	printf ("\tuae_u32 newv = dst + src;\n");
-	genastore ("newv", table68k[opcode].dmode, "dstreg", sz_long, "dst");
+	genastore ("newv", curi->dmode, "dstreg", sz_long, "dst");
 	break;
      case i_ADDX:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0);
 	start_brace ();
-	printf ("\tuae_u32 newv = dst + src + (XFLG ? 1 : 0);\n");
-	genflags (flag_addx, table68k[opcode].size, "newv", "src", "dst");
-	genflags (flag_zn, table68k[opcode].size, "newv", "", "");
-	genastore ("newv", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst");
+	printf ("\tuae_u32 newv = dst + src + (GET_XFLG ? 1 : 0);\n");
+	genflags (flag_addx, curi->size, "newv", "src", "dst");
+	genflags (flag_zn, curi->size, "newv", "", "");
+	genastore ("newv", curi->dmode, "dstreg", curi->size, "dst");
 	break;
      case i_ABCD:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0);
 	start_brace ();
-	printf ("\tuae_u16 newv_lo = (src & 0xF) + (dst & 0xF) + (XFLG ? 1 : 0);\n");
+	printf ("\tuae_u16 newv_lo = (src & 0xF) + (dst & 0xF) + (GET_XFLG ? 1 : 0);\n");
 	printf ("\tuae_u16 newv_hi = (src & 0xF0) + (dst & 0xF0);\n");
 	printf ("\tuae_u16 newv;\n");
+	printf ("\tint cflg;\n");
 	printf ("\tif (newv_lo > 9) { newv_lo +=6; }\n");
 	printf ("\tnewv = newv_hi + newv_lo;");
-	printf ("\tCFLG = XFLG = (newv & 0x1F0) > 0x90;\n");
-	printf ("\tif (CFLG) newv += 0x60;\n");
-	genflags (flag_zn, table68k[opcode].size, "newv", "", "");
-	genflags (flag_sv, table68k[opcode].size, "newv", "src", "dst");
-	genastore ("newv", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst");
+	printf ("\tSET_CFLG (cflg = (newv & 0x1F0) > 0x90);\n");
+	duplicate_carry ();
+	printf ("\tif (cflg) newv += 0x60;\n");
+	genflags (flag_zn, curi->size, "newv", "", "");
+	genflags (flag_sv, curi->size, "newv", "src", "dst");
+	genastore ("newv", curi->dmode, "dstreg", curi->size, "dst");
 	break;
      case i_NEG:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
 	start_brace ();
-	genflags (flag_sub, table68k[opcode].size, "dst", "src", "0");
-	genastore ("dst", table68k[opcode].smode, "srcreg", table68k[opcode].size, "src");
+	genflags (flag_sub, curi->size, "dst", "src", "0");
+	genastore ("dst", curi->smode, "srcreg", curi->size, "src");
 	break;
      case i_NEGX:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
 	start_brace ();
-	printf ("\tuae_u32 newv = 0 - src - (XFLG ? 1 : 0);\n");
-	genflags (flag_subx, table68k[opcode].size, "newv", "src", "0");
-	genflags (flag_zn, table68k[opcode].size, "newv", "", "");
-	genastore ("newv", table68k[opcode].smode, "srcreg", table68k[opcode].size, "src");
+	printf ("\tuae_u32 newv = 0 - src - (GET_XFLG ? 1 : 0);\n");
+	genflags (flag_subx, curi->size, "newv", "src", "0");
+	genflags (flag_zn, curi->size, "newv", "", "");
+	genastore ("newv", curi->smode, "srcreg", curi->size, "src");
 	break;
      case i_NBCD:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
 	start_brace ();
-	printf ("\tuae_u16 newv_lo = - (src & 0xF) - (XFLG ? 1 : 0);\n");
+	printf ("\tuae_u16 newv_lo = - (src & 0xF) - (GET_XFLG ? 1 : 0);\n");
 	printf ("\tuae_u16 newv_hi = - (src & 0xF0);\n");
 	printf ("\tuae_u16 newv;\n");
+	printf ("\tint cflg;\n");
 	printf ("\tif (newv_lo > 9) { newv_lo-=6; newv_hi-=0x10; }\n");
 	printf ("\tnewv = newv_hi + (newv_lo & 0xF);");
-	printf ("\tCFLG = XFLG = (newv_hi & 0x1F0) > 0x90;\n");
-	printf ("\tif (CFLG) newv -= 0x60;\n");
-	genflags (flag_zn, table68k[opcode].size, "newv", "", "");
-	genastore ("newv", table68k[opcode].smode, "srcreg", table68k[opcode].size, "src");
+	printf ("\tSET_CFLG (cflg = (newv_hi & 0x1F0) > 0x90);\n");
+	duplicate_carry();
+	printf ("\tif (cflg) newv -= 0x60;\n");
+	genflags (flag_zn, curi->size, "newv", "", "");
+	genastore ("newv", curi->smode, "srcreg", curi->size, "src");
 	break;
      case i_CLR:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 2, 0);
-	genflags (flag_logical, table68k[opcode].size, "0", "", "");
-	genastore ("0", table68k[opcode].smode, "srcreg", table68k[opcode].size, "src");
+	genamode (curi->smode, "srcreg", curi->size, "src", 2, 0);
+	genflags (flag_logical, curi->size, "0", "", "");
+	genastore ("0", curi->smode, "srcreg", curi->size, "src");
 	break;
      case i_NOT:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
 	start_brace ();
 	printf ("\tuae_u32 dst = ~src;\n");
-	genflags (flag_logical, table68k[opcode].size, "dst", "", "");
-	genastore ("dst", table68k[opcode].smode, "srcreg", table68k[opcode].size, "src");
+	genflags (flag_logical, curi->size, "dst", "", "");
+	genastore ("dst", curi->smode, "srcreg", curi->size, "src");
 	break;
      case i_TST:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genflags (flag_logical, table68k[opcode].size, "src", "", "");
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	genflags (flag_logical, curi->size, "src", "", "");
 	break;
      case i_BTST:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0);
-	if (table68k[opcode].size == sz_byte)
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0);
+	if (curi->size == sz_byte)
 	    printf ("\tsrc &= 7;\n");
 	else
 	    printf ("\tsrc &= 31;\n");
-	printf ("\tZFLG = !(dst & (1 << src));\n");
+	printf ("\tSET_ZFLG (1 ^ ((dst >> src) & 1));\n");
 	break;
      case i_BCHG:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0);
-	if (table68k[opcode].size == sz_byte)
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0);
+	if (curi->size == sz_byte)
 	    printf ("\tsrc &= 7;\n");
 	else
 	    printf ("\tsrc &= 31;\n");
-	printf ("\tZFLG = !(dst & (1 << src));\n");
 	printf ("\tdst ^= (1 << src);\n");
-	genastore ("dst", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst");
+	printf ("\tSET_ZFLG (((uae_u32)dst & (1 << src)) >> src);\n");
+	genastore ("dst", curi->dmode, "dstreg", curi->size, "dst");
 	break;
      case i_BCLR:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0);
-	if (table68k[opcode].size == sz_byte)
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0);
+	if (curi->size == sz_byte)
 	    printf ("\tsrc &= 7;\n");
 	else
 	    printf ("\tsrc &= 31;\n");
-	printf ("\tZFLG = !(dst & (1 << src));\n");
+	printf ("\tSET_ZFLG (1 ^ ((dst >> src) & 1));\n");
 	printf ("\tdst &= ~(1 << src);\n");
-	genastore ("dst", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst");
+	genastore ("dst", curi->dmode, "dstreg", curi->size, "dst");
 	break;
      case i_BSET:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0);
-	if (table68k[opcode].size == sz_byte)
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0);
+	if (curi->size == sz_byte)
 	    printf ("\tsrc &= 7;\n");
 	else
 	    printf ("\tsrc &= 31;\n");
-	printf ("\tZFLG = !(dst & (1 << src));\n");
+	printf ("\tSET_ZFLG (1 ^ ((dst >> src) & 1));\n");
 	printf ("\tdst |= (1 << src);\n");
-	genastore ("dst", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst");
+	genastore ("dst", curi->dmode, "dstreg", curi->size, "dst");
 	break;
      case i_CMPM:
      case i_CMP:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0);
 	start_brace ();
-	genflags (flag_cmp, table68k[opcode].size, "newv", "src", "dst");
+	genflags (flag_cmp, curi->size, "newv", "src", "dst");
 	break;
      case i_CMPA:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", sz_long, "dst", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", sz_long, "dst", 1, 0);
 	start_brace ();
 	genflags (flag_cmp, sz_long, "newv", "src", "dst");
 	break;
 	/* The next two are coded a little unconventional, but they are doing
 	 * weird things... */
      case i_MVPRM:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
 
 	printf ("\tuaecptr memp = m68k_areg(regs, dstreg) + (uae_s32)(uae_s16)%s;\n", gen_nextiword ());
-	if (table68k[opcode].size == sz_word) {
+	if (curi->size == sz_word) {
 	    printf ("\tput_byte(memp, src >> 8); put_byte(memp + 2, src);\n");
 	} else {
 	    printf ("\tput_byte(memp, src >> 24); put_byte(memp + 2, src >> 16);\n");
@@ -1214,42 +1244,42 @@ static void gen_opcode (unsigned long in
 	break;
      case i_MVPMR:
 	printf ("\tuaecptr memp = m68k_areg(regs, srcreg) + (uae_s32)(uae_s16)%s;\n", gen_nextiword ());
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 2, 0);
-	if (table68k[opcode].size == sz_word) {
+	genamode (curi->dmode, "dstreg", curi->size, "dst", 2, 0);
+	if (curi->size == sz_word) {
 	    printf ("\tuae_u16 val = (get_byte(memp) << 8) + get_byte(memp + 2);\n");
 	} else {
 	    printf ("\tuae_u32 val = (get_byte(memp) << 24) + (get_byte(memp + 2) << 16)\n");
 	    printf ("              + (get_byte(memp + 4) << 8) + get_byte(memp + 6);\n");
 	}
-	genastore ("val", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst");
+	genastore ("val", curi->dmode, "dstreg", curi->size, "dst");
 	break;
      case i_MOVE:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 2, 0);
-	genflags (flag_logical, table68k[opcode].size, "src", "", "");
-	genastore ("src", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst");
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "dst", 2, 0);
+	genflags (flag_logical, curi->size, "src", "", "");
+	genastore ("src", curi->dmode, "dstreg", curi->size, "dst");
 	break;
      case i_MOVEA:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 2, 0);
-	if (table68k[opcode].size == sz_word) {
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "dst", 2, 0);
+	if (curi->size == sz_word) {
 	    printf ("\tuae_u32 val = (uae_s32)(uae_s16)src;\n");
 	} else {
 	    printf ("\tuae_u32 val = src;\n");
 	}
-	genastore ("val", table68k[opcode].dmode, "dstreg", sz_long, "dst");
+	genastore ("val", curi->dmode, "dstreg", sz_long, "dst");
 	break;
      case i_MVSR2:
-	genamode (table68k[opcode].smode, "srcreg", sz_word, "src", 2, 0);
+	genamode (curi->smode, "srcreg", sz_word, "src", 2, 0);
 	printf ("\tMakeSR();\n");
-	if (table68k[opcode].size == sz_byte)
-	    genastore ("regs.sr & 0xff", table68k[opcode].smode, "srcreg", sz_word, "src");
+	if (curi->size == sz_byte)
+	    genastore ("regs.sr & 0xff", curi->smode, "srcreg", sz_word, "src");
 	else
-	    genastore ("regs.sr", table68k[opcode].smode, "srcreg", sz_word, "src");
+	    genastore ("regs.sr", curi->smode, "srcreg", sz_word, "src");
 	break;
      case i_MV2SR:
-	genamode (table68k[opcode].smode, "srcreg", sz_word, "src", 1, 0);
-	if (table68k[opcode].size == sz_byte)
+	genamode (curi->smode, "srcreg", sz_word, "src", 1, 0);
+	if (curi->size == sz_byte)
 	    printf ("\tMakeSR();\n\tregs.sr &= 0xFF00;\n\tregs.sr |= src & 0xFF;\n");
 	else {
 	    printf ("\tregs.sr = src;\n");
@@ -1257,31 +1287,31 @@ static void gen_opcode (unsigned long in
 	printf ("\tMakeFromSR();\n");
 	break;
      case i_SWAP:
-	genamode (table68k[opcode].smode, "srcreg", sz_long, "src", 1, 0);
+	genamode (curi->smode, "srcreg", sz_long, "src", 1, 0);
 	start_brace ();
 	printf ("\tuae_u32 dst = ((src >> 16)&0xFFFF) | ((src&0xFFFF)<<16);\n");
 	genflags (flag_logical, sz_long, "dst", "", "");
-	genastore ("dst", table68k[opcode].smode, "srcreg", sz_long, "src");
+	genastore ("dst", curi->smode, "srcreg", sz_long, "src");
 	break;
      case i_EXG:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0);
-	genastore ("dst", table68k[opcode].smode, "srcreg", table68k[opcode].size, "src");
-	genastore ("src", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst");
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0);
+	genastore ("dst", curi->smode, "srcreg", curi->size, "src");
+	genastore ("src", curi->dmode, "dstreg", curi->size, "dst");
 	break;
      case i_EXT:
-	genamode (table68k[opcode].smode, "srcreg", sz_long, "src", 1, 0);
+	genamode (curi->smode, "srcreg", sz_long, "src", 1, 0);
 	start_brace ();
-	switch (table68k[opcode].size) {
+	switch (curi->size) {
 	 case sz_byte: printf ("\tuae_u32 dst = (uae_s32)(uae_s8)src;\n"); break;
 	 case sz_word: printf ("\tuae_u16 dst = (uae_s16)(uae_s8)src;\n"); break;
 	 case sz_long: printf ("\tuae_u32 dst = (uae_s32)(uae_s16)src;\n"); break;
 	 default: abort ();
 	}
 	genflags (flag_logical,
-		  table68k[opcode].size == sz_word ? sz_word : sz_long, "dst", "", "");
-	genastore ("dst", table68k[opcode].smode, "srcreg",
-	    table68k[opcode].size == sz_word ? sz_word : sz_long, "src");
+		  curi->size == sz_word ? sz_word : sz_long, "dst", "", "");
+	genastore ("dst", curi->smode, "srcreg",
+		   curi->size == sz_word ? sz_word : sz_long, "src");
 	break;
      case i_MVMEL:
 	genmovemel (opcode);
@@ -1290,18 +1320,18 @@ static void gen_opcode (unsigned long in
 	genmovemle (opcode);
 	break;
      case i_TRAP:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
 	sync_m68k_pc ();
 	printf ("\tException(src+32,0);\n");
 	m68k_pc_offset = 0;
 	break;
      case i_MVR2USP:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
 	printf ("\tregs.usp = src;\n");
 	break;
      case i_MVUSP2R:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 2, 0);
-	genastore ("regs.usp", table68k[opcode].smode, "srcreg", table68k[opcode].size, "src");
+	genamode (curi->smode, "srcreg", curi->size, "src", 2, 0);
+	genastore ("regs.usp", curi->smode, "srcreg", curi->size, "src");
 	break;
      case i_RESET:
 	printf ("\tcustomreset();\n");
@@ -1309,7 +1339,7 @@ static void gen_opcode (unsigned long in
      case i_NOP:
 	break;
      case i_STOP:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
 	printf ("\tregs.sr = src;\n");
 	printf ("\tMakeFromSR();\n");
 	printf ("\tm68k_setstopped(1);\n");
@@ -1351,7 +1381,7 @@ static void gen_opcode (unsigned long in
      case i_RTD:
 	printf ("\tcompiler_flush_jsr_stack();\n");
 	genamode (Aipi, "7", sz_long, "pc", 1, 0);
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "offs", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "offs", 1, 0);
 	printf ("\tm68k_areg(regs, 7) += offs;\n");
 	printf ("\tm68k_setpc_rte(pc);\n");
 	fill_prefetch_0 ();
@@ -1360,17 +1390,17 @@ static void gen_opcode (unsigned long in
 	break;
      case i_LINK:
 	genamode (Apdi, "7", sz_long, "old", 2, 0);
-	genamode (table68k[opcode].smode, "srcreg", sz_long, "src", 1, 0);
+	genamode (curi->smode, "srcreg", sz_long, "src", 1, 0);
 	genastore ("src", Apdi, "7", sz_long, "old");
-	genastore ("m68k_areg(regs, 7)", table68k[opcode].smode, "srcreg", sz_long, "src");
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "offs", 1, 0);
+	genastore ("m68k_areg(regs, 7)", curi->smode, "srcreg", sz_long, "src");
+	genamode (curi->dmode, "dstreg", curi->size, "offs", 1, 0);
 	printf ("\tm68k_areg(regs, 7) += offs;\n");
 	break;
      case i_UNLK:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
 	printf ("\tm68k_areg(regs, 7) = src;\n");
 	genamode (Aipi, "7", sz_long, "old", 1, 0);
-	genastore ("old", table68k[opcode].smode, "srcreg", table68k[opcode].size, "src");
+	genastore ("old", curi->smode, "srcreg", curi->size, "src");
 	break;
      case i_RTS:
 	printf ("\tm68k_do_rts();\n");
@@ -1379,7 +1409,7 @@ static void gen_opcode (unsigned long in
 	break;
      case i_TRAPV:
 	sync_m68k_pc ();
-	printf ("\tif(VFLG) { Exception(7,m68k_getpc()); goto %s; }\n", endlabelstr);
+	printf ("\tif (GET_VFLG) { Exception(7,m68k_getpc()); goto %s; }\n", endlabelstr);
 	need_endlabel = 1;
 	break;
      case i_RTR:
@@ -1394,19 +1424,19 @@ static void gen_opcode (unsigned long in
 	m68k_pc_offset = 0;
 	break;
      case i_JSR:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 0, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 0, 0);
 	printf ("\tm68k_do_jsr(m68k_getpc() + %d, srca);\n", m68k_pc_offset);
 	fill_prefetch_0 ();
 	m68k_pc_offset = 0;
 	break;
      case i_JMP:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 0, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 0, 0);
 	printf ("\tm68k_setpc(srca);\n");
 	fill_prefetch_0 ();
 	m68k_pc_offset = 0;
 	break;
      case i_BSR:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
 	printf ("\tuae_s32 s = (uae_s32)src + 2;\n");
 	if (using_exception_3) {
 	    printf ("\tif (src & 1) {\n");
@@ -1421,10 +1451,10 @@ static void gen_opcode (unsigned long in
 	m68k_pc_offset = 0;
 	break;
      case i_Bcc:
-	if (table68k[opcode].size == sz_long) {
+	if (curi->size == sz_long) {
 	    if (cpu_level < 2) {
 		printf ("\tm68k_incpc(2);\n");
-		printf ("\tif (!cctrue(%d)) goto %s;\n", table68k[opcode].cc, endlabelstr);
+		printf ("\tif (!cctrue(%d)) goto %s;\n", curi->cc, endlabelstr);
 		printf ("\t\tlast_addr_for_exception_3 = m68k_getpc() + 2;\n");
 		printf ("\t\tlast_fault_for_exception_3 = m68k_getpc() + 1;\n");
 		printf ("\t\tlast_op_for_exception_3 = opcode; Exception(3,0); goto %s;\n", endlabelstr);
@@ -1434,8 +1464,8 @@ static void gen_opcode (unsigned long in
 		    next_cpu_level = 1;
 	    }
 	}
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	printf ("\tif (!cctrue(%d)) goto didnt_jump;\n", table68k[opcode].cc);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	printf ("\tif (!cctrue(%d)) goto didnt_jump;\n", curi->cc);
 	if (using_exception_3) {
 	    printf ("\tif (src & 1) {\n");
 	    printf ("\t\tlast_addr_for_exception_3 = m68k_getpc() + 2;\n");
@@ -1455,21 +1485,21 @@ static void gen_opcode (unsigned long in
 	need_endlabel = 1;
 	break;
      case i_LEA:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 0, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 2, 0);
-	genastore ("srca", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst");
+	genamode (curi->smode, "srcreg", curi->size, "src", 0, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "dst", 2, 0);
+	genastore ("srca", curi->dmode, "dstreg", curi->size, "dst");
 	break;
      case i_PEA:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 0, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 0, 0);
 	genamode (Apdi, "7", sz_long, "dst", 2, 0);
 	genastore ("srca", Apdi, "7", sz_long, "dst");
 	break;
      case i_DBcc:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "offs", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "offs", 1, 0);
 
-	printf ("\tif (!cctrue(%d)) {\n", table68k[opcode].cc);
-	genastore ("(src-1)", table68k[opcode].smode, "srcreg", table68k[opcode].size, "src");
+	printf ("\tif (!cctrue(%d)) {\n", curi->cc);
+	genastore ("(src-1)", curi->smode, "srcreg", curi->size, "src");
 
 	printf ("\t\tif (src) {\n");
 	if (using_exception_3) {
@@ -1492,24 +1522,27 @@ static void gen_opcode (unsigned long in
 	need_endlabel = 1;
 	break;
      case i_Scc:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 2, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 2, 0);
 	start_brace ();
-	printf ("\tint val = cctrue(%d) ? 0xff : 0;\n", table68k[opcode].cc);
-	genastore ("val", table68k[opcode].smode, "srcreg", table68k[opcode].size, "src");
+	printf ("\tint val = cctrue(%d) ? 0xff : 0;\n", curi->cc);
+	genastore ("val", curi->smode, "srcreg", curi->size, "src");
 	break;
      case i_DIVU:
 	printf ("\tuaecptr oldpc = m68k_getpc();\n");
-	genamode (table68k[opcode].smode, "srcreg", sz_word, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", sz_long, "dst", 1, 0);
-	printf ("\tif(src == 0) { Exception(5,oldpc); goto %s; } else {\n", endlabelstr);
+	genamode (curi->smode, "srcreg", sz_word, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", sz_long, "dst", 1, 0);
+	sync_m68k_pc ();
+	/* Clear V flag when dividing by zero - Alcatraz Odyssey demo depends
+	 * on this (actually, it's doing a DIVS).  */
+	printf ("\tif (src == 0) { SET_VFLG (0); Exception (5, oldpc); goto %s; } else {\n", endlabelstr);
 	printf ("\tuae_u32 newv = (uae_u32)dst / (uae_u32)(uae_u16)src;\n");
 	printf ("\tuae_u32 rem = (uae_u32)dst %% (uae_u32)(uae_u16)src;\n");
 	/* The N flag appears to be set each time there is an overflow.
 	 * Weird. */
-	printf ("\tif (newv > 0xffff) { VFLG = NFLG = 1; CFLG = 0; } else\n\t{\n");
+	printf ("\tif (newv > 0xffff) { SET_VFLG (1); SET_NFLG (1); SET_CFLG (0); } else\n\t{\n");
 	genflags (flag_logical, sz_word, "newv", "", "");
 	printf ("\tnewv = (newv & 0xffff) | ((uae_u32)rem << 16);\n");
-	genastore ("newv", table68k[opcode].dmode, "dstreg", sz_long, "dst");
+	genastore ("newv", curi->dmode, "dstreg", sz_long, "dst");
 	printf ("\t}\n");
 	printf ("\t}\n");
 	insn_n_cycles += 68;
@@ -1517,54 +1550,55 @@ static void gen_opcode (unsigned long in
 	break;
      case i_DIVS:
 	printf ("\tuaecptr oldpc = m68k_getpc();\n");
-	genamode (table68k[opcode].smode, "srcreg", sz_word, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", sz_long, "dst", 1, 0);
-	printf ("\tif(src == 0) { Exception(5,oldpc); goto %s; } else {\n", endlabelstr);
+	genamode (curi->smode, "srcreg", sz_word, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", sz_long, "dst", 1, 0);
+	sync_m68k_pc ();
+	printf ("\tif (src == 0) { SET_VFLG (0); Exception(5,oldpc); goto %s; } else {\n", endlabelstr);
 	printf ("\tuae_s32 newv = (uae_s32)dst / (uae_s32)(uae_s16)src;\n");
 	printf ("\tuae_u16 rem = (uae_s32)dst %% (uae_s32)(uae_s16)src;\n");
-	printf ("\tif ((newv & 0xffff8000) != 0 && (newv & 0xffff8000) != 0xffff8000) { VFLG = NFLG = 1; CFLG = 0; } else\n\t{\n");
+	printf ("\tif ((newv & 0xffff8000) != 0 && (newv & 0xffff8000) != 0xffff8000) { SET_VFLG (1); SET_NFLG (1); SET_CFLG (0); } else\n\t{\n");
 	printf ("\tif (((uae_s16)rem < 0) != ((uae_s32)dst < 0)) rem = -rem;\n");
 	genflags (flag_logical, sz_word, "newv", "", "");
 	printf ("\tnewv = (newv & 0xffff) | ((uae_u32)rem << 16);\n");
-	genastore ("newv", table68k[opcode].dmode, "dstreg", sz_long, "dst");
+	genastore ("newv", curi->dmode, "dstreg", sz_long, "dst");
 	printf ("\t}\n");
 	printf ("\t}\n");
 	insn_n_cycles += 72;
 	need_endlabel = 1;
 	break;
      case i_MULU:
-	genamode (table68k[opcode].smode, "srcreg", sz_word, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", sz_word, "dst", 1, 0);
+	genamode (curi->smode, "srcreg", sz_word, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", sz_word, "dst", 1, 0);
 	start_brace ();
 	printf ("\tuae_u32 newv = (uae_u32)(uae_u16)dst * (uae_u32)(uae_u16)src;\n");
 	genflags (flag_logical, sz_long, "newv", "", "");
-	genastore ("newv", table68k[opcode].dmode, "dstreg", sz_long, "dst");
+	genastore ("newv", curi->dmode, "dstreg", sz_long, "dst");
 	insn_n_cycles += 32;
 	break;
      case i_MULS:
-	genamode (table68k[opcode].smode, "srcreg", sz_word, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", sz_word, "dst", 1, 0);
+	genamode (curi->smode, "srcreg", sz_word, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", sz_word, "dst", 1, 0);
 	start_brace ();
 	printf ("\tuae_u32 newv = (uae_s32)(uae_s16)dst * (uae_s32)(uae_s16)src;\n");
 	genflags (flag_logical, sz_long, "newv", "", "");
-	genastore ("newv", table68k[opcode].dmode, "dstreg", sz_long, "dst");
+	genastore ("newv", curi->dmode, "dstreg", sz_long, "dst");
 	insn_n_cycles += 32;
 	break;
      case i_CHK:
 	printf ("\tuaecptr oldpc = m68k_getpc();\n");
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0);
-	printf ("\tif ((uae_s32)dst < 0) { NFLG=1; Exception(6,oldpc); goto %s; }\n", endlabelstr);
-	printf ("\telse if (dst > src) { NFLG=0; Exception(6,oldpc); goto %s; }\n", endlabelstr);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0);
+	printf ("\tif ((uae_s32)dst < 0) { SET_NFLG (1); Exception(6,oldpc); goto %s; }\n", endlabelstr);
+	printf ("\telse if (dst > src) { SET_NFLG (0); Exception(6,oldpc); goto %s; }\n", endlabelstr);
 	need_endlabel = 1;
 	break;
 
      case i_CHK2:
 	printf ("\tuaecptr oldpc = m68k_getpc();\n");
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "extra", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 2, 0);
+	genamode (curi->smode, "srcreg", curi->size, "extra", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "dst", 2, 0);
 	printf ("\t{uae_s32 upper,lower,reg = regs.regs[(extra >> 12) & 15];\n");
-	switch (table68k[opcode].size) {
+	switch (curi->size) {
 	 case sz_byte:
 	    printf ("\tlower=(uae_s32)(uae_s8)get_byte(dsta); upper = (uae_s32)(uae_s8)get_byte(dsta+1);\n");
 	    printf ("\tif ((extra & 0x8000) == 0) reg = (uae_s32)(uae_s8)reg;\n");
@@ -1579,447 +1613,419 @@ static void gen_opcode (unsigned long in
 	 default:
 	    abort ();
 	}
-	printf ("\tZFLG=upper == reg || lower == reg;\n");
-	printf ("\tCFLG=lower <= upper ? reg < lower || reg > upper : reg > upper || reg < lower;\n");
-	printf ("\tif ((extra & 0x800) && CFLG) { Exception(6,oldpc); goto %s; }\n}\n", endlabelstr);
+	printf ("\tSET_ZFLG (upper == reg || lower == reg);\n");
+	printf ("\tSET_CFLG (lower <= upper ? reg < lower || reg > upper : reg > upper || reg < lower);\n");
+	printf ("\tif ((extra & 0x800) && GET_CFLG) { Exception(6,oldpc); goto %s; }\n}\n", endlabelstr);
 	need_endlabel = 1;
 	break;
 
      case i_ASR:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "cnt", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "cnt", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "data", 1, 0);
 	start_brace ();
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u8 val = data;\n"); break;
-	 case sz_word: printf ("\tuae_u16 val = data;\n"); break;
+	switch (curi->size) {
+	 case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break;
+	 case sz_word: printf ("\tuae_u32 val = (uae_u16)data;\n"); break;
 	 case sz_long: printf ("\tuae_u32 val = data;\n"); break;
 	 default: abort ();
 	}
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break;
-	 case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break;
-	 case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break;
-	 default: abort ();
-	}
-	printf ("\tuae_u32 sign = cmask & val;\n");
+	printf ("\tuae_u32 sign = (%s & val) >> %d;\n", cmask (curi->size), bit_size (curi->size) - 1);
 	printf ("\tcnt &= 63;\n");
-	printf ("\tVFLG = 0;\n");
-	printf ("\tif (!cnt) { CFLG = 0; } else {\n");
-	printf ("\tif (cnt >= %d) {\n", bit_size (table68k[opcode].size));
-	printf ("\t\tval = sign ? %s : 0;\n", bit_mask (table68k[opcode].size));
-	printf ("\t\tCFLG=XFLG= sign ? 1 : 0;\n");
-	printf ("\t} else {\n");
-	printf ("\t\tCFLG=XFLG=(val >> (cnt-1)) & 1;\n");
-	printf ("\t\tval >>= cnt;\n");
-	printf ("\t\tif (sign) val |= %s << (%d - cnt);\n",
-		bit_mask (table68k[opcode].size),
-		bit_size (table68k[opcode].size));
-	printf ("\t}}\n");
-	printf ("\tNFLG = sign != 0;\n");
-	printf ("\tZFLG = val == 0;\n");
-	genastore ("val", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data");
+	printf ("\tCLEAR_CZNV;\n");
+	printf ("\tif (cnt >= %d) {\n", bit_size (curi->size));
+	printf ("\t\tval = %s & (uae_u32)-sign;\n", bit_mask (curi->size));
+	printf ("\t\tSET_CFLG (sign);\n");
+	duplicate_carry ();
+	if (source_is_imm1_8 (curi))
+	    printf ("\t} else {\n");
+	else
+	    printf ("\t} else if (cnt > 0) {\n");
+	printf ("\t\tval >>= cnt - 1;\n");
+	printf ("\t\tSET_CFLG (val & 1);\n");
+	duplicate_carry ();
+	printf ("\t\tval >>= 1;\n");
+	printf ("\t\tval |= (%s << (%d - cnt)) & (uae_u32)-sign;\n",
+		bit_mask (curi->size),
+		bit_size (curi->size));
+	printf ("\t\tval &= %s;\n", bit_mask (curi->size));
+	printf ("\t}\n");
+	genflags (flag_logical_noclobber, curi->size, "val", "", "");
+	genastore ("val", curi->dmode, "dstreg", curi->size, "data");
 	break;
      case i_ASL:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "cnt", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "cnt", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "data", 1, 0);
 	start_brace ();
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u8 val = data;\n"); break;
-	 case sz_word: printf ("\tuae_u16 val = data;\n"); break;
+	switch (curi->size) {
+	 case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break;
+	 case sz_word: printf ("\tuae_u32 val = (uae_u16)data;\n"); break;
 	 case sz_long: printf ("\tuae_u32 val = data;\n"); break;
 	 default: abort ();
 	}
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break;
-	 case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break;
-	 case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break;
-	 default: abort ();
-	}
 	printf ("\tcnt &= 63;\n");
-	printf ("\tVFLG = 0;\n");
-	printf ("\tif (!cnt) { CFLG = 0; } else {\n");
-	printf ("\tif (cnt >= %d) {\n", bit_size (table68k[opcode].size));
-	printf ("\t\tVFLG = val != 0;\n");
-	printf ("\t\tCFLG=XFLG = cnt == %d ? val & 1 : 0;\n",
-		bit_size (table68k[opcode].size));
+	printf ("\tCLEAR_CZNV;\n");
+	printf ("\tif (cnt >= %d) {\n", bit_size (curi->size));
+	printf ("\t\tSET_VFLG (val != 0);\n");
+	printf ("\t\tSET_CFLG (cnt == %d ? val & 1 : 0);\n",
+		bit_size (curi->size));
+	duplicate_carry ();
 	printf ("\t\tval = 0;\n");
-	printf ("\t} else {\n");
+	if (source_is_imm1_8 (curi))
+	    printf ("\t} else {\n");
+	else
+	    printf ("\t} else if (cnt > 0) {\n");
 	printf ("\t\tuae_u32 mask = (%s << (%d - cnt)) & %s;\n",
-		bit_mask (table68k[opcode].size),
-		bit_size (table68k[opcode].size) - 1,
-		bit_mask (table68k[opcode].size));
-	printf ("\t\tCFLG=XFLG=(val << (cnt-1)) & cmask ? 1 : 0;\n");
-	printf ("\t\tVFLG = (val & mask) != mask && (val & mask) != 0;\n");
-	printf ("\t\tval <<= cnt;\n");
-	printf ("\t}}\n");
-	printf ("\tNFLG = (val&cmask) != 0;\n");
-	printf ("\tZFLG = val == 0;\n");
-	genastore ("val", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data");
+		bit_mask (curi->size),
+		bit_size (curi->size) - 1,
+		bit_mask (curi->size));
+	printf ("\t\tSET_VFLG ((val & mask) != mask && (val & mask) != 0);\n");
+	printf ("\t\tval <<= cnt - 1;\n");
+	printf ("\t\tSET_CFLG ((val & %s) >> %d);\n", cmask (curi->size), bit_size (curi->size) - 1);
+	duplicate_carry ();
+	printf ("\t\tval <<= 1;\n");
+	printf ("\t\tval &= %s;\n", bit_mask (curi->size));
+	printf ("\t}\n");
+	genflags (flag_logical_noclobber, curi->size, "val", "", "");
+	genastore ("val", curi->dmode, "dstreg", curi->size, "data");
 	break;
      case i_LSR:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "cnt", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "cnt", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "data", 1, 0);
 	start_brace ();
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u8 val = data;\n"); break;
-	 case sz_word: printf ("\tuae_u16 val = data;\n"); break;
+	switch (curi->size) {
+	 case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break;
+	 case sz_word: printf ("\tuae_u32 val = (uae_u16)data;\n"); break;
 	 case sz_long: printf ("\tuae_u32 val = data;\n"); break;
 	 default: abort ();
 	}
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break;
-	 case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break;
-	 case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break;
-	 default: abort ();
-	}
 	printf ("\tcnt &= 63;\n");
-	printf ("\tif (!cnt) { CFLG = 0; } else {\n");
-	printf ("\tif (cnt >= %d) {\n", bit_size (table68k[opcode].size));
-	printf ("\t\tCFLG=XFLG = cnt == %d ? (val & cmask ? 1 : 0) : 0;\n",
-		bit_size (table68k[opcode].size));
+	printf ("\tCLEAR_CZNV;\n");
+	printf ("\tif (cnt >= %d) {\n", bit_size (curi->size));
+	printf ("\t\tSET_CFLG ((cnt == %d) & (val >> %d));\n",
+		bit_size (curi->size), bit_size (curi->size) - 1);
+	duplicate_carry ();
 	printf ("\t\tval = 0;\n");
-	printf ("\t} else {\n");
-	printf ("\t\tCFLG=XFLG=(val >> (cnt-1)) & 1;\n");
-	printf ("\t\tval >>= cnt;\n");
-	printf ("\t}}\n");
-	printf ("\tNFLG = (val & cmask) != 0; ZFLG = val == 0; VFLG = 0;\n");
-	genastore ("val", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data");
+	if (source_is_imm1_8 (curi))
+	    printf ("\t} else {\n");
+	else
+	    printf ("\t} else if (cnt > 0) {\n");
+	printf ("\t\tval >>= cnt - 1;\n");
+	printf ("\t\tSET_CFLG (val & 1);\n");
+	duplicate_carry ();
+	printf ("\t\tval >>= 1;\n");
+	printf ("\t}\n");
+	genflags (flag_logical_noclobber, curi->size, "val", "", "");
+	genastore ("val", curi->dmode, "dstreg", curi->size, "data");
 	break;
      case i_LSL:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "cnt", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "cnt", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "data", 1, 0);
 	start_brace ();
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u8 val = data;\n"); break;
-	 case sz_word: printf ("\tuae_u16 val = data;\n"); break;
+	switch (curi->size) {
+	 case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break;
+	 case sz_word: printf ("\tuae_u32 val = (uae_u16)data;\n"); break;
 	 case sz_long: printf ("\tuae_u32 val = data;\n"); break;
 	 default: abort ();
 	}
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break;
-	 case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break;
-	 case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break;
-	 default: abort ();
-	}
 	printf ("\tcnt &= 63;\n");
-	printf ("\tif (!cnt) { CFLG = 0; } else {\n");
-	printf ("\tif (cnt >= %d) {\n", bit_size (table68k[opcode].size));
-	printf ("\t\tCFLG=XFLG = cnt == %d ? val & 1 : 0;\n",
-		bit_size (table68k[opcode].size));
+	printf ("\tCLEAR_CZNV;\n");
+	printf ("\tif (cnt >= %d) {\n", bit_size (curi->size));
+	printf ("\t\tSET_CFLG (cnt == %d ? val & 1 : 0);\n",
+		bit_size (curi->size));
+	duplicate_carry ();
 	printf ("\t\tval = 0;\n");
-	printf ("\t} else {\n");
-	printf ("\t\tCFLG=XFLG=(val << (cnt-1)) & cmask ? 1 : 0;\n");
-	printf ("\t\tval <<= cnt;\n");
-	printf ("\t}}\n");
-	printf ("\tNFLG = (val & cmask) != 0; ZFLG = val == 0; VFLG = 0;\n");
-	genastore ("val", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data");
+	if (source_is_imm1_8 (curi))
+	    printf ("\t} else {\n");
+	else
+	    printf ("\t} else if (cnt > 0) {\n");
+	printf ("\t\tval <<= (cnt - 1);\n");
+	printf ("\t\tSET_CFLG ((val & %s) >> %d);\n", cmask (curi->size), bit_size (curi->size) - 1);
+	duplicate_carry ();
+	printf ("\t\tval <<= 1;\n");
+	printf ("\tval &= %s;\n", bit_mask (curi->size));
+	printf ("\t}\n");
+	genflags (flag_logical_noclobber, curi->size, "val", "", "");
+	genastore ("val", curi->dmode, "dstreg", curi->size, "data");
 	break;
      case i_ROL:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "cnt", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "cnt", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "data", 1, 0);
 	start_brace ();
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u8 val = data;\n"); break;
-	 case sz_word: printf ("\tuae_u16 val = data;\n"); break;
+	switch (curi->size) {
+	 case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break;
+	 case sz_word: printf ("\tuae_u32 val = (uae_u16)data;\n"); break;
 	 case sz_long: printf ("\tuae_u32 val = data;\n"); break;
 	 default: abort ();
 	}
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break;
-	 case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break;
-	 case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break;
-	 default: abort ();
-	}
 	printf ("\tcnt &= 63;\n");
-	printf ("\tif (!cnt) { CFLG = 0; } else {\n");
-	printf ("\tuae_u32 carry;\n");
-	printf ("\tfor(;cnt;--cnt){\n");
-	printf ("\tcarry=val&cmask; val <<= 1;\n");
-	printf ("\tif(carry) val |= 1;\n");
-	printf ("\t}\n");
-	printf ("\tCFLG = carry!=0;\n}\n");
-	printf ("\tNFLG = (val & cmask) != 0; ZFLG = val == 0; VFLG = 0;\n");
-	genastore ("val", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data");
+	printf ("\tCLEAR_CZNV;\n");
+	if (source_is_imm1_8 (curi))
+	    printf ("{");
+	else
+	    printf ("\tif (cnt > 0) {\n");
+	printf ("\tuae_u32 loval;\n");
+	printf ("\tcnt &= %d;\n", bit_size (curi->size) - 1);
+	printf ("\tloval = val >> (%d - cnt);\n", bit_size (curi->size));
+	printf ("\tval <<= cnt;\n");
+	printf ("\tval |= loval;\n");
+	printf ("\tval &= %s;\n", bit_mask (curi->size));
+	printf ("\tSET_CFLG (val & 1);\n");
+	printf ("}\n");
+	genflags (flag_logical_noclobber, curi->size, "val", "", "");
+	genastore ("val", curi->dmode, "dstreg", curi->size, "data");
 	break;
      case i_ROR:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "cnt", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "cnt", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "data", 1, 0);
 	start_brace ();
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u8 val = data;\n"); break;
-	 case sz_word: printf ("\tuae_u16 val = data;\n"); break;
+	switch (curi->size) {
+	 case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break;
+	 case sz_word: printf ("\tuae_u32 val = (uae_u16)data;\n"); break;
 	 case sz_long: printf ("\tuae_u32 val = data;\n"); break;
 	 default: abort ();
 	}
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break;
-	 case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break;
-	 case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break;
-	 default: abort ();
-	}
 	printf ("\tcnt &= 63;\n");
-	printf ("\tif (!cnt) { CFLG = 0; } else {");
-	printf ("\tuae_u32 carry;\n");
-	printf ("\tfor(;cnt;--cnt){\n");
-	printf ("\tcarry=val&1; val = val >> 1;\n");
-	printf ("\tif(carry) val |= cmask;\n");
+	printf ("\tCLEAR_CZNV;\n");
+	if (source_is_imm1_8 (curi))
+	    printf ("{");
+	else
+	    printf ("\tif (cnt > 0) {");
+	printf ("\tuae_u32 hival;\n");
+	printf ("\tcnt &= %d;\n", bit_size (curi->size) - 1);
+	printf ("\thival = val << (%d - cnt);\n", bit_size (curi->size));
+	printf ("\tval >>= cnt;\n");
+	printf ("\tval |= hival;\n");
+	printf ("\tval &= %s;\n", bit_mask (curi->size));
+	printf ("\tSET_CFLG ((val & %s) >> %d);\n", cmask (curi->size), bit_size (curi->size) - 1);
 	printf ("\t}\n");
-	printf ("\tCFLG = carry;\n}\n");
-	printf ("\tNFLG = (val & cmask) != 0; ZFLG = val == 0; VFLG = 0;\n");
-	genastore ("val", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data");
+	genflags (flag_logical_noclobber, curi->size, "val", "", "");
+	genastore ("val", curi->dmode, "dstreg", curi->size, "data");
 	break;
      case i_ROXL:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "cnt", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "cnt", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "data", 1, 0);
 	start_brace ();
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u8 val = data;\n"); break;
-	 case sz_word: printf ("\tuae_u16 val = data;\n"); break;
+	switch (curi->size) {
+	 case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break;
+	 case sz_word: printf ("\tuae_u32 val = (uae_u16)data;\n"); break;
 	 case sz_long: printf ("\tuae_u32 val = data;\n"); break;
 	 default: abort ();
 	}
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break;
-	 case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break;
-	 case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break;
-	 default: abort ();
-	}
-	printf ("\tuae_u32 carry;\n");
 	printf ("\tcnt &= 63;\n");
-	printf ("\tfor(;cnt;--cnt){\n");
-	printf ("\tcarry=val&cmask; val <<= 1;\n");
-	printf ("\tif(XFLG) val |= 1;\n");
-	printf ("\tXFLG = carry != 0;\n");
-	printf ("\t}\n");
-	printf ("\tCFLG = XFLG;\n");
-	printf ("\tNFLG = (val & cmask) != 0; ZFLG = val == 0; VFLG = 0;\n");
-	genastore ("val", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data");
+	printf ("\tCLEAR_CZNV;\n");
+	if (! source_is_imm1_8 (curi))
+	    force_range_for_rox ("cnt", curi->size);
+	if (source_is_imm1_8 (curi))
+	    printf ("{");
+	else
+	    printf ("\tif (cnt > 0) {\n");
+	printf ("\tcnt--;\n");
+	printf ("\t{\n\tuae_u32 carry;\n");
+	printf ("\tuae_u32 loval = val >> (%d - cnt);\n", bit_size (curi->size) - 1);
+	printf ("\tcarry = loval & 1;\n");
+	printf ("\tval = (((val << 1) | GET_XFLG) << cnt) | (loval >> 1);\n");
+	printf ("\tSET_XFLG (carry);\n");
+	printf ("\tval &= %s;\n", bit_mask (curi->size));
+	printf ("\t} }\n");
+	printf ("\tSET_CFLG (GET_XFLG);\n");
+	genflags (flag_logical_noclobber, curi->size, "val", "", "");
+	genastore ("val", curi->dmode, "dstreg", curi->size, "data");
 	break;
      case i_ROXR:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "cnt", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "cnt", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "data", 1, 0);
 	start_brace ();
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u8 val = data;\n"); break;
-	 case sz_word: printf ("\tuae_u16 val = data;\n"); break;
+	switch (curi->size) {
+	 case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break;
+	 case sz_word: printf ("\tuae_u32 val = (uae_u16)data;\n"); break;
 	 case sz_long: printf ("\tuae_u32 val = data;\n"); break;
 	 default: abort ();
 	}
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break;
-	 case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break;
-	 case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break;
-	 default: abort ();
-	}
-	printf ("\tuae_u32 carry;\n");
 	printf ("\tcnt &= 63;\n");
-	printf ("\tfor(;cnt;--cnt){\n");
-	printf ("\tcarry=val&1; val >>= 1;\n");
-	printf ("\tif(XFLG) val |= cmask;\n");
-	printf ("\tXFLG = carry;\n");
-	printf ("\t}\n");
-	printf ("\tCFLG = XFLG;\n");
-	printf ("\tNFLG = (val & cmask) != 0; ZFLG = val == 0; VFLG = 0;\n");
-	genastore ("val", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data");
+	printf ("\tCLEAR_CZNV;\n");
+	if (! source_is_imm1_8 (curi))
+	    force_range_for_rox ("cnt", curi->size);
+	if (source_is_imm1_8 (curi))
+	    printf ("{");
+	else
+	    printf ("\tif (cnt > 0) {\n");
+	printf ("\tcnt--;\n");
+	printf ("\t{\n\tuae_u32 carry;\n");
+	printf ("\tuae_u32 hival = (val << 1) | GET_XFLG;\n");
+	printf ("\thival <<= (%d - cnt);\n", bit_size (curi->size) - 1);
+	printf ("\tval >>= cnt;\n");
+	printf ("\tcarry = val & 1;\n");
+	printf ("\tval >>= 1;\n");
+	printf ("\tval |= hival;\n");
+	printf ("\tSET_XFLG (carry);\n");
+	printf ("\tval &= %s;\n", bit_mask (curi->size));
+	printf ("\t} }\n");
+	printf ("\tSET_CFLG (GET_XFLG);\n");
+	genflags (flag_logical_noclobber, curi->size, "val", "", "");
+	genastore ("val", curi->dmode, "dstreg", curi->size, "data");
 	break;
      case i_ASRW:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "data", 1, 0);
-	printf ("\tVFLG = 0;\n");
+	genamode (curi->smode, "srcreg", curi->size, "data", 1, 0);
 	start_brace ();
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u8 val = data;\n"); break;
-	 case sz_word: printf ("\tuae_u16 val = data;\n"); break;
+	switch (curi->size) {
+	 case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break;
+	 case sz_word: printf ("\tuae_u32 val = (uae_u16)data;\n"); break;
 	 case sz_long: printf ("\tuae_u32 val = data;\n"); break;
 	 default: abort ();
 	}
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break;
-	 case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break;
-	 case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break;
-	 default: abort ();
-	}
-	printf ("\tuae_u32 sign = cmask & val;\n");
-	printf ("\tCFLG=XFLG=val&1; val = (val >> 1) | sign;\n");
-	printf ("\tNFLG = sign != 0;\n");
-	printf ("\tZFLG = val == 0;\n");
-	genastore ("val", table68k[opcode].smode, "srcreg", table68k[opcode].size, "data");
+	printf ("\tuae_u32 sign = %s & val;\n", cmask (curi->size));
+	printf ("\tuae_u32 cflg = val & 1;\n");
+	printf ("\tval = (val >> 1) | sign;\n");
+	genflags (flag_logical, curi->size, "val", "", "");
+	printf ("\tSET_CFLG (cflg);\n");
+	duplicate_carry ();
+	genastore ("val", curi->smode, "srcreg", curi->size, "data");
 	break;
      case i_ASLW:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "data", 1, 0);
-	printf ("\tVFLG = 0;\n");
+	genamode (curi->smode, "srcreg", curi->size, "data", 1, 0);
 	start_brace ();
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u8 val = data;\n"); break;
-	 case sz_word: printf ("\tuae_u16 val = data;\n"); break;
+	switch (curi->size) {
+	 case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break;
+	 case sz_word: printf ("\tuae_u32 val = (uae_u16)data;\n"); break;
 	 case sz_long: printf ("\tuae_u32 val = data;\n"); break;
 	 default: abort ();
 	}
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break;
-	 case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break;
-	 case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break;
-	 default: abort ();
-	}
-	printf ("\tuae_u32 sign = cmask & val;\n");
-	printf ("\tCFLG=XFLG=(val&cmask)!=0; val <<= 1;\n");
-	printf ("\tif ((val&cmask)!=sign) VFLG=1;\n");
-	printf ("\tNFLG = (val&cmask) != 0;\n");
-	printf ("\tZFLG = val == 0;\n");
-	genastore ("val", table68k[opcode].smode, "srcreg", table68k[opcode].size, "data");
+	printf ("\tuae_u32 sign = %s & val;\n", cmask (curi->size));
+	printf ("\tuae_u32 sign2;\n");
+	printf ("\tval <<= 1;\n");
+	genflags (flag_logical, curi->size, "val", "", "");
+	printf ("\tsign2 = %s & val;\n", cmask (curi->size));
+	printf ("\tSET_CFLG (sign != 0);\n");
+	duplicate_carry ();
+
+	printf ("\tSET_VFLG (GET_VFLG | (sign2 != sign));\n");
+	genastore ("val", curi->smode, "srcreg", curi->size, "data");
 	break;
      case i_LSRW:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "data", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "data", 1, 0);
 	start_brace ();
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u8 val = data;\n"); break;
-	 case sz_word: printf ("\tuae_u16 val = data;\n"); break;
+	switch (curi->size) {
+	 case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break;
+	 case sz_word: printf ("\tuae_u32 val = (uae_u16)data;\n"); break;
 	 case sz_long: printf ("\tuae_u32 val = data;\n"); break;
 	 default: abort ();
 	}
-	printf ("\tuae_u32 carry = val&1;\n");
+	printf ("\tuae_u32 carry = val & 1;\n");
 	printf ("\tval >>= 1;\n");
-	genflags (flag_logical, table68k[opcode].size, "val", "", "");
-	printf ("CFLG = XFLG = carry!=0;\n");
-	genastore ("val", table68k[opcode].smode, "srcreg", table68k[opcode].size, "data");
+	genflags (flag_logical, curi->size, "val", "", "");
+	printf ("SET_CFLG (carry);\n");
+	duplicate_carry ();
+	genastore ("val", curi->smode, "srcreg", curi->size, "data");
 	break;
      case i_LSLW:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "data", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "data", 1, 0);
 	start_brace ();
-	switch (table68k[opcode].size) {
+	switch (curi->size) {
 	 case sz_byte: printf ("\tuae_u8 val = data;\n"); break;
 	 case sz_word: printf ("\tuae_u16 val = data;\n"); break;
 	 case sz_long: printf ("\tuae_u32 val = data;\n"); break;
 	 default: abort ();
 	}
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break;
-	 case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break;
-	 case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break;
-	 default: abort ();
-	}
-	printf ("\tuae_u32 carry = val&cmask;\n");
+	printf ("\tuae_u32 carry = val & %s;\n", cmask (curi->size));
 	printf ("\tval <<= 1;\n");
-	genflags (flag_logical, table68k[opcode].size, "val", "", "");
-	printf ("CFLG = XFLG = carry!=0;\n");
-	genastore ("val", table68k[opcode].smode, "srcreg", table68k[opcode].size, "data");
+	genflags (flag_logical, curi->size, "val", "", "");
+	printf ("SET_CFLG (carry >> %d);\n", bit_size (curi->size) - 1);
+	duplicate_carry ();
+	genastore ("val", curi->smode, "srcreg", curi->size, "data");
 	break;
      case i_ROLW:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "data", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "data", 1, 0);
 	start_brace ();
-	switch (table68k[opcode].size) {
+	switch (curi->size) {
 	 case sz_byte: printf ("\tuae_u8 val = data;\n"); break;
 	 case sz_word: printf ("\tuae_u16 val = data;\n"); break;
 	 case sz_long: printf ("\tuae_u32 val = data;\n"); break;
 	 default: abort ();
 	}
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break;
-	 case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break;
-	 case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break;
-	 default: abort ();
-	}
-	printf ("\tuae_u32 carry = val&cmask;\n");
+	printf ("\tuae_u32 carry = val & %s;\n", cmask (curi->size));
 	printf ("\tval <<= 1;\n");
-	printf ("\tif(carry)  val |= 1;\n");
-	genflags (flag_logical, table68k[opcode].size, "val", "", "");
-	printf ("CFLG = carry!=0;\n");
-	genastore ("val", table68k[opcode].smode, "srcreg", table68k[opcode].size, "data");
+	printf ("\tif (carry)  val |= 1;\n");
+	genflags (flag_logical, curi->size, "val", "", "");
+	printf ("SET_CFLG (carry >> %d);\n", bit_size (curi->size) - 1);
+	genastore ("val", curi->smode, "srcreg", curi->size, "data");
 	break;
      case i_RORW:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "data", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "data", 1, 0);
 	start_brace ();
-	switch (table68k[opcode].size) {
+	switch (curi->size) {
 	 case sz_byte: printf ("\tuae_u8 val = data;\n"); break;
 	 case sz_word: printf ("\tuae_u16 val = data;\n"); break;
 	 case sz_long: printf ("\tuae_u32 val = data;\n"); break;
 	 default: abort ();
 	}
-	printf ("\tuae_u32 carry = val&1;\n");
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break;
-	 case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break;
-	 case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break;
-	 default: abort ();
-	}
+	printf ("\tuae_u32 carry = val & 1;\n");
 	printf ("\tval >>= 1;\n");
-	printf ("\tif(carry) val |= cmask;\n");
-	genflags (flag_logical, table68k[opcode].size, "val", "", "");
-	printf ("CFLG = carry!=0;\n");
-	genastore ("val", table68k[opcode].smode, "srcreg", table68k[opcode].size, "data");
+	printf ("\tif (carry) val |= %s;\n", cmask (curi->size));
+	genflags (flag_logical, curi->size, "val", "", "");
+	printf ("SET_CFLG (carry);\n");
+	genastore ("val", curi->smode, "srcreg", curi->size, "data");
 	break;
      case i_ROXLW:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "data", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "data", 1, 0);
 	start_brace ();
-	switch (table68k[opcode].size) {
+	switch (curi->size) {
 	 case sz_byte: printf ("\tuae_u8 val = data;\n"); break;
 	 case sz_word: printf ("\tuae_u16 val = data;\n"); break;
 	 case sz_long: printf ("\tuae_u32 val = data;\n"); break;
 	 default: abort ();
 	}
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break;
-	 case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break;
-	 case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break;
-	 default: abort ();
-	}
-	printf ("\tuae_u32 carry = val&cmask;\n");
+	printf ("\tuae_u32 carry = val & %s;\n", cmask (curi->size));
 	printf ("\tval <<= 1;\n");
-	printf ("\tif(XFLG) val |= 1;\n");
-	printf ("\tXFLG = carry != 0;\n");
-	genflags (flag_logical, table68k[opcode].size, "val", "", "");
-	printf ("XFLG = CFLG = carry!=0;\n");
-	genastore ("val", table68k[opcode].smode, "srcreg", table68k[opcode].size, "data");
+	printf ("\tif (GET_XFLG) val |= 1;\n");
+	genflags (flag_logical, curi->size, "val", "", "");
+	printf ("SET_CFLG (carry >> %d);\n", bit_size (curi->size) - 1);
+	duplicate_carry ();
+	genastore ("val", curi->smode, "srcreg", curi->size, "data");
 	break;
      case i_ROXRW:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "data", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "data", 1, 0);
 	start_brace ();
-	switch (table68k[opcode].size) {
+	switch (curi->size) {
 	 case sz_byte: printf ("\tuae_u8 val = data;\n"); break;
 	 case sz_word: printf ("\tuae_u16 val = data;\n"); break;
 	 case sz_long: printf ("\tuae_u32 val = data;\n"); break;
 	 default: abort ();
 	}
-	printf ("\tuae_u32 carry = val&1;\n");
-	switch (table68k[opcode].size) {
-	 case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break;
-	 case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break;
-	 case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break;
-	 default: abort ();
-	}
+	printf ("\tuae_u32 carry = val & 1;\n");
 	printf ("\tval >>= 1;\n");
-	printf ("\tif(XFLG) val |= cmask;\n");
-	printf ("\tXFLG = carry != 0;\n");
-	genflags (flag_logical, table68k[opcode].size, "val", "", "");
-	printf ("XFLG = CFLG = carry!=0;\n");
-	genastore ("val", table68k[opcode].smode, "srcreg", table68k[opcode].size, "data");
+	printf ("\tif (GET_XFLG) val |= %s;\n", cmask (curi->size));
+	genflags (flag_logical, curi->size, "val", "", "");
+	printf ("SET_CFLG (carry);\n");
+	duplicate_carry ();
+	genastore ("val", curi->smode, "srcreg", curi->size, "data");
 	break;
      case i_MOVEC2:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
 	start_brace ();
 	printf ("\tint regno = (src >> 12) & 15;\n");
 	printf ("\tuae_u32 *regp = regs.regs + regno;\n");
-	printf ("\tm68k_movec2(src & 0xFFF, regp);\n");
+	printf ("\tif (! m68k_movec2(src & 0xFFF, regp)) goto %s;\n", endlabelstr);
 	break;
      case i_MOVE2C:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
 	start_brace ();
 	printf ("\tint regno = (src >> 12) & 15;\n");
 	printf ("\tuae_u32 *regp = regs.regs + regno;\n");
-	printf ("\tm68k_move2c(src & 0xFFF, regp);\n");
+	printf ("\tif (! m68k_move2c(src & 0xFFF, regp)) goto %s;\n", endlabelstr);
 	break;
      case i_CAS:
 	{
 	    int old_brace_level;
-	    genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	    genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0);
+	    genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	    genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0);
 	    start_brace ();
 	    printf ("\tint ru = (src >> 6) & 7;\n");
 	    printf ("\tint rc = src & 7;\n");
-	    genflags (flag_cmp, table68k[opcode].size, "newv", "m68k_dreg(regs, rc)", "dst");
-	    printf ("\tif (ZFLG)");
+	    genflags (flag_cmp, curi->size, "newv", "m68k_dreg(regs, rc)", "dst");
+	    printf ("\tif (GET_ZFLG)");
 	    old_brace_level = n_braces;
 	    start_brace ();
-	    genastore ("(m68k_dreg(regs, ru))", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst");
+	    genastore ("(m68k_dreg(regs, ru))", curi->dmode, "dstreg", curi->size, "dst");
 	    pop_braces (old_brace_level);
 	    printf ("else");
 	    start_brace ();
@@ -2028,36 +2034,36 @@ static void gen_opcode (unsigned long in
 	}
 	break;
      case i_CAS2:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "extra", 1, 0);
-	printf ("\tuae_u32 rn1 = regs.regs[(extra >> 28) & 7];\n");
-	printf ("\tuae_u32 rn2 = regs.regs[(extra >> 12) & 7];\n");
-	if (table68k[opcode].size == sz_word) {
+	genamode (curi->smode, "srcreg", curi->size, "extra", 1, 0);
+	printf ("\tuae_u32 rn1 = regs.regs[(extra >> 28) & 15];\n");
+	printf ("\tuae_u32 rn2 = regs.regs[(extra >> 12) & 15];\n");
+	if (curi->size == sz_word) {
 	    int old_brace_level = n_braces;
 	    printf ("\tuae_u16 dst1 = get_word(rn1), dst2 = get_word(rn2);\n");
-	    genflags (flag_cmp, table68k[opcode].size, "newv", "m68k_dreg(regs, (extra >> 16) & 7)", "dst1");
-	    printf ("\tif (ZFLG) {\n");
-	    genflags (flag_cmp, table68k[opcode].size, "newv", "m68k_dreg(regs, extra & 7)", "dst2");
-	    printf ("\tif (ZFLG) {\n");
+	    genflags (flag_cmp, curi->size, "newv", "m68k_dreg(regs, (extra >> 16) & 7)", "dst1");
+	    printf ("\tif (GET_ZFLG) {\n");
+	    genflags (flag_cmp, curi->size, "newv", "m68k_dreg(regs, extra & 7)", "dst2");
+	    printf ("\tif (GET_ZFLG) {\n");
 	    printf ("\tput_word(rn1, m68k_dreg(regs, (extra >> 22) & 7));\n");
 	    printf ("\tput_word(rn1, m68k_dreg(regs, (extra >> 6) & 7));\n");
 	    printf ("\t}}\n");
 	    pop_braces (old_brace_level);
-	    printf ("\tif (!ZFLG) {\n");
+	    printf ("\tif (! GET_ZFLG) {\n");
 	    printf ("\tm68k_dreg(regs, (extra >> 22) & 7) = (m68k_dreg(regs, (extra >> 22) & 7) & ~0xffff) | (dst1 & 0xffff);\n");
 	    printf ("\tm68k_dreg(regs, (extra >> 6) & 7) = (m68k_dreg(regs, (extra >> 6) & 7) & ~0xffff) | (dst2 & 0xffff);\n");
 	    printf ("\t}\n");
 	} else {
 	    int old_brace_level = n_braces;
 	    printf ("\tuae_u32 dst1 = get_long(rn1), dst2 = get_long(rn2);\n");
-	    genflags (flag_cmp, table68k[opcode].size, "newv", "m68k_dreg(regs, (extra >> 16) & 7)", "dst1");
-	    printf ("\tif (ZFLG) {\n");
-	    genflags (flag_cmp, table68k[opcode].size, "newv", "m68k_dreg(regs, extra & 7)", "dst2");
-	    printf ("\tif (ZFLG) {\n");
+	    genflags (flag_cmp, curi->size, "newv", "m68k_dreg(regs, (extra >> 16) & 7)", "dst1");
+	    printf ("\tif (GET_ZFLG) {\n");
+	    genflags (flag_cmp, curi->size, "newv", "m68k_dreg(regs, extra & 7)", "dst2");
+	    printf ("\tif (GET_ZFLG) {\n");
 	    printf ("\tput_long(rn1, m68k_dreg(regs, (extra >> 22) & 7));\n");
 	    printf ("\tput_long(rn1, m68k_dreg(regs, (extra >> 6) & 7));\n");
 	    printf ("\t}}\n");
 	    pop_braces (old_brace_level);
-	    printf ("\tif (!ZFLG) {\n");
+	    printf ("\tif (! GET_ZFLG) {\n");
 	    printf ("\tm68k_dreg(regs, (extra >> 22) & 7) = dst1;\n");
 	    printf ("\tm68k_dreg(regs, (extra >> 6) & 7) = dst2;\n");
 	    printf ("\t}\n");
@@ -2066,26 +2072,26 @@ static void gen_opcode (unsigned long in
      case i_MOVES:		/* ignore DFC and SFC because we have no MMU */
 	{
 	    int old_brace_level;
-	    genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "extra", 1, 0);
+	    genamode (curi->smode, "srcreg", curi->size, "extra", 1, 0);
 	    printf ("\tif (extra & 0x800)\n");
 	    old_brace_level = n_braces;
 	    start_brace ();
 	    printf ("\tuae_u32 src = regs.regs[(extra >> 12) & 15];\n");
-	    genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 2, 0);
-	    genastore ("src", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst");
+	    genamode (curi->dmode, "dstreg", curi->size, "dst", 2, 0);
+	    genastore ("src", curi->dmode, "dstreg", curi->size, "dst");
 	    pop_braces (old_brace_level);
 	    printf ("else");
 	    start_brace ();
-	    genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "src", 1, 0);
+	    genamode (curi->dmode, "dstreg", curi->size, "src", 1, 0);
 	    printf ("\tif (extra & 0x8000) {\n");
-	    switch (table68k[opcode].size) {
+	    switch (curi->size) {
 	     case sz_byte: printf ("\tm68k_areg(regs, (extra >> 12) & 7) = (uae_s32)(uae_s8)src;\n"); break;
 	     case sz_word: printf ("\tm68k_areg(regs, (extra >> 12) & 7) = (uae_s32)(uae_s16)src;\n"); break;
 	     case sz_long: printf ("\tm68k_areg(regs, (extra >> 12) & 7) = src;\n"); break;
 	     default: abort ();
 	    }
 	    printf ("\t} else {\n");
-	    genastore ("src", Dreg, "(extra >> 12) & 7", table68k[opcode].size, "");
+	    genastore ("src", Dreg, "(extra >> 12) & 7", curi->size, "");
 	    printf ("\t}\n");
 	    pop_braces (old_brace_level);
 	}
@@ -2103,23 +2109,23 @@ static void gen_opcode (unsigned long in
 	printf ("\top_illg(opcode);\n");
 	break;
      case i_TRAPcc:
-	if (table68k[opcode].smode != am_unknown && table68k[opcode].smode != am_illg)
-	    genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "dummy", 1, 0);
-	printf ("\tif (cctrue(%d)) { Exception(7,m68k_getpc()); goto %s; }\n", table68k[opcode].cc, endlabelstr);
+	if (curi->smode != am_unknown && curi->smode != am_illg)
+	    genamode (curi->smode, "srcreg", curi->size, "dummy", 1, 0);
+	printf ("\tif (cctrue(%d)) { Exception(7,m68k_getpc()); goto %s; }\n", curi->cc, endlabelstr);
 	need_endlabel = 1;
 	break;
      case i_DIVL:
 	sync_m68k_pc ();
 	start_brace ();
 	printf ("\tuaecptr oldpc = m68k_getpc();\n");
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "extra", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "extra", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0);
 	sync_m68k_pc ();
 	printf ("\tm68k_divl(opcode, dst, extra, oldpc);\n");
 	break;
      case i_MULL:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "extra", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "extra", 1, 0);
+	genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0);
 	sync_m68k_pc ();
 	printf ("\tm68k_mull(opcode, dst, extra);\n");
 	break;
@@ -2131,12 +2137,12 @@ static void gen_opcode (unsigned long in
      case i_BFFFO:
      case i_BFSET:
      case i_BFINS:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "extra", 1, 0);
-	genamode (table68k[opcode].dmode, "dstreg", sz_long, "dst", 2, 0);
+	genamode (curi->smode, "srcreg", curi->size, "extra", 1, 0);
+	genamode (curi->dmode, "dstreg", sz_long, "dst", 2, 0);
 	start_brace ();
 	printf ("\tuae_s32 offset = extra & 0x800 ? m68k_dreg(regs, (extra >> 6) & 7) : (extra >> 6) & 0x1f;\n");
 	printf ("\tint width = (((extra & 0x20 ? m68k_dreg(regs, extra & 7) : extra) -1) & 0x1f) +1;\n");
-	if (table68k[opcode].dmode == Dreg) {
+	if (curi->dmode == Dreg) {
 	    printf ("\tuae_u32 tmp = m68k_dreg(regs, dstreg) << (offset & 0x1f);\n");
 	} else {
 	    printf ("\tuae_u32 tmp,bf0,bf1;\n");
@@ -2145,8 +2151,9 @@ static void gen_opcode (unsigned long in
 	    printf ("\ttmp = (bf0 << (offset & 7)) | (bf1 >> (8 - (offset & 7)));\n");
 	}
 	printf ("\ttmp >>= (32 - width);\n");
-	printf ("\tNFLG = tmp & (1 << (width-1)) ? 1 : 0;ZFLG = tmp == 0;VFLG = 0;CFLG = 0;\n");
-	switch (table68k[opcode].mnemo) {
+	printf ("\tSET_NFLG (tmp & (1 << (width-1)) ? 1 : 0);\n");
+	printf ("\tSET_ZFLG (tmp == 0); SET_VFLG (0); SET_CFLG (0);\n");
+	switch (curi->mnemo) {
 	 case i_BFTST:
 	    break;
 	 case i_BFEXTU:
@@ -2156,7 +2163,7 @@ static void gen_opcode (unsigned long in
 	    printf ("\ttmp = ~tmp;\n");
 	    break;
 	 case i_BFEXTS:
-	    printf ("\tif (NFLG) tmp |= width == 32 ? 0 : (-1 << width);\n");
+	    printf ("\tif (GET_NFLG) tmp |= width == 32 ? 0 : (-1 << width);\n");
 	    printf ("\tm68k_dreg(regs, (extra >> 12) & 7) = tmp;\n");
 	    break;
 	 case i_BFCLR:
@@ -2176,13 +2183,13 @@ static void gen_opcode (unsigned long in
 	 default:
 	    break;
 	}
-	if (table68k[opcode].mnemo == i_BFCHG
-	    || table68k[opcode].mnemo == i_BFCLR
-	    || table68k[opcode].mnemo == i_BFSET
-	    || table68k[opcode].mnemo == i_BFINS)
+	if (curi->mnemo == i_BFCHG
+	    || curi->mnemo == i_BFCLR
+	    || curi->mnemo == i_BFSET
+	    || curi->mnemo == i_BFINS)
 	{
 	    printf ("\ttmp <<= (32 - width);\n");
-	    if (table68k[opcode].dmode == Dreg) {
+	    if (curi->dmode == Dreg) {
 		printf ("\tm68k_dreg(regs, dstreg) = (m68k_dreg(regs, dstreg) & ((offset & 0x1f) == 0 ? 0 :\n");
 		printf ("\t\t(0xffffffff << (32 - (offset & 0x1f))))) |\n");
 		printf ("\t\t(tmp >> (offset & 0x1f)) |\n");
@@ -2203,7 +2210,7 @@ static void gen_opcode (unsigned long in
 	}
 	break;
      case i_PACK:
-	if (table68k[opcode].smode == Dreg) {
+	if (curi->smode == Dreg) {
 	    printf ("\tuae_u16 val = m68k_dreg(regs, srcreg) + %s;\n", gen_nextiword ());
 	    printf ("\tm68k_dreg(regs, dstreg) = (m68k_dreg(regs, dstreg) & 0xffffff00) | ((val >> 4) & 0xf0) | (val & 0xf);\n");
 	} else {
@@ -2217,7 +2224,7 @@ static void gen_opcode (unsigned long in
 	}
 	break;
      case i_UNPK:
-	if (table68k[opcode].smode == Dreg) {
+	if (curi->smode == Dreg) {
 	    printf ("\tuae_u16 val = m68k_dreg(regs, srcreg);\n");
 	    printf ("\tval = (((val << 4) & 0xf00) | (val & 0xf)) + %s;\n", gen_nextiword ());
 	    printf ("\tm68k_dreg(regs, dstreg) = (m68k_dreg(regs, dstreg) & 0xffff0000) | (val & 0xffff);\n");
@@ -2233,62 +2240,54 @@ static void gen_opcode (unsigned long in
 	}
 	break;
      case i_TAS:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0);
-	genflags (flag_logical, table68k[opcode].size, "src", "", "");
+	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
+	genflags (flag_logical, curi->size, "src", "", "");
 	printf ("\tsrc |= 0x80;\n");
-	genastore ("src", table68k[opcode].smode, "srcreg", table68k[opcode].size, "src");
+	genastore ("src", curi->smode, "srcreg", curi->size, "src");
 	break;
      case i_FPP:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "extra", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "extra", 1, 0);
 	sync_m68k_pc ();
-	swap_opcode ();
 	printf ("\tfpp_opp(opcode,extra);\n");
 	break;
      case i_FDBcc:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "extra", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "extra", 1, 0);
 	sync_m68k_pc ();
-	swap_opcode ();
 	printf ("\tfdbcc_opp(opcode,extra);\n");
 	break;
      case i_FScc:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "extra", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "extra", 1, 0);
 	sync_m68k_pc ();
-	swap_opcode ();
 	printf ("\tfscc_opp(opcode,extra);\n");
 	break;
      case i_FTRAPcc:
 	sync_m68k_pc ();
 	start_brace ();
 	printf ("\tuaecptr oldpc = m68k_getpc();\n");
-	if (table68k[opcode].smode != am_unknown && table68k[opcode].smode != am_illg)
-	    genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "dummy", 1, 0);
+	if (curi->smode != am_unknown && curi->smode != am_illg)
+	    genamode (curi->smode, "srcreg", curi->size, "dummy", 1, 0);
 	sync_m68k_pc ();
-	swap_opcode ();
 	printf ("\tftrapcc_opp(opcode,oldpc);\n");
 	break;
      case i_FBcc:
 	sync_m68k_pc ();
 	start_brace ();
 	printf ("\tuaecptr pc = m68k_getpc();\n");
-	genamode (table68k[opcode].dmode, "srcreg", table68k[opcode].size, "extra", 1, 0);
+	genamode (curi->dmode, "srcreg", curi->size, "extra", 1, 0);
 	sync_m68k_pc ();
-	swap_opcode ();
 	printf ("\tfbcc_opp(opcode,pc,extra);\n");
 	break;
      case i_FSAVE:
 	sync_m68k_pc ();
-	swap_opcode ();
 	printf ("\tfsave_opp(opcode);\n");
 	break;
      case i_FRESTORE:
 	sync_m68k_pc ();
-	swap_opcode ();
 	printf ("\tfrestore_opp(opcode);\n");
 	break;
      case i_MMUOP:
-	genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "extra", 1, 0);
+	genamode (curi->smode, "srcreg", curi->size, "extra", 1, 0);
 	sync_m68k_pc ();
-	swap_opcode ();
 	printf ("\tmmu_op(opcode,extra);\n");
 	break;
      default:
@@ -2305,7 +2304,6 @@ static void generate_includes (FILE * f)
     fprintf (f, "#include \"sysdeps.h\"\n");
     fprintf (f, "#include \"config.h\"\n");
     fprintf (f, "#include \"options.h\"\n");
-    fprintf (f, "#include \"machdep/m68k.h\"\n");
     fprintf (f, "#include \"memory.h\"\n");
     fprintf (f, "#include \"custom.h\"\n");
     fprintf (f, "#include \"readcpu.h\"\n");
@@ -2375,25 +2373,6 @@ static void generate_one_opcode (int rp)
 	    if (pos < 8 && (smsk >> (8 - pos)) != 0)
 		abort ();
 #endif
-	    printf ("#ifdef HAVE_GET_WORD_UNSWAPPED\n");
-
-	    if (pos < 8 && (smsk >> (8 - pos)) != 0)
-		sprintf (source, "(((opcode >> %d) | (opcode << %d)) & %d)",
-			pos ^ 8, 8 - pos, dmsk);
-	    else if (pos != 8)
-		sprintf (source, "((opcode >> %d) & %d)", pos ^ 8, smsk);
-	    else
-		sprintf (source, "(opcode & %d)", smsk);
-
-	    if (table68k[opcode].stype == 3)
-		printf ("\tuae_u32 srcreg = imm8_table[%s];\n", source);
-	    else if (table68k[opcode].stype == 1)
-		printf ("\tuae_u32 srcreg = (uae_s32)(uae_s8)%s;\n", source);
-	    else
-		printf ("\tuae_u32 srcreg = %s;\n", source);
-
-	    printf ("#else\n");
-
 	    if (pos)
 		sprintf (source, "((opcode >> %d) & %d)", pos, smsk);
 	    else
@@ -2405,8 +2384,6 @@ static void generate_one_opcode (int rp)
 		printf ("\tuae_u32 srcreg = (uae_s32)(uae_s8)%s;\n", source);
 	    else
 		printf ("\tuae_u32 srcreg = %s;\n", source);
-
-	    printf ("#endif\n");
 	}
     }
     if (table68k[opcode].duse
@@ -2427,26 +2404,11 @@ static void generate_one_opcode (int rp)
 	    if (pos < 8 && (dmsk >> (8 - pos)) != 0)
 		abort ();
 #endif	    
-	    printf ("#ifdef HAVE_GET_WORD_UNSWAPPED\n");
-
-	    if (pos < 8 && (dmsk >> (8 - pos)) != 0)
-		printf ("\tuae_u32 dstreg = ((opcode >> %d) | (opcode << %d)) & %d;\n",
-			pos ^ 8, 8 - pos, dmsk);
-	    else if (pos != 8)
-		printf ("\tuae_u32 dstreg = (opcode >> %d) & %d;\n",
-			pos ^ 8, dmsk);
-	    else
-		printf ("\tuae_u32 dstreg = opcode & %d;\n", dmsk);
-
-	    printf ("#else\n");
-
 	    if (pos)
 		printf ("\tuae_u32 dstreg = (opcode >> %d) & %d;\n",
 			pos, dmsk);
 	    else
 		printf ("\tuae_u32 dstreg = opcode & %d;\n", dmsk);
-
-	    printf ("#endif\n");
 	}
     }
     need_endlabel = 0;