6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-09 05:25:01 +00:00
Code Issues Projects Releases Wiki Activity

Made an attempt to fix wake-from-WAIT.

Browse Source
This commit is contained in:
Thomas Harte
2016-10-25 19:06:46 -04:00
parent 4b18c76b84
commit f84b66a5f4
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Processors/6502/CPU6502.hpp
View File

@@ -616,6 +616,12 @@ template <class T> class Processor {
op;\ op;\
} }
#define bus_access() \
_interrupt_requests = (_interrupt_requests & ~InterruptRequestFlags::IRQ) | (_irq_request_history ? InterruptRequestFlags::IRQ : 0); \
_irq_request_history = _irq_line_is_enabled && !_interruptFlag; \
number_of_cycles -= static_cast<T *>(this)->perform_bus_operation(nextBusOperation, busAddress, busValue); \
nextBusOperation = BusOperation::None;
checkSchedule(); checkSchedule();
number_of_cycles += _cycles_left_to_run; number_of_cycles += _cycles_left_to_run;
const MicroOp *program = _scheduledPrograms[scheduleProgramsReadPointer]; const MicroOp *program = _scheduledPrograms[scheduleProgramsReadPointer];
@@ -628,6 +634,11 @@ template <class T> class Processor {
if(!_ready_is_active) if(!_ready_is_active)
{ {
if(nextBusOperation != BusOperation::None)
{
bus_access();
}
while(number_of_cycles > 0) { while(number_of_cycles > 0) {
const MicroOp cycle = program[scheduleProgramProgramCounter]; const MicroOp cycle = program[scheduleProgramProgramCounter];
@@ -1098,10 +1109,7 @@ template <class T> class Processor {
_ready_is_active = true; _ready_is_active = true;
break; break;
} }
_interrupt_requests = (_interrupt_requests & ~InterruptRequestFlags::IRQ) | (_irq_request_history ? InterruptRequestFlags::IRQ : 0); bus_access();
_irq_request_history = _irq_line_is_enabled && !_interruptFlag;
number_of_cycles -= static_cast<T *>(this)->perform_bus_operation(nextBusOperation, busAddress, busValue);
nextBusOperation = BusOperation::None;
} }
} }
} }