From 945b7e90da18565ec91a4d0e68282f4034f4aa37 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sun, 3 Mar 2024 14:03:08 -0500 Subject: [PATCH] Add just enough to persuade self that execution is broadly sane. --- .../Mac/Clock SignalTests/ARMDecoderTests.mm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/OSBindings/Mac/Clock SignalTests/ARMDecoderTests.mm b/OSBindings/Mac/Clock SignalTests/ARMDecoderTests.mm index 004e7ac9e..50a104977 100644 --- a/OSBindings/Mac/Clock SignalTests/ARMDecoderTests.mm +++ b/OSBindings/Mac/Clock SignalTests/ARMDecoderTests.mm @@ -24,22 +24,29 @@ struct Memory { (void)source; (void)mode; (void)trans; + printf("W of %08x to %08x [%lu]\n", source, address, sizeof(IntT)); return true; } template bool read(uint32_t address, IntT &source, Mode mode, bool trans) { if(address > 0x3800000) { + has_moved_rom_ = true; source = *reinterpret_cast(&rom[address - 0x3800000]); - } else { + } else if(!has_moved_rom_) { // TODO: this is true only very transiently. source = *reinterpret_cast(&rom[address]); + } else { + printf("Unknown read from %08x [%lu]\n", address, sizeof(IntT)); } (void)mode; (void)trans; return true; } + + private: + bool has_moved_rom_ = false; }; } @@ -194,6 +201,9 @@ struct Memory { XCTAssertEqual(carry, 0); } +/* + TODO: turn the below into a trace-driven test case. + - (void)testROM319 { constexpr ROM::Name rom_name = ROM::Name::AcornRISCOS319; ROM::Request request(rom_name); @@ -203,13 +213,13 @@ struct Memory { executor.bus_.rom = roms.find(rom_name)->second; uint32_t pc = 0; - for(int c = 0; c < 200; c++) { + for(int c = 0; c < 1000; c++) { uint32_t instruction; executor.bus_.read(pc, instruction, executor.mode(), false); printf("%08x: %08x\n", pc, instruction); dispatch(pc, instruction, executor); } -} +}*/ @end