# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1224100668 18000
# Node ID f2c62b0fc3ba61e65d0665ff27add336fb24ab9f
# Parent  eb29c6fbdeb3d53bb5de37e0944993039e901aaf
Start on line-level output model, not unlike upse.

diff -r eb29c6fbdeb3 -r f2c62b0fc3ba src/psf2/peops2/spu.c
--- a/src/psf2/peops2/spu.c	Wed Oct 15 14:41:46 2008 -0500
+++ b/src/psf2/peops2/spu.c	Wed Oct 15 14:57:48 2008 -0500
@@ -118,7 +118,6 @@
 // user settings          
 
 int             iUseXA=0;
-int             iVolume=3;
 int             iXAPitch=1;
 int             iUseTimer=2;
 int             iSPUIRQWait=1;
@@ -369,7 +368,7 @@
 
 static void *MAINThread(int samp2run, void *data)
 {
- int s_1,s_2,fa,voldiv=iVolume;
+ int s_1,s_2,fa;
  unsigned char * start;unsigned int nSample;
  int ch,predict_nr,shift_factor,flags,d,d2,s;
  int gpos,bIRQReturn=0;
@@ -735,8 +734,8 @@
     SSumR[0]+=MixREVERBRight(0);
     SSumR[0]+=MixREVERBRight(1);
                                               
-    d=SSumL[0]/voldiv;SSumL[0]=0;
-    d2=SSumR[0]/voldiv;SSumR[0]=0;
+    d=SSumL[0];SSumL[0]=0;
+    d2=SSumR[0];SSumR[0]=0;
 
     if(d<-32767) d=-32767;if(d>32767) d=32767;
     if(d2<-32767) d2=-32767;if(d2>32767) d2=32767;
@@ -925,7 +924,6 @@
  if(bSPUIsOpen) return 0;                              // security for some stupid main emus
 
  iUseXA=0;                                             // just small setup
- iVolume=3;
  bEndThread=0;
  bThreadEnded=0;
  spuMemC=(unsigned char *)spuMem;      
diff -r eb29c6fbdeb3 -r f2c62b0fc3ba src/psf2/psx_hw.c
--- a/src/psf2/psx_hw.c	Wed Oct 15 14:41:46 2008 -0500
+++ b/src/psf2/psx_hw.c	Wed Oct 15 14:57:48 2008 -0500
@@ -236,6 +236,10 @@
 static uint32 dma4_cb, dma7_cb, dma4_fval, dma4_flag, dma7_fval, dma7_flag;
 static uint32 irq9_cb, irq9_fval, irq9_flag;
 
+#if DEBUG_THREADING
+static int wakecount = 0;
+#endif
+
 // take a snapshot of the CPU state for a thread
 static void FreezeThread(int32 iThread, int flag)
 {
@@ -277,8 +281,6 @@
 	{
 		char buffer[256];
 
-		DasmMIPS(buffer, mipsinfo.i, &psx_ram[(mipsinfo.i & 0x7fffffff)/4]);
-
 		printf("IOP: FreezeThread(%d) => %08x  [%s]\n", iThread, threads[iThread].save_regs[34], buffer);
 	}
 	#endif
@@ -318,7 +320,6 @@
 		char buffer[256];
 
 		mips_get_info(CPUINFO_INT_PC, &mipsinfo);
-		DasmMIPS(buffer, mipsinfo.i, &psx_ram[(mipsinfo.i & 0x7fffffff)/4]);
 
 		printf("IOP: ThawThread(%d) => %08x  [%s] (wake %d)\n", iThread, threads[iThread].save_regs[34], buffer, wakecount);
 	}