6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2026-03-15 01:16:39 +00:00
Code Issues Projects Releases Wiki Activity

Fix some more timing issues

Browse Source
This commit is contained in:
Adrian Conlon
2026-03-04 16:37:25 +00:00
parent a1afe7f78c
commit 8ef462f5c4
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Z80/inc/Z80.h
View File

@@ -142,7 +142,7 @@ namespace EightBit {
void jumpRelative(int8_t offset) noexcept final;
void call(register16_t destination) override;
void call(register16_t destination) final;
private:
bool m_interruptPending = false;

14
Z80/src/Z80.cpp
View File

@@ -300,7 +300,6 @@ EightBit::register16_t EightBit::Z80::sbc(const register16_t operand, const regi
MEMPTR() = operand + 1;
tick(7);
return intermediate();
}
@@ -455,7 +454,7 @@ void EightBit::Z80::adjustBlockRepeatFlagsIO() {
void EightBit::Z80::adjustBlockInputOutputFlags(int basis) noexcept {
setBit(HC | CF, basis > 0xff);
adjustParity(((basis & (int)Mask::Mask3) ^ B()));
adjustParity(((basis & Mask::Mask3) ^ B()));
}
void EightBit::Z80::adjustBlockInFlagsIncrement() noexcept {
@@ -476,19 +475,21 @@ void EightBit::Z80::blockIn() noexcept {
tick();
readPort(BC());
BUS().ADDRESS() = HL();
memoryWrite();
memoryUpdate(1);
adjustSZXY(--B());
F() = setBit(F(), NF);
setBit(NF, BUS().DATA() & SF);
}
void EightBit::Z80::ini() noexcept {
blockIn();
adjustBlockInFlagsIncrement();
++HL();
++MEMPTR();
}
void EightBit::Z80::ind() noexcept {
blockIn();
adjustBlockInFlagsDecrement();
--HL();
--MEMPTR();
}
@@ -607,7 +608,6 @@ void EightBit::Z80::readPort(const uint8_t port) noexcept {
void EightBit::Z80::readPort() noexcept {
MEMPTR() = BUS().ADDRESS();
tick(2);
tick();
lowerIORQ();
lowerRD();
BUS().DATA() = m_ports.read(BUS().ADDRESS());
@@ -674,7 +674,6 @@ void EightBit::Z80::readInternalRegister(reader_t reader) noexcept {
adjustSZXY(A() = reader());
clearBit(NF | HC);
setBit(PF, IFF2());
tick();
}
EightBit::register16_t& EightBit::Z80::HL2() noexcept {
@@ -905,7 +904,7 @@ void EightBit::Z80::executeCB(const int x, const int y, const int z) noexcept {
if (!memoryZ)
R2(z, operand);
} else {
R(z, operand);
R(z, operand, 2);
}
}
}
@@ -1002,6 +1001,7 @@ void EightBit::Z80::executeED(const int x, const int y, const int z, const int p
break;
case 2: // LD A,I
readInternalRegister([this]() { return IV(); });
tick();
break;
case 3: // LD A,R
readInternalRegister([this]() { return REFRESH(); });

1
inc/IntelProcessor.h
View File

@@ -169,6 +169,7 @@ namespace EightBit {
virtual void jump();
void callIndirect();
void call();
virtual void call(register16_t destination);
virtual void jumpRelative(int8_t offset) noexcept;
void jumpRelative(uint8_t offset) noexcept { jumpRelative((int8_t)offset); }
void ret() override;

6
src/IntelProcessor.cpp
View File

@@ -133,7 +133,11 @@ void EightBit::IntelProcessor::callIndirect() {
}
void EightBit::IntelProcessor::call() {
Processor::call(MEMPTR());
call(MEMPTR());
}
void EightBit::IntelProcessor::call(register16_t destination) {
Processor::call(destination);
}
bool EightBit::IntelProcessor::operator==(const EightBit::IntelProcessor& rhs) const noexcept {