6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2024-12-28 01:29:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MoleskiCoder/EightBit

Browse Source
This commit is contained in:
Adrian Conlon 2019-08-16 21:57:01 +01:00
commit 326ebfd8ea
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LR35902/src/Disassembler.cpp
View File

@ -423,7 +423,7 @@ void EightBit::GameBoy::Disassembler::disassembleOther(
dumpCount++;
break;
case 7:
specification = "LD HL,SP%4$+i";
specification = "LD HL,SP+%4%";
dumpCount++;
break;
}

25
LR35902/src/IoRegisters.cpp
View File

@ -32,20 +32,17 @@ void EightBit::GameBoy::IoRegisters::Bus_ReadingByte(EightBit::EventArgs) {
// Port/Mode Registers
case P1: {
auto p14 = m_scanP14 && !m_p14;
auto p15 = m_scanP15 && !m_p15;
auto live = p14 || p15;
auto p10 = live && !m_p10;
auto p11 = live && !m_p11;
auto p12 = live && !m_p12;
auto p13 = live && !m_p13;
poke(port,
((int)!p10)
| ((int)!p11 << 1)
| ((int)!p12 << 2)
| ((int)!p13 << 3)
| Chip::Bit4 | Chip::Bit5
| Chip::Bit6 | Chip::Bit7);
auto directionKeys = m_scanP14 && !m_p14;
auto miscKeys = m_scanP15 && !m_p15;
auto live = directionKeys || miscKeys;
auto rightOrA = (live && !m_p10) ? 0 : Chip::Bit0;
auto leftOrB = (live && !m_p11) ? 0 : Chip::Bit1;
auto upOrSelect = (live && !m_p12) ? 0 : Chip::Bit2;
auto downOrStart = (live && !m_p13) ? 0 : Chip::Bit3;
auto lowNibble = rightOrA | leftOrB | upOrSelect | downOrStart;
auto highNibble = Chip::promoteNibble(Chip::Mask4);
auto value = lowNibble | highNibble;
poke(port, lowNibble | highNibble);
}
break;
case SB: