--- BasiliskII/src/uae_cpu/gencpu.c	1999/10/21 15:55:32	1.5
+++ BasiliskII/src/uae_cpu/gencpu.c	2000/09/22 17:19:12	1.11
@@ -59,7 +59,7 @@ static void read_counts (void)
     if (file) {
 	fscanf (file, "Total: %lu\n", &total);
 	while (fscanf (file, "%lx: %lu %s\n", &opcode, &count, name) == 3) {
-	    opcode_next_clev[nr] = 3;
+	    opcode_next_clev[nr] = 4;
 	    opcode_last_postfix[nr] = -1;
 	    opcode_map[nr++] = opcode;
 	    counts[opcode] = count;
@@ -72,7 +72,7 @@ static void read_counts (void)
 	if (table68k[opcode].handler == -1 && table68k[opcode].mnemo != i_ILLG
 	    && counts[opcode] == 0)
 	{
-	    opcode_next_clev[nr] = 3;
+	    opcode_next_clev[nr] = 4;
 	    opcode_last_postfix[nr] = -1;
 	    opcode_map[nr++] = opcode;
 	    counts[opcode] = count;
@@ -232,7 +232,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);
@@ -241,7 +241,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);
@@ -1517,6 +1517,8 @@ static void gen_opcode (unsigned long in
 	    printf ("\tif ((format & 0xF000) == 0x0000) { break; }\n");
 	    printf ("\telse if ((format & 0xF000) == 0x1000) { ; }\n");
 	    printf ("\telse if ((format & 0xF000) == 0x2000) { m68k_areg(regs, 7) += 4; break; }\n");
+	    printf ("\telse if ((format & 0xF000) == 0x3000) { m68k_areg(regs, 7) += 4; break; }\n");
+	    printf ("\telse if ((format & 0xF000) == 0x7000) { m68k_areg(regs, 7) += 52; break; }\n");
 	    printf ("\telse if ((format & 0xF000) == 0x8000) { m68k_areg(regs, 7) += 50; break; }\n");
 	    printf ("\telse if ((format & 0xF000) == 0x9000) { m68k_areg(regs, 7) += 12; break; }\n");
 	    printf ("\telse if ((format & 0xF000) == 0xa000) { m68k_areg(regs, 7) += 24; break; }\n");
@@ -2442,6 +2444,24 @@ static void gen_opcode (unsigned long in
 	swap_opcode ();
 	printf ("\tfrestore_opp(opcode);\n");
 	break;
+     case i_CINVL:
+     case i_CINVP:
+     case i_CINVA:
+     case i_CPUSHL:
+     case i_CPUSHP:
+     case i_CPUSHA:
+	break;
+     case i_MOVE16:
+	printf ("\tuaecptr mems = m68k_areg(regs, srcreg) & ~15, memd;\n");
+	printf ("\tdstreg = (%s >> 12) & 7;\n", gen_nextiword());
+	printf ("\tmemd = m68k_areg(regs, dstreg) & ~15;\n");
+	printf ("\tput_long(memd, get_long(mems));\n");
+	printf ("\tput_long(memd+4, get_long(mems+4));\n");
+	printf ("\tput_long(memd+8, get_long(mems+8));\n");
+	printf ("\tput_long(memd+12, get_long(mems+12));\n");
+	printf ("\tm68k_areg(regs, srcreg) += 16;\n");
+	printf ("\tm68k_areg(regs, dstreg) += 16;\n");
+	break;
      case i_MMUOP:
 	genamode (curi->smode, "srcreg", curi->size, "extra", 1, 0);
 	sync_m68k_pc ();
@@ -2494,7 +2514,7 @@ static void generate_one_opcode (int rp)
     }
     fprintf (stblfile, "{ op_%lx_%d, 0, %ld }, /* %s */\n", opcode, postfix, opcode, lookuptab[i].name);
     fprintf (headerfile, "extern cpuop_func op_%lx_%d;\n", opcode, postfix);
-    printf ("unsigned long REGPARAM2 op_%lx_%d(uae_u32 opcode) /* %s */\n{\n", opcode, postfix, lookuptab[i].name);
+    printf ("void REGPARAM2 op_%lx_%d(uae_u32 opcode) /* %s */\n{\n", opcode, postfix, lookuptab[i].name);
 
     switch (table68k[opcode].stype) {
      case 0: smsk = 7; break;
@@ -2608,7 +2628,6 @@ static void generate_one_opcode (int rp)
     gen_opcode (opcode);
     if (need_endlabel)
 	printf ("%s: ;\n", endlabelstr);
-    printf ("return %d;\n", insn_n_cycles);
     printf ("}\n");
     opcode_next_clev[rp] = next_cpu_level;
     opcode_last_postfix[rp] = postfix;
@@ -2620,9 +2639,15 @@ static void generate_func (void)
 
     using_prefetch = 0;
     using_exception_3 = 0;
-    for (i = 0; i < 5; i++) {
-	cpu_level = 3 - i;
-	if (i == 4) {
+#if !USE_PREFETCH_BUFFER
+	/* gb-- No need for a prefetch buffer, nor exception 3 handling */
+	/* Anyway, Basilisk2 does not use the op_smalltbl_5 table... */
+    for (i = 0; i <= 4; i++) {
+#else
+    for (i = 0; i < 6; i++) {
+#endif
+	cpu_level = 4 - i;
+	if (i == 5) {
 	    cpu_level = 0;
 	    using_prefetch = 1;
 	    using_exception_3 = 1;