6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2025-01-10 10:29:43 +00:00
Code Issues Projects Releases Wiki Activity

Correct recently introduced IO implementation issues in the 8080 core.

Browse Source 
Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2020-02-13 09:17:52 +00:00
parent c8bdabf34f
commit a37601df67
2 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Intel8080/inc/Intel8080.h
View File

@ -35,8 +35,8 @@ namespace EightBit {
virtual register16_t& DE() final;
virtual register16_t& HL() final;
bool requestingIO() { return m_requestIO; }
bool requestingMemory() { return m_requestMemory; }
bool requestingIO() noexcept { return m_requestIO; }
bool requestingMemory() noexcept { return m_requestMemory; }
bool requestingRead() { return raised(DBIN()); }
bool requestingWrite() { return lowered(WR()); }
@ -199,5 +199,15 @@ namespace EightBit {
uint8_t portRead(uint8_t port);
uint8_t portRead();
void requestIO() noexcept { assert(!requestingMemory()); m_requestIO = true; }
void releaseIO() noexcept { m_requestIO = false; }
void requestMemory() noexcept { assert(!requestingIO()); m_requestMemory = true; }
void releaseMemory() noexcept { m_requestMemory = false; }
void requestRead() { raise(DBIN()); }
void releaseRead() { lower(DBIN()); }
void requestWrite() { lower(WR()); }
void releaseWrite() { raise(WR()); }
};
}

43
Intel8080/src/Intel8080.cpp
View File

@ -2,7 +2,18 @@
#include "Intel8080.h"
EightBit::Intel8080::Intel8080(Bus& bus)
: IntelProcessor(bus){
: IntelProcessor(bus) {
RaisedPOWER.connect([this](EventArgs) {
releaseMemory();
releaseIO();
releaseRead();
releaseWrite();
di();
});
}
DEFINE_PIN_LEVEL_CHANGERS(DBIN, Intel8080);
@ -26,27 +37,28 @@ EightBit::register16_t& EightBit::Intel8080::HL() {
}
void EightBit::Intel8080::memoryWrite() {
m_requestMemory = true;
requestMemory();
IntelProcessor::memoryWrite();
m_requestMemory = false;
releaseMemory();
}
uint8_t EightBit::Intel8080::memoryRead() {
m_requestMemory = true;
return IntelProcessor::memoryRead();
m_requestMemory = false;
requestMemory();
const auto returned = IntelProcessor::memoryRead();
releaseMemory();
return returned;
}
void EightBit::Intel8080::busWrite() {
lowerWR();
requestWrite();
IntelProcessor::busWrite();
raiseWR();
releaseWrite();
}
uint8_t EightBit::Intel8080::busRead() {
raiseDBIN();
requestRead();
const auto returned = IntelProcessor::busRead();
lowerDBIN();
releaseRead();
return returned;
}
@ -275,13 +287,14 @@ void EightBit::Intel8080::xhtl(register16_t& exchange) {
void EightBit::Intel8080::portWrite(const uint8_t port) {
BUS().ADDRESS() = { port, port };
BUS().DATA() = A();
portWrite();
}
void EightBit::Intel8080::portWrite() {
m_requestIO = true;
requestIO();
busWrite();
m_requestIO = false;
releaseIO();;
}
uint8_t EightBit::Intel8080::portRead(const uint8_t port) {
@ -290,9 +303,9 @@ uint8_t EightBit::Intel8080::portRead(const uint8_t port) {
}
uint8_t EightBit::Intel8080::portRead() {
m_requestIO = true;
requestIO();
const auto returned = busRead();
m_requestIO = false;
releaseIO();;
return returned;
}
@ -399,7 +412,7 @@ void EightBit::Intel8080::execute(const int x, const int y, const int z, const i
break;
case 3: // LD A,(nn)
BUS().ADDRESS() = fetchWord();
A() = busRead();
A() = memoryRead();
tick(13);
break;
default: