X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjaguar.cpp;h=2ad0e969fc89da0799536bd34cd62d66ea5bb1ee;hb=55185aba2676444e7763ef6b374d3c7c57768be8;hp=7f3d3c0d61410e200edb25ab6dce8ac664fa7447;hpb=4a9e75bf88e044c9f24f6d2d5f9858d0b0857cc3;p=virtualjaguar

diff --git a/src/jaguar.cpp b/src/jaguar.cpp
index 7f3d3c0..2ad0e96 100644
--- a/src/jaguar.cpp
+++ b/src/jaguar.cpp
@@ -40,10 +40,6 @@ extern int effect_start2, effect_start3, effect_start4, effect_start5, effect_st
 char * whoName[9] =
 	{ "Unknown", "Jaguar", "DSP", "GPU", "TOM", "JERRY", "M68K", "Blitter", "OP" };
 
-// These values are overridden by command line switches...
-
-//extern bool dsp_enabled;
-//extern bool jaguar_use_bios;						// Default is now to USE the BIOS
 uint32 jaguar_active_memory_dumps = 0;
 
 uint32 jaguar_mainRom_crc32;
@@ -51,12 +47,16 @@ uint32 jaguar_mainRom_crc32;
 /*static*/ uint8 * jaguar_mainRam = NULL;
 /*static*/ uint8 * jaguar_bootRom = NULL;
 /*static*/ uint8 * jaguar_mainRom = NULL;
+
 #ifdef CPU_DEBUG_MEMORY
 uint8 writeMemMax[0x400000], writeMemMin[0x400000];
 uint8 readMem[0x400000];
 uint32 returnAddr[4000], raPtr = 0xFFFFFFFF;
 #endif
 
+uint32 pcQueue[0x400];
+uint32 pcQPtr = 0;
+
 //
 // Callback function to detect illegal instructions
 //
@@ -65,6 +65,34 @@ uint32 returnAddr[4000], raPtr = 0xFFFFFFFF;
 void M68KInstructionHook(void)
 {
 	uint32 m68kPC = m68k_get_reg(NULL, M68K_REG_PC);
+
+// For tracebacks...
+// Ideally, we'd save all the registers as well...
+	pcQueue[pcQPtr++] = m68kPC;
+	pcQPtr &= 0x3FF;
+
+	if (m68kPC & 0x01)		// Oops! We're fetching an odd address!
+	{
+		WriteLog("M68K: Attempted to execute from an odd adress!\n\nBacktrace:\n\n");
+
+		static char buffer[2048];
+		for(int i=0; i<0x400; i++)
+		{
+			m68k_disassemble(buffer, pcQueue[(pcQPtr + i) & 0x3FF], M68K_CPU_TYPE_68000);
+			WriteLog("\t%08X: %s\n", pcQueue[(pcQPtr + i) & 0x3FF], buffer);
+		}
+		WriteLog("\n");
+
+		uint32 topOfStack = m68k_get_reg(NULL, M68K_REG_A7);
+		WriteLog("M68K: Top of stack: %08X. Stack trace:\n", JaguarReadLong(topOfStack));
+		for(int i=0; i<10; i++)
+			WriteLog("%06X: %08X\n", topOfStack - (i * 4), JaguarReadLong(topOfStack - (i * 4)));
+		WriteLog("Jaguar: VBL interrupt is %s\n", ((tom_irq_enabled(IRQ_VBLANK)) && (jaguar_interrupt_handler_is_valid(64))) ? "enabled" : "disabled");
+		M68K_show_context();
+		log_done();
+		exit(0);
+	}
+
 /*	if (m68kPC >= 0x807EC4 && m68kPC <= 0x807EDB)
 	{
 		static char buffer[2048];
@@ -642,6 +670,13 @@ uint32 JaguarReadLong(uint32 offset, uint32 who/*=UNKNOWN*/)
 // We really should re-do this so that it does *real* 32-bit access... !!! FIX !!!
 void JaguarWriteLong(uint32 offset, uint32 data, uint32 who/*=UNKNOWN*/)
 {
+/*	extern bool doDSPDis;
+	if (offset < 0x400 && !doDSPDis)
+	{
+		WriteLog("JLW: Write to %08X by %s... Starting DSP log!\n\n", offset, whoName[who]);
+		doDSPDis = true;
+	}//*/
+
 	JaguarWriteWord(offset, data >> 16, who);
 	JaguarWriteWord(offset+2, data & 0xFFFF, who);
 }
@@ -854,7 +889,7 @@ if (effect_start)
 				m68k_set_irq(7);
 			}
 		}
-		
+
 //		uint32 invalid_instruction_address = s68000exec(M68KCyclesPerScanline);
 //		if (invalid_instruction_address != 0x80000000)
 //			cd_bios_process(invalid_instruction_address);
@@ -867,9 +902,11 @@ if (effect_start)
 		gpu_exec(RISCCyclesPerScanline);
 
 		if (vjs.DSPEnabled)
-//			DSPExec(RISCCyclesPerScanline);
-// Do pipelined DSP execution...
-			DSPExecP3(RISCCyclesPerScanline);
+			if (vjs.usePipelinedDSP)
+				DSPExecP2(RISCCyclesPerScanline);	// Pipelined DSP execution (3 stage)...
+			else
+				DSPExec(RISCCyclesPerScanline);		// Ordinary non-pipelined DSP
+//			DSPExecComp(RISCCyclesPerScanline);		// Comparison core
 
 		TOMExecScanline(i, render);
 	}