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

Linux commits

Browse Source
This commit is contained in:
theoddone33
2001-04-10 04:28:44 +00:00
parent 297d98dfc4
commit 42bf44301b
63 changed files with 3057 additions and 2826 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zsnes/src/cfgload.asm
View File

@@ -30,7 +30,7 @@ EXTSYM spcon,vsyncon,Open_File,Read_File
EXTSYM Create_File,Write_File,Close_File EXTSYM Create_File,Write_File,Close_File
NEWSYM CfgLoadAsmStart
@@ -1871,3 +1871,4 @@ SECTION .data
SECTION .text SECTION .text
NEWSYM CfgLoadAsmEnd

1
zsnes/src/chips/dsp1emu.c
View File

@@ -949,4 +949,3 @@ DSPOp0E()
Log_Message(" X:%d Y:%d",Op0EX,Op0EY); Log_Message(" X:%d Y:%d",Op0EX,Op0EY);
#endif #endif
} }

4
zsnes/src/chips/dsp1proc.asm
View File

@@ -36,7 +36,7 @@ EXTSYM Op03X, Op03Y, Op03Z, Op03F, Op03L, Op03U, DSPOp03
EXTSYM Op14Zr, Op14Xr, Op14Yr, Op14U, Op14F, Op14L EXTSYM Op14Zr, Op14Xr, Op14Yr, Op14U, Op14F, Op14L
EXTSYM Op14Zrr,Op14Xrr,Op14Yrr, DSPOp14 EXTSYM Op14Zrr,Op14Xrr,Op14Yrr, DSPOp14
NEWSYM Dsp1ProcAsmStart
@@ -636,3 +636,5 @@ DSP1_14: ; 3D angle rotation
mov byte[DSP1RLeft],3 mov byte[DSP1RLeft],3
pop eax pop eax
ret ret
NEWSYM Dsp1ProcAsmEnd

6
zsnes/src/chips/fxemu2.asm
View File

@@ -22,6 +22,8 @@ EXTSYM fxxand,sfx128lineloc,sfx160lineloc,sfx192lineloc,sfxobjlineloc
EXTSYM sfxramdata,fxbit45,fxbit67,SFXProc,ChangeOps EXTSYM sfxramdata,fxbit45,fxbit67,SFXProc,ChangeOps
EXTSYM PLOTJmpa,PLOTJmpb EXTSYM PLOTJmpa,PLOTJmpb
NEWSYM FxEmu2AsmStart
%include "chips/fxemu2.mac" %include "chips/fxemu2.mac"
@@ -117,6 +119,7 @@ NEWSYM SfxB, dd 0 ; B flag (1 when with instruction executed)
NEWSYM SfxOverflow, dd 0 ; Overflow flag NEWSYM SfxOverflow, dd 0 ; Overflow flag
NEWSYM SfxCACHERAM, times 512 db 0 ; 512 bytes of GSU cache memory NEWSYM SfxCACHERAM, times 512 db 0 ; 512 bytes of GSU cache memory
SECTION .data
num2writesfxreg equ $-SfxR0 num2writesfxreg equ $-SfxR0
; pharos equ hack *sigh* ; pharos equ hack *sigh*
NEWSYM PHnum2writesfxreg, dd num2writesfxreg NEWSYM PHnum2writesfxreg, dd num2writesfxreg
@@ -2644,6 +2647,7 @@ NEWSYM FxOpFFA2 ; SM (XX),RN store word in RAM
ret ret
ALIGN32 ALIGN32
NEWSYM NumberOfOpcodes, dd 0 ; Number of opcodes to execute NEWSYM NumberOfOpcodes, dd 0 ; Number of opcodes to execute
NEWSYM NumberOfOpcodesBU, dd 0 ; Number of opcodes to execute backup value NEWSYM NumberOfOpcodesBU, dd 0 ; Number of opcodes to execute backup value
NEWSYM sfxwarningb, db 0 NEWSYM sfxwarningb, db 0
@@ -2679,4 +2683,6 @@ NEWSYM FXEndLoop
SECTION .data SECTION .data
NEWSYM fxtrace, db 0; times 65536 db 0 NEWSYM fxtrace, db 0; times 65536 db 0
SECTION .text
NEWSYM FxEmu2AsmEnd

4
zsnes/src/chips/fxemu2b.asm
View File

@@ -20,6 +20,8 @@
EXTSYM FxTable,FxTableb,FxTablec,SfxB,SfxCPB,SfxCROM,SfxCarry,SfxOverflow EXTSYM FxTable,FxTableb,FxTablec,SfxB,SfxCPB,SfxCROM,SfxCarry,SfxOverflow
EXTSYM SfxR0,SfxR14,SfxR15,SfxRomBuffer,SfxSignZero,withr15sk EXTSYM SfxR0,SfxR14,SfxR15,SfxRomBuffer,SfxSignZero,withr15sk
NEWSYM FxEmu2BAsmStart
%include "chips/fxemu2.mac" %include "chips/fxemu2.mac"
%include "chips/fxemu2b.mac" %include "chips/fxemu2b.mac"
@@ -611,3 +613,5 @@ NEWSYM FxOpcBF ; FROM rn set source register
mov byte[SfxOverflow],al mov byte[SfxOverflow],al
CLRFLAGS CLRFLAGS
ret ret
NEWSYM FxEmu2BAsmEnd

4
zsnes/src/chips/fxemu2c.asm
View File

@@ -30,6 +30,8 @@ EXTSYM fxbit01,fxbit23,fxbit45,fxbit67
EXTSYM fxxand EXTSYM fxxand
EXTSYM PLOTJmpa,PLOTJmpb EXTSYM PLOTJmpa,PLOTJmpb
NEWSYM FxEmu2CAsmStart
%include "chips/fxemu2.mac" %include "chips/fxemu2.mac"
%include "chips/fxemu2b.mac" %include "chips/fxemu2b.mac"
%include "chips/fxemu2c.mac" %include "chips/fxemu2c.mac"
@@ -2548,3 +2550,5 @@ NEWSYM FxOpdFFA2 ; SM (XX),RN store word in RAM
mov [eax+ebx],dh mov [eax+ebx],dh
CLRFLAGS CLRFLAGS
FXReturn FXReturn
NEWSYM FxEmu2CAsmEnd

3
zsnes/src/chips/fxtable.asm
View File

@@ -193,7 +193,7 @@ EXTSYM FxOpd4C1288bl,FxOpd4C1288bzl,FxOpd4C1288bdl,FxOpd4C1288bzdl
EXTSYM fxxand,fxbit01,fxbit23,fxbit45,fxbit67 EXTSYM fxxand,fxbit01,fxbit23,fxbit45,fxbit67
NEWSYM FxTableAsmStart
@@ -3543,3 +3543,4 @@ NEWSYM sfxnametab
db 'IWT R8 IWT R9 IWT R10 IWT R11 ' db 'IWT R8 IWT R9 IWT R10 IWT R11 '
db 'IWT R12 IWT R13 IWT R14 IWT R15 ' db 'IWT R12 IWT R13 IWT R14 IWT R15 '
NEWSYM FxTableAsmEnd

4
zsnes/src/chips/sa1proc.asm
View File

@@ -26,7 +26,7 @@ EXTSYM membank0w8,romdata,SA1LBound,SA1UBound,SA1SH,SA1SHb
EXTSYM stackor,stackand,snesmmap,SA1xs,SA1IRQExec EXTSYM stackor,stackand,snesmmap,SA1xs,SA1IRQExec
EXTSYM SA1Message,Sflagnz,Sflagc,Sflago EXTSYM SA1Message,Sflagnz,Sflagc,Sflago
NEWSYM Sa1ProcAsmStart
@@ -362,3 +362,5 @@ NEWSYM SA1switchtovirq
mov [initaddrl],esi mov [initaddrl],esi
add esi,eax add esi,eax
ret ret
NEWSYM Sa1ProcAsmEnd

19
zsnes/src/chips/sa1regs.asm
View File

