Cleanup and fixes for spc700 fixes.

zsnes/src/gblvars.h

@@ -29,13 +29,13 @@ extern unsigned int cycpbl, PH65816regsize;
 extern unsigned int *wramdata, *vram, PHspcsave, PHdspsave, *C4Ram, *sfxramdata;
 extern unsigned int PHnum2writesa1reg, SA1Mode, prevedi, SA1xpc, sa1dmaptr;
 extern unsigned int soundcycleft, spc700read, timer2upd, xa, PHnum2writesfxreg;
-extern unsigned int spcnumread, spchalted, opcd, HIRQCycNext, oamaddr;
+extern unsigned int opcd, HIRQCycNext, oamaddr;
 extern unsigned int SfxR0, *setaramdata, ramsize, *sram;
 extern unsigned int tempesi, tempedi, tempedx, tempebp;
 extern unsigned int SPCMultA, PHnum2writespc7110reg, PHdspsave2;
 extern unsigned char sndrot, SPCRAM[65472], DSPMem[256], SA1Status, *SA1RAMArea;
 extern unsigned char DSP1Type, DSP1COp, prevoamptr, BRRBuffer[32], *romdata;
-extern unsigned char curcyc, echoon0;
+extern unsigned char curcyc, echoon0, spcnumread;
 extern unsigned char vidmemch4[4096], vidmemch8[4096], vidmemch2[4096];
 
 extern bool C4Enable, SFXEnable, SA1Enable, SPC7110Enable, SETAEnable, spcon;

zsnes/src/gui/gui.asm

@@ -88,7 +88,7 @@ EXTSYM Close_File,Write_File,Create_File,File_Seek,File_Seek_End,Get_Date
 EXTSYM Check_Key,Get_Key,Change_Drive,Change_Single_Dir,Change_Dir,Get_Dir
 EXTSYM Get_First_Entry,Get_Next_Entry,Set_DTA_Address,curexecstate,TripBufAvail
 EXTSYM nmiprevaddrl,nmiprevaddrh,nmirept,nmiprevline,nmistatus,spcnumread
-EXTSYM spchalted,NextLineCache,ResetTripleBuf,GUINGVID,ScanCodeListing
+EXTSYM NextLineCache,ResetTripleBuf,GUINGVID,ScanCodeListing
 EXTSYM AdjustFrequency,GUISaveVars,Init_Mouse,Get_MouseData,Set_MouseXMax
 EXTSYM Set_MouseYMax,Set_MousePosition,Get_MousePositionDisplacement,GUIInit
 EXTSYM GUIDeInit,SpecialLine,DrawWater,DrawBurn,SA1Enable,SA1RAMArea

zsnes/src/gui/guiload.inc

@@ -233,8 +233,7 @@ GUIloadfilename:
     mov dword[nmirept],0
     mov dword[nmiprevline],224
     mov dword[nmistatus],0
-    mov dword[spcnumread],0
-    mov dword[spchalted],-1
+    mov byte[spcnumread],0
     mov byte[NextLineCache],0
     mov byte[curexecstate],1
 

zsnes/src/gui/guimouse.inc

@@ -2801,7 +2801,7 @@ DisplayGameOptnsClick:
 %ifndef __MSDOS__
     DGOptnsProcBox 78,140,[KeyDisplayBatt]
 %endif
-    
+
     DGOptnsProcBox 191,100,[KeyNewGfxSwt]
     DGOptnsProcBox 191,110,[KeyWinDisble]
     DGOptnsProcBox 191,120,[KeyOffsetMSw]

zsnes/src/gui/guiwindp.inc

@@ -2750,7 +2750,7 @@ DisplayGameOptns:        ; Misc Key Window
 %ifndef __MSDOS__
     GUIDisplayText 9,9,142,GUIGameOptnsTextD1e
 %endif
-    
+
     GUIDisplayTextY 9,119,93,GUIGameOptnsTextD2
     GUIDisplayText 9,122,102,GUIGameOptnsTextD2a
     GUIDisplayText 9,122,112,GUIGameOptnsTextD2b
@@ -2789,7 +2789,7 @@ DisplayGameOptns:        ; Misc Key Window
 %ifndef __MSDOS__
     DDrawBox 9,77,139,[KeyDisplayBatt]
 %endif
