From 1369046bfcf4fa8aa8b111455ba3a3b6b030502a Mon Sep 17 00:00:00 2001 From: jbo_85 <> Date: Sat, 25 Mar 2006 21:18:31 +0000 Subject: [PATCH] Removed some dead code. --- zsnes/src/cpu/regs.inc | 32 +-------------------- zsnes/src/cpu/regs.mac | 40 -------------------------- zsnes/src/cpu/regsw.inc | 64 +---------------------------------------- 3 files changed, 2 insertions(+), 134 deletions(-) diff --git a/zsnes/src/cpu/regs.inc b/zsnes/src/cpu/regs.inc index 5e1491bd..438a7d5b 100644 --- a/zsnes/src/cpu/regs.inc +++ b/zsnes/src/cpu/regs.inc @@ -21,8 +21,7 @@ EXTSYM SFXEnable,regptr,initsfxregsr,initSA1regs,SA1Enable,initSDD1regs EXTSYM SPC7110Enable,initSPC7110regs,RTCEnable,RTCReset,curypos,cycpl EXTSYM debuggeron,pdh,vram,romispal,reg1read,spcnumread,spcon,reg2read,reg3read -EXTSYM reg4read,JoyEOrig,JoyENow,device2,cycphb,joycontren,totlines,DosExit -EXTSYM invalid,numinst,previdmode,printhex,printnum +EXTSYM reg4read,JoyEOrig,JoyENow,device2,cycphb,joycontren,totlines SECTION .text @@ -1215,32 +1214,3 @@ regINVALID: ; Invalid Register .nospc7110 ; mov byte[debstop3],1 ret - - mov al,[previdmode] - mov ah,0 - int 10h - mov byte[invalid],1 - mov [invreg],cx - mov ah,9 - mov edx,.invalidreg - int 21h - xor eax,eax - mov ax,[invreg] - call printhex - mov ah,2 - mov dl,13 - int 21h - mov ah,2 - mov dl,10 - int 21h - mov eax,[numinst] ;Temporary - call printnum - jmp DosExit - -SECTION .data -.invalidreg db 'Invalid Read Register : $' -SECTION .text - - - - diff --git a/zsnes/src/cpu/regs.mac b/zsnes/src/cpu/regs.mac index da4cc399..95ad9e1c 100644 --- a/zsnes/src/cpu/regs.mac +++ b/zsnes/src/cpu/regs.mac @@ -54,43 +54,3 @@ mov byte[multchange],0 .nomult %endmacro - -%macro mouse4016doxA 2 - cmp byte[JoyAPos],%1 - jne .nx7 - mov bx,[mousexpos] - shr bx,%2 - and bx,1 - mov al,bl -.nx7 -%endmacro - -%macro mouse4016doyA 2 - cmp byte[JoyAPos],%1 - jne .ny7 - mov bx,[mouseypos] - shr bx,%2 - and bx,1 - mov al,bl -.ny7 -%endmacro - -%macro mouse4017dox 2 - cmp byte[JoyBPos],%1 - jne .nx7 - mov bx,[mousexpos] - shr bx,%2 - and bx,1 - mov al,bl -.nx7 -%endmacro - -%macro mouse4017doy 2 - cmp byte[JoyBPos],%1 - jne .ny7 - mov bx,[mouseypos] - shr bx,%2 - and bx,1 - mov al,bl -.ny7 -%endmacro diff --git a/zsnes/src/cpu/regsw.inc b/zsnes/src/cpu/regsw.inc index c5b20a32..d3a2ed40 100644 --- a/zsnes/src/cpu/regsw.inc +++ b/zsnes/src/cpu/regsw.inc @@ -22,11 +22,8 @@ EXTSYM initsfxregsw,reg420Bw,reg420Cw,regptw,initSA1regsw,SDD1Reset EXTSYM SPC7110Reset,RTCReset2,debstop,NextLineCache,vidmemch2,vidmemch4 EXTSYM vidmemch8,vrama,nmirept,sndwrit,SPCRAM,HIRQCycNext,HIRQNextExe,HIRQSkip EXTSYM cycpb268,cycpb358,cycpbl,cycpblt,opexec268,opexec268cph,opexec358 -EXTSYM opexec358cph,printhex8 +EXTSYM opexec358cph -SECTION .bss -NEWSYM testgfxv1, resb 1 -NEWSYM testgfxv2, resb 1 SECTION .text NEWSYM initregw @@ -1173,10 +1170,6 @@ reg2133w: mov word[resolutn],239 ret -SECTION .bss -NEWSYM CleartheScreen, resb 1 -SECTION .text - ; Sound Register #1 reg2140w: mov byte[sndwrit],1 @@ -1656,58 +1649,3 @@ reg43XAw: regINVALIDw: ; Invalid Register ret - - -regexiter: - mov bl,[xpb] - mov ax,[xpc] - test ax,8000h - jz .loweraddr2 - mov eax,[snesmmap+ebx*4] - jmp .nextaddr -.loweraddr2 - mov eax,[snesmap2+ebx*4] -.nextaddr - mov ebx,esi - sub ebx,eax ; subtract program counter by address - mov [.invaddr],bx - mov bl,[xpb] - mov [.invbank],bl - - mov al,[previdmode] - mov ah,0 - int 10h - mov byte[invalid],1 - mov [invreg],cx - mov ah,9 - mov edx,.invalidreg - int 21h - xor eax,eax - mov ax,[invreg] - call printhex - mov ah,9 - mov edx,.invalidreg - int 21h - xor eax,eax - mov al,[.invbank] - call printhex8 - mov ax,[.invaddr] - call printhex - mov ah,2 - mov dl,13 - int 21h - mov ah,2 - mov dl,10 - int 21h - mov eax,[numinst] - call printnum - jmp DosExit - -SECTION .data -.invalidreg db 'Invalid Write Register : $' -.invalidaddr db ' at address $' - -SECTION .bss -.invbank resb 1 -.invaddr resb 1 -SECTION .text