[core] memory: Fix unaligned S16 reads from out-of-bounds ROM.

nba-emu · May 24, 2020 · 65c857a · 65c857a
1 parent 8d5fcd8
commit 65c857a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/source/emulator/core/cpu-memory.inl b/source/emulator/core/cpu-memory.inl
@@ -125,7 +125,7 @@ inline auto CPU::ReadByte(std::uint32_t address, Access access) -> std::uint8_t
       //   return gpio->read(address);
       // }
       if (address >= memory.rom.size) {
-        return address / 2;
+        return (address / 2) >> ((address & 1) * 8);
       }
       return Read<std::uint8_t>(memory.rom.data.get(), address);
     }