Restore (an)+/-(an) modification before generating unimplemented inst…

…ruction exception.
tonioni · Jan 17, 2021 · e55659e · e55659e
1 parent 0001c7a
commit e55659e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/gencpu.cpp b/gencpu.cpp
@@ -8634,6 +8634,9 @@ static void gen_opcode (unsigned int opcode)
 			out("cpu_restore_fixup();\n");
 			out("}\n");
 		}
+		out("if (e < 0) {\n");
+		out("op_unimpl(opcode);\n");
+		out("}\n");
 		write_return_cycles(0);
 		out("}\n");
 		break;
@@ -8648,6 +8651,9 @@ static void gen_opcode (unsigned int opcode)
 			out("cpu_restore_fixup();\n");
 			out("}\n");
 		}
+		out("if (e < 0) {\n");
+		out("op_unimpl(opcode);\n");
+		out("}\n");
 		write_return_cycles(0);
 		out("}\n");
 		break;

diff --git a/newcpu_common.cpp b/newcpu_common.cpp
@@ -1242,7 +1242,6 @@ static void divul_divbyzero(uae_u16 extra, uae_s64 a, uaecptr oldpc)
 int m68k_divl(uae_u32 opcode, uae_u32 src, uae_u16 extra, uaecptr oldpc)
 {
 	if ((extra & 0x400) && currprefs.int_no_unimplemented && currprefs.cpu_model == 68060) {
-		op_unimpl (opcode);
 		return -1;
 	}
 
@@ -1315,7 +1314,6 @@ int m68k_divl(uae_u32 opcode, uae_u32 src, uae_u16 extra, uaecptr oldpc)
 int m68k_mull (uae_u32 opcode, uae_u32 src, uae_u16 extra)
 {
 	if ((extra & 0x400) && currprefs.int_no_unimplemented && currprefs.cpu_model == 68060) {
-		op_unimpl (opcode);
 		return -1;
 	}
 	if (extra & 0x800) {