1
0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-16 18:30:32 +00:00

Fix test.

This commit is contained in:
Thomas Harte 2024-01-09 21:19:44 -05:00
parent 5f00d29297
commit 177e741bca

View File

@ -275,11 +275,10 @@ namespace {
int physical = physicalStart; int physical = physicalStart;
for(int logical = logicalStart; logical < logicalEnd; logical++) { for(int logical = logicalStart; logical < logicalEnd; logical++) {
const auto &region = self->_memoryMap.regions[self->_memoryMap.region_map[logical]]; const auto &region = self->_memoryMap.region(logical);
// Don't worry about IO pages here; they'll be compared shortly. // Don't worry about IO pages here; they'll be compared shortly.
if(!(region.flags & MemoryMap::Region::IsIO)) { if(!(region.flags & MemoryMap::Region::IsIO)) {
const auto &region = self->_memoryMap.regions[self->_memoryMap.region_map[logical]];
applyTest(logical, physical, region); applyTest(logical, physical, region);
if(*stop) { if(*stop) {
@ -367,8 +366,7 @@ namespace {
int logical = 0; int logical = 0;
for(NSNumber *next in test[@"shadowed"]) { for(NSNumber *next in test[@"shadowed"]) {
while(logical < [next intValue]) { while(logical < [next intValue]) {
[[maybe_unused]] const auto &region = const auto &region = _memoryMap.region(logical);
self->_memoryMap.regions[self->_memoryMap.region_map[logical]];
const bool isShadowed = _memoryMap.is_shadowed(region, logical << 8); const bool isShadowed = _memoryMap.is_shadowed(region, logical << 8);
XCTAssertEqual( XCTAssertEqual(
@ -386,8 +384,7 @@ namespace {
logical = 0; logical = 0;
for(NSNumber *next in test[@"io"]) { for(NSNumber *next in test[@"io"]) {
while(logical < [next intValue]) { while(logical < [next intValue]) {
const auto &region = const auto &region = self->_memoryMap.region(logical);
self->_memoryMap.regions[self->_memoryMap.region_map[logical]];
// This emulator marks card pages as IO because it uses IO to mean // 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. // "anything that isn't the built-in RAM". Just don't test card pages.