Fixed OP regression in Rayman, probably others.

[virtualjaguar] / src / memory.h

diff --git a/src/memory.h b/src/memory.h
index e57dc84a8495d238fd62a57085a702dd6a1f09e8..7f451d645ab8d7957d8a98125dcc1d934b248cd8 100644 (file)
--- a/src/memory.h
+++ b/src/memory.h
@@ -13,8 +13,11 @@ extern uint8 jagMemSpace[];
 
 extern uint8 * jaguarMainRAM;
 extern uint8 * jaguarMainROM;
-extern uint8 jaguarBootROM[];
-extern uint8 jaguarCDBootROM[];
+//extern uint8 jaguarBootROM[];
+//extern uint8 jaguarCDBootROM[];
+//extern uint8 jaguarDevBootROM1[];
+//extern uint8 jaguarDevBootROM2[];
+//extern uint8 jaguarDevCDBootROM[];
 extern uint8 * gpuRAM;
 extern uint8 * dspRAM;
 
@@ -70,6 +73,11 @@ uint32 & smode     = *((uint32 *)&jagMemSpace[0xF1A154]);
 enum { UNKNOWN, JAGUAR, DSP, GPU, TOM, JERRY, M68K, BLITTER, OP };
 extern const char * whoName[9];
 
+// BIOS identification enum
+
+//enum { BIOS_NORMAL=0x01, BIOS_CD=0x02, BIOS_STUB1=0x04, BIOS_STUB2=0x08, BIOS_DEV_CD=0x10 };
+//extern int biosAvailable;
+
 // Some handy macros to help converting native endian to big endian (jaguar native)
 // & vice versa
 
@@ -87,6 +95,9 @@ extern const char * whoName[9];
 #define SET16(r, a, v) r[(a)] = ((v) & 0xFF00) >> 8, r[(a)+1] = (v) & 0xFF
 #define GET16(r, a)            ((r[(a)] << 8) | r[(a)+1])
 
+//This doesn't seem to work on OSX. So have to figure something else out. :-(
+//byteswap.h doesn't exist on OSX.
+#if 0
 // This is GCC specific, but we can fix that if we need to...
 // Big plus of this approach is that these compile down to single instructions on little
 // endian machines while one big endian machines we don't have any overhead. :-)
@@ -103,5 +114,6 @@ extern const char * whoName[9];
        #define ESAFE32(x)      (x)
        #define ESAFE64(x)      (x)
 #endif
+#endif
 
 #endif // __MEMORY_H__