X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdsp.cpp;h=7a0553f292b6c432a8daaa80b56c51daf88e7ef5;hb=d4731454394b78afceb79046c1917e9049a09374;hp=3ab0b6246808b6885637f1b3722ad896f7fe9981;hpb=576a7bd6373a53d9cff6a7bb88334429469e0751;p=virtualjaguar

diff --git a/src/dsp.cpp b/src/dsp.cpp
index 3ab0b62..7a0553f 100644
--- a/src/dsp.cpp
+++ b/src/dsp.cpp
@@ -25,16 +25,10 @@
 #include "jaguar.h"
 #include "jerry.h"
 #include "log.h"
-#include "m68k.h"
+#include "m68000/m68kinterface.h"
 //#include "memory.h"
 
 
-#ifdef __GCCWIN32__
-// Apparently on win32, they left of the last little bits of these. So let's do this:
-#define random rand
-#define srandom srand
-#endif
-
 // Seems alignment in loads & stores was off...
 #define DSP_CORRECT_ALIGNMENT
 //#define DSP_CORRECT_ALIGNMENT_STORE
@@ -630,12 +624,9 @@ uint32 DSPReadLong(uint32 offset, uint32 who/*=UNKNOWN*/)
 		offset &= 0x3F;
 		switch (offset)
 		{
-		case 0x00:	/*dsp_flag_c?(dsp_flag_c=1):(dsp_flag_c=0);
-					dsp_flag_z?(dsp_flag_z=1):(dsp_flag_z=0);
-					dsp_flag_n?(dsp_flag_n=1):(dsp_flag_n=0);*/
-
-					dsp_flags = (dsp_flags & 0xFFFFFFF8) | (dsp_flag_n << 2) | (dsp_flag_c << 1) | dsp_flag_z;
-					return dsp_flags & 0xFFFFC1FF;
+		case 0x00:
+			dsp_flags = (dsp_flags & 0xFFFFFFF8) | (dsp_flag_n << 2) | (dsp_flag_c << 1) | dsp_flag_z;
+			return dsp_flags & 0xFFFFC1FF;
 		case 0x04: return dsp_matrix_control;
 		case 0x08: return dsp_pointer_to_matrix;
 		case 0x0C: return dsp_data_organization;
@@ -731,19 +722,22 @@ SET16(ram2, offset, data);
 		if ((offset & 0x1C) == 0x1C)
 		{
 			if (offset & 0x03)
-				dsp_div_control = (dsp_div_control&0xffff0000)|(data&0xffff);
+				dsp_div_control = (dsp_div_control & 0xFFFF0000) | (data & 0xFFFF);
 			else
-				dsp_div_control = (dsp_div_control&0xffff)|((data&0xffff)<<16);
+				dsp_div_control = (dsp_div_control & 0xFFFF) | ((data & 0xFFFF) << 16);
 		}
 		else
 		{
-			uint32 old_data = DSPReadLong(offset & 0xffffffc, who);
+			uint32 old_data = DSPReadLong(offset & 0xFFFFFFC, who);
+
 			if (offset & 0x03)
-				old_data = (old_data&0xffff0000)|(data&0xffff);
+				old_data = (old_data & 0xFFFF0000) | (data & 0xFFFF);
 			else
-				old_data = (old_data&0xffff)|((data&0xffff)<<16);
-			DSPWriteLong(offset & 0xffffffc, old_data, who);
+				old_data = (old_data & 0xFFFF) | ((data & 0xFFFF) << 16);
+
+			DSPWriteLong(offset & 0xFFFFFFC, old_data, who);
 		}
+
 		return;
 	}
 
@@ -790,7 +784,9 @@ SET32(ram2, offset, data);
 #endif
 //			bool IMASKCleared = (dsp_flags & IMASK) && !(data & IMASK);
 			IMASKCleared = (dsp_flags & IMASK) && !(data & IMASK);
-			dsp_flags = data;
+			// NOTE: According to the JTRM, writing a 1 to IMASK has no effect; only the
+			//       IRQ logic can set it. So we mask it out here to prevent problems...
+			dsp_flags = data & (~IMASK);
 			dsp_flag_z = dsp_flags & 0x01;
 			dsp_flag_c = (dsp_flags >> 1) & 0x01;
 			dsp_flag_n = (dsp_flags >> 2) & 0x01;
@@ -820,6 +816,9 @@ SET32(ram2, offset, data);
 // IRQs on J_INT ($F10020), you don't have to run an I2S interrupt on the DSP. Also,
 // It seems that it's only stable for values of SCLK <= 9.
 
+// All of the preceeding is moot now; we run the DSP in the host audio IRQ. This means
+// that we don't actually need this stuff anymore. :-D
+#if 0
 			if (data & INT_ENA1) // I2S interrupt
 			{
 				int freq = GetCalculatedFrequency();
@@ -834,6 +833,7 @@ SET32(ram2, offset, data);
 //				WriteLog("DSP: Setting audio freqency to %u Hz...\n", freq);
 				DACSetNewFrequency(freq);
 			}
+#endif
 
 /*			if (IMASKCleared)						// If IMASK was cleared,
 #ifdef DSP_DEBUG_IRQ
@@ -1286,6 +1286,11 @@ DSPHandleIRQsNP();
 //	GPUSetIRQLine(GPUIRQ_DSP, ASSERT_LINE);
 }
 
+bool DSPIsRunning(void)
+{
+	return (DSP_RUNNING ? true : false);
+}
+
 void DSPInit(void)
 {
 //	memory_malloc_secure((void **)&dsp_ram_8, 0x2000, "DSP work RAM");
@@ -1294,7 +1299,7 @@ void DSPInit(void)
 
 	dsp_build_branch_condition_table();
 	DSPReset();
-	srandom(time(NULL));							// For randomizing local RAM
+	srand(time(NULL));							// For randomizing local RAM
 }
 
 void DSPReset(void)
@@ -1325,7 +1330,7 @@ void DSPReset(void)
 	// Contents of local RAM are quasi-stable; we simulate this by randomizing RAM contents
 	for(uint32 i=0; i<8192; i+=4)
 	{
-		*((uint32 *)(&dsp_ram_8[i])) = random();
+		*((uint32 *)(&dsp_ram_8[i])) = rand();
 	}
 }