# HG changeset patch
# User Michael Pavone <pavone@retrodev.com>
# Date 1578466347 28800
# Node ID c157a535ceebfe5d1061bd40b35f1824af4bbd5e
# Parent  33c0c4579c1fd66325d1c6933c699cf6209ac52c
Reset 68K supervisor state and interrupt mask on soft reset

diff -r 33c0c4579c1f -r c157a535ceeb m68k_core.c
--- a/m68k_core.c	Mon Jan 06 22:02:57 2020 -0800
+++ b/m68k_core.c	Tue Jan 07 22:52:27 2020 -0800
@@ -1188,8 +1188,15 @@
 {
 	//TODO: Actually execute the M68K reset vector rather than simulating some of its behavior
 	uint16_t *reset_vec = get_native_pointer(0, (void **)context->mem_pointers, &context->options->gen);
+	if (!(context->status & 0x20)) {
+		//switching from user to system mode so swap stack pointers
+		context->aregs[8] = context->aregs[7];
+	}
+	context->status = 0x27;
 	context->aregs[7] = reset_vec[0] << 16 | reset_vec[1];
 	uint32_t address = reset_vec[2] << 16 | reset_vec[3];
+	//interrupt mask may have changed so force a sync
+	sync_components(context, address);
 	start_68k_context(context, address);
 }