6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-30 19:30:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #732 from TomHarte/TraceFlag

Browse Source 
Improves 68000 trace support
This commit is contained in:
Thomas Harte 2020-01-18 23:17:21 -05:00 committed by GitHub
commit 3bfeebf2a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Processors/68000/Implementation/68000Implementation.hpp
View File

@ -273,11 +273,12 @@ template <class T, bool dtack_is_implicit, bool signal_will_perform> void Proces
break; break;
} }
if(trace_flag_) { if(trace_flag_ && last_trace_flag_) {
// The user has set the trace bit in the status register. // The user has set the trace bit in the status register.
active_program_ = nullptr; active_program_ = nullptr;
active_micro_op_ = short_exception_micro_ops_; active_micro_op_ = short_exception_micro_ops_;
populate_trap_steps(9, get_status()); populate_trap_steps(9, get_status());
program_counter_.full -= 4;
} else { } else {
#ifdef LOG_TRACE #ifdef LOG_TRACE
if(should_log) { if(should_log) {
@ -310,7 +311,7 @@ template <class T, bool dtack_is_implicit, bool signal_will_perform> void Proces
} }
#endif #endif
if(signal_will_perform) { if constexpr (signal_will_perform) {
bus_handler_.will_perform(program_counter_.full - 4, decoded_instruction_.full); bus_handler_.will_perform(program_counter_.full - 4, decoded_instruction_.full);
} }
@ -363,6 +364,7 @@ template <class T, bool dtack_is_implicit, bool signal_will_perform> void Proces
} }
} }
} }
last_trace_flag_ = trace_flag_;
} }
auto bus_program = &all_bus_steps_[active_micro_op_->bus_program]; auto bus_program = &all_bus_steps_[active_micro_op_->bus_program];

6
Processors/68000/Implementation/68000Storage.hpp
View File

@ -53,6 +53,8 @@ class ProcessorStorage {
uint_fast32_t negative_flag_; // The negative flag is set if this value is non-zero. uint_fast32_t negative_flag_; // The negative flag is set if this value is non-zero.
uint_fast32_t trace_flag_; // The trace flag is set if this value is non-zero. uint_fast32_t trace_flag_; // The trace flag is set if this value is non-zero.
uint_fast32_t last_trace_flag_ = 0;
// Bus inputs. // Bus inputs.
int bus_interrupt_level_ = 0; int bus_interrupt_level_ = 0;
bool dtack_ = false; bool dtack_ = false;
@ -498,7 +500,7 @@ class ProcessorStorage {
// Switch to supervisor mode, disable the trace bit. // Switch to supervisor mode, disable the trace bit.
set_is_supervisor(true); set_is_supervisor(true);
trace_flag_ = 0; trace_flag_ = last_trace_flag_ = 0;
// Pick a vector. // Pick a vector.
effective_address_[0].full = vector << 2; effective_address_[0].full = vector << 2;
@ -521,7 +523,7 @@ class ProcessorStorage {
// Switch to supervisor mode, disable the trace bit. // Switch to supervisor mode, disable the trace bit.
set_is_supervisor(true); set_is_supervisor(true);
trace_flag_ = 0; trace_flag_ = last_trace_flag_ = 0;
// Pick a vector. // Pick a vector.
effective_address_[0].full = vector << 2; effective_address_[0].full = vector << 2;