From 77c627e82232ad2bea1972c62714a5a079655c5f Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Mon, 2 Aug 2021 07:47:08 -0400
Subject: [PATCH] Ensure that reading the interrupt flags really clears the
 master bit.

Also makes some guesses on one-shot and reload timing. Alas the test isn't in itself specific enough to be more systematic here.
---
 Components/6526/Implementation/6526Implementation.hpp |  1 +
 Components/6526/Implementation/6526Storage.hpp        | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Components/6526/Implementation/6526Implementation.hpp b/Components/6526/Implementation/6526Implementation.hpp
index b4d1ca655..84ddb7da7 100644
--- a/Components/6526/Implementation/6526Implementation.hpp
+++ b/Components/6526/Implementation/6526Implementation.hpp
@@ -170,6 +170,7 @@ uint8_t MOS6526<BusHandlerT, personality>::read(int address) {
 		case 13: {
 			const uint8_t result = interrupt_state_;
 			interrupt_state_ = 0;
+			pending_ &= ~(InterruptNow | InterruptInOne);
 			update_interrupts();
 			return result;
 		} break;
diff --git a/Components/6526/Implementation/6526Storage.hpp b/Components/6526/Implementation/6526Storage.hpp
index 77d74513d..2a088e13f 100644
--- a/Components/6526/Implementation/6526Storage.hpp
+++ b/Components/6526/Implementation/6526Storage.hpp
@@ -60,12 +60,12 @@ struct MOS6526Storage {
 				pending |= ApplyClockInTwo;
 			}
 			if(control & 0x08) {
-				pending |= OneShotInTwo;
+				pending |= OneShotInOne;
 			}
 
 			if((pending & ReloadNow) || (hit_zero && (pending & ApplyClockInTwo))) {
 				value = reload;
-				pending &= ~ApplyClockInOne;	// Skip one decrement.
+				pending &= ~ApplyClockNow;	// Skip one decrement.
 			}
 
 			if(pending & ApplyClockNow) {
@@ -86,12 +86,12 @@ struct MOS6526Storage {
 		private:
 			int pending = 0;
 
-			static constexpr int ReloadInThree = 1 << 0;
-			static constexpr int ReloadInTwo = 1 << 1;
+//			static constexpr int ReloadInThree = 1 << 0;
+//			static constexpr int ReloadInTwo = 1 << 1;
 			static constexpr int ReloadInOne = 1 << 2;
 			static constexpr int ReloadNow = 1 << 3;
 
-			static constexpr int OneShotInTwo = 1 << 4;
+//			static constexpr int OneShotInTwo = 1 << 4;
 			static constexpr int OneShotInOne = 1 << 5;
 			static constexpr int OneShotNow = 1 << 6;