@@ -52,10 +52,18 @@ EXTSYM curypos,CurrentExecSA1
EXTSYM debstop3 EXTSYM debstop3
EXTSYM memaccessbankr8sdd1,memtabler8,AddrNoIncr EXTSYM memaccessbankr8sdd1,memtabler8,AddrNoIncr
NEWSYM Sa1RegsAsmStart
%include "cpu/regs.mac" %include "cpu/regs.mac"
%include "cpu/regsw.mac" %include "cpu/regsw.mac"
ALIGN32 ALIGN32
NEWSYM SPCMultA, dd 0 NEWSYM SPCMultA, dd 0
NEWSYM SPCMultB, dd 0 NEWSYM SPCMultB, dd 0
@@ -1422,11 +1430,11 @@ SPC4842:
;$4820 16 BIT MULTIPLICAND: ($00FF) low byte, defval:00 ;$4820 16 BIT MULTIPLICAND: ($00FF) low byte, defval:00
; 32 BIT DIVIDEND: ($000000FF) low byte of low word, defval:00 ; 32 BIT DIVI: ($000000FF) low byte of low word, defval:00
;$4821 16 BIT MULTIPLICAND: ($FF00) high byte, defval:00 ;$4821 16 BIT MULTIPLICAND: ($FF00) high byte, defval:00
; 32 BIT DIVIDEND: ($0000FF00) high byte of low word, defval:00 ; 32 BIT DIVI: ($0000FF00) high byte of low word, defval:00
;$4822 32 BIT DIVIDEND: ($00FF0000) low byte of high word, defval:00 ;$4822 32 BIT DIVI: ($00FF0000) low byte of high word, defval:00
;$4823 32 BIT DIVIDEND: ($FF000000) high byte of high word, defval:00 ;$4823 32 BIT DIVI: ($FF000000) high byte of high word, defval:00
;$4824 16 BIT MULTIPLIER: ($00FF) low byte, defval:00 ;$4824 16 BIT MULTIPLIER: ($00FF) low byte, defval:00
;$4825 16 BIT MULTIPLIER: ($FF00) high byte, defval:00 ;$4825 16 BIT MULTIPLIER: ($FF00) high byte, defval:00
;$4826 16 BIT DIVISOR: ($00FF), defval:00 ;$4826 16 BIT DIVISOR: ($00FF), defval:00
@@ -1515,7 +1523,6 @@ NEWSYM SNSBWPtr,dd 0
NEWSYM SNSPtr, dd 0 ; Current PC, SNES NEWSYM SNSPtr, dd 0 ; Current PC, SNES
NEWSYM IRAM, times 2049 db 0 ;2 kbytes of iram NEWSYM IRAM, times 2049 db 0 ;2 kbytes of iram
num2writesa1reg equ $-SA1Mode num2writesa1reg equ $-SA1Mode
NEWSYM PHnum2writesa1reg, dd num2writesa1reg NEWSYM PHnum2writesa1reg, dd num2writesa1reg
@@ -2568,3 +2575,5 @@ NEWSYM sdd14801w
pop ebx pop ebx
pop eax pop eax
ret ret
NEWSYM Sa1RegsAsmEnd

7
zsnes/src/chips/sfxproc.asm
View File

@@ -25,10 +25,16 @@ EXTSYM SfxSignZero,SfxnRamBanks,StartSFX,regptr,regptw,sfxramdata,ChangeOps
EXTSYM SfxPOR,sfxclineloc,UpdatePORSCMR,UpdateCLSR,UpdateSCBRCOLR,SfxAC EXTSYM SfxPOR,sfxclineloc,UpdatePORSCMR,UpdateCLSR,UpdateSCBRCOLR,SfxAC
EXTSYM sfx128lineloc,sfx160lineloc,sfx192lineloc,sfxobjlineloc,SFXProc EXTSYM sfx128lineloc,sfx160lineloc,sfx192lineloc,sfxobjlineloc,SFXProc
NEWSYM SfxProcAsmStart
%include "cpu/regs.mac" %include "cpu/regs.mac"
%include "cpu/regsw.mac" %include "cpu/regsw.mac"
%macro AssembleSFXFlags 0 %macro AssembleSFXFlags 0
and word[SfxSFR],8F60h and word[SfxSFR],8F60h
test byte[SfxCarry],1 test byte[SfxCarry],1
@@ -663,3 +669,4 @@ NEWSYM sfxaccessbankw16d
xor ebx,ebx xor ebx,ebx
ret ret
NEWSYM SfxProcAsmEnd

1
zsnes/src/cpu/65816dc.inc
View File

@@ -1628,3 +1628,4 @@ emulRTI
mov word[stackor],0100h mov word[stackor],0100h
endloop endloop
%endmacro %endmacro

6
zsnes/src/cpu/addrni.asm
View File

@@ -17,11 +17,6 @@
;******************************************************* ;*******************************************************
; Address Modes ; Address Modes
;******************************************************* ;*******************************************************
@@ -405,4 +400,3 @@
.npb .npb
call dword near [memtabler16+ebx*4] call dword near [memtabler16+ebx*4]
%endmacro %endmacro

3
zsnes/src/cpu/dma.asm
View File

@@ -27,7 +27,7 @@ EXTSYM curhdma,curypos,disablehdma,hdmadata,hdmadelay,hdmaearlstart
EXTSYM resolutn EXTSYM resolutn
EXTSYM memtabler16 EXTSYM memtabler16
NEWSYM DmaAsmStart
@@ -1352,3 +1352,4 @@ NEWSYM exechdmars
NEWSYM DmaAsmEnd

3
zsnes/src/cpu/dsp.asm
View File

@@ -38,6 +38,8 @@ EXTSYM MuteVoiceF,VoiceStarter
EXTSYM DecayRate,SustainRate,SustainValue EXTSYM DecayRate,SustainRate,SustainValue
EXTSYM KeyOnStA,KeyOnStB,SoundTest EXTSYM KeyOnStA,KeyOnStB,SoundTest
NEWSYM DspAsmStart
%include "betauser.mac" %include "betauser.mac"
@@ -3051,3 +3053,4 @@ NEWSYM WDSPRegFF ;
mov [DSPMem+0FFh],al mov [DSPMem+0FFh],al
ret ret
NEWSYM DspAsmEnd

4
zsnes/src/cpu/dspproc.asm
View File

@@ -131,7 +131,7 @@ EXTSYM cfgecho,Surround,SoundBufEn
EXTSYM echobuf EXTSYM echobuf
EXTSYM LowPassFilter EXTSYM LowPassFilter
NEWSYM DspProcAsmStart
@@ -2343,7 +2343,6 @@ AdsrBendData db 122,118,114,110,106,102,99,95,92,89,86,83,80,77,74,72,69,67
NEWSYM AdsrSustLevLoc, db 58,39,27,19,13,8,3,1 NEWSYM AdsrSustLevLoc, db 58,39,27,19,13,8,3,1
dspsave equ marksave-BRRBuffer dspsave equ marksave-BRRBuffer
dspconvb equ marksave-Voice0Freq dspconvb equ marksave-Voice0Freq
NEWSYM PHdspsave, dd dspsave NEWSYM PHdspsave, dd dspsave
@@ -5695,3 +5694,4 @@ GetCDMAPos:
ja .loop ja .loop
.fin .fin
NEWSYM DspProcAsmEnd

4
zsnes/src/cpu/e65816.inc
View File

@@ -27,7 +27,7 @@ EXTSYM debstop3
NEWSYM E65816IncStart
; B = ( or ) ; B = ( or )
@@ -1992,3 +1992,5 @@ COpFB: ; XCE i
COp42: ; WDM COp42: ; WDM
inc esi inc esi
endloop endloop
NEWSYM E65816IncEnd

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

@@ -114,7 +114,7 @@ EXTSYM fxbit01,fxbit01pcal,fxbit23,fxbit23pcal,fxbit45,fxbit45pcal,fxbit67,fxbit
EXTSYM SfxSFR EXTSYM SfxSFR
EXTSYM cpucycle,debstop,switchtovirqdeb,debstop3,switchtonmideb EXTSYM cpucycle,debstop,switchtovirqdeb,debstop3,switchtonmideb
NEWSYM ExecuteAsmStart
@@ -4368,6 +4368,4 @@ NEWSYM execsingle
jmp switchtovirqdeb jmp switchtovirqdeb
NEWSYM ExecuteAsmEnd

2
zsnes/src/cpu/irq.asm
View File

@@ -26,6 +26,7 @@ EXTSYM irqv8
EXTSYM execloopdeb EXTSYM execloopdeb
EXTSYM nmiv8 EXTSYM nmiv8
NEWSYM IrqAsmStart
@@ -521,3 +522,4 @@ NEWSYM NMIemulmodedeb
add esi,eax add esi,eax
jmp execloopdeb jmp execloopdeb
NEWSYM IrqAsmEnd

4
zsnes/src/cpu/memory.asm
View File

@@ -41,7 +41,7 @@ EXTSYM SA1Overflow
EXTSYM Sdd1Mode,Sdd1Bank,Sdd1Addr,Sdd1NewAddr,memtabler8,AddrNoIncr,SDD1BankA EXTSYM Sdd1Mode,Sdd1Bank,Sdd1Addr,Sdd1NewAddr,memtabler8,AddrNoIncr,SDD1BankA
EXTSYM SPC7110Entries,spc7110romptr EXTSYM SPC7110Entries,spc7110romptr
NEWSYM MemoryAsmStart
@@ -4403,3 +4403,5 @@ debugdecompress:
call .nomoredec call .nomoredec
pop ebx pop ebx
jmp memaccessbankr8 jmp memaccessbankr8
NEWSYM MemoryAsmEnd

