Read P1 directly (#20)

kremi151 · Aug 11, 2020 · e50d0db · e50d0db
1 parent e127cb6
commit e50d0db
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/core/source/emulator/cpu.cpp b/core/source/emulator/cpu.cpp
@@ -252,7 +252,7 @@ inline u8 getInterruptBitMask(InterruptType type) {
 }
 
 void CPU::doJoypad() {
-    u8 oldP1 = memory->read8BitsAt(FB_REG_P1) & 0b00001111u;
+    u8 oldP1 = ioRegisters->getP1() & 0b00001111u;
     u8 newP1 = ioRegisters->updateJoypad() & 0b00001111u;
     bool isNotPressed = oldP1 & newP1;
     if (!isNotPressed && joypadWasNotPressed) {

diff --git a/core/source/emulator/io_registers.cpp b/core/source/emulator/io_registers.cpp
@@ -135,4 +135,8 @@ void io_registers::updateLCD(bool lcdOn, GPUMode gpuMode, u8 ly) {
     *(hwIO + FB_REG_OFFSET_STAT) = stat;
 
     *(hwIO + FB_REG_OFFSET_LY) = ly;
+}
+
+u8 &io_registers::getP1() {
+    return *(hwIO + FB_REG_OFFSET_P1);
 }
diff --git a/core/source/emulator/io_registers.h b/core/source/emulator/io_registers.h
@@ -70,6 +70,8 @@ namespace FunkyBoy {
         u8 updateJoypad();
         void updateLCD(bool lcdOn, GPUMode gpuMode, u8 ly);
 
+        u8 &getP1();
+
         friend class CPU;
     };