scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add int_delay to Cpu class

Browse Source
This commit is contained in:
scawful
2024-04-24 15:56:46 -04:00
parent 8a06219353
commit 4c466d5ab8
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/emu/cpu/cpu.cc
View File

@@ -31,6 +31,7 @@ void Cpu::Reset(bool hard) {
waiting_ = false; waiting_ = false;
nmi_wanted_ = false; nmi_wanted_ = false;
int_wanted_ = false; int_wanted_ = false;
int_delay_ = false;
} }
void Cpu::Update(UpdateMode mode, int stepCount) { void Cpu::Update(UpdateMode mode, int stepCount) {

21
src/app/emu/cpu/cpu.h
View File

@@ -143,6 +143,14 @@ class Cpu : public Loggable, public core::ExperimentFlags {
enum class AccessType { Control, Data }; enum class AccessType { Control, Data };
uint8_t ReadOpcode() { return ReadByte((PB << 16) | PC++); }
uint16_t ReadOpcodeWord(bool int_check = false) {
uint8_t value = ReadOpcode();
if (int_check) CheckInt();
return value | (ReadOpcode() << 8);
}
// Memory access routines // Memory access routines
uint8_t ReadByte(uint32_t address) const { uint8_t ReadByte(uint32_t address) const {
return callbacks_.read_byte(address); return callbacks_.read_byte(address);
@@ -254,14 +262,16 @@ class Cpu : public Loggable, public core::ExperimentFlags {
void DoBranch(bool check) { void DoBranch(bool check) {
if (!check) CheckInt(); if (!check) CheckInt();
uint8_t value = FetchByte(); uint8_t value = ReadOpcode();
if (check) { if (check) {
CheckInt(); CheckInt();
callbacks_.idle(false); // taken branch: 1 extra cycle callbacks_.idle(false); // taken branch: 1 extra cycle
next_pc_ += (int8_t)value; PC += (int8_t)value;
} }
} }
void set_int_delay(bool delay) { int_delay_ = delay; }
// ========================================================================== // ==========================================================================
// Addressing Modes // Addressing Modes
@@ -736,7 +746,8 @@ class Cpu : public Loggable, public core::ExperimentFlags {
auto GetBreakpoints() { return breakpoints_; } auto GetBreakpoints() { return breakpoints_; }
void CheckInt() { void CheckInt() {
int_wanted_ = nmi_wanted_ || (irq_wanted_ && !GetInterruptFlag()); int_wanted_ = (nmi_wanted_ || (irq_wanted_ && !GetInterruptFlag()))&& !int_delay_;
int_delay_ = false;
} }
auto mutable_log_instructions() -> bool* { return &log_instructions_; } auto mutable_log_instructions() -> bool* { return &log_instructions_; }
@@ -778,10 +789,8 @@ class Cpu : public Loggable, public core::ExperimentFlags {
bool nmi_wanted_ = false; bool nmi_wanted_ = false;
bool reset_wanted_ = false; bool reset_wanted_ = false;
bool int_wanted_ = false; bool int_wanted_ = false;
bool int_delay_ = false;
uint16_t last_call_frame_;
uint16_t next_pc_;
uint8_t next_pb_;
memory::CpuCallbacks callbacks_; memory::CpuCallbacks callbacks_;
memory::Memory& memory; memory::Memory& memory;