1
zsnes/src/cpu/regs.inc
View File

@@ -1096,3 +1096,4 @@ regINVALID: ; Invalid Register
.invalidreg db 'Invalid Read Register : $' .invalidreg db 'Invalid Read Register : $'

3
zsnes/src/cpu/spc700.asm
View File

@@ -23,6 +23,8 @@ EXTSYM spc700read
EXTSYM dspWptr EXTSYM dspWptr
EXTSYM changeexecloop,curexecstate,SA1Enable,tableadb EXTSYM changeexecloop,curexecstate,SA1Enable,tableadb
NEWSYM Spc700AsmStart
%include "cpu/regsw.mac" %include "cpu/regsw.mac"
%include "cpu/spcdef.inc" %include "cpu/spcdef.inc"
%include "cpu/spcaddr.inc" %include "cpu/spcaddr.inc"
@@ -2692,3 +2694,4 @@ NEWSYM Invalidopcode ; Invalid Opcode
dec ebp dec ebp
ret ret
NEWSYM Spc700AsmEnd

2
zsnes/src/cpu/stable.asm
View File

@@ -21,6 +21,7 @@ EXTSYM SA1tableA,SA1tableB,SA1tableC,SA1tableD,SA1tableE
EXTSYM SA1tableF,SA1tableG,SA1tableH,SA1tablead EXTSYM SA1tableF,SA1tableG,SA1tableH,SA1tablead
EXTSYM cpucycle, SA1UpdateDPage, intrset EXTSYM cpucycle, SA1UpdateDPage, intrset
NEWSYM StableAsmStart
%include "cpu/s65816d.inc" %include "cpu/s65816d.inc"
%include "cpu/saddress.inc" %include "cpu/saddress.inc"
%include "cpu/saddrni.inc" %include "cpu/saddrni.inc"
@@ -696,3 +697,4 @@ NEWSYM SA1settableDm16
mov dword[edi+0FFh*4],SA1COpFFm16d mov dword[edi+0FFh*4],SA1COpFFm16d
ret ret
NEWSYM StableAsmEnd

2
zsnes/src/cpu/table.asm
View File

@@ -54,6 +54,7 @@ EXTSYM DPageR8,DPageW8,DPageR16,DPageW16
EXTSYM SDD1Enable EXTSYM SDD1Enable
EXTSYM JoyAOrig,JoyANow,JoyBOrig,JoyBNow,JoyCOrig,JoyCNow,JoyDOrig,JoyDNow EXTSYM JoyAOrig,JoyANow,JoyBOrig,JoyBNow,JoyCOrig,JoyCNow,JoyDOrig,JoyDNow
NEWSYM TableAsmStart
%include "cpu/65816d.inc" %include "cpu/65816d.inc"
%include "cpu/address.inc" %include "cpu/address.inc"
%include "cpu/addrni.inc" %include "cpu/addrni.inc"
@@ -1188,3 +1189,4 @@ NEWSYM settableDm16
mov dword[edi+0FFh*4],COpFFm16d mov dword[edi+0FFh*4],COpFFm16d
ret ret
NEWSYM TableAsmEnd

2
zsnes/src/cpu/tableb.asm
View File

@@ -30,6 +30,7 @@ EXTSYM sramaccessbankw8,tableAb,tableBb,tableCb,tableDb,tableEb
EXTSYM tableFb,tableGb,tableHb,wramaccessbankr16 EXTSYM tableFb,tableGb,tableHb,wramaccessbankr16
EXTSYM wramaccessbankr8,wramaccessbankw16,wramaccessbankw8,tableadb EXTSYM wramaccessbankr8,wramaccessbankw16,wramaccessbankw8,tableadb
NEWSYM TableBAsmStart
%include "cpu/65816db.inc" %include "cpu/65816db.inc"
%include "cpu/address.inc" %include "cpu/address.inc"
%include "cpu/addrni.inc" %include "cpu/addrni.inc"
@@ -720,3 +721,4 @@ settableDm16:
mov dword[edi+0FFh*4],COpFFm16d mov dword[edi+0FFh*4],COpFFm16d
ret ret
NEWSYM TableBAsmEnd

2
zsnes/src/cpu/tablec.asm
View File

@@ -30,6 +30,7 @@ EXTSYM sramaccessbankw8,tableAc,tableBc,tableCc,tableDc,tableEc
EXTSYM tableFc,tableGc,tableHc,wramaccessbankr16 EXTSYM tableFc,tableGc,tableHc,wramaccessbankr16
EXTSYM wramaccessbankr8,wramaccessbankw16,wramaccessbankw8,tableadc EXTSYM wramaccessbankr8,wramaccessbankw16,wramaccessbankw8,tableadc
NEWSYM TableCAsmStart
%include "cpu/65816dc.inc" %include "cpu/65816dc.inc"
%include "cpu/address.inc" %include "cpu/address.inc"
%include "cpu/addrni.inc" %include "cpu/addrni.inc"
@@ -720,3 +721,4 @@ settableDm16:
mov dword[edi+0FFh*4],COpFFm16d mov dword[edi+0FFh*4],COpFFm16d
ret ret
NEWSYM TableCAsmEnd

4
zsnes/src/dos/debug.asm
View File

@@ -49,7 +49,7 @@ EXTSYM SA1xpb,SA1xpc,SA1xa,SA1xx,SA1xy,SA1xd,SA1xdb,SA1xs
EXTSYM cycpbl,debugbuf,soundon,spcA,spcNZ,spcP,spcPCRam EXTSYM cycpbl,debugbuf,soundon,spcA,spcNZ,spcP,spcPCRam
EXTSYM spcRam,spcRamDP,spcS,spcX,spcY EXTSYM spcRam,spcRamDP,spcS,spcX,spcY
NEWSYM DebugAsmStart
@@ -3846,3 +3846,5 @@ NEWSYM ArgumentTable
db 00,01,02,03,04,05,06,07,08,24,63,32,30,00,31,00 db 00,01,02,03,04,05,06,07,08,24,63,32,30,00,31,00
; F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE FF ; F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE FF
db 14,01,02,03,15,16,17,18,35,64,09,65,31,66,67,00 db 14,01,02,03,15,16,17,18,35,64,09,65,31,66,67,00
NEWSYM DebugAsmEnd

2
zsnes/src/dos/gppro.asm
View File

@@ -17,6 +17,7 @@
%include "macros.mac" %include "macros.mac"
NEWSYM GPProAsmStart
section .data section .data
sample times 60 db 0 sample times 60 db 0
clock_mask db 0 clock_mask db 0
@@ -153,3 +154,4 @@ GPP_ERR:
pop ebx pop ebx
mov eax,1 mov eax,1
ret ret
NEWSYM GPProAsmEnd

3
zsnes/src/dos/initvid.asm
View File

@@ -22,7 +22,7 @@ EXTSYM scanlines,selcA000,vesa2_bits,vesa2_bpos,vesa2_clbit
EXTSYM vesa2_gpos,vesa2_rpos,vesa2_usbit,vesa2_x,vesa2_y EXTSYM vesa2_gpos,vesa2_rpos,vesa2_usbit,vesa2_x,vesa2_y
EXTSYM vesa2selec,InitVesa12,videotroub EXTSYM vesa2selec,InitVesa12,videotroub
NEWSYM InitVidAsmStart
@@ -618,3 +618,4 @@ NEWSYM dosinitvideo
pop es pop es
ret ret
NEWSYM InitVidAsmEnd

2
zsnes/src/dos/joy.asm
View File

@@ -30,6 +30,7 @@ EXTSYM pl5contrl,pl5p209
EXTSYM CalibXmin, CalibYmin, CalibXmax, CalibYmax, CalibXmin209 EXTSYM CalibXmin, CalibYmin, CalibXmax, CalibYmax, CalibXmin209
EXTSYM CalibYmin209, CalibXmax209, CalibYmax209 EXTSYM CalibYmin209, CalibXmax209, CalibYmax209
NEWSYM JoyAsmStart
NEWSYM joy4218, db 0 NEWSYM joy4218, db 0
NEWSYM joy4219, db 0 NEWSYM joy4219, db 0
@@ -1614,3 +1615,4 @@ NEWSYM SetInputDevice209
.exit .exit
ret ret
NEWSYM JoyAsmEnd

3
zsnes/src/dos/modemrtn.asm
View File

@@ -23,7 +23,7 @@ EXTSYM GUIinit18_2hz,GUIinit36_4hz
EXTSYM GUIMenuItem EXTSYM GUIMenuItem
EXTSYM delay EXTSYM delay
NEWSYM DosModemRTNAsmStart
@@ -434,3 +434,4 @@ NEWSYM DeInitModemC
sti sti
ret ret
NEWSYM DosModemRTNAsmEnd

3
zsnes/src/dos/sw.asm
View File

