a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More spaces removed. Removed some dead code and useless macros and variables.

Browse Source
This commit is contained in:
jbo_85
2005-07-06 14:13:32 +00:00
parent 0e58ee7723
commit b0c151615b
16 changed files with 168 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zsnes/src/chips/fxemu2.mac
View File

@@ -43,11 +43,6 @@
mov [SfxRomBuffer],eax
%endmacro
%macro UpdateR15 0
mov ebp,[SfxCPB]
add ebp,[SfxR15]
%endmacro
%macro CLRFLAGS 0
;and dword [SfxSFR],0FFFFh-0100h-0200h-1000h ; Clear ALT1,ALT2 and B Flags
; xor ch,ch

82
zsnes/src/cpu/execute.asm
View File

@@ -20,12 +20,12 @@
%include "macros.mac"
EXTSYM KeyRewind,statesaver,timer2upd,Voice0Status,UpdateDPage,MessageOn
EXTSYM MsgCount,Msgptr,StartGUI,cbitmode,debuggeron,romdata,initvideo,newgfx16b
EXTSYM cvidmode,vidbufferofsa,disable65816sh,GUISaveVars,virqnodisable
EXTSYM KeyRewind,statesaver,timer2upd,Voice0Status,UpdateDPage
EXTSYM StartGUI,debuggeron,romdata,initvideo
EXTSYM vidbufferofsa,disable65816sh,GUISaveVars,virqnodisable
EXTSYM KeySaveState,KeyLoadState,KeyQuickExit,KeyQuickLoad,KeyQuickRst
EXTSYM GUIDoReset,GUIReset,KeyOnStA,KeyOnStB,ProcessKeyOn,C4Enable,KeyQuickClock
EXTSYM KeyQuickSaveSPC,TimerEnable,IRQHack,HIRQLoc,splitflags,joinflags
EXTSYM KeyQuickSaveSPC,TimerEnable,IRQHack,splitflags,joinflags
EXTSYM KeyQuickSnapShot,csounddisable,videotroub,ResetTripleBuf
EXTSYM Output_Text,Check_Key,Get_Key,Change_Dir
EXTSYM InitPreGame,Curtableaddr,curcyc,debugdisble,dmadata,guioff,memtabler8
@@ -241,10 +241,6 @@ VoiceStartMute:
SECTION .data
NEWSYM romloadskip, db 0
NEWSYM abcdefg, dd 0
NEWSYM abcdefg1, dd 0
NEWSYM abcdefg2, dd 0
NEWSYM abcdefg3, dd 0
NEWSYM SSKeyPressed, dd 0
NEWSYM SPCKeyPressed, dd 0
NEWSYM NoSoundReinit, dd 0
@@ -265,25 +261,6 @@ NEWSYM start65816
ret
.notrouble
jmp .nonewgfxcheck
cmp byte[cbitmode],1
jne .nonewgfxcheck
cmp byte[newengen],1
jne .nonewgfxcheck
cmp byte[cvidmode],3
jne .nocorrectmode
cmp byte[newgfx16b],1
je .nonewgfxcheck
jmp .correctmode
.nocorrectmode
mov dword[Msgptr],newgfxerror2
jmp .correctmode
mov dword[Msgptr],newgfxerror
.correctmode
mov eax,[MsgCount]
mov [MessageOn],eax
mov byte[newengen],0
.nonewgfxcheck
mov edi,[vidbufferofsa]
mov ecx,37518
xor eax,eax
@@ -400,13 +377,6 @@ reexecuteb2:
mov edi,[tableadb+ebx*4]
and byte[curexecstate],0FDh
.soundta
jmp .nomovie
.movie
mov edi,[tableadc+ebx*4]
test byte[curexecstate],2
jnz .nomovie
mov edi,[tableadb+ebx*4]
.nomovie
mov ebp,[spcPCRam]
@@ -416,13 +386,7 @@ reexecuteb2:
call splitflags
; cmp byte[MovieProcessing],0
; jne .movie2
call execute
jmp .nomovie2
.movie2
call cpuover.returntoloop
.nomovie2
call joinflags
@@ -597,8 +561,8 @@ NEWSYM initaddrl, dd 0 ; initial address location
NEWSYM NetSent, dd 0
NEWSYM nextframe, dd 0 ; tick count for timer
NEWSYM curfps, db 0 ; frame/sec for current screen
NEWSYM newgfxerror, db 'NEED MEMORY FOR GFX ENGINE',0
NEWSYM newgfxerror2, db 'NEED 320x240 FOR NEW GFX 16B',0
;NEWSYM newgfxerror, db 'NEED MEMORY FOR GFX ENGINE',0
;NEWSYM newgfxerror2, db 'NEED 320x240 FOR NEW GFX 16B',0
;newgfxerror db 'NEW GFX IN 16BIT IS N/A',0
NEWSYM HIRQCycNext, dd 0
NEWSYM HIRQNextExe, db 0
@@ -1538,13 +1502,6 @@ NEWSYM cpuover
jne .nointrset2w
mov byte[intrset],2
.nointrset2w
cmp byte[esi],0CBh
jne .nowai
jmp .nowai
test dl,04h
jz .nowai
or byte[INTEnab],80h
.nowai
xor ebx,ebx
xor ecx,ecx
mov bl,[esi]
@@ -1614,33 +1571,6 @@ NEWSYM cpuover
jmp execloop.startagain
.virq
test byte[INTEnab],10h
jz .skiphirq
cmp word[HIRQLoc],0
je .skiphirq
jmp .skiphirq
cmp word[HIRQLoc],339
jbe .hirqnotover
mov word[HIRQLoc],339
.hirqnotover
; first dh = HIRQLoc*DHAdd/340, second dh = DHAdd-first dh
push edx
mov ax,[HIRQLoc]
xor ecx,ecx
mov cl,[cycpl]
mul cx
mov cx,340
div cx
pop edx
mov dh,al
mov cl,[cycpl]
sub cl,al
xor cl,cl
mov [HIRQCycNext],cl
mov byte[HIRQNextExe],1
; jmp .hirq
jmp .returnfromhirq
.skiphirq
test byte[curexecstate],01h
jnz .dis658162
or byte[curexecstate],01h

