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/getset.h | |
| 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/getset.h')
| -rw-r--r-- | source/getset.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/source/getset.h b/source/getset.h index 9b94b22..02a3845 100644 --- a/source/getset.h +++ b/source/getset.h @@ -98,12 +98,10 @@ #include "obc1.h" #include "seta.h" -#ifndef NO_OPEN_BUS extern "C" { extern uint8 OpenBus; } -#endif uint8 S9xGetByte (uint32 Address) { @@ -180,11 +178,7 @@ uint8 S9xGetByte (uint32 Address) #ifdef DEBUGGER printf ("DEBUG R(B) %06x\n", Address); #endif -#ifndef NO_OPEN_BUS return OpenBus; -#else - return 0; // Arbitrarily chosen value [Neb] -#endif default: @@ -198,11 +192,7 @@ uint8 S9xGetByte (uint32 Address) #ifdef DEBUGGER printf ("R(B) %06x\n", Address); #endif -#ifndef NO_OPEN_BUS return OpenBus; -#else - return 0; // Arbitrarily chosen value [Neb] -#endif } } @@ -210,13 +200,8 @@ uint16 S9xGetWord (uint32 Address) { if ((Address & 0x0fff) == 0x0fff) { -#ifndef NO_OPEN_BUS OpenBus = S9xGetByte (Address); return (OpenBus | (S9xGetByte (Address + 1) << 8)); -#else - uint8 Split = S9xGetByte (Address); - return (Split | (S9xGetByte (Address + 1) << 8)); -#endif } int block; uint8 *GetAddress = Memory.Map [block = (Address >> MEMMAP_SHIFT) & MEMMAP_MASK]; @@ -316,11 +301,7 @@ uint16 S9xGetWord (uint32 Address) #ifdef DEBUGGER printf ("DEBUG R(W) %06x\n", Address); #endif -#ifndef NO_OPEN_BUS return (OpenBus | (OpenBus<<8)); -#else - return 0; // Arbitrarily chosen value [Neb] -#endif default: case CMemory::MAP_NONE: @@ -333,11 +314,7 @@ uint16 S9xGetWord (uint32 Address) #ifdef DEBUGGER printf ("R(W) %06x\n", Address); #endif -#ifndef NO_OPEN_BUS return (OpenBus | (OpenBus<<8)); -#else - return 0; // Arbitrarily chosen value [Neb] -#endif } } |