From 177e741bca298cd2afc9fc52149f93d53fa21bf9 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Tue, 9 Jan 2024 21:19:44 -0500 Subject: [PATCH] Fix test. --- OSBindings/Mac/Clock SignalTests/IIgsMemoryMapTests.mm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/OSBindings/Mac/Clock SignalTests/IIgsMemoryMapTests.mm b/OSBindings/Mac/Clock SignalTests/IIgsMemoryMapTests.mm index e2b5c0cc4..28d098aa0 100644 --- a/OSBindings/Mac/Clock SignalTests/IIgsMemoryMapTests.mm +++ b/OSBindings/Mac/Clock SignalTests/IIgsMemoryMapTests.mm @@ -275,11 +275,10 @@ namespace { int physical = physicalStart; for(int logical = logicalStart; logical < logicalEnd; logical++) { - const auto ®ion = self->_memoryMap.regions[self->_memoryMap.region_map[logical]]; + const auto ®ion = self->_memoryMap.region(logical); // Don't worry about IO pages here; they'll be compared shortly. if(!(region.flags & MemoryMap::Region::IsIO)) { - const auto ®ion = self->_memoryMap.regions[self->_memoryMap.region_map[logical]]; applyTest(logical, physical, region); if(*stop) { @@ -367,8 +366,7 @@ namespace { int logical = 0; for(NSNumber *next in test[@"shadowed"]) { while(logical < [next intValue]) { - [[maybe_unused]] const auto ®ion = - self->_memoryMap.regions[self->_memoryMap.region_map[logical]]; + const auto ®ion = _memoryMap.region(logical); const bool isShadowed = _memoryMap.is_shadowed(region, logical << 8); XCTAssertEqual( @@ -386,8 +384,7 @@ namespace { logical = 0; for(NSNumber *next in test[@"io"]) { while(logical < [next intValue]) { - const auto ®ion = - self->_memoryMap.regions[self->_memoryMap.region_map[logical]]; + const auto ®ion = self->_memoryMap.region(logical); // This emulator marks card pages as IO because it uses IO to mean // "anything that isn't the built-in RAM". Just don't test card pages.