19
zsnes/src/gui/gui.asm
View File

@@ -78,7 +78,7 @@ EXTSYM statesaver,loadstate2,vidbuffer,ASCII2Font,hirestiledat,showallext
EXTSYM scanlines,statefileloc,pl1selk,pl2selk,fnamest,sprlefttot,spritetablea
EXTSYM fnames,CHIPBATT,sfxramdata,setaramdata,SETAEnable,cgram,srama,tempco0
EXTSYM prevbright,maxbr,prevpal,coladdr,coladdg,coladdb,scaddtype,ScreenScale
EXTSYM vesa2red10,initvideo2,initvideo,pressed,UpdateDevices,memtabler8
EXTSYM initvideo2,initvideo,pressed,UpdateDevices,memtabler8
EXTSYM memtablew8,writeon,pl1contrl,pl2contrl,JoyRead,SetInputDevice,delay
EXTSYM SetInputDevice209,FPSOn,RevStereo,WDSPReg0C,WDSPReg1C,pl12s34,resolutn
EXTSYM InitDrive,InitDir,createnewcfg,Makemode7Table,vidbufferofsb,ZipSupport
@@ -3576,23 +3576,6 @@ GUISetPal16:
GUIPal16b 237,60,20,25
GUIPal16b 238,42,20,25
cmp byte[vesa2red10],1
jne .nored10
jmp .nored10
mov esi,GUICPC
mov ecx,256
.next2
mov ax,[esi]
mov bx,ax
and bx,0000000000011111b
and ax,1111111111000000b
shr ax,1
or ax,bx
mov [esi],ax
add esi,2
dec ecx
jnz .next2
.nored10
cmp byte[GUIPalConv],0
je .convert
ret