-    
+
     DDrawBox 9,190,99,[KeyNewGfxSwt]
     DDrawBox 9,190,109,[KeyWinDisble]
     DDrawBox 9,190,119,[KeyOffsetMSw]

zsnes/src/init.asm

@@ -48,7 +48,7 @@ EXTSYM forceblnk,nmiprevaddrh,nmiprevaddrl,nmiprevline,nmirept,nmistatus
 EXTSYM opexec268,opexec268b,opexec268cph,opexec268cphb,opexec358,opexec358b
 EXTSYM opexec358cph,spcextraram,opexec358cphb,prevoamptr,reg1read,reg2read
 EXTSYM reg3read,reg4read,resolutn,romdata,scrndis,spcP,SPCRAM,spcnumread
-EXTSYM spchalted,tableD,timeron,vidbright,SPC700read,SPC700write,spc700read
+EXTSYM tableD,timeron,vidbright,SPC700read,SPC700write,spc700read
 EXTSYM GUIReset,InitC4,SA1Reset,SetAddressingModesSA1,SDD1BankA,SPC7110init
 EXTSYM RTCinit,InitOBC,memaccessspc7110r8,memaccessspc7110r16,memaccessspc7110w8
 EXTSYM memaccessspc7110w16,ram7f,snesmap2,snesmmap,MultiTap,memaccessbankr848mb
@@ -1172,8 +1172,7 @@ NEWSYM init65816
     mov byte[reg3read],0
     mov byte[reg4read],0
     mov dword[cycpbl],0
-    mov dword[spcnumread],0
- mov dword[spchalted],-1
+    mov byte[spcnumread],0
     mov dword[coladdr],0
     mov byte[NMIEnab],1
     mov word[VIRQLoc],0

zsnes/src/initc.c

@@ -1904,7 +1904,7 @@ unsigned int showinfogui()
 }
 
 extern unsigned int nmiprevaddrl, nmiprevaddrh, nmirept, nmiprevline, nmistatus;
-extern unsigned int spcnumread, spchalted;
+extern unsigned char spcnumread;
 extern unsigned char NextLineCache, sramsavedis, sndrot, regsbackup[3019];
 extern unsigned char yesoutofmemory, fnames[512];
 
@@ -1994,7 +1994,7 @@ void CheckROMType()
   // Setup DSP-X stuff
   DSP1Type = 0;
 
-  if (DSP1Enable || DSP2Enable || DSP3Enable)
+  if (DSP1Enable || DSP2Enable)
   {
     if (DSP2Enable)
     {
@@ -2005,7 +2005,15 @@ void CheckROMType()
 
     DSP1Type = (romtype == 2) ? 2 : 1;
   }
+/*
+  if (DSP3Enable)
+  {
+    InitDSP3();
 
+    // DSP-3 mapping, banks 20 - 3F
+    map_mem(0x20, &dsp3bank, 0x20);
+  }
+*/
   if (DSP4Enable)
   {
     InitDSP4();
@@ -2208,7 +2216,6 @@ void powercycle(bool sramload)
   nmiprevline = 224;
   nmistatus = 0;
   spcnumread = 0;
-  spchalted = ~0;
   NextLineCache = 0;
   curexecstate = 1;
 

zsnes/src/zmovie.c

@@ -2134,7 +2134,6 @@ static void OldMoviePlay(FILE *fp)
     nmiprevline = 224;
     nmistatus = 0;
     spcnumread = 0;
-    spchalted = 0xFFFFFFFF;
     NextLineCache = 0;
   }
 

zsnes/src/zstate.c

@@ -72,8 +72,7 @@ static void copy_extra_data(unsigned char **buffer, void (*copy_func)(unsigned c
   copy_func(buffer, &spc700read, 10*4);
   copy_func(buffer, &timer2upd, 1*4);
   copy_func(buffer, &xa, 14*4);
-  copy_func(buffer, &spcnumread, 4);
-  copy_func(buffer, &spchalted, 4);
+  copy_func(buffer, &spcnumread, 1);
   copy_func(buffer, &opcd, 6*4);
   copy_func(buffer, &HIRQCycNext, 5);
   copy_func(buffer, &oamaddr, 14*4);
@@ -758,7 +757,6 @@ bool zst_load(FILE *fp, size_t Compressed)
     prevoamptr = 0xFF;
     ioportval = 0xFF;
     spcnumread = 0;
-    spchalted = 0xFFFFFFFF;
     nexthdma = 0;
   }