X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjaguar.cpp;h=3ae824cbd7ad331fb61e83138e8acd51c78cf472;hb=07d689da4cceee0c376861a1459c9e9c2289c6a2;hp=796d9ee839786f0f96bdfcb3230f9e4d5bd36403;hpb=bfca68337bb71d75f7848922c2d0a73837c923cb;p=virtualjaguar

diff --git a/src/jaguar.cpp b/src/jaguar.cpp
index 796d9ee..3ae824c 100644
--- a/src/jaguar.cpp
+++ b/src/jaguar.cpp
@@ -25,7 +25,6 @@
 #include "eeprom.h"
 #include "event.h"
 #include "gpu.h"
-//#include "gui.h"
 #include "jerry.h"
 #include "joystick.h"
 #include "log.h"
@@ -34,7 +33,6 @@
 #include "mmu.h"
 #include "settings.h"
 #include "tom.h"
-#include "video.h"
 
 #define CPU_DEBUG
 //Do this in makefile??? Yes! Could, but it's easier to define here...
@@ -43,6 +41,7 @@
 #define ABORT_ON_ILLEGAL_INSTRUCTIONS
 //#define ABORT_ON_OFFICIAL_ILLEGAL_INSTRUCTION
 #define CPU_DEBUG_MEMORY
+//#define LOG_CD_BIOS_CALLS
 
 // Private function prototypes
 
@@ -67,6 +66,8 @@ uint32 jaguarMainROMCRC32, jaguarROMSize, jaguarRunAddress;
 bool BIOSLoaded = false;
 bool CDBIOSLoaded = false;
 
+uint32 * backbuffer;
+
 #ifdef CPU_DEBUG_MEMORY
 uint8 writeMemMax[0x400000], writeMemMin[0x400000];
 uint8 readMem[0x400000];
@@ -243,6 +244,8 @@ if (m68kPC == 0x802058) start = true;
 		WriteLog("--> [Calling BusWrite2] D2: %08X\n", m68k_get_reg(NULL, M68K_REG_D2));
 //		m68k_set_reg(M68K_REG_D2, 0x12345678);
 	}//*/
+
+#ifdef LOG_CD_BIOS_CALLS
 /*
 CD_init::	-> $3000
 BIOS_VER::	-> $3004
@@ -308,7 +311,8 @@ CD_switch::	-> $306C
 		WriteLog("\t\tA0=%08X, A1=%08X, D0=%08X, D1=%08X, D2=%08X\n",
 			m68k_get_reg(NULL, M68K_REG_A0), m68k_get_reg(NULL, M68K_REG_A1),
 			m68k_get_reg(NULL, M68K_REG_D0), m68k_get_reg(NULL, M68K_REG_D1), m68k_get_reg(NULL, M68K_REG_D2));
-//*/
+#endif
+
 #ifdef ABORT_ON_ILLEGAL_INSTRUCTIONS
 	if (!m68k_is_valid_instruction(m68k_read_memory_16(m68kPC), M68K_CPU_TYPE_68000))
 	{
@@ -1511,8 +1515,8 @@ void RenderCallback(void);
 //extern uint32 * backbuffer;
 void JaguarReset(void)
 {
-//NOTE: This causes a (virtual) crash if this is set in the config but not found... !!! FIX !!!
-	if (vjs.useJaguarBIOS)
+	// Only use the system BIOS if it's available...!
+	if (vjs.useJaguarBIOS && (biosAvailable & (BIOS_NORMAL | BIOS_STUB1 | BIOS_STUB2)))
 		memcpy(jaguarMainRAM, jaguarBootROM, 8);
 	else
 		SET32(jaguarMainRAM, 4, jaguarRunAddress);
@@ -1909,7 +1913,7 @@ void ScanlineCallback(void)
 // This isn't currently used, but maybe it should be...
 void RenderCallback(void)
 {
-	RenderBackbuffer();
+//	RenderBackbuffer();
 	TOMResetBackbuffer(backbuffer);
 //	SetCallbackTime(RenderCallback, 33303.082);	// # Scanlines * scanline time
 	SetCallbackTime(RenderCallback, 16651.541);	// # Scanlines * scanline time