diff options
author | Nebuleon Fumika | 2013-01-08 16:26:43 -0500 |
---|---|---|
committer | Nebuleon Fumika | 2013-01-08 16:26:43 -0500 |
commit | 1896286ad5bbe3390ccaf2e7ca54917a3a48a42f (patch) | |
tree | 355b041e1de11a37ca2c7a8bc054090e764f7fd0 /source/cpuops.cpp | |
parent | 65f1ead0e736f857df83277465fdc068419d7434 (diff) | |
download | snesemu-1896286ad5bbe3390ccaf2e7ca54917a3a48a42f.tar.gz snesemu-1896286ad5bbe3390ccaf2e7ca54917a3a48a42f.tar.bz2 snesemu-1896286ad5bbe3390ccaf2e7ca54917a3a48a42f.zip |
Permanently remove NO_OPEN_BUS hacks. It was a premature optimisation.
Diffstat (limited to 'source/cpuops.cpp')
-rw-r--r-- | source/cpuops.cpp | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/source/cpuops.cpp b/source/cpuops.cpp index cb10b46..db88c34 100644 --- a/source/cpuops.cpp +++ b/source/cpuops.cpp @@ -4431,9 +4431,7 @@ static void Op00 (void) PushW (CPU.PC - CPU.PCBase + 1); S9xPackStatus (); PushB (ICPU.Registers.PL); -#ifndef NO_OPEN_BUS OpenBus = ICPU.Registers.PL; -#endif ClearDecimal (); SetIRQ (); @@ -4449,9 +4447,7 @@ static void Op00 (void) PushW (CPU.PC - CPU.PCBase); S9xPackStatus (); PushB (ICPU.Registers.PL); -#ifndef NO_OPEN_BUS OpenBus = ICPU.Registers.PL; -#endif ClearDecimal (); SetIRQ (); @@ -4489,9 +4485,7 @@ void S9xOpcode_IRQ (void) PushW (CPU.PC - CPU.PCBase); S9xPackStatus (); PushB (ICPU.Registers.PL); -#ifndef NO_OPEN_BUS OpenBus = ICPU.Registers.PL; -#endif ClearDecimal (); SetIRQ (); @@ -4514,9 +4508,7 @@ void S9xOpcode_IRQ (void) PushW (CPU.PC - CPU.PCBase); S9xPackStatus (); PushB (ICPU.Registers.PL); -#ifndef NO_OPEN_BUS OpenBus = ICPU.Registers.PL; -#endif ClearDecimal (); SetIRQ (); @@ -4551,9 +4543,7 @@ void S9xOpcode_NMI (void) PushW (CPU.PC - CPU.PCBase); S9xPackStatus (); PushB (ICPU.Registers.PL); -#ifndef NO_OPEN_BUS OpenBus = ICPU.Registers.PL; -#endif ClearDecimal (); SetIRQ (); @@ -4576,9 +4566,7 @@ void S9xOpcode_NMI (void) PushW (CPU.PC - CPU.PCBase); S9xPackStatus (); PushB (ICPU.Registers.PL); -#ifndef NO_OPEN_BUS OpenBus = ICPU.Registers.PL; -#endif ClearDecimal (); SetIRQ (); @@ -4612,9 +4600,7 @@ static void Op02 (void) PushW (CPU.PC - CPU.PCBase + 1); S9xPackStatus (); PushB (ICPU.Registers.PL); -#ifndef NO_OPEN_BUS OpenBus = ICPU.Registers.PL; -#endif ClearDecimal (); SetIRQ (); @@ -4630,9 +4616,7 @@ static void Op02 (void) PushW (CPU.PC - CPU.PCBase); S9xPackStatus (); PushB (ICPU.Registers.PL); -#ifndef NO_OPEN_BUS OpenBus = ICPU.Registers.PL; -#endif ClearDecimal (); SetIRQ (); @@ -4806,10 +4790,7 @@ static void Op54X1 (void) ICPU.Registers.DB = *CPU.PC++; ICPU.ShiftedDB = ICPU.Registers.DB << 16; -#ifndef NO_OPEN_BUS - OpenBus = -#endif - SrcBank = *CPU.PC++; + OpenBus = SrcBank = *CPU.PC++; S9xSetByte (S9xGetByte ((SrcBank << 16) + ICPU.Registers.X.W), ICPU.ShiftedDB + ICPU.Registers.Y.W); @@ -4831,10 +4812,7 @@ static void Op54X0 (void) ICPU.Registers.DB = *CPU.PC++; ICPU.ShiftedDB = ICPU.Registers.DB << 16; -#ifndef NO_OPEN_BUS - OpenBus = -#endif - SrcBank = *CPU.PC++; + OpenBus = SrcBank = *CPU.PC++; S9xSetByte (S9xGetByte ((SrcBank << 16) + ICPU.Registers.X.W), ICPU.ShiftedDB + ICPU.Registers.Y.W); @@ -4855,10 +4833,7 @@ static void Op44X1 (void) #endif ICPU.Registers.DB = *CPU.PC++; ICPU.ShiftedDB = ICPU.Registers.DB << 16; -#ifndef NO_OPEN_BUS - OpenBus = -#endif - SrcBank = *CPU.PC++; + OpenBus = SrcBank = *CPU.PC++; S9xSetByte (S9xGetByte ((SrcBank << 16) + ICPU.Registers.X.W), ICPU.ShiftedDB + ICPU.Registers.Y.W); @@ -4878,10 +4853,7 @@ static void Op44X0 (void) #endif ICPU.Registers.DB = *CPU.PC++; ICPU.ShiftedDB = ICPU.Registers.DB << 16; -#ifndef NO_OPEN_BUS - OpenBus = -#endif - SrcBank = *CPU.PC++; + OpenBus = SrcBank = *CPU.PC++; S9xSetByte (S9xGetByte ((SrcBank << 16) + ICPU.Registers.X.W), ICPU.ShiftedDB + ICPU.Registers.Y.W); |