From 5a97c0923882811791d0fea33b8e50b73f2ab021 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Thu, 23 Jun 2022 11:23:00 -0400
Subject: [PATCH] Flip internal presumption on the BRK flag.

---
 Processors/6502Esque/Implementation/LazyFlags.hpp       | 2 +-
 Processors/65816/Implementation/65816Implementation.hpp | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Processors/6502Esque/Implementation/LazyFlags.hpp b/Processors/6502Esque/Implementation/LazyFlags.hpp
index 756d7a779..2169d8c24 100644
--- a/Processors/6502Esque/Implementation/LazyFlags.hpp
+++ b/Processors/6502Esque/Implementation/LazyFlags.hpp
@@ -64,7 +64,7 @@ struct LazyFlags {
 	}
 
 	uint8_t get() const {
-		return carry | overflow | (inverse_interrupt ^ Flag::Interrupt) | (negative_result & 0x80) | (zero_result ? 0 : Flag::Zero) | Flag::Always | decimal;
+		return carry | overflow | (inverse_interrupt ^ Flag::Interrupt) | (negative_result & 0x80) | (zero_result ? 0 : Flag::Zero) | Flag::Always | Flag::Break | decimal;
 	}
 
 	LazyFlags() {
diff --git a/Processors/65816/Implementation/65816Implementation.hpp b/Processors/65816/Implementation/65816Implementation.hpp
index c503c0a44..3a50f3d72 100644
--- a/Processors/65816/Implementation/65816Implementation.hpp
+++ b/Processors/65816/Implementation/65816Implementation.hpp
@@ -415,7 +415,7 @@ template <typename BusHandler, bool uses_ready_line> void Processor<BusHandler,
 				case OperationPrepareException:
 					data_buffer_.value = uint32_t((registers_.pc << 8) | get_flags());
 					if(registers_.emulation_flag) {
-						if(!exception_is_interrupt_) data_buffer_.value |= Flag::Break;
+						if(exception_is_interrupt_) data_buffer_.value &= ~Flag::Break;
 						data_buffer_.size = 3;
 						registers_.data_bank = 0;
 						++next_op_;
@@ -563,11 +563,6 @@ template <typename BusHandler, bool uses_ready_line> void Processor<BusHandler,
 						case PHP:
 							data_buffer_.value = get_flags();
 							data_buffer_.size = 1;
-
-							if(registers_.emulation_flag) {
-								// On the 6502, the break flag is set during a PHP.
-								data_buffer_.value |= Flag::Break;
-							}
 						break;
 
 						case NOP:						break;