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

Exit gracefully upon a STP or WAI.

Browse Source
This commit is contained in:
Thomas Harte 2022-06-23 21:03:40 -04:00
parent a23b0f5122
commit 2e7afb13c7
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OSBindings/Mac/Clock SignalTests/65816ComparativeTests.mm
View File

@ -38,6 +38,7 @@ struct BusHandler: public CPU::MOS6502Esque::BusHandler<uint32_t> {
--opcodes_remaining; --opcodes_remaining;
if(!opcodes_remaining) { if(!opcodes_remaining) {
cycles.pop_back(); cycles.pop_back();
pc_overshoot = -1;
throw StopException(); throw StopException();
} }
case BusOperation::Read: case BusOperation::Read:
@ -55,7 +56,12 @@ struct BusHandler: public CPU::MOS6502Esque::BusHandler<uint32_t> {
cycle.value = ram[address] = *value; cycle.value = ram[address] = *value;
break; break;
default: break; case BusOperation::Ready:
case BusOperation::None:
throw StopException();
break;
default: assert(false);
} }
// Don't occupy any bonus time. // Don't occupy any bonus time.
@ -66,6 +72,7 @@ struct BusHandler: public CPU::MOS6502Esque::BusHandler<uint32_t> {
ram.clear(); ram.clear();
inventions.clear(); inventions.clear();
cycles.clear(); cycles.clear();
pc_overshoot = 0;
using Register = CPU::MOS6502Esque::Register; using Register = CPU::MOS6502Esque::Register;
const uint32_t pc = const uint32_t pc =
@ -75,6 +82,7 @@ struct BusHandler: public CPU::MOS6502Esque::BusHandler<uint32_t> {
} }
int opcodes_remaining = 0; int opcodes_remaining = 0;
int pc_overshoot = 0;
struct Cycle { struct Cycle {
CPU::MOS6502Esque::BusOperation operation; CPU::MOS6502Esque::BusOperation operation;
@ -89,7 +97,6 @@ struct BusHandler: public CPU::MOS6502Esque::BusHandler<uint32_t> {
BusHandler() : processor(*this) { BusHandler() : processor(*this) {
// Never run the official reset procedure. // Never run the official reset procedure.
processor.set_power_on(false); processor.set_power_on(false);
} }
}; };
@ -188,7 +195,7 @@ void print_ram(FILE *file, const std::unordered_map<uint32_t, uint8_t> &data) {
// Dump final state. // Dump final state.
fprintf(target, "}, \"final\": {"); fprintf(target, "}, \"final\": {");
print_registers(target, handler.processor, -1); print_registers(target, handler.processor, handler.pc_overshoot);
print_ram(target, handler.ram); print_ram(target, handler.ram);
fprintf(target, "}, "); fprintf(target, "}, ");