16
zsnes/src/ui.asm
View File

@@ -22,7 +22,7 @@
%include "macros.mac"
EXTSYM PrintStr,WaitForKey,PrintChar,ram7fa,wramdataa,malloc,free,MMXSupport
EXTSYM PrintStr,WaitForKey,PrintChar,ram7fa,wramdataa,malloc,MMXSupport
EXTSYM MMXextSupport,statefileloc,LatestSave,firstsaveinc,Open_File
EXTSYM Get_File_Date,Close_File,Change_Dir,Get_Dir,romloadskip,cfgloadgdir
EXTSYM cfgloadsdir,init18_2hz,OSExit,SRAMDirCurDir,SRAMChdir,SRAMChdirFail
@@ -885,20 +885,6 @@ NEWSYM DosExit ; Terminate Program
%elifdef __LINUX__
call LinuxExit
%elifdef __MSDOS__
jmp .nodeallocate
mov ebx,memfreearray
.nextdeallocate
mov eax,[ebx]
or eax,eax
jz .nodeallocate
push ebx
push eax
call free
pop eax
pop ebx
add ebx,4
jmp .nextdeallocate
.nodeallocate
call init18_2hz
mov ax,4c00h ;terminate
int 21h

37
zsnes/src/vcache.asm
View File

@@ -26,8 +26,8 @@ EXTSYM MessageOn,MsgCount,Msgptr,Voice0Disable,Voice0Status,Voice1Disable
EXTSYM Voice1Status,Voice2Disable,Voice2Status,Voice3Disable,Voice3Status
EXTSYM Voice4Disable,Voice4Status,Voice5Disable,Voice5Status,Voice6Disable
EXTSYM Voice6Status,Voice7Disable,Voice7Status,bgcmsung,bgmode,cbackofsaddr
EXTSYM cbitmode,cgmod,debuggeron,disableeffects,frameskip,frskipper,newgfxerror2
EXTSYM maxbr,modeused,mousexloc,mouseyloc,newengen,newgfx16b,newgfxerror
EXTSYM cgmod,debuggeron,disableeffects,frameskip,frskipper
EXTSYM maxbr,modeused,mousexloc,mouseyloc,newengen
EXTSYM nextdrawallng,oamaddr,pal16b,pal16bxcl,pressed,prevbright,prevpal
EXTSYM scaddsngb,scaddtngb,scaddtngbx,scfbl,scrndis,snesmouse,sprprdrn,t1cc
EXTSYM vidbright,vidbuffer,vidbufferm,vidbufferofsa,vidbufferofsb,vidmemch2
@@ -570,23 +570,6 @@ NEWSYM cachevideo
test byte[pressed+eax],1
je near .nodis8
mov byte[pressed+eax],2
cmp byte[cbitmode],1
jne .no16bng
cmp byte[newgfx16b],1
je .no16bng
jmp .no16bng
mov dword[Msgptr],newgfxerror
.msgstuff
mov eax,[MsgCount]
mov [MessageOn],eax
cmp byte[newengen],0
je near .nodis8
mov byte[newengen],0
jmp .disng
.nores
mov dword[Msgptr],newgfxerror2
jmp .msgstuff
.no16bng
mov byte[prevbright],16
xor byte[newengen],1
mov dword[Msgptr],ngena
@@ -891,22 +874,6 @@ NEWSYM docache
.nosprites
; fill background with 0's unless 16-bit/new graphics engine mode is on
jmp .skipbgclear
cmp byte[cbitmode],1
je .skipbgclear
cmp byte[newengen],1
jne .skipbgclear
mov edi,[vidbuffer]
xor eax,eax
add edi,16
mov dl,[resolutn]
.loopa
mov ecx,64
rep stosd
add edi,32
dec dl
jnz .loopa
.skipbgclear
xor ecx,ecx
pop es
NEWSYM yesblank