From 2b11045ac93bf8dc8898d8fac261706f7236481b Mon Sep 17 00:00:00 2001 From: pagefault <> Date: Mon, 1 Apr 2002 14:49:05 +0000 Subject: [PATCH] Code cleanup --- zsnes/src/cpu/dsp.asm | 190 ------------------------------------- zsnes/src/cpu/execute.asm | 7 +- zsnes/src/gui/gui.asm | 2 +- zsnes/src/gui/guimouse.inc | 26 +---- 4 files changed, 3 insertions(+), 222 deletions(-) diff --git a/zsnes/src/cpu/dsp.asm b/zsnes/src/cpu/dsp.asm index 6344f38a..a3c5e540 100644 --- a/zsnes/src/cpu/dsp.asm +++ b/zsnes/src/cpu/dsp.asm @@ -67,21 +67,6 @@ identcode db 255,1,78,78 mov [DSPMem+00h+%1],al %endmacro -NEWSYM initrevst - cmp byte[RevStereo],0 -; jne .norev - ret -.norev - initrevsthelp 00h - initrevsthelp 10h - initrevsthelp 20h - initrevsthelp 30h - initrevsthelp 40h - initrevsthelp 50h - initrevsthelp 60h - initrevsthelp 70h - ret - ALIGN32 NEWSYM DSPMem, times 256 db 0 @@ -89,22 +74,12 @@ NEWSYM DSPMem, times 256 db 0 ;Read DSP Registers functions NEWSYM RDSPReg00 ; Voice 0 Volume Left -; cmp byte[RevStereo],1 -; je .rev mov al,[DSPMem+00h] ret -.rev - mov al,[DSPMem+01h] - ret NEWSYM RDSPReg01 ; Voice 0 Volume Right -; cmp byte[RevStereo],1 -; je .rev mov al,[DSPMem+01h] ret -.rev - mov al,[DSPMem+00h] - ret NEWSYM RDSPReg02 ; Voice 0 Pitch Low mov al,[DSPMem+02h] @@ -164,22 +139,12 @@ NEWSYM RDSPReg0F ; Voice 0 Echo coefficient ret NEWSYM RDSPReg10 ; Voice 1 Volume Left -; cmp byte[RevStereo],1 -; je .rev mov al,[DSPMem+10h] ret -.rev - mov al,[DSPMem+11h] - ret NEWSYM RDSPReg11 ; Voice 1 Volume Right -; cmp byte[RevStereo],1 -; je .rev mov al,[DSPMem+11h] ret -.rev - mov al,[DSPMem+10h] - ret NEWSYM RDSPReg12 ; Voice 1 Pitch Low mov al,[DSPMem+012h] @@ -239,22 +204,12 @@ NEWSYM RDSPReg1F ; Voice 1 Echo coefficient ret NEWSYM RDSPReg20 ; Voice 2 Volume Left -; cmp byte[RevStereo],1 -; je .rev mov al,[DSPMem+20h] ret -.rev - mov al,[DSPMem+21h] - ret NEWSYM RDSPReg21 ; Voice 2 Volume Right -; cmp byte[RevStereo],1 -; je .rev mov al,[DSPMem+21h] ret -.rev - mov al,[DSPMem+20h] - ret NEWSYM RDSPReg22 ; Voice 2 Pitch Low mov al,[DSPMem+022h] @@ -314,22 +269,12 @@ NEWSYM RDSPReg2F ; Voice 2 Echo coefficient ret NEWSYM RDSPReg30 ; Voice 3 Volume Left -; cmp byte[RevStereo],1 -; je .rev mov al,[DSPMem+30h] ret -.rev - mov al,[DSPMem+31h] - ret NEWSYM RDSPReg31 ; Voice 3 Volume Right -; cmp byte[RevStereo],1 -; je .rev mov al,[DSPMem+31h] ret -.rev - mov al,[DSPMem+30h] - ret NEWSYM RDSPReg32 ; Voice 3 Pitch Low mov al,[DSPMem+032h] @@ -389,22 +334,12 @@ NEWSYM RDSPReg3F ; Voice 3 Echo coefficient ret NEWSYM RDSPReg40 ; Voice 4 Volume Left -; cmp byte[RevStereo],1 -; je .rev mov al,[DSPMem+40h] ret -.rev - mov al,[DSPMem+41h] - ret NEWSYM RDSPReg41 ; Voice 4 Volume Right -; cmp byte[RevStereo],1 -; je .rev mov al,[DSPMem+41h] ret -.rev - mov al,[DSPMem+40h] - ret NEWSYM RDSPReg42 ; Voice 4 Pitch Low mov al,[DSPMem+042h] @@ -464,22 +399,12 @@ NEWSYM RDSPReg4F ; Voice 4 Echo coefficient ret NEWSYM RDSPReg50 ; Voice 5 Volume Left -; cmp byte[RevStereo],1 -; je .rev mov al,[DSPMem+50h] ret -.rev - mov al,[DSPMem+51h] - ret NEWSYM RDSPReg51 ; Voice 5 Volume Right -; cmp byte[RevStereo],1 -; je .rev mov al,[DSPMem+51h] ret -.rev - mov al,[DSPMem+50h] - ret NEWSYM RDSPReg52 ; Voice 5 Pitch Low mov al,[DSPMem+052h] @@ -539,22 +464,12 @@ NEWSYM RDSPReg5F ; Voice 5 Echo coefficient ret NEWSYM RDSPReg60 ; Voice 6 Volume Left -; cmp byte[RevStereo],1 -; je .rev mov al,[DSPMem+60h] ret -.rev - mov al,[DSPMem+61h] - ret NEWSYM RDSPReg61 ; Voice 6 Volume Right -; cmp byte[RevStereo],1 -; je .rev mov al,[DSPMem+61h] ret -.rev - mov al,[DSPMem+60h] - ret NEWSYM RDSPReg62 ; Voice 6 Pitch Low mov al,[DSPMem+062h] @@ -614,22 +529,12 @@ NEWSYM RDSPReg6F ; Voice 6 Echo coefficient ret NEWSYM RDSPReg70 ; Voice 7 Volume Left -; cmp byte[RevStereo],1 -; je .rev mov al,[DSPMem+70h] ret -.rev - mov al,[DSPMem+71h] - ret NEWSYM RDSPReg71 ; Voice 7 Volume Right -; cmp byte[RevStereo],1 -; je .rev mov al,[DSPMem+71h] ret -.rev - mov al,[DSPMem+70h] - ret NEWSYM RDSPReg72 ; Voice 7 Pitch Low mov al,[DSPMem+072h] @@ -1719,15 +1624,9 @@ NEWSYM WDSPReg0C ; Voice 0 mov al,[VolumeTableb+eax] mov ah,[MusicVol] mov al,[VolumeConvTable+eax*2] -; cmp byte[RevStereo],1 -; je .rev mov [GlobalVL],al pop eax ret -.rev - mov [GlobalVR],al - pop eax - ret NEWSYM WDSPReg0D ; Echo Feedback mov [DSPMem+0Dh],al @@ -1751,22 +1650,12 @@ NEWSYM WDSPReg0F ; Voice 0 Echo coefficient ret NEWSYM WDSPReg10 ; Voice 1 Volume Left -; cmp byte[RevStereo],1 -; je .rev mov [DSPMem+10h],al ret -.rev - mov [DSPMem+11h],al - ret NEWSYM WDSPReg11 ; Voice 1 Volume Right -; cmp byte[RevStereo],1 -; je .rev mov [DSPMem+11h],al ret -.rev - mov [DSPMem+10h],al - ret NEWSYM WDSPReg12 ; Voice 1 Pitch Low mov [DSPMem+012h],al @@ -1815,15 +1704,9 @@ NEWSYM WDSPReg1C ; Voice 1 mov al,[VolumeTableb+eax] mov ah,[MusicVol] mov al,[VolumeConvTable+eax*2] -; cmp byte[RevStereo],1 -; je .rev mov [GlobalVR],al pop eax ret -.rev - mov [GlobalVL],al - pop eax - ret NEWSYM WDSPReg1D ; Voice 1 mov [DSPMem+01Dh],al @@ -1842,22 +1725,12 @@ NEWSYM WDSPReg1F ; Voice 1 Echo coefficient ret NEWSYM WDSPReg20 ; Voice 2 Volume Left -; cmp byte[RevStereo],1 -; je .rev mov [DSPMem+20h],al ret -.rev - mov [DSPMem+21h],al - ret NEWSYM WDSPReg21 ; Voice 2 Volume Right -; cmp byte[RevStereo],1 -; je .rev mov [DSPMem+21h],al ret -.rev - mov [DSPMem+20h],al - ret NEWSYM WDSPReg22 ; Voice 2 Pitch Low mov [DSPMem+022h],al @@ -1906,15 +1779,9 @@ NEWSYM WDSPReg2C ; Voice 2 mov al,[VolumeTableb+eax] mov ah,[MusicVol] mov al,[VolumeConvTable+eax*2] -; cmp byte[RevStereo],1 -; je .rev mov [EchoVL],al pop eax ret -.rev - mov [EchoVR],al - pop eax - ret NEWSYM WDSPReg2D ; Voice 2 mov [DSPMem+02Dh],al @@ -1933,22 +1800,12 @@ NEWSYM WDSPReg2F ; Voice 2 Echo coefficient ret NEWSYM WDSPReg30 ; Voice 3 Volume Left -; cmp byte[RevStereo],1 -; je .rev mov [DSPMem+30h],al ret -.rev - mov [DSPMem+31h],al - ret NEWSYM WDSPReg31 ; Voice 3 Volume Right -; cmp byte[RevStereo],1 -; je .rev mov [DSPMem+31h],al ret -.rev - mov [DSPMem+30h],al - ret NEWSYM WDSPReg32 ; Voice 3 Pitch Low mov [DSPMem+032h],al @@ -1997,15 +1854,9 @@ NEWSYM WDSPReg3C ; Voice 3 mov al,[VolumeTableb+eax] mov ah,[MusicVol] mov al,[VolumeConvTable+eax*2] -; cmp byte[RevStereo],1 -; je .rev mov [EchoVR],al pop eax ret -.rev - mov [EchoVL],al - pop eax - ret NEWSYM WDSPReg3D ; Voice 3 mov byte [Voice0Noise],0 @@ -2064,22 +1915,12 @@ NEWSYM WDSPReg3F ; Voice 3 Echo coefficient ret NEWSYM WDSPReg40 ; Voice 4 Volume Left -; cmp byte[RevStereo],1 -; je .rev mov [DSPMem+40h],al ret -.rev - mov [DSPMem+41h],al - ret NEWSYM WDSPReg41 ; Voice 4 Volume Right -; cmp byte[RevStereo],1 -; je .rev mov [DSPMem+41h],al ret -.rev - mov [DSPMem+40h],al - ret NEWSYM WDSPReg42 ; Voice 4 Pitch Low mov [DSPMem+042h],al @@ -2121,7 +1962,6 @@ NEWSYM WDSPReg4B ; Voice 4 mov [DSPMem+04Bh],al ret - NEWSYM WDSPReg4C ; Key On push ebx mov bl,[MuteVoiceF] @@ -2219,22 +2059,12 @@ NEWSYM WDSPReg4F ; Voice 4 Echo coefficient ret NEWSYM WDSPReg50 ; Voice 5 Volume Left -; cmp byte[RevStereo],1 -; je .rev mov [DSPMem+50h],al ret -.rev - mov [DSPMem+51h],al - ret NEWSYM WDSPReg51 ; Voice 5 Volume Right -; cmp byte[RevStereo],1 -; je .rev mov [DSPMem+51h],al ret -.rev - mov [DSPMem+50h],al - ret NEWSYM WDSPReg52 ; Voice 5 Pitch Low mov [DSPMem+052h],al @@ -2354,22 +2184,12 @@ NEWSYM WDSPReg5F ; Voice 5 Echo coefficient ret NEWSYM WDSPReg60 ; Voice 6 Volume Left -; cmp byte[RevStereo],1 -; je .rev mov [DSPMem+60h],al ret -.rev - mov [DSPMem+61h],al - ret NEWSYM WDSPReg61 ; Voice 6 Volume Right -; cmp byte[RevStereo],1 -; je .rev mov [DSPMem+61h],al ret -.rev - mov [DSPMem+60h],al - ret NEWSYM WDSPReg62 ; Voice 6 Pitch Low mov [DSPMem+062h],al @@ -2466,22 +2286,12 @@ NEWSYM WDSPReg6F ; Voice 6 Echo coefficient ret NEWSYM WDSPReg70 ; Voice 7 Volume Left -; cmp byte[RevStereo],1 -; je .rev mov [DSPMem+70h],al ret -.rev - mov [DSPMem+71h],al - ret NEWSYM WDSPReg71 ; Voice 7 Volume Right -; cmp byte[RevStereo],1 -; je .rev mov [DSPMem+71h],al ret -.rev - mov [DSPMem+70h],al - ret NEWSYM WDSPReg72 ; Voice 7 Pitch Low mov [DSPMem+072h],al diff --git a/zsnes/src/cpu/execute.asm b/zsnes/src/cpu/execute.asm index 94e6ee99..fcce6f0c 100644 --- a/zsnes/src/cpu/execute.asm +++ b/zsnes/src/cpu/execute.asm @@ -58,7 +58,7 @@ EXTSYM deinitipx EXTSYM deinitvideo EXTSYM BRRBuffer,DSPMem,PrepareSaveState,ResetState,SFXEnable,PHdspsave EXTSYM fnamest,sndrot,spcRam,spcRamDP,tableA,unpackfunct,vram,wramdata -EXTSYM zsmesg,PHnum2writesfxreg,SfxR0,PHnum2writecpureg,PHspcsave,initrevst +EXTSYM zsmesg,PHnum2writesfxreg,SfxR0,PHnum2writecpureg,PHspcsave EXTSYM C4Ram EXTSYM SPC7110Enable EXTSYM SA1Mode,PHnum2writesa1reg,SaveSA1,RestoreSA1,UpdateBanksSDD1 @@ -1511,7 +1511,6 @@ NEWSYM statesaver sub dword[spcRamDP],spcRam call PrepareSaveState call unpackfunct - call initrevst ; Auto increment save state slot @@ -1647,7 +1646,6 @@ NEWSYM statesaver add dword[spcPCRam],spcRam add dword[spcRamDP],spcRam call ResetState - call initrevst stim ; Get the state number @@ -1669,7 +1667,6 @@ NEWSYM statesaver add dword[spcPCRam],spcRam add dword[spcRamDP],spcRam call ResetState - call initrevst stim mov dword[Msgptr],.savemsgfail mov eax,[MsgCount] @@ -1846,7 +1843,6 @@ NEWSYM stateloader ; call headerhack call initpitch - call initrevst ret .convert @@ -1910,7 +1906,6 @@ NEWSYM stateloader mov byte[nexthdma],0 call headerhack call initpitch - call initrevst ret NEWSYM loadstate mov byte[pressed+1],0 diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm index 6a9af808..d4653ee0 100644 --- a/zsnes/src/gui/gui.asm +++ b/zsnes/src/gui/gui.asm @@ -81,7 +81,7 @@ EXTSYM fnamest,sprlefttot,spritetablea,fnames,SFXSRAM,sfxramdata,cgram,srama EXTSYM tempco0,prevbright,maxbr,prevpal,coladdr,coladdg,coladdb EXTSYM scaddtype,ScreenScale,vesa2red10,initvideo2,initvideo,pressed,UpdateDevices EXTSYM memtabler8,memtablew8,writeon,pl1contrl,pl2contrl,JoyRead,SetInputDevice -EXTSYM SetInputDevice209,FPSOn,RevStereo,initrevst,WDSPReg0C,WDSPReg1C,WDSPReg2C +EXTSYM SetInputDevice209,FPSOn,RevStereo,WDSPReg0C,WDSPReg1C,WDSPReg2C EXTSYM WDSPReg3C,pl12s34,resolutn,delay,chaton,chatstrL,chatLpos,chatstrR,chatRTL EXTSYM InitDrive,InitDir,createnewcfg,Makemode7Table,SnowOn,MovieBuffSize EXTSYM MovieBuffFrame,vidbufferofsb,ZipSupport,wramdata,bgfixer,cfgnewgfx diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc index 7bb25c44..17060a79 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -1053,30 +1053,6 @@ GUIWinClicked: %%noclick %endmacro -%macro GUIClickCButtonS 3 - cmp eax,%1+1 - jl %%noclick - cmp edx,%2+3 - jl %%noclick - cmp eax,%1+6 - jg %%noclick - cmp edx,%2+8 - jg %%noclick - push eax - xor %3,1 - call initrevst - mov al,[DSPMem+0Ch] - call WDSPReg0C - mov al,[DSPMem+1Ch] - call WDSPReg1C - mov al,[DSPMem+2Ch] - call WDSPReg2C - mov al,[DSPMem+3Ch] - call WDSPReg3C - pop eax -%%noclick -%endmacro - %macro GUIClickCButtonM 3 cmp eax,%1+1 jl %%noclick @@ -2352,7 +2328,7 @@ DisplayGUISoundClick: GUIClickCButton 11,30,byte[cfgStereoSound] GUIClickCButton 11,39,byte[RaisePitch] GUIClickCButton 11,101,byte[SoundNoiseDis] - GUIClickCButtonS 11,111,byte[RevStereo] + GUIClickCButton 11,111,byte[RevStereo] ; cmp byte[OSPort],3 ; je near .win32sound GUIClickCButton 11,121,byte[Surround]