From 0cf532c00d07ba9dbfb4dc01325d200c80e74353 Mon Sep 17 00:00:00 2001
From: Kelvin Sherlock <ksherlock@gmail.com>
Date: Mon, 28 Jan 2019 23:03:04 -0500
Subject: [PATCH] BRK / COP weren't pushing the current z/neg flags.

---
 src/instable.h | 53 ++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 41 insertions(+), 12 deletions(-)

diff --git a/src/instable.h b/src/instable.h
index 5ff6a5e..95ab03a 100644
--- a/src/instable.h
+++ b/src/instable.h
@@ -81,17 +81,30 @@ brk_testing_SYM
 	}
 	g_num_brk++;
 	INC_KPC_2;
+
+	psr = psr & (~0x82);
+	psr |= (neg << 7);
+	psr |= ((!zero) << 1);
+	tmp1 = psr & 0xff;
 	if(psr & 0x100) {
-		PUSH16(kpc & 0xffff);
-		PUSH8(psr & 0xff);
+		MMU_CHECK(
+			((stack - 2) & 0xff) | 0x0100,
+			(kpc << 8) | tmp1, 3, 1, 1
+		)
+		_PUSH16(kpc & 0xffff);
+		_PUSH8(tmp1);
 		GET_MEMORY16(0xfffe, kpc, 0);
 		dbank = 0;
 	} else {
-		PUSH8(kpc >> 16);
-		PUSH16(kpc);
-		PUSH8(psr & 0xff);
+		MMU_CHECK(
+			(stack - 3) & 0xffff,
+			(kpc << 8) | tmp1, 4, 0, 1
+		)
+		_PUSH8(kpc >> 16);
+		_PUSH16(kpc);
+		_PUSH8(tmp1);
 		GET_MEMORY16(0xffe6, kpc, 0);
-		halt_printf("Halting for native break!\n");
+		//halt_printf("Halting for native break!\n");
 	}
 	kpc = kpc & 0xffff;
 	psr |= 0x4;
@@ -155,16 +168,32 @@ cop_native_SYM
 #else
 	g_num_cop++;
 	INC_KPC_2;
+
+	psr = psr & (~0x82);
+	psr |= (neg << 7);
+	psr |= ((!zero) << 1);
+	tmp1 = psr & 0xff;
+
 	if(psr & 0x100) {
-		halt_printf("Halting for emul COP at %04x\n", kpc);
-		PUSH16(kpc & 0xffff);
-		PUSH8(psr & 0xff);
+		//halt_printf("Halting for emul COP at %04x\n", kpc);
+		MMU_CHECK(
+			((stack - 2) & 0xff) | 0x0100,
+			(kpc << 8) | tmp1, 3, 1, 1
+		)
+
+		_PUSH16(kpc & 0xffff);
+		_PUSH8(tmp1);
 		GET_MEMORY16(0xfff4, kpc, 0);
 		dbank = 0;
 	} else {
-		PUSH8(kpc >> 16);
-		PUSH16(kpc & 0xffff);
-		PUSH8(psr & 0xff);
+		MMU_CHECK(
+			(stack - 3) & 0xffff,
+			(kpc << 8) | tmp1, 4, 0, 1
+		)
+
+		_PUSH8(kpc >> 16);
+		_PUSH16(kpc & 0xffff);
+		_PUSH8(tmp1);
 		GET_MEMORY16(0xffe4, kpc, 0);
 	}
 	kpc = kpc & 0xffff;