bugfix in LD (nn), SP

diff --git a/core/GBMemory.cc b/core/GBMemory.cc
index 19c29e68a1fef527cc1987d22fee00dba44c390a..af5b906cb836cf458aa73d670e17e8de589d6d62 100644 (file)
--- a/core/GBMemory.cc
+++ b/core/GBMemory.cc
@@ -109,6 +109,11 @@ void GBMemory::write(u16 addr, u8 value, WatchpointControl watch)
        }
 }
 
+void GBMemory::write16(u16 addr, u8 value, WatchpointControl watch)
+{
+       write(addr, value & 0xFF, watch);
+       write(addr+1, value >> 8, watch);
+}
 
 u8  GBMemory::read(u16 addr, WatchpointControl watch)
 {

diff --git a/core/GBMemory.h b/core/GBMemory.h
index def434a871a04faac181093574b0f718213ef13c..3cfcfabf87c2bfcce84e00606cdda6fd0f3d1d00 100644 (file)
--- a/core/GBMemory.h
+++ b/core/GBMemory.h
@@ -97,9 +97,10 @@ class GBMemory
                DONT_WATCH=1,
        };
 
-       u8   read  (u16 addr, WatchpointControl watch = WATCH);
-       u16  read16(u16 addr, WatchpointControl watch = WATCH);
-       void write (u16 addr, u8 value, WatchpointControl watch = WATCH);
+       u8   read   (u16 addr, WatchpointControl watch = WATCH);
+       u16  read16 (u16 addr, WatchpointControl watch = WATCH);
+       void write  (u16 addr, u8 value, WatchpointControl watch = WATCH);
+       void write16(u16 addr, u8 value, WatchpointControl watch = WATCH);
 
        enum PortAccess
        {

diff --git a/core/GameBoy.cc b/core/GameBoy.cc
index a0d7045781b61039f66210b485300ccaff705fe5..5d1d401f7377761d86154699276d577eb9f26391 100644 (file)
--- a/core/GameBoy.cc
+++ b/core/GameBoy.cc
@@ -317,7 +317,7 @@ GameBoy::run_status GameBoy::run_cycle()
                                        case 0x08: {
                                                int addr = memory.read16(regs.PC);
                                                regs.PC += 2;
-                                               memory.write(addr, regs.SP);
+                                               memory.write16(addr, regs.SP);
                                                cycles_until_next_instruction = 20; 
                                                break;
                                                }