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

Ensure STOP exits the run loop.

Browse Source
This commit is contained in:
Thomas Harte 2022-05-14 19:17:32 -04:00
parent 27c4d19455
commit ff8e4754d7
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
InstructionSets/M68k/Implementation/ExecutorImplementation.hpp
View File

@ -64,6 +64,9 @@ void Executor<model, BusHandler>::run_for_instructions(int count) {
try {
state_.run(count);
} catch (uint64_t exception) {
// Potiental source of an exception #1: STOP. Check for that first.
if(state_.stopped) return;
// Unpack the exception; this is the converse of the AccessException macro.
const int vector_address = (exception >> 6) & 0xfc;
const uint16_t code = uint16_t(exception & 0xff);
@ -446,6 +449,10 @@ void Executor<model, BusHandler>::State::did_update_status() {
template <Model model, typename BusHandler>
void Executor<model, BusHandler>::State::stop() {
stopped = true;
// Raise an exception to exit the run loop; it doesn't matter
// what value is used as long as it is a uint64_t, so 0 will do.
throw uint64_t();
}
template <Model model, typename BusHandler>