@@ -19,7 +19,7 @@
EXTSYM SidewinderFix EXTSYM SidewinderFix
NEWSYM SWAsmStart
@@ -223,3 +223,4 @@ ModeALoop:
dec ecx dec ecx
jnz ModeALoop jnz ModeALoop
ret ret
NEWSYM SWAsmEnd

4
zsnes/src/dos/vesa12.asm
View File

@@ -28,7 +28,7 @@ EXTSYM InitDrive,gotoroot,InitDir,fulladdtab
EXTSYM LFBpointer,noblocks,bytesperscanline,vesamode,VESAmodelist EXTSYM LFBpointer,noblocks,bytesperscanline,vesamode,VESAmodelist
NEWSYM Vesa12AsmStart
@@ -552,3 +552,5 @@ RMREGS
.sp dw 0 .sp dw 0
.ss dw 0 .ss dw 0
.spare times 20 dd 0 .spare times 20 dd 0
NEWSYM Vesa12AsmEnd

3
zsnes/src/dos/vesa2.asm
View File

@@ -27,7 +27,7 @@ EXTSYM UnusedBit,HalfTrans,UnusedBitXor,ngrposng,nggposng,ngbposng
; EXTSYM printhex ; EXTSYM printhex
EXTSYM Init_2xSaIMMX,Init_2xSaI EXTSYM Init_2xSaIMMX,Init_2xSaI
NEWSYM Vesa2AsmStart
@@ -799,3 +799,4 @@ NEWSYM RMREGS
.ss dw 0 .ss dw 0
.spare times 20 dd 0 .spare times 20 dd 0
;---------------------------------------------------------------------- ;----------------------------------------------------------------------
NEWSYM Vesa2AsmEnd

3
zsnes/src/endmem.asm
View File

@@ -17,7 +17,7 @@
%include "macros.mac" %include "macros.mac"
NEWSYM EndMemAsmStart
@@ -247,3 +247,4 @@ NEWSYM bg4change, times 256 db 0
NEWSYM bgwinchange, times 256 db 0 NEWSYM bgwinchange, times 256 db 0
NEWSYM PrevPicture, times 64*56*2 db 0 NEWSYM PrevPicture, times 64*56*2 db 0
NEWSYM EndMemAsmEnd

1
zsnes/src/fixsin.h
View File

@@ -21,4 +21,3 @@ extern int FCosTab[2048];
#define FSINMAX 2047 #define FSINMAX 2047
#define FSin(x) FSinTab[(x)&FSINMAX] #define FSin(x) FSinTab[(x)&FSINMAX]
#define FCos(x) FCosTab[(x)&FSINMAX] #define FCos(x) FCosTab[(x)&FSINMAX]

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

@@ -170,7 +170,7 @@ EXTSYM ipxgetchar,ipxsendchar,TCPIPStoreByte
EXTSYM TCPIPGetByte EXTSYM TCPIPGetByte
EXTSYM ModemSendChar EXTSYM ModemSendChar
NEWSYM GuiAsmStart
%include "gui/guitools.inc" %include "gui/guitools.inc"
%include "gui/guimisc.inc" %include "gui/guimisc.inc"
@@ -184,6 +184,8 @@ EXTSYM ModemSendChar
; ProcessRemoteCommand ; ProcessRemoteCommand
; NetLoadStuff ; Send 14 to initiate, Send 15 to cancel (either way) ; NetLoadStuff ; Send 14 to initiate, Send 15 to cancel (either way)
; call PreparePacket ; call PreparePacket
@@ -192,11 +194,8 @@ EXTSYM ModemSendChar
; call SendPacket ; call SendPacket
; NetAddChar ; NetAddChar
NEWSYM WaterOn, db 1 NEWSYM WaterOn, db 1
; Things to do : ; Things to do :
; ;
; .checkmenuboxclick ; .checkmenuboxclick
@@ -885,9 +884,10 @@ NEWSYM GUIRestoreVars
.failb .failb
ret ret
SECTION .data
NEWSYM ComboHeader, db 'Key Combination File',26,1,0 NEWSYM ComboHeader, db 'Key Combination File',26,1,0
NEWSYM ComboBlHeader, times 23 db 0 NEWSYM ComboBlHeader, times 23 db 0
SECTION .text
NEWSYM ExecGUISaveVars NEWSYM ExecGUISaveVars
cmp byte[ShowTimer],1 cmp byte[ShowTimer],1
@@ -944,6 +944,7 @@ NEWSYM ExecGUISaveVars
call GUIDeInit call GUIDeInit
%endmacro %endmacro
SECTION .data
NEWSYM GUIoldhand9o, dd 0 NEWSYM GUIoldhand9o, dd 0
NEWSYM GUIoldhand9s, dw 0 NEWSYM GUIoldhand9s, dw 0
NEWSYM GUIoldhand8o, dd 0 NEWSYM GUIoldhand8o, dd 0
@@ -952,6 +953,7 @@ GUIt1cc dd 0
GUIt1ccSwap db 0 GUIt1ccSwap db 0
GUIskipnextkey42 db 0 GUIskipnextkey42 db 0
SECTION .text
NEWSYM GUIinit18_2hz NEWSYM GUIinit18_2hz
mov al,00110110b mov al,00110110b
out 43H,al out 43H,al
@@ -1156,6 +1158,7 @@ LoadDetermine:
.noromloaded .noromloaded
ret ret
SECTION .data
SantaData: SantaData:
db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -1171,6 +1174,7 @@ SantaNextT dd 36*15
NumSnow dd 0 NumSnow dd 0
NEWSYM SnowTimer, dd 36*30 NEWSYM SnowTimer, dd 36*30
MsgGiftLeft dd 0 MsgGiftLeft dd 0
SECTION .text
DrawSnow: DrawSnow:
cmp byte[OkaySC],0 cmp byte[OkaySC],0
@@ -4890,6 +4894,4 @@ db 57,103,110,236,113,118,203,200,22,87,251,7,138,37,12,84,221,171,51,209
db 242,37,89,73,151,162,139,189,131,209,221,96,107,144,175,79,199,123,98,138 db 242,37,89,73,151,162,139,189,131,209,221,96,107,144,175,79,199,123,98,138
db 226,86,221,254,72,14,126,180,200,171,85,94,120,124,196,225,150,57,219,158 db 226,86,221,254,72,14,126,180,200,171,85,94,120,124,196,225,150,57,219,158
NEWSYM GuiAsmEnd

4
zsnes/src/gui/guiwindp.inc
View File

@@ -4763,7 +4763,7 @@ GUIGUIAboutText3 db ' ZSKNIGHT',0
GUIGUIAboutText4 db ' _DEMO_',0 GUIGUIAboutText4 db ' _DEMO_',0
GUIGUIAboutText5 db 'ASSISTANT CODER : ',0 GUIGUIAboutText5 db 'ASSISTANT CODER : ',0
GUIGUIAboutText6 db ' PHAROS',0 GUIGUIAboutText6 db ' PHAROS',0
GUIGUIAboutText7 db 'WIN PORT V0.86',0 GUIGUIAboutText7 db 'WIN PORT V0.85',0
GUIGUIAboutText8 db 'HOMEPAGE',0 GUIGUIAboutText8 db 'HOMEPAGE',0
DisplayGUIMovies: DisplayGUIMovies:
@@ -5463,6 +5463,7 @@ DisplayGUICombo:
.noscrolldisplay .noscrolldisplay
ret ret
GUIccombviewloc dd 0 GUIccombviewloc dd 0
GUIccombcursloc dd 0 GUIccombcursloc dd 0
GUIccomblcursloc dd 0 GUIccomblcursloc dd 0
@@ -5619,3 +5620,4 @@ NEWSYM GUIMenuItem, db 'GAME ',0
db 'NETPLAY',0 db 'NETPLAY',0
db 'MISC ',0 db 'MISC ',0
db 25,0 db 25,0

3
zsnes/src/gui/menu.asm
View File

@@ -35,7 +35,7 @@ EXTSYM Voice0Disable,Voice1Disable,Voice2Disable,Voice3Disable
EXTSYM Voice4Disable,Voice5Disable,Voice6Disable,Voice7Disable EXTSYM Voice4Disable,Voice5Disable,Voice6Disable,Voice7Disable
NEWSYM MenuAsmStart
@@ -1434,3 +1434,4 @@ restore16b:
mov byte[vesa2_gpos],6 mov byte[vesa2_gpos],6
.nored .nored
ret ret
NEWSYM MenuAsmEnd

15
zsnes/src/init.asm
View File

