6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-06-25 18:30:07 +00:00
Code Issues Projects Releases Wiki Activity

Tidy up slightly, without fixing failure.

Browse Source
This commit is contained in:
Thomas Harte 2022-06-28 16:32:35 -04:00
parent 6c9fc0ac75
commit 22c0b588c4
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
OSBindings/Mac/Clock SignalTests/IIgsMemoryMapTests.mm
View File

@ -258,7 +258,7 @@ namespace {
// Test results.
auto testMemory =
^(NSString *type, void (^ applyTest)(int logical, int physical)) {
^(NSString *type, void (^ applyTest)(int logical, int physical, const MemoryMap::Region &region)) {
for(NSArray<NSNumber *> *region in test[type]) {
const auto logicalStart = [region[0] intValue];
const auto logicalEnd = [region[1] intValue];
@ -271,8 +271,19 @@ namespace {
int physical = physicalStart;
for(int logical = logicalStart; logical < logicalEnd; logical++) {
applyTest(logical, physical);
if(*stop) return;
const auto &region = self->_memoryMap.regions[self->_memoryMap.region_map[logical]];
// Don't worry about IO pages here; they'll be compared shortly.
if(!(region.flags & MemoryMap::Region::IsIO)) {
const auto &region = self->_memoryMap.regions[self->_memoryMap.region_map[logical]];
applyTest(logical, physical, region);
if(*stop) {
NSLog(@"Stopping after first failure");
return;
}
}
if(physical != physicalEnd) ++physical;
}
}
@ -305,15 +316,8 @@ namespace {
};
// Test read pointers.
testMemory(@"read", ^(int logical, int physical) {
const auto &region = self->_memoryMap.regions[self->_memoryMap.region_map[logical]];
testMemory(@"read", ^(int logical, int physical, const MemoryMap::Region &region) {
XCTAssert(region.read != nullptr);
// Don't worry about IO pages here; they'll be compared shortly.
if(region.flags & MemoryMap::Region::IsIO) {
return;
}
const int foundPhysical = physicalOffset(&region.read[logical << 8]);
// Compare to correct value.
@ -324,20 +328,12 @@ namespace {
foundPhysical);
if(physical != foundPhysical) {
NSLog(@"Stopping after first failure");
*stop = YES;
}
});
// Test write pointers.
testMemory(@"write", ^(int logical, int physical) {
const auto &region = self->_memoryMap.regions[self->_memoryMap.region_map[logical]];
// Don't worry about IO pages here.
if(region.flags & MemoryMap::Region::IsIO) {
return;
}
testMemory(@"write", ^(int logical, int physical, const MemoryMap::Region &region) {
// This emulator guards writes to ROM by setting those pointers to nullptr;
// so allow a nullptr write target if ROM is mapped here.
if(region.write == nullptr && physical >= 0xfc00) {
@ -355,7 +351,6 @@ namespace {
foundPhysical);
if(physical != foundPhysical) {
NSLog(@"Stopping after first failure");
*stop = YES;
}
});