6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-28 07:29:45 +00:00
Code Issues Projects Releases Wiki Activity

Attempted to round out NMI handling.

Browse Source
This commit is contained in:
Thomas Harte 2017-06-03 11:30:12 -04:00
parent d14902700a
commit 9c3bda0111
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Processors/Z80/Z80.hpp
View File

@ -129,6 +129,8 @@ struct MicroOp {
SetInstructionPage, SetInstructionPage,
CalculateIndexAddress, CalculateIndexAddress,
BeginNMI,
BeginIRQ,
RETN, RETN,
HALT, HALT,
@ -646,6 +648,18 @@ template <class T> class Processor: public MicroOpScheduler<MicroOp> {
target.fetch_decode_execute_data = target.fetch_decode_execute.data(); target.fetch_decode_execute_data = target.fetch_decode_execute.data();
} }
void copy_program(MicroOp *source, std::vector<MicroOp> &destination) {
size_t length = 0;
while(source[length].type != MicroOp::MoveToNextProgram) length++;
destination.resize(length + 1);
size_t pointer = 0;
while(true) {
destination[pointer] = source[pointer];
if(source[pointer].type == MicroOp::MoveToNextProgram) break;
pointer++;
}
}
public: public:
Processor() : MicroOpScheduler(), Processor() : MicroOpScheduler(),
halt_mask_(0xff), halt_mask_(0xff),
@ -679,10 +693,15 @@ template <class T> class Processor: public MicroOpScheduler<MicroOp> {
assemble_fetch_decode_execute(ddcb_page_, 3); assemble_fetch_decode_execute(ddcb_page_, 3);
MicroOp reset_program[] = Program(WAIT(3), {MicroOp::Reset}); MicroOp reset_program[] = Program(WAIT(3), {MicroOp::Reset});
reset_program_.resize(3); MicroOp nmi_program[] = {
reset_program_[0] = reset_program[0]; { MicroOp::BeginNMI },
reset_program_[1] = reset_program[1]; { MicroOp::BusOperation, nullptr, nullptr, {ReadOpcode, 5, &pc_.full, &operation_}},
reset_program_[2] = reset_program[2]; PUSH(pc_),
{ MicroOp::MoveToNextProgram }
};
copy_program(reset_program, reset_program_);
copy_program(nmi_program, nmi_program_);
} }
/*! /*!
@ -1413,6 +1432,17 @@ template <class T> class Processor: public MicroOpScheduler<MicroOp> {
#pragma mark - Special-case Flow #pragma mark - Special-case Flow
case MicroOp::BeginIRQ:
iff2_ = iff1_ = false;
request_status_ &= ~Interrupt::IRQ;
break;
case MicroOp::BeginNMI:
iff2_ = iff1_;
iff1_ = false;
request_status_ &= ~Interrupt::IRQ;
break;
case MicroOp::RETN: case MicroOp::RETN:
iff1_ = iff2_; iff1_ = iff2_;
if(irq_line_ && iff1_) request_status_ |= Interrupt::IRQ; if(irq_line_ && iff1_) request_status_ |= Interrupt::IRQ;