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

Make better effort to establish initial state.

Browse Source
This commit is contained in:
Thomas Harte 2022-05-25 16:47:41 -04:00
parent 22714b8c7f
commit 06f3c716f5
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,6 +54,10 @@ class RAM68000: public CPU::MC68000Mk2::BusHandler {
} }
void will_perform(uint32_t, uint16_t) { void will_perform(uint32_t, uint16_t) {
if(!has_run_) {
m68000_.set_state(initial_state_);
}
--instructions_remaining_; --instructions_remaining_;
if(!instructions_remaining_) { if(!instructions_remaining_) {
captured_state_ = m68000_.get_state(); captured_state_ = m68000_.get_state();
@ -78,9 +82,9 @@ class RAM68000: public CPU::MC68000Mk2::BusHandler {
// If the 68000 hasn't run yet, build in the necessary // If the 68000 hasn't run yet, build in the necessary
// cycles to finish the reset program, and set the stored state. // cycles to finish the reset program, and set the stored state.
if(!has_run_) { if(!has_run_) {
has_run_ = true;
m68000_.run_for(HalfCycles(80)); m68000_.run_for(HalfCycles(80));
duration_ -= HalfCycles(80); duration_ -= HalfCycles(80);
has_run_ = true;
} }
} }
@ -127,6 +131,7 @@ class RAM68000: public CPU::MC68000Mk2::BusHandler {
} }
void set_processor_state(const CPU::MC68000Mk2::State &state) { void set_processor_state(const CPU::MC68000Mk2::State &state) {
initial_state_ = captured_state_ = state;
m68000_.set_state(state); m68000_.set_state(state);
} }
@ -148,7 +153,7 @@ class RAM68000: public CPU::MC68000Mk2::BusHandler {
int instructions_remaining_; int instructions_remaining_;
HalfCycles duration_; HalfCycles duration_;
bool has_run_ = false; bool has_run_ = false;
CPU::MC68000Mk2::State captured_state_; CPU::MC68000Mk2::State captured_state_, initial_state_;
}; };
#endif /* TestRunner68000_h */ #endif /* TestRunner68000_h */