6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-27 06:35:04 +00:00
Code Issues Projects Releases Wiki Activity

Attempts to do the proper thing for interrupts.

Browse Source
This commit is contained in:
Thomas Harte 2020-10-11 21:10:44 -04:00
parent a0885ab7d0
commit 82797fd395
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Processors/65816/Implementation/65816Implementation.hpp
View File

@ -48,7 +48,7 @@ template <typename BusHandler> void Processor<BusHandler>::run_for(const Cycles
// The exception program will determine the appropriate way to respond // The exception program will determine the appropriate way to respond
// based on the pending exception if one exists; otherwise just do a // based on the pending exception if one exists; otherwise just do a
// standard fetch-decode-execute. // standard fetch-decode-execute.
const auto offset = instructions[pending_exceptions_ ? size_t(OperationSlot::Exception) : size_t(OperationSlot::FetchDecodeExecute)].program_offsets[0]; const auto offset = instructions[selected_exceptions_ ? size_t(OperationSlot::Exception) : size_t(OperationSlot::FetchDecodeExecute)].program_offsets[0];
next_op_ = &micro_ops_[offset]; next_op_ = &micro_ops_[offset];
instruction_buffer_.clear(); instruction_buffer_.clear();
data_buffer_.clear(); data_buffer_.clear();
@ -331,12 +331,14 @@ template <typename BusHandler> void Processor<BusHandler>::run_for(const Cycles
// Put the proper exception vector into the data address, put the flags and PC // Put the proper exception vector into the data address, put the flags and PC
// into the data buffer (possibly also PBR), and skip an instruction if in // into the data buffer (possibly also PBR), and skip an instruction if in
// emulation mode. // emulation mode.
//
// I've assumed here that interrupts, BRKs and COPs can be usurped similarly
// to a 6502 but may not have the exact details correct. E.g. if IRQ has
// become inactive since the decision was made to start an interrupt, should
// that turn into a BRK?
bool is_brk = false; bool is_brk = false;
// TODO: probably this should have been decided in advance? And the interrupt flag
// needs to be factored in?
if(pending_exceptions_ & (Reset | PowerOn)) { if(pending_exceptions_ & (Reset | PowerOn)) {
pending_exceptions_ &= ~(Reset | PowerOn); pending_exceptions_ &= ~(Reset | PowerOn);
data_address_ = 0xfffc; data_address_ = 0xfffc;
@ -344,11 +346,11 @@ template <typename BusHandler> void Processor<BusHandler>::run_for(const Cycles
} else if(pending_exceptions_ & NMI) { } else if(pending_exceptions_ & NMI) {
pending_exceptions_ &= ~NMI; pending_exceptions_ &= ~NMI;
data_address_ = 0xfffa; data_address_ = 0xfffa;
} else if(pending_exceptions_ & IRQ) { } else if(pending_exceptions_ & IRQ & flags_.inverse_interrupt) {
pending_exceptions_ &= ~IRQ; pending_exceptions_ &= ~IRQ;
data_address_ = 0xfffe; data_address_ = 0xfffe;
} else { } else {
is_brk = active_instruction_ == instructions; is_brk = active_instruction_ == instructions; // Given that BRK has opcode 00.
if(is_brk) { if(is_brk) {
data_address_ = emulation_flag_ ? 0xfffe : 0xfff6; data_address_ = emulation_flag_ ? 0xfffe : 0xfff6;
} else { } else {
@ -856,9 +858,11 @@ template <typename BusHandler> void Processor<BusHandler>::run_for(const Cycles
#undef y_top #undef y_top
#undef a_top #undef a_top
// TODO: do some sort of evaluation here on whether an interrupt or similar is pending, // TODO: the ready line.
// react appropriately.
// Store a selection as to the exceptions, if any, that would be honoured after this cycle if the
// next thing is a MoveToNextProgram.
selected_exceptions_ = pending_exceptions_ & (flags_.inverse_interrupt | PowerOn | Reset | NMI);
number_of_cycles -= bus_handler_.perform_bus_operation(bus_operation, bus_address, bus_value); number_of_cycles -= bus_handler_.perform_bus_operation(bus_operation, bus_address, bus_value);
} }

8
Processors/65816/Implementation/65816Storage.hpp
View File

@ -261,9 +261,15 @@ struct ProcessorStorage {
static constexpr int PowerOn = 1 << 0; static constexpr int PowerOn = 1 << 0;
static constexpr int Reset = 1 << 1; static constexpr int Reset = 1 << 1;
static constexpr int IRQ = 1 << 2; static constexpr int IRQ = Flag::Interrupt; // This makes masking a lot easier later on; this is 1 << 2.
static constexpr int NMI = 1 << 3; static constexpr int NMI = 1 << 3;
int pending_exceptions_ = PowerOn; // By default. int pending_exceptions_ = PowerOn; // By default.
int selected_exceptions_ = 0;
// Just to be safe.
static_assert(PowerOn != IRQ);
static_assert(Reset != IRQ);
static_assert(NMI != IRQ);
/// Sets the required exception flags necessary to exit a STP or WAI. /// Sets the required exception flags necessary to exit a STP or WAI.
int required_exceptions_ = 0; int required_exceptions_ = 0;