From 34bdd86772c55df6167a085b39554fe28cbe1cb5 Mon Sep 17 00:00:00 2001
From: transistor <trans@jabberwocky.ca>
Date: Sun, 11 Sep 2022 14:51:58 -0700
Subject: [PATCH] Added address mask to memory accesses from the tests

---
 src/memory.rs                 | 4 ++++
 tests/harte_tests/src/main.rs | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/memory.rs b/src/memory.rs
index b67d0ae..0573b13 100644
--- a/src/memory.rs
+++ b/src/memory.rs
@@ -267,6 +267,10 @@ impl BusPort {
         self.subdevice.borrow_mut().dump_memory(self.offset + (addr & self.address_mask), count)
     }
 
+    pub fn address_mask(&self) -> Address {
+        self.address_mask
+    }
+
     pub fn data_width(&self) -> u8 {
         self.data_width
     }
diff --git a/tests/harte_tests/src/main.rs b/tests/harte_tests/src/main.rs
index 8c1daac..db14e70 100644
--- a/tests/harte_tests/src/main.rs
+++ b/tests/harte_tests/src/main.rs
@@ -14,7 +14,7 @@ use serde_derive::Deserialize;
 use moa::error::Error;
 use moa::system::System;
 use moa::memory::{MemoryBlock, BusPort};
-use moa::devices::{Addressable, Steppable, wrap_transmutable};
+use moa::devices::{Address, Addressable, Steppable, wrap_transmutable};
 
 use moa::cpus::m68k::{M68k, M68kType};
 use moa::cpus::m68k::state::Status;
@@ -205,16 +205,18 @@ fn assert_state(cpu: &M68k, system: &System, expected: &TestState) -> Result<(),
     assert_value(cpu.state.sr, expected.sr, "sr")?;
     assert_value(cpu.state.pc, expected.pc, "pc")?;
 
+    let addr_mask = cpu.port.address_mask();
+
     // Load instructions into memory
     for (i, ins) in expected.prefetch.iter().enumerate() {
         let addr = expected.pc + (i as u32 * 2);
-        let actual = system.get_bus().read_beu16(addr as u64)?;
+        let actual = system.get_bus().read_beu16(addr as Address & addr_mask)?;
         assert_value(actual, *ins, &format!("prefetch at {}", addr))?;
     }
 
     // Load data bytes into memory
     for (addr, byte) in expected.ram.iter() {
-        let actual = system.get_bus().read_u8(*addr as u64)?;
+        let actual = system.get_bus().read_u8(*addr as Address & addr_mask)?;
         assert_value(actual, *byte, &format!("ram at {}", addr))?;
     }