Some code cleanup and dead code removal.

zsnes/src/gui/guimisc.inc

@@ -503,29 +503,14 @@ NEWSYM GUIDoReset
 .skipfileend
     pushad
     call RestoreSystemVars
-    call clearSPCRAM
     popad
 
-    ; clear dsp ram
-    xor al,al
-    mov edi,DSPMem
-    mov ecx,256
-    rep stosb
-
     ; reset the snes
     call init65816
     pushad
     call procexecloop
     popad
 
-    mov eax,spcRam
-    mov edx,0EFh
-.loop
-    mov byte[eax],0
-    inc eax
-    dec edx
-    jnz .loop
-
     xor eax,eax
     mov edx,spcRam
     mov ax,0FFC9h

zsnes/src/init.asm

@@ -62,12 +62,12 @@ EXTSYM BackState
 EXTSYM FIRTAPVal0,FIRTAPVal1,FIRTAPVal2,FIRTAPVal3,FIRTAPVal4
 EXTSYM FIRTAPVal5,FIRTAPVal6,FIRTAPVal7,INTEnab,JoyAPos,JoyBPos
 EXTSYM NMIEnab,SPCROM,VIRQLoc,coladdb,coladdg,coladdr,doirqnext
-EXTSYM echobuf,forceblnk,nmiprevaddrh,nmiprevaddrl,nmiprevline
+EXTSYM forceblnk,nmiprevaddrh,nmiprevaddrl,nmiprevline
 EXTSYM nmirept,nmistatus,opexec268,opexec268b,opexec268cph
 EXTSYM opexec268cphb,opexec358,opexec358b,opexec358cph,spcextraram
 EXTSYM opexec358cphb,prevoamptr,reg1read,reg2read,reg3read
-EXTSYM reg4read,resolutn,romdata,scrndis,spcBuffera,spcP,spcRam
+EXTSYM reg4read,resolutn,romdata,scrndis,spcP,spcRam
-EXTSYM spcnumread,spchalted,tableD,timeron,vidbright,DSPMem,OldGfxMode2
+EXTSYM spcnumread,spchalted,tableD,timeron,vidbright,OldGfxMode2
 EXTSYM SPC700read,SPC700write,GUIDoReset,spc700read, GUIReset
 EXTSYM InitC4,SA1Reset,SetAddressingModesSA1,SetAddressingModes,SDD1BankA,SPC7110init
 EXTSYM RTCinit,InitOBC
@@ -1440,26 +1440,9 @@ NEWSYM init65816
     ; Clear SPC Memory
     pushad
     call clearSPCRAM
+    call clearvidsound
     popad
 
-    ; Clear Sound buffer
-    mov edi,[spcBuffera]
-    mov ecx,65536
-    xor eax,eax
-    rep stosd
-
-    ; Clear Echo buffer
-    mov edi,echobuf
-    mov ecx,25000
-    xor eax,eax
-    rep stosd
-
-    ; Clear DSPMem
-    mov edi,DSPMem
-    mov ecx,64
-    xor eax,eax
-    rep stosd
-
     mov byte[prevoamptr],0FFh
     mov byte[disablehdma],0
     mov byte[disableeffects],0
@@ -1585,9 +1568,6 @@ NEWSYM init65816
     mov dword[ram7fa+65528],01010101h
     mov dword[ram7fa+65532],01010101h
 .notbsx2
-    pushad
-    call clearvidsound
-    popad
     mov dword[wramreadptr],getwram1fff
     mov dword[wramwriteptr],setwram1fff
     ret

zsnes/src/initc.c

@@ -1338,6 +1338,9 @@ extern unsigned char BRRBuffer[32];
 extern unsigned char echoon0;
 extern unsigned int PHdspsave;
 extern unsigned int PHdspsave2;
+unsigned char echobuf[90000];
+extern unsigned char *spcBuffera;
+extern unsigned char DSPMem[256];
 
 void clearvidsound()
 {
@@ -1347,6 +1350,9 @@ void clearvidsound()
   memset(vidmemch8, 0, 4096);
   memset(&BRRBuffer, 0, PHdspsave);
   memset(&echoon0, 0, PHdspsave2);
+  memset(echobuf, 0, 90000);
+  memset(spcBuffera, 0, 65536*4+4096);
+  memset(DSPMem, 0, 256);
 }
 
 /*

zsnes/src/ui.asm

@@ -328,9 +328,6 @@ NEWSYM regptwa,     resb 49152
 
 NEWSYM fulladdtab, resw 65536
 
-; init.asm
-NEWSYM echobuf,       resb 90000
-
 ; dspproc.asm
 
 NEWSYM spcRamcmp, resb 65536