From e5869adc4469115c7eac9abf70145fc178e017de Mon Sep 17 00:00:00 2001
From: Nebuleon Fumika
Date: Wed, 26 Dec 2012 14:42:02 -0500
Subject: Merge Registers structures into their respective CPUs to avoid
 additional memory addresses being loaded every opcode.

---
 source/snaporig.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'source/snaporig.cpp')

diff --git a/source/snaporig.cpp b/source/snaporig.cpp
index 090c378..219f67f 100644
--- a/source/snaporig.cpp
+++ b/source/snaporig.cpp
@@ -230,7 +230,7 @@ static int ReadOrigSnapshot (STREAM snap)
     if ((result = ReadBlock ("REG:", &OrigRegisters, sizeof (OrigRegisters), snap)) != SUCCESS)
 	return (result);
 
-    Registers = *(struct SRegisters *) &OrigRegisters;
+    ICPU.Registers = *(struct SRegisters *) &OrigRegisters;
 
     if ((result = ReadBlock ("PPU:", &OrigPPU, sizeof (OrigPPU), snap)) != SUCCESS)
 	return (result);
@@ -379,7 +379,7 @@ static int ReadOrigSnapshot (STREAM snap)
 	if ((result = ReadBlock ("ARE:", &OrigAPURegisters,
 				 sizeof (OrigAPURegisters), snap)) != SUCCESS)
 	    return (result);
-	APURegisters = *(struct SAPURegisters *) &OrigAPURegisters;
+	IAPU.Registers = *(struct SAPURegisters *) &OrigAPURegisters;
 	if ((result = ReadBlock ("ARA:", IAPU.RAM, 0x10000, snap)) != SUCCESS)
 	    return (result);
 	if ((result = ReadBlock ("SOU:", &OrigSoundData,
@@ -437,7 +437,7 @@ static int ReadOrigSnapshot (STREAM snap)
 	}
 
 	S9xSetSoundMute (FALSE);
-	IAPU.PC = IAPU.RAM + APURegisters.PC;
+	IAPU.PC = IAPU.RAM + IAPU.Registers.PC;
 	S9xAPUUnpackStatus ();
 	if (APUCheckDirectPage ())
 	    IAPU.DirectPage = IAPU.RAM + 0x100;
@@ -453,9 +453,9 @@ static int ReadOrigSnapshot (STREAM snap)
 	S9xSetSoundMute (TRUE);
     }
     S9xFixSoundAfterSnapshotLoad ();
-    ICPU.ShiftedPB = Registers.PB << 16;
-    ICPU.ShiftedDB = Registers.DB << 16;
-    S9xSetPCBase (ICPU.ShiftedPB + Registers.PC);
+    ICPU.ShiftedPB = ICPU.Registers.PB << 16;
+    ICPU.ShiftedDB = ICPU.Registers.DB << 16;
+    S9xSetPCBase (ICPU.ShiftedPB + ICPU.Registers.PC);
     S9xUnpackStatus ();
     S9xFixCycles ();
     S9xReschedule ();
-- 
cgit v1.2.3