6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-10 23:31:24 +00:00
Code Issues Projects Releases Wiki Activity

Fix state transitions.

Browse Source 
Confirmed that the 68000 mk 2 now appears correctly to perform a reset.
This commit is contained in:
Thomas Harte 2022-05-16 21:00:25 -04:00
parent e94efe887c
commit c7aa4d8b6d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
View File

@ -27,9 +27,12 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
// Subtracts `n` half-cycles from `time_remaining_`; if permit_overrun is false, also ConsiderExit() // Subtracts `n` half-cycles from `time_remaining_`; if permit_overrun is false, also ConsiderExit()
#define Spend(n) time_remaining_ -= (n); if constexpr (!permit_overrun) ConsiderExit() #define Spend(n) time_remaining_ -= (n); if constexpr (!permit_overrun) ConsiderExit()
// Performs ConsiderExit() only if permit_overrun is true // Performs ConsiderExit() only if permit_overrun is true.
#define CheckOverrun() if constexpr (permit_overrun) ConsiderExit() #define CheckOverrun() if constexpr (permit_overrun) ConsiderExit()
// Sets `x` as the next state, and exits now if all remaining time has been extended and permit_overrun is true.
#define MoveToState(x) state_ = x; if (permit_overrun && time_remaining_ <= HalfCycles(0)) return
// //
// So basic structure is, in general: // So basic structure is, in general:
// //
@ -40,9 +43,8 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
// Spend(10); // Spend(10);
// do_a_third_thing(); // do_a_third_thing();
// Spend(30); // Spend(30);
// CheckOverrun();
// //
// state_ = next_action; // MoveToState(next_action);
// break; // break;
// //
// Additional notes: // Additional notes:
@ -171,11 +173,11 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
IdleBus(1); // n IdleBus(1); // n
Prefetch(); // np Prefetch(); // np
state_ = State::Dispatch; MoveToState(State::Dispatch);
CheckOverrun();
break; break;
default: assert(false); default:
assert(false);
}} }}
#undef CheckOverrun #undef CheckOverrun