6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-17 10:06:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix instruction and time counting, and initial state.

Browse Source
This commit is contained in:
Thomas Harte 2022-05-26 09:17:37 -04:00
parent f3c0c62c79
commit 88e33353a1
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OSBindings/Mac/Clock SignalTests/TestRunner68000.hpp
View File

@ -38,12 +38,12 @@ class RAM68000: public CPU::MC68000Mk2::BusHandler {
// Ensure the condition codes start unset and set the initial program counter // Ensure the condition codes start unset and set the initial program counter
// and supervisor stack pointer, as well as starting in supervisor mode. // and supervisor stack pointer, as well as starting in supervisor mode.
set_registers([=](InstructionSet::M68k::RegisterSet &registers){ auto registers = m68000_.get_state().registers;
registers.status &= ~ConditionCode::AllConditions; registers.status &= ~ConditionCode::AllConditions;
registers.status |= 0x2700; registers.status |= 0x2700;
registers.program_counter = initial_pc(); registers.program_counter = initial_pc();
registers.supervisor_stack_pointer = stack_pointer; registers.supervisor_stack_pointer = stack_pointer;
}); m68000_.decode_from_state(registers);
} }
void set_registers(std::function<void(InstructionSet::M68k::RegisterSet &)> func) { void set_registers(std::function<void(InstructionSet::M68k::RegisterSet &)> func) {
@ -54,12 +54,13 @@ class RAM68000: public CPU::MC68000Mk2::BusHandler {
void will_perform(uint32_t, uint16_t) { void will_perform(uint32_t, uint16_t) {
--instructions_remaining_; --instructions_remaining_;
if(!instructions_remaining_) { if(instructions_remaining_ < 0) {
throw StopException(); throw StopException();
} }
} }
void run_for_instructions(int count) { void run_for_instructions(int count) {
duration_ = HalfCycles(0);
instructions_remaining_ = count; instructions_remaining_ = count;
if(!instructions_remaining_) return; if(!instructions_remaining_) return;
@ -80,7 +81,7 @@ class RAM68000: public CPU::MC68000Mk2::BusHandler {
HalfCycles perform_bus_operation(const CPU::MC68000Mk2::Microcycle &cycle, int) { HalfCycles perform_bus_operation(const CPU::MC68000Mk2::Microcycle &cycle, int) {
const uint32_t word_address = cycle.word_address(); const uint32_t word_address = cycle.word_address();
if(instructions_remaining_) duration_ += cycle.length; duration_ += cycle.length;
using Microcycle = CPU::MC68000Mk2::Microcycle; using Microcycle = CPU::MC68000Mk2::Microcycle;
if(cycle.data_select_active()) { if(cycle.data_select_active()) {