From: slack <slack@codemaniacs.com>
Date: Wed, 11 Mar 2009 01:17:59 +0000 (+0100)
Subject: bugfix in LD (nn), SP
X-Git-Url: http://slack.codemaniacs.com/git/?a=commitdiff_plain;h=83e5b8b9e1b1f6536fb691c21ce888f60fe509d5;p=wenboi.git

bugfix in LD (nn), SP
---

diff --git a/core/GBMemory.cc b/core/GBMemory.cc
index 19c29e6..af5b906 100644
--- 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 def434a..3cfcfab 100644
--- 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 a0d7045..5d1d401 100644
--- 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;
 						}