@@ -83,9 +83,12 @@ EXTSYM pal16bxcl,ram7fa,regptra,regptwa,srama,vidmemch2,vidmemch4
EXTSYM vidmemch8,vcache2b,vcache4b,vcache8b,vram,wramdata EXTSYM vidmemch8,vcache2b,vcache4b,vcache8b,vram,wramdata
EXTSYM wramdataa EXTSYM wramdataa
EXTSYM fname,fnames,GetCurDir EXTSYM fname,fnames,GetCurDir
EXTSYM GUIcurrentdir,extractzip,PrintStr ;EXTSYM GUIcurrentdir,extractzip,PrintStr
;STUB DDOI
EXTSYM GUIcurrentdir, PrintStr
EXTSYM GUIsmcfind,GUIsfcfind,GUIswcfind,GUIfigfind,GUIfind058,GUIfind078,GUIfindBIN EXTSYM GUIsmcfind,GUIsfcfind,GUIswcfind,GUIfigfind,GUIfind058,GUIfind078,GUIfindBIN
EXTSYM GUIfindUSA,GUIfindJAP,GUIfindZIP,GUIfind1,DTALoc,GUIfindall,ZipError ;EXTSYM GUIfindUSA,GUIfindJAP,GUIfindZIP,GUIfind1,DTALoc,GUIfindall,ZipError
EXTSYM GUIfindUSA,GUIfindJAP,GUIfindZIP,GUIfind1,DTALoc,GUIfindall
EXTSYM spc7110romptr,allocspc7110 EXTSYM spc7110romptr,allocspc7110
EXTSYM SRAMDir,SRAMDrive,cfgloadsdir,fnamest,statefileloc EXTSYM SRAMDir,SRAMDrive,cfgloadsdir,fnamest,statefileloc
EXTSYM ForcePal,InitDir,InitDrive,enterpress,frameskip EXTSYM ForcePal,InitDir,InitDrive,enterpress,frameskip
@@ -105,7 +108,7 @@ EXTSYM sramaccessbankr8s,sramaccessbankw16,sramaccessbankw16s
EXTSYM sramaccessbankw8,sramaccessbankw8s,GenerateBank0TableSA1 EXTSYM sramaccessbankw8,sramaccessbankw8s,GenerateBank0TableSA1
NEWSYM InitAsmStart
@@ -3545,6 +3548,11 @@ GUIfindBlank db '*.',0
InvalidZip db 'ZSNES Version A does not support .ZIP files.',13,10,'Please use Version C for this feature.',10,13,0 InvalidZip db 'ZSNES Version A does not support .ZIP files.',13,10,'Please use Version C for this feature.',10,13,0
ZipError db 0
extractzip:
ret
UnZipFile: UnZipFile:
cmp byte[OSPort],1 cmp byte[OSPort],1
jne .noasm jne .noasm
@@ -5324,3 +5332,4 @@ NEWSYM outofmemoryerror, db 'OUT OF MEMORY.',0
NEWSYM outofmemoryerror2, db 'ROM IS TOO BIG.',0 NEWSYM outofmemoryerror2, db 'ROM IS TOO BIG.',0
SECTION .text SECTION .text
NEWSYM InitAsmEnd

22
zsnes/src/macros.mac
View File

@@ -19,6 +19,27 @@
bits 32 bits 32
section .text section .text
; Zsnes required macros ; Zsnes required macros
%ifdef __LINUX__
%imacro newsym 1
GLOBAL %1
%1:
%endmacro
%imacro newsym 2+
GLOBAL %1
%1: %2
%endmacro
%define EXTSYM EXTERN
%macro ALIGN32 0
times ($$-$) & 1Fh nop ; Long word alignment
%endmacro
%macro ALIGN16 0
times ($$-$) & 1Fh nop ; Long word alignment
%endmacro
%else
%imacro newsym 1 %imacro newsym 1
GLOBAL _%1 GLOBAL _%1
_%1: _%1:
@@ -46,3 +67,4 @@ section .text
%rotate 1 %rotate 1
%endrep %endrep
%endmacro %endmacro
%endif

38
zsnes/src/makefile.linux
View File

