diff --git a/Machines/Acorn/Archimedes/Archimedes.cpp b/Machines/Acorn/Archimedes/Archimedes.cpp index 1fd64d50d..aa0d4e2c6 100644 --- a/Machines/Acorn/Archimedes/Archimedes.cpp +++ b/Machines/Acorn/Archimedes/Archimedes.cpp @@ -389,7 +389,7 @@ struct Interrupts { // IRQ A. case 0x3200010 & AddressMask: value = irq_a_.status; -// logger.error().append("IRQ A status is %02x", value); + logger.error().append("IRQ A status is %02x", value); return true; case 0x3200014 & AddressMask: value = irq_a_.request(); @@ -403,7 +403,7 @@ struct Interrupts { // IRQ B. case 0x3200020 & AddressMask: value = irq_b_.status; -// logger.error().append("IRQ B status is %02x", value); + logger.error().append("IRQ B status is %02x", value); return true; case 0x3200024 & AddressMask: value = irq_b_.request(); @@ -1041,7 +1041,8 @@ class ConcreteMachine: // printf(""); // } // log |= (executor_.pc() > 0x02000000 && executor_.pc() < 0x02000078); -// log |= executor_.pc() == 0x03811eb4; + log |= executor_.pc() == 0x0381201c; +// log = executor_.pc() == 0x0381202c; // log |= (executor_.pc() > 0x03801000); // log &= executor_.pc() != 0x03801a0c; diff --git a/OSBindings/Mac/Clock SignalTests/ARMDecoderTests.mm b/OSBindings/Mac/Clock SignalTests/ARMDecoderTests.mm index d6fb35f1a..644dcd8ce 100644 --- a/OSBindings/Mac/Clock SignalTests/ARMDecoderTests.mm +++ b/OSBindings/Mac/Clock SignalTests/ARMDecoderTests.mm @@ -425,9 +425,9 @@ struct MemoryLedger { continue; } - if(instruction == 0xe1a0f001 && test_count == 1) { - printf(""); - } +// if(instruction == 0xe1a0f001 && test_count == 1) { +// printf(""); +// } execute(instruction, *test); NSMutableString *error = nil; diff --git a/OSBindings/Mac/Clock SignalTests/Messy ARM/test.txt.gz b/OSBindings/Mac/Clock SignalTests/Messy ARM/test.txt.gz index db4c455bc..55a29e720 100644 Binary files a/OSBindings/Mac/Clock SignalTests/Messy ARM/test.txt.gz and b/OSBindings/Mac/Clock SignalTests/Messy ARM/test.txt.gz differ