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/globals.cpp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'source/globals.cpp')

diff --git a/source/globals.cpp b/source/globals.cpp
index ca2b12b..adb9ab4 100644
--- a/source/globals.cpp
+++ b/source/globals.cpp
@@ -113,20 +113,14 @@ struct SICPU ICPU;
 
 struct SCPUState CPU;
 
-struct SRegisters Registers;
-
 struct SAPU APU;
 
 struct SIAPU IAPU;
 
-struct SAPURegisters APURegisters;
-
 struct SSettings Settings;
 
 struct SDSP1 DSP1;
 
-struct SSA1Registers SA1Registers;
-
 struct SSA1 SA1;
 
 SSoundData SoundData;
@@ -361,7 +355,7 @@ struct SNetPlay NetPlay;
 #endif
 
 // Raw SPC700 instruction cycle lengths
-int32 S9xAPUCycleLengths [256] = 
+uint16 S9xAPUCycleLengths [256] = 
 {
     /*        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b, c, d, e, f, */
     /* 00 */  2, 8, 4, 5, 3, 4, 3, 6, 2, 6, 5, 4, 5, 4, 6, 8, 
@@ -384,7 +378,7 @@ int32 S9xAPUCycleLengths [256] =
 
 // Actual data used by CPU emulation, will be scaled by APUReset routine
 // to be relative to the 65c816 instruction lengths.
-int32 S9xAPUCycles [256] =
+uint16 S9xAPUCycles [256] =
 {
     /*        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b, c, d, e, f, */
     /* 00 */  2, 8, 4, 5, 3, 4, 3, 6, 2, 6, 5, 4, 5, 4, 6, 8, 
-- 
cgit v1.2.3