@@ -20,12 +20,12 @@ CPUDIR=cpu
DOSDIR=dos DOSDIR=dos
GUIDIR=gui GUIDIR=gui
VIDEODIR=video VIDEODIR=video
WINDIR=win WINDIR=linux
OBJDIR=obj OBJDIR=obj
CHIPSOBJ=${CHIPDIR}/dsp1emu.o ${CHIPDIR}/fxemu2.o ${CHIPDIR}/sfxproc.o\ CHIPSOBJ=${CHIPDIR}/sfxproc.o ${CHIPDIR}/fxemu2.o ${CHIPDIR}/dsp1proc.o\
${CHIPDIR}/fxemu2b.o ${CHIPDIR}/fxemu2c.o ${CHIPDIR}/fxtable.o\ ${CHIPDIR}/fxemu2b.o ${CHIPDIR}/fxemu2c.o ${CHIPDIR}/fxtable.o\
${CHIPDIR}/sa1proc.o ${CHIPDIR}/sa1regs.o ${CHIPDIR}/dsp1proc.o ${CHIPDIR}/sa1proc.o ${CHIPDIR}/sa1regs.o ${CHIPDIR}/dsp1emu.o
CPUOBJ=${CPUDIR}/addrni.o ${CPUDIR}/dma.o ${CPUDIR}/dsp.o ${CPUDIR}/dspproc.o\ CPUOBJ=${CPUDIR}/addrni.o ${CPUDIR}/dma.o ${CPUDIR}/dsp.o ${CPUDIR}/dspproc.o\
${CPUDIR}/execute.o ${CPUDIR}/irq.o ${CPUDIR}/memory.o \ ${CPUDIR}/execute.o ${CPUDIR}/irq.o ${CPUDIR}/memory.o \
@@ -39,26 +39,25 @@ VIDEOBJ=${VIDEODIR}/makev16b.o ${VIDEODIR}/makev16t.o ${VIDEODIR}/makevid.o\
${VIDEODIR}/mode716e.o ${VIDEODIR}/mode716t.o ${VIDEODIR}/mode7.o\ ${VIDEODIR}/mode716e.o ${VIDEODIR}/mode716t.o ${VIDEODIR}/mode7.o\
${VIDEODIR}/mode7ext.o ${VIDEODIR}/mv16tms.o ${VIDEODIR}/newg162.o\ ${VIDEODIR}/mode7ext.o ${VIDEODIR}/mv16tms.o ${VIDEODIR}/newg162.o\
${VIDEODIR}/newgfx16.o ${VIDEODIR}/newgfx2.o ${VIDEODIR}/newgfx.o\ ${VIDEODIR}/newgfx16.o ${VIDEODIR}/newgfx2.o ${VIDEODIR}/newgfx.o\
${VIDEODIR}/m716text.o ${VIDEODIR}/2xsai.o ${VIDEODIR}/procvid.o ${VIDEODIR}/m716text.o ${VIDEODIR}/2xsaiw.o ${VIDEODIR}/2xsai.o\
${VIDEODIR}/procvid.o
DOSOBJ= ${DOSDIR}/dosintrf.o ${DOSDIR}/gppro.o ${DOSDIR}/debug.o\ WINOBJ=${WINDIR}/copyvwin.o ${WINDIR}/winintrf.o ${WINDIR}/sdllink.o\
${DOSDIR}/initvid.o ${DOSDIR}/modemrtn.o ${DOSDIR}/sw32.o\ ${WINDIR}/zloaderw.o ${WINDIR}/ztcp.o ${WINDIR}/zipxw.o\
${DOSDIR}/joy.o ${DOSDIR}/sw.o ${DOSDIR}/vesa12.o ${DOSDIR}/vesa2.o\ ${WINDIR}/zfilew.o ${WINDIR}/protect.o
${DOSDIR}/zloader.o ${DOSDIR}/zsipx.o ${DOSDIR}/zfile.o
WINOBJ=${WINDIR}/copywin.o ${WINDIR}/winintrf.o ${WINDIR}/winlink.o\ WINDOSOBJ=${DOSDIR}/debug.o ${DOSDIR}/joy.o ${DOSDIR}/modemrtn.o ${DOSDIR}/vesa2.o\
${WINDIR}/zloaderw.o ${WINDIR}/ztcp.o ${WINDIR}/zipxw.o ${DOSDIR}/initvid.o ${DOSDIR}/sw.o ${DOSDIR}/gppro.o ${DOSDIR}/vesa12.o
PREOBJ= #PREOBJ=${OBJDIR}/unzip.o ${OBJDIR}/zzip.o ${DOSDIR}/zsipx.o
MAINOBJ=cfgload.o endmem.o fixsin.o init.o ui.o vcache.o water.o MAINOBJ=cfgload.o endmem.o fixsin.o init.o ui.o vcache.o water.o
OBJS=${CHIPSOBJ} ${CPUOBJ} ${WINOBJ} ${WINDOSOBJ} ${GUIOBJ} ${VIDEOBJ} ${PREOBJ} ${MAINOBJ}
OBJS=${CHIPSOBJ} ${CPUOBJ} ${DOSOBJ} ${GUIOBJ} ${VIDEOBJ} ${PREOBJ} ${MAINOBJ} LIBS=`sdl-config --libs`
LIBS=-lz -lgcc -lm CFLAGS=-g -D__LINUX__ `sdl-config --cflags`
CFLAGS=
ASM=nasm ASM=nasm
ASMFLAGS=-f elf ASMFLAGS=-f elf -D__LINUX__ -g
CC=gcc CC=gcc
PP=g++ PP=g++
@@ -78,7 +77,7 @@ PP=g++
ALL: zsnes ALL: zsnes
zsnes: ${OBJS} zsnes: ${OBJS}
${CC} -Ws -s -o zsnes ${OBJS} ${LIBS} ${CC} -o zsnes ${OBJS} ${LIBS}
${DOSDIR}/zloader.o: ${DOSDIR}/zloader.c ${DOSDIR}/zloader.o: ${DOSDIR}/zloader.c
fixsin.o: fixsin.c fixsin.o: fixsin.c
@@ -174,12 +173,11 @@ endmem.o: endmem.asm macros.mac
${DOSDIR}/modemrtn.o: ${DOSDIR}/modemrtn.asm macros.mac ${DOSDIR}/modemrtn.o: ${DOSDIR}/modemrtn.asm macros.mac
clean: clean:
rm *.o
rm ${CHIPDIR}/*.o rm ${CHIPDIR}/*.o
rm ${CPUDIR}/*.o rm ${CPUDIR}/*.o
rm ${VIDEODIR}/*.o rm ${VIDEODIR}/*.o
rm ${GUIDIR}/*.o rm ${GUIDIR}/*.o
rm ${DOSDIR}/*.o rm ${DOSDIR}/*.o
rm ${WINDIR}/*.o
rm *.o
rm zsnes rm zsnes

88
zsnes/src/ui.asm
View File

@@ -36,6 +36,7 @@ EXTSYM romloadskip
EXTSYM cfgloadgdir,cfgloadsdir EXTSYM cfgloadgdir,cfgloadsdir
EXTSYM init18_2hz EXTSYM init18_2hz
NEWSYM UIAsmStart
%include "betauser.mac" %include "betauser.mac"
@@ -115,7 +116,7 @@ NEWSYM outofmemory
call PrintStr call PrintStr
jmp DosExit jmp DosExit
;SECTION .data SECTION .data
NEWSYM outofmem, db 'You don',39,'t have enough memory to run this program!',13,10,0 NEWSYM outofmem, db 'You don',39,'t have enough memory to run this program!',13,10,0
%define ZVERSION '18 ' %define ZVERSION '18 '
;%define ZBETA 0 ;%define ZBETA 0
@@ -336,6 +337,39 @@ NEWSYM getcmdline
jmp .next2 jmp .next2
.nomore .nomore
mov [FilenameStart],esi mov [FilenameStart],esi
%ifdef __LINUX__
mov byte[esi],'z'
mov byte[esi+1],'s'
mov byte[esi+2],'n'
mov byte[esi+3],'e'
mov byte[esi+4],'s'
mov byte[esi+5],'.'
mov byte[esi+6],'c'
mov byte[esi+7],'f'
mov byte[esi+8],'g'
mov byte[esi+9],0
mov byte[esi+256],'z'
mov byte[esi+1+256],'g'
mov byte[esi+2+256],'u'
mov byte[esi+3+256],'i'
mov byte[esi+4+256],'c'
mov byte[esi+5+256],'f'
mov byte[esi+6+256],'g'
mov byte[esi+7+256],'.'
mov byte[esi+8+256],'d'
mov byte[esi+9+256],'a'
mov byte[esi+10+256],'t'
mov byte[esi+11+256],0
mov byte[esi+512],'d'
mov byte[esi+1+512],'a'
mov byte[esi+2+512],'t'
mov byte[esi+3+512],'a'
mov byte[esi+4+512],'.'
mov byte[esi+5+512],'c'
mov byte[esi+6+512],'m'
mov byte[esi+7+512],'b'
mov byte[esI+8+512],0
%else
mov byte[esi],'Z' mov byte[esi],'Z'
mov byte[esi+1],'S' mov byte[esi+1],'S'
mov byte[esi+2],'N' mov byte[esi+2],'N'
@@ -367,12 +401,46 @@ NEWSYM getcmdline
mov byte[esi+6+512],'M' mov byte[esi+6+512],'M'
mov byte[esi+7+512],'B' mov byte[esi+7+512],'B'
mov byte[esI+8+512],0 mov byte[esI+8+512],0
%endif
ret ret
.nfound .nfound
mov edx,.stringnf mov edx,.stringnf
call PrintStr call PrintStr
mov esi,CMDLineStr mov esi,CMDLineStr
mov [FilenameStart],esi mov [FilenameStart],esi
%ifdef __LINUX__
mov byte[esi],'z'
mov byte[esi+1],'s'
mov byte[esi+2],'n'
mov byte[esi+3],'e'
mov byte[esi+4],'s'
mov byte[esi+5],'.'
mov byte[esi+6],'c'
mov byte[esi+7],'f'
mov byte[esi+8],'g'
mov byte[esi+9],0
mov byte[esi+256],'z'
mov byte[esi+1+256],'g'
mov byte[esi+2+256],'u'
mov byte[esi+3+256],'i'
mov byte[esi+4+256],'c'
mov byte[esi+5+256],'f'
mov byte[esi+6+256],'g'
mov byte[esi+7+256],'.'
mov byte[esi+8+256],'d'
mov byte[esi+9+256],'a'
mov byte[esi+10+256],'t'
mov byte[esi+11+256],0
mov byte[esi+512],'d'
mov byte[esi+1+512],'a'
mov byte[esi+2+512],'t'
mov byte[esi+3+512],'a'
mov byte[esi+4+512],'.'
mov byte[esi+5+512],'c'
mov byte[esi+6+512],'m'
mov byte[esi+7+512],'b'
mov byte[esI+8+512],0
%else
mov byte[esi],'Z' mov byte[esi],'Z'
mov byte[esi+1],'S' mov byte[esi+1],'S'
mov byte[esi+2],'N' mov byte[esi+2],'N'
@@ -404,6 +472,7 @@ NEWSYM getcmdline
mov byte[esi+6+512],'M' mov byte[esi+6+512],'M'
mov byte[esi+7+512],'B' mov byte[esi+7+512],'B'
mov byte[esI+8+512],0 mov byte[esI+8+512],0
%endif
ret ret
SECTION .data SECTION .data
@@ -1020,7 +1089,11 @@ NEWSYM makeextension
.loopz .loopz
dec edx dec edx
mov al,[fnames+edx] mov al,[fnames+edx]
%ifdef __LINUX__
cmp al, '/'
%else
cmp al,'\' cmp al,'\'
%endif
je .addext je .addext
cmp al,'.' cmp al,'.'
je .addb je .addb
@@ -1033,6 +1106,17 @@ NEWSYM makeextension
mov byte[fnames+ebx],'.' mov byte[fnames+ebx],'.'
mov byte[fnamest+ebx],'.' mov byte[fnamest+ebx],'.'
inc ebx inc ebx
%ifdef __LINUX__
mov byte[fnames+ebx],'s'
mov byte[fnamest+ebx],'z'
inc ebx
mov byte[fnames+ebx],'r'
mov byte[fnamest+ebx],'s'
inc ebx
mov byte[fnames+ebx],'m'
mov byte[fnamest+ebx],'t'
mov dword[statefileloc],ebx
%else
mov byte[fnames+ebx],'S' mov byte[fnames+ebx],'S'
mov byte[fnamest+ebx],'Z' mov byte[fnamest+ebx],'Z'
inc ebx inc ebx
@@ -1042,6 +1126,7 @@ NEWSYM makeextension
mov byte[fnames+ebx],'M' mov byte[fnames+ebx],'M'
mov byte[fnamest+ebx],'T' mov byte[fnamest+ebx],'T'
mov dword[statefileloc],ebx mov dword[statefileloc],ebx
%endif
inc ebx inc ebx
mov byte[fnames+ebx],0 mov byte[fnames+ebx],0
mov byte[fnamest+ebx],0 mov byte[fnamest+ebx],0
@@ -1327,3 +1412,4 @@ NEWSYM DosExit ; Terminate Program
mov ax,4c00h ;terminate mov ax,4c00h ;terminate
int 21h int 21h
NEWSYM UIAsmEnd

3
zsnes/src/vcache.asm
View File

@@ -56,7 +56,7 @@ EXTSYM tltype2b
EXTSYM tltype8b EXTSYM tltype8b
NEWSYM VCacheAsmStart
@@ -3762,3 +3762,4 @@ NEWSYM cachesingle8bng
pop edi pop edi
pop esi pop esi
ret ret
NEWSYM VCacheAsmEnd

5
zsnes/src/video/2xsaiw.asm
View File

@@ -17,7 +17,7 @@
%include "macros.mac" %include "macros.mac"
NEWSYM TwoxSaiWAsmStart
;/*---------------------------------------------------------------------* ;/*---------------------------------------------------------------------*
; * The following (piece of) code, (part of) the 2xSaI engine, * ; * The following (piece of) code, (part of) the 2xSaI engine, *
; * copyright (c) 1999 by Derek Liauw Kie Fa. * ; * copyright (c) 1999 by Derek Liauw Kie Fa. *
@@ -1342,3 +1342,6 @@ final1a times 8 db 0
final1b times 8 db 0 final1b times 8 db 0
final2a times 8 db 0 final2a times 8 db 0
final2b times 8 db 0 final2b times 8 db 0
SECTION .text
NEWSYM TwoxSaiWAsmEnd

4
zsnes/src/video/copyvid.inc
View File

@@ -831,6 +831,7 @@ copyvesa2320x480x8ng:
;******************************************************* ;*******************************************************
ALIGN32 ALIGN32
SECTION .data
NEWSYM EagleHold, dd 0 NEWSYM EagleHold, dd 0
NEWSYM smallscreenon, dd 0 NEWSYM smallscreenon, dd 0
NEWSYM smallscreence, dd 0 NEWSYM smallscreence, dd 0
@@ -838,7 +839,7 @@ NEWSYM CurrentGUIOn, dd 0
vesavaland dd 0,0 vesavaland dd 0,0
mmxvalanda dd 11111111110000001111111111000000b,11111111110000001111111111000000b mmxvalanda dd 11111111110000001111111111000000b,11111111110000001111111111000000b
mmxvalandb dd 00000000000111110000000000011111b,00000000000111110000000000011111b mmxvalandb dd 00000000000111110000000000011111b,00000000000111110000000000011111b
SECTION .text
NEWSYM copyvesa2640x480x8bgui NEWSYM copyvesa2640x480x8bgui
mov byte[CurrentGUIOn],1 mov byte[CurrentGUIOn],1
cmp byte[smallscreenon],1 cmp byte[smallscreenon],1
@@ -5695,3 +5696,4 @@ NEWSYM Clear2xSaIBuffer
add ebx,4 add ebx,4
loop .nextb loop .nextb
ret ret

3
zsnes/src/video/m716text.asm
View File

@@ -24,7 +24,7 @@ EXTSYM vesa2_clbit,vram,vrama,winon,xtravbuf,winptrref,scaddset
EXTSYM fulladdtab EXTSYM fulladdtab
EXTSYM cwinptr EXTSYM cwinptr
NEWSYM M716TExtAsmStart
@@ -991,3 +991,4 @@ extbg2sub:
cmp dh,1 cmp dh,1
jne near domosaic16b jne near domosaic16b
ret ret
NEWSYM M716TExtAsmEnd

2
zsnes/src/video/makev16b.asm
View File

@@ -51,6 +51,7 @@ EXTSYM ofsmcptr,ofsmady,ofsmadx,yposng,yposngom,flipyposng,flipyposngom
EXTSYM ofsmtptr,ofsmmptr,ofsmcyps,bgtxadd,bg1ptrx,bg1ptry EXTSYM ofsmtptr,ofsmmptr,ofsmcyps,bgtxadd,bg1ptrx,bg1ptry
EXTSYM a16x16xinc,a16x16yinc EXTSYM a16x16xinc,a16x16yinc
NEWSYM MakeV16BAsmStart
%include "video/vidmacro.mac" %include "video/vidmacro.mac"
@@ -3082,3 +3083,4 @@ draw16x1616bwinon:
jne near domosaic16b jne near domosaic16b
ret ret
NEWSYM MakeV16BAsmEnd

2
zsnes/src/video/makev16t.asm
View File

@@ -60,6 +60,7 @@ EXTSYM ofsmcptr,ofsmady,ofsmadx,yposng,yposngom,flipyposng,flipyposngom
EXTSYM ofsmtptr,ofsmmptr,ofsmcyps,bgtxadd,bg1ptrx,bg1ptry EXTSYM ofsmtptr,ofsmmptr,ofsmcyps,bgtxadd,bg1ptrx,bg1ptry
EXTSYM a16x16xinc,a16x16yinc EXTSYM a16x16xinc,a16x16yinc
NEWSYM MakeV16TAsmStart
%include "video/vidmacro.mac" %include "video/vidmacro.mac"
@@ -5310,3 +5311,4 @@ NEWSYM draw16x1616tswinon
dec byte[tileleft16b] dec byte[tileleft16b]
jnz near .loopa jnz near .loopa
ret ret
NEWSYM MakeV16TAsmEnd

3
zsnes/src/video/makevid.asm
View File

@@ -41,6 +41,8 @@ EXTSYM tempoffset,vidmemch2,vidmemch4,vidmemch8
EXTSYM ofsmcptr,ofsmady,ofsmadx,yposng,yposngom,flipyposng,flipyposngom EXTSYM ofsmcptr,ofsmady,ofsmadx,yposng,yposngom,flipyposng,flipyposngom
EXTSYM ofsmtptr,ofsmmptr,ofsmcyps,bgtxadd,bg1ptrx,bg1ptry EXTSYM ofsmtptr,ofsmmptr,ofsmcyps,bgtxadd,bg1ptrx,bg1ptry
NEWSYM MakeVidAsmStart
%include "video/vidmacro.mac" %include "video/vidmacro.mac"
@@ -4383,3 +4385,4 @@ NEWSYM a16x16xinc, db 0
NEWSYM a16x16yinc, db 0 NEWSYM a16x16yinc, db 0
NEWSYM MakeVidAsmEnd

3
zsnes/src/video/mode7.asm
View File

@@ -25,6 +25,8 @@ EXTSYM pesimpng
EXTSYM mode7hr EXTSYM mode7hr
EXTSYM BGMA, mode7ab, mode7cd, BG1SYl, BG1SXl, mosenng, mosszng EXTSYM BGMA, mode7ab, mode7cd, BG1SYl, BG1SXl, mosenng, mosszng
NEWSYM Mode7AsmStart
%include "video/mode7.mac" %include "video/mode7.mac"
@@ -815,3 +817,4 @@ NEWSYM processmode7hires
pop esi pop esi
.nogo .nogo
ret ret
NEWSYM Mode7AsmEnd

2
zsnes/src/video/mode716.asm
View File

@@ -29,6 +29,7 @@ EXTSYM mode7ab,mode7cd,BGMA
EXTSYM BG1SXl,BG1SYl EXTSYM BG1SXl,BG1SYl
EXTSYM processmode7hires EXTSYM processmode7hires
NEWSYM Mode716AsmStart
%include "video/mode716.mac" %include "video/mode716.mac"
@@ -684,3 +685,4 @@ NEWSYM processmode7hires16bd
.nogo .nogo
ret ret
NEWSYM Mode716AsmEnd

2
zsnes/src/video/mode716b.asm
View File

@@ -22,6 +22,7 @@ EXTSYM mode7A,mode7B,mode7C,mode7D,mode7X0,mode7Y0,mode7set
EXTSYM pal16b,vram,vrama,winon,mode7tab,xtravbuf,drawmode7dcolor EXTSYM pal16b,vram,vrama,winon,mode7tab,xtravbuf,drawmode7dcolor
EXTSYM cwinptr EXTSYM cwinptr
NEWSYM Mode716BAsmStart
%include "video/mode7.mac" %include "video/mode7.mac"
@@ -186,3 +187,4 @@ ALIGN32
Mode7Process Mode7Window, domosaic16b, 2 Mode7Process Mode7Window, domosaic16b, 2
.nextval3w .nextval3w
Mode7ProcessB Mode7Window, domosaic16b, 2 Mode7ProcessB Mode7Window, domosaic16b, 2
NEWSYM Mode716BAsmEnd

2
zsnes/src/video/mode716d.asm
View File

@@ -21,6 +21,7 @@ EXTSYM curmosaicsz,curvidoffset,domosaic16b,winptrref,scaddset
EXTSYM mode7A,mode7B,mode7C,mode7D,mode7X0,mode7Y0,mode7set,cwinptr EXTSYM mode7A,mode7B,mode7C,mode7D,mode7X0,mode7Y0,mode7set,cwinptr
EXTSYM pal16b,vram,vrama,winon,mode7tab,xtravbuf,dcolortab,vidbright EXTSYM pal16b,vram,vrama,winon,mode7tab,xtravbuf,dcolortab,vidbright
NEWSYM Mode716DAsmStart
%include "video/mode7.mac" %include "video/mode7.mac"
@@ -230,3 +231,4 @@ ALIGN32
Mode7Process Mode7Window, domosaic16b, 2 Mode7Process Mode7Window, domosaic16b, 2
.nextval3w .nextval3w
Mode7ProcessB Mode7Window, domosaic16b, 2 Mode7ProcessB Mode7Window, domosaic16b, 2
NEWSYM Mode716DAsmEnd

3
zsnes/src/video/mode716e.asm
View File

@@ -23,7 +23,7 @@ EXTSYM pal16b,vram,vrama,winon,mode7tab,xtravbuf,drawmode7dcolor
EXTSYM cwinptr EXTSYM cwinptr
NEWSYM Mode716EAsmStart
@@ -1258,3 +1258,4 @@ NEWSYM drawmode716extbg2
cmp dh,1 cmp dh,1
jne near domosaic16b jne near domosaic16b
ret ret
NEWSYM Mode716EAsmEnd

3
zsnes/src/video/mode716t.asm
View File

@@ -24,6 +24,8 @@ EXTSYM pal16b,pal16bcl,pal16bxcl,scaddtype,scrnon,transpbuf,drawmode716b
EXTSYM vesa2_clbit,vram,vrama,winon,xtravbuf,winptrref,scaddset EXTSYM vesa2_clbit,vram,vrama,winon,xtravbuf,winptrref,scaddset
EXTSYM fulladdtab EXTSYM fulladdtab
NEWSYM Mode716TAsmStart
%include "video/mode7.mac" %include "video/mode7.mac"
@@ -361,3 +363,4 @@ NEWSYM drawmode716tb
cwinptr2 dd 0 cwinptr2 dd 0
NEWSYM Mode716TAsmEnd

2
zsnes/src/video/mode7ext.asm
View File

@@ -26,6 +26,7 @@ EXTSYM nglogicval,winlogicaval,ProcessMode7ngwinD,ProcessMode7ngwinC
EXTSYM ngwinen, winbg1enval, BuildWindow, ngwintable, ngcwinptr EXTSYM ngwinen, winbg1enval, BuildWindow, ngwintable, ngcwinptr
EXTSYM ProcessMode7ngwin,ProcessMode7ngwinB EXTSYM ProcessMode7ngwin,ProcessMode7ngwinB
NEWSYM Mode7ExtAsmStart
%include "video/mode7.mac" %include "video/mode7.mac"
@@ -1315,3 +1316,4 @@ NEWSYM drawmode7ngextbg2
jne near domosaic jne near domosaic
ret ret
NEWSYM Mode7ExtAsmEnd

3
zsnes/src/video/mv16tms.asm
View File

@@ -28,6 +28,8 @@ EXTSYM pal16bxcl
EXTSYM coadder16 EXTSYM coadder16
EXTSYM a16x16xinc,a16x16yinc,curypos,yflipadd EXTSYM a16x16xinc,a16x16yinc,curypos,yflipadd
NEWSYM MV16TMSAsmStart
%include "video/vidmacro.mac" %include "video/vidmacro.mac"
@@ -1499,3 +1501,4 @@ NEWSYM draw16x1616tswinonms
dec byte[tileleft16b] dec byte[tileleft16b]
jnz near .loopa jnz near .loopa
ret ret
NEWSYM MV16TMSAsmEnd

3
zsnes/src/video/newg162.asm
View File

@@ -31,6 +31,8 @@ EXTSYM vidmemch2s,vidmemch4s,vidmemch8s
EXTSYM cpalval EXTSYM cpalval
EXTSYM SpecialLine EXTSYM SpecialLine
NEWSYM NewG162AsmStart
%include "video/vidmacro.mac" %include "video/vidmacro.mac"
%include "video/newg162.mac" %include "video/newg162.mac"
%include "video/newgfx16.mac" %include "video/newgfx16.mac"
@@ -1399,3 +1401,4 @@ drawlineng4b16bmsom16x16:
drawlineng4b16bmsntom16x16 drawlineng4b16bmsntom16x16
drawline16bmacroom16x16 tltype4b,preparet4ba,cachesingle4bng,ngpalcon4b,test4ba,0Fh,procpixelsmsnt,procpixelstmsnt drawline16bmacroom16x16 tltype4b,preparet4ba,cachesingle4bng,ngpalcon4b,test4ba,0Fh,procpixelsmsnt,procpixelstmsnt
NEWSYM NewG162AsmEnd

4
zsnes/src/video/newgfx.asm
View File

@@ -47,6 +47,8 @@ EXTSYM winlogicb
EXTSYM ngwinptr,objwlrpos,objwen,objclineptr,CSprWinPtr EXTSYM ngwinptr,objwlrpos,objwen,objclineptr,CSprWinPtr
EXTSYM WindowRedraw EXTSYM WindowRedraw
NEWSYM NewGfxAsmStart
%include "video/vidmacro.mac" %include "video/vidmacro.mac"
%include "video/newgfx2.mac" %include "video/newgfx2.mac"
%include "video/newgfx.mac" %include "video/newgfx.mac"
@@ -2336,3 +2338,5 @@ NEWSYM preparesprpr
ALIGN32 ALIGN32
NEWSYM sprclprio, dd 0 NEWSYM sprclprio, dd 0
NEWSYM sprsingle, dd 0 NEWSYM sprsingle, dd 0
NEWSYM NewGfxAsmEnd

3
zsnes/src/video/newgfx16.asm
View File

@@ -65,6 +65,8 @@ EXTSYM NGNumSpr
EXTSYM fulladdtab EXTSYM fulladdtab
EXTSYM FPUCopy EXTSYM FPUCopy
NEWSYM NewGfx16AsmStart
%include "video/vidmacro.mac" %include "video/vidmacro.mac"
%include "video/newgfx16.mac" %include "video/newgfx16.mac"
%include "video/newg162.mac" %include "video/newg162.mac"
@@ -3409,3 +3411,4 @@ NEWSYM FullBitAnd, dd 0F800F800h,0F800F800h
NEWSYM HalfTransB, dd 00001000010000010000100001000001b,00001000010000010000100001000001b NEWSYM HalfTransB, dd 00001000010000010000100001000001b,00001000010000010000100001000001b
NEWSYM HalfTransC, dd 11110111100111101111011110011110b,11110111100111101111011110011110b NEWSYM HalfTransC, dd 11110111100111101111011110011110b,11110111100111101111011110011110b
NEWSYM NGNoTransp, dd 0 NEWSYM NGNoTransp, dd 0
NEWSYM NewGfx16AsmEnd

3
zsnes/src/video/newgfx2.asm
View File

@@ -26,6 +26,8 @@ EXTSYM ngpalcon2b,tleftnb,tltype2b,tltype4b,tltype8b,yposng,flipyposng
EXTSYM ofsmcptr,ofsmtptr,ofsmmptr,ofsmcyps,ofsmady,ofsmadx EXTSYM ofsmcptr,ofsmtptr,ofsmmptr,ofsmcyps,ofsmady,ofsmadx
EXTSYM yposngom,flipyposngom,cbgval,ofsmval,ofsmvalh,vram EXTSYM yposngom,flipyposngom,cbgval,ofsmval,ofsmvalh,vram
NEWSYM NewGfx2AsmStart
%include "video/vidmacro.mac" %include "video/vidmacro.mac"
%include "video/newgfx2.mac" %include "video/newgfx2.mac"
%include "video/newgfx.mac" %include "video/newgfx.mac"
@@ -671,3 +673,4 @@ Processwinclipom4b:
cmp dword[ngcwinmode],1 cmp dword[ngcwinmode],1
je near drawlinengom4bwin.winclipped je near drawlinengom4bwin.winclipped
jmp drawlinengom4bwin.loop jmp drawlinengom4bwin.loop
NEWSYM NewGfx2AsmEnd

4
zsnes/src/video/procvid.asm
View File

@@ -54,10 +54,12 @@ EXTSYM ChatNick
EXTSYM StringLength EXTSYM StringLength
EXTSYM chatstrLt EXTSYM chatstrLt
NEWSYM ProcVidAsmStart
NEWSYM ScreenScale, db 0 ; If horizontal is scaled or not NEWSYM ScreenScale, db 0 ; If horizontal is scaled or not
NEWSYM TempDebugV, dw 0 ; Temporary Debugging variable NEWSYM TempDebugV, dw 0 ; Temporary Debugging variable
%macro MMXStuff 0 %macro MMXStuff 0
%%1 %%1
movq mm0,[esi] movq mm0,[esi]
@@ -3571,6 +3573,7 @@ NEWSYM vidpaste
.SSRedCo dw 0 .SSRedCo dw 0
NEWSYM lastfps, db 0 ; stores the last fps encountered NEWSYM lastfps, db 0 ; stores the last fps encountered
NEWSYM lastfps2, db 0 ; stores the last fps encountered NEWSYM lastfps2, db 0 ; stores the last fps encountered
NEWSYM curfps2, db 0 ; current video refresh fps NEWSYM curfps2, db 0 ; current video refresh fps
@@ -3602,3 +3605,4 @@ db 0,0,0,0,0,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0
db 0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0 db 0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0
db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
NEWSYM ProcVidAsmEnd