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

Replaced most of the OSPort tests with %ifdef

Browse Source
This commit is contained in:
teuf
2001-05-07 00:00:45 +00:00
parent a258375051
commit 28f53de9b6
8 changed files with 168 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1497,11 +1497,11 @@ NEWSYM InitSPC
mov dword [opcjmptab+03F4h],OpFD mov dword [opcjmptab+03F4h],OpFD
mov dword [opcjmptab+03F8h],OpFE mov dword [opcjmptab+03F8h],OpFE
mov dword [opcjmptab+03FCh],OpFF mov dword [opcjmptab+03FCh],OpFF
cmp byte[soundon],0 ; cmp byte[soundon],0
; je near .nosound ; je near .nosound
cmp byte[OSPort],2 ; cmp byte[OSPort],2
jae near .nosound ; jae near .nosound
%ifdef __MSDOS__
mov ax,0100h ; Allocate DOS memory mov ax,0100h ; Allocate DOS memory
mov bx,16384/16 ; Allocate 16384 bytes mov bx,16384/16 ; Allocate 16384 bytes
int 31h int 31h
@@ -1537,12 +1537,14 @@ NEWSYM InitSPC
mov eax,0 mov eax,0
rep stosd rep stosd
pop es pop es
%endif
.nosound .nosound
pop edx pop edx
pop ecx pop ecx
pop ebx pop ebx
pop eax pop eax
ret ret
%ifdef __MSDOS__
.error .error
mov edx,.nohand ;use extended mov edx,.nohand ;use extended
mov ah,9 ;DOS- API mov ah,9 ;DOS- API
@@ -1550,10 +1552,12 @@ NEWSYM InitSPC
call DosExit call DosExit
.nohand db 'Unable to allocate conventional memory!',13,10,'$' .nohand db 'Unable to allocate conventional memory!',13,10,'$'
%endif
NEWSYM InitSB NEWSYM InitSB
%ifdef __MSDOS__
call initSB call initSB
%endif
ret ret
NEWSYM DeInitSPC NEWSYM DeInitSPC

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

@@ -415,10 +415,12 @@ NEWSYM ProcessRewind
ret ret
NEWSYM UpdateRewind NEWSYM UpdateRewind
cmp byte[OSPort],3 ; cmp byte[OSPort],3
je .yeswin32 ; je .yeswin32
ret ; ret
.yeswin32
;.yeswin32
%ifndef __MSDOS__
push eax push eax
cmp dword[KeyRewind],0 cmp dword[KeyRewind],0
je .notftimer je .notftimer
@@ -449,6 +451,7 @@ NEWSYM UpdateRewind
.noteq .noteq
mov dword[RewindTimer],60*3 mov dword[RewindTimer],60*3
pop eax pop eax
%endif
ret ret
NEWSYM BackupSystemVars NEWSYM BackupSystemVars
@@ -812,17 +815,21 @@ NetSaveState:
%macro stim 0 %macro stim 0
cmp byte[OSPort],1 ; cmp byte[OSPort],1
ja %%nosti ; ja %%nosti
%ifdef __MSDOS__
sti sti
%%nosti %endif
;%%nosti
%endmacro %endmacro
%macro clim 0 %macro clim 0
cmp byte[OSPort],1 ; cmp byte[OSPort],1
ja %%nocli ; ja %%nocli
%ifdef __MSDOS__
cli cli
%%nocli %endif
;%%nocli
%endmacro %endmacro
%macro ProcessIRQStuffB 0 %macro ProcessIRQStuffB 0
@@ -1050,8 +1057,9 @@ NEWSYM reexecute
jmp reexecuteb2 jmp reexecuteb2
NEWSYM reexecuteb NEWSYM reexecuteb
cmp byte[OSPort],1 ;cmp byte[OSPort],1
ja reexecuteb2 ;ja reexecuteb2
%ifdef __MSDOS__
mov esi,pressed mov esi,pressed
mov ecx,256+128+64 mov ecx,256+128+64
mov al,0 mov al,0
@@ -1062,6 +1070,7 @@ NEWSYM reexecuteb
.notclear .notclear
inc esi inc esi
loop .loopa loop .loopa
%endif
reexecuteb2: reexecuteb2:
; temporary sprite displayer ; temporary sprite displayer
; mov edx,.sdispname ; mov edx,.sdispname
@@ -2787,8 +2796,9 @@ NEWSYM cpuover
call RemoteSendChar call RemoteSendChar
; ################## ; ##################
; Send latency value ; Send latency value
cmp byte[OSPort],3 ;cmp byte[OSPort],3
jne .nolatencysend ;jne .nolatencysend
%ifndef __MSDOS__
cmp byte[BackState],1 cmp byte[BackState],1
jne .nolatencysend jne .nolatencysend
mov ebx,[LatencySendPtr] mov ebx,[LatencySendPtr]
@@ -2799,6 +2809,7 @@ NEWSYM cpuover
mov al,[LocalLValue] mov al,[LocalLValue]
; inc al ; inc al
call RemoteSendChar call RemoteSendChar
%endif
.nolatencysend .nolatencysend
mov ebx,[cnetptrhead] mov ebx,[cnetptrhead]
mov ecx,JoyAOrig mov ecx,JoyAOrig
@@ -2837,13 +2848,15 @@ NEWSYM cpuover
push esi push esi
mov esi,chatstrR mov esi,chatstrR
cmp byte[OSPort],2 ;cmp byte[OSPort],2
jae .notwin32b ;jae .notwin32b
%ifdef __MSDOS__
mov byte[esi],'L' mov byte[esi],'L'
mov byte[esi+1],'>' mov byte[esi+1],'>'
add esi,2 add esi,2
jmp .skipsendnick %else
.notwin32b ;jmp .skipsendnick
;.notwin32b
cmp dword[chatstrL+1],'/ME ' cmp dword[chatstrL+1],'/ME '
jne .noaction jne .noaction
mov al,'*' mov al,'*'
@@ -2883,13 +2896,16 @@ NEWSYM cpuover
call RemoteSendChar call RemoteSendChar
pop eax pop eax
pop ebx pop ebx
%endif
.skipsendnick .skipsendnick
mov ebx,chatstrL+1 mov ebx,chatstrL+1
cmp byte[OSPort],2 ;cmp byte[OSPort],2
jb .noaction3 ;jb .noaction3
%ifndef __MSDOS__
cmp dword[chatstrL+1],'/ME ' cmp dword[chatstrL+1],'/ME '
jne .noaction3 jne .noaction3
mov ebx,chatstrL+5 mov ebx,chatstrL+5
%endif
.noaction3 .noaction3
.nextchatc .nextchatc
mov al,[ebx] mov al,[ebx]
@@ -2937,8 +2953,9 @@ NEWSYM cpuover
push ecx push ecx
push ebx push ebx
cmp byte[OSPort],3 ; cmp byte[OSPort],3
jne .nobackstate ; jne .nobackstate
%ifndef __MSDOS__
cmp byte[BackState],1 cmp byte[BackState],1
jne .nobackstate jne .nobackstate
call BackupCVFrame call BackupCVFrame
@@ -2947,6 +2964,7 @@ NEWSYM cpuover
inc ebx inc ebx
and ebx,0Fh and ebx,0Fh
mov [CBackupPos],ebx mov [CBackupPos],ebx
%endif
.nobackstate .nobackstate
pop ebx pop ebx
pop ecx pop ecx
@@ -3007,8 +3025,9 @@ NEWSYM cpuover
.notor .notor
cmp dh,0 cmp dh,0
jne .foundchar jne .foundchar
cmp byte[OSPort],3 ;cmp byte[OSPort],3
jne .notwin32 ;jne .notwin32
%ifndef __MSDOS__
push ebx push ebx
cmp byte[BackState],1 cmp byte[BackState],1
jne .nobackstate2 jne .nobackstate2
@@ -3049,6 +3068,7 @@ NEWSYM cpuover
jb .notwin32 jb .notwin32
cmp byte[pressed+1],1 cmp byte[pressed+1],1
je .netquit2 je .netquit2
%endif
.notwin32 .notwin32
mov bl,1 mov bl,1
jmp .notfoundchar jmp .notfoundchar
@@ -3079,8 +3099,9 @@ NEWSYM cpuover
pushad pushad
; Receive latency value ; Receive latency value
; ##################### ; #####################
cmp byte[OSPort],3 ;cmp byte[OSPort],3
jne near .nolatencyrecv2 ;jne near .nolatencyrecv2
%ifndef __MSDOS__
cmp byte[BackState],1 cmp byte[BackState],1
jne near .nolatencyrecv2 jne near .nolatencyrecv2
.tryagainlatency .tryagainlatency
@@ -3114,6 +3135,7 @@ NEWSYM cpuover
jb .nolatencyrecv2 jb .nolatencyrecv2
mov dword[latencytimer],0 mov dword[latencytimer],0
inc byte[t1cc] inc byte[t1cc]
%endif
.nolatencyrecv2 .nolatencyrecv2
popad popad
inc dword[NetSent2] inc dword[NetSent2]
@@ -3155,8 +3177,9 @@ NEWSYM cpuover
test dl,02h test dl,02h
jz near .nocrupdate2 jz near .nocrupdate2
cmp byte[OSPort],3 ; cmp byte[OSPort],3
jne .notwin32d ; jne .notwin32d
%ifndef __MSDOS__
cmp byte[BackState],1 cmp byte[BackState],1
jne .notwin32d jne .notwin32d
push edx push edx
@@ -3182,6 +3205,7 @@ NEWSYM cpuover
and ebx,0Fh and ebx,0Fh
mov [PBackupPos],ebx mov [PBackupPos],ebx
pop edx pop edx
%endif
.notwin32d .notwin32d
mov ecx,JoyAOrig mov ecx,JoyAOrig
NetHelpExecRecv 0 NetHelpExecRecv 0
@@ -3260,12 +3284,14 @@ NEWSYM cpuover
jne .nextchatcr ; ********* jne .nextchatcr ; *********
pop edx pop edx
pushad pushad
cmp byte[OSPort],2 ;cmp byte[OSPort],2
jae .notwin32e ;jae .notwin32e
%ifdef __MSDOS__
mov dl,'R' mov dl,'R'
call NetAddChar call NetAddChar
mov dl,'>' mov dl,'>'
call NetAddChar call NetAddChar
%endif
.notwin32e .notwin32e
mov esi,chatstrR mov esi,chatstrR
call WritetochatBuffer call WritetochatBuffer

9
zsnes/src/init.asm
View File

@@ -25,7 +25,8 @@ EXTSYM MessageOn,Msgptr,MsgCount,sndrot,GenerateBank0Table,SnowTimer
EXTSYM inittableb,inittablec,FPUCopy,newgfx16b,cfgreinittime,EndMessage EXTSYM inittableb,inittablec,FPUCopy,newgfx16b,cfgreinittime,EndMessage
EXTSYM Open_File,Read_File,Write_File,Close_File,Output_Text,Get_Key,CNetType EXTSYM Open_File,Read_File,Write_File,Close_File,Output_Text,Get_Key,CNetType
EXTSYM Delete_File,Get_First_Entry,Get_Next_Entry,Change_Dir,Get_Dir,InitDSP EXTSYM Delete_File,Get_First_Entry,Get_Next_Entry,Change_Dir,Get_Dir,InitDSP
EXTSYM Remove_Dir,Change_Single_Dir,Create_Dir,Get_Memfree,OSPort,Create_File EXTSYM Remove_Dir,Change_Single_Dir,Create_Dir,Get_Memfree,Create_File
EXTSYM OSPort
EXTSYM SPCDisable,osm2dis,CurRecv,BackupSystemVars EXTSYM SPCDisable,osm2dis,CurRecv,BackupSystemVars
EXTSYM SnowData,SnowVelDist EXTSYM SnowData,SnowVelDist
EXTSYM cvidmode, newengen, cfgnewgfx, GUI16VID EXTSYM cvidmode, newengen, cfgnewgfx, GUI16VID
@@ -4871,8 +4872,9 @@ NEWSYM showinfo
; wait for key ; wait for key
cmp byte[enterpress],0 cmp byte[enterpress],0
jne .noesc jne .noesc
cmp byte[OSPort],3 ; cmp byte[OSPort],3
je .noesc ; je .noesc
%ifdef __MSDOS__
call Get_Key call Get_Key
cmp al,27 cmp al,27
jne .noesc jne .noesc
@@ -4880,6 +4882,7 @@ NEWSYM showinfo
mov ebx,InitDir mov ebx,InitDir
call Change_Dir call Change_Dir
jmp DosExit jmp DosExit
%endif
.noesc .noesc
mov edx,.ret mov edx,.ret
call Output_Text call Output_Text

20
zsnes/src/linux/sdlintrf.asm
View File

@@ -69,9 +69,6 @@ EXTSYM RaisePitch,AdjustFrequency
EXTSYM vidbufferofsb,vidbuffer EXTSYM vidbufferofsb,vidbuffer
EXTSYM clearwin EXTSYM clearwin
EXTSYM Stop60HZ EXTSYM Stop60HZ
EXTSYM dosmakepal
EXTSYM doschangepal
EXTSYM dosinitvideo,dosinitvideo2
EXTSYM initwinvideo EXTSYM initwinvideo
EXTSYM vesa2_rpos EXTSYM vesa2_rpos
EXTSYM vesa2_gpos EXTSYM vesa2_gpos
@@ -93,15 +90,12 @@ EXTSYM scanlines,vesa2_bits
EXTSYM vesa2_x,vesa2_y EXTSYM vesa2_x,vesa2_y
EXTSYM vesa2selec,InitVesa12,videotroub EXTSYM vesa2selec,InitVesa12,videotroub
EXTSYM genfulladdtab EXTSYM genfulladdtab
EXTSYM DosDrawScreen,dosvidpastecopyscr,GUICPC EXTSYM GUICPC
EXTSYM drawscreenwin EXTSYM drawscreenwin
EXTSYM ConvertToAFormat EXTSYM ConvertToAFormat
EXTSYM UnusedBit,HalfTrans,UnusedBitXor,UnusedBit,UnusedBitXor EXTSYM UnusedBit,HalfTrans,UnusedBitXor,UnusedBit,UnusedBitXor
EXTSYM ngrposng,nggposng,ngbposng,HalfTransB,HalfTransC EXTSYM ngrposng,nggposng,ngbposng,HalfTransB,HalfTransC
EXTSYM DOSClearScreen
EXTSYM DosUpdateDevices
EXTSYM WinUpdateDevices EXTSYM WinUpdateDevices
EXTSYM DOSJoyRead
EXTSYM UpdateVFrame EXTSYM UpdateVFrame
EXTSYM GetMouseX EXTSYM GetMouseX
EXTSYM GetMouseY EXTSYM GetMouseY
@@ -985,20 +979,8 @@ NEWSYM NumVideoModes, dd 4
NEWSYM GUIVideoModeNames NEWSYM GUIVideoModeNames
db '256X224 R WIN ',0 ;2 db '256X224 R WIN ',0 ;2
db '256x224 R FULL',0 ;3 db '256x224 R FULL',0 ;3
;db '512X448 R WIN ',0 ;4
db '512X448 DR WIN ',0 ;5 db '512X448 DR WIN ',0 ;5
db '640x480 DR FULL',0 ;6 db '640x480 DR FULL',0 ;6
;db '640x480 S WIN ',0 ;6
;db '640X480 DS FULL',0 ;8
;db '640X480 S FULL',0 ;9
;db '800x600 S WIN ',0 ;10
;db '800x600 DS WIN ',0 ;11
;db '800x600 S FULL',0 ;12
;db '800x600 DS FULL',0 ;13
;db '1024X768 S WIN ',0 ;14
;db '1024X768 DS WIN ',0 ;15
;db '1024x768 S FULL',0 ;16
;db '1024x768 DS FULL',0 ;17
; Video Mode Feature Availability (1 = Available, 0 = Not Available) ; Video Mode Feature Availability (1 = Available, 0 = Not Available)

24
zsnes/src/ui.asm
View File

@@ -26,7 +26,7 @@ EXTSYM SBPort,SBInt,SBIrq,SBDMA,SBDMAPage,SBHDMAPage,getenv,vibracard
EXTSYM ram7fa,wramdataa EXTSYM ram7fa,wramdataa
EXTSYM malloc,free EXTSYM malloc,free
EXTSYM StateBackup EXTSYM StateBackup
EXTSYM OSPort ;EXTSYM OSPort
EXTSYM ADSRGAINSwitch,FPUCopy,ScreenScale,SoundQuality EXTSYM ADSRGAINSwitch,FPUCopy,ScreenScale,SoundQuality
EXTSYM debugger,pl1contrl,pl2contrl,romtype,smallscreence EXTSYM debugger,pl1contrl,pl2contrl,romtype,smallscreence
EXTSYM smallscreenon,spcon EXTSYM smallscreenon,spcon
@@ -518,6 +518,7 @@ SECTION .text
; Get Blaster Locates SET BLASTER environment ; Get Blaster Locates SET BLASTER environment
;******************************************************* ;*******************************************************
NEWSYM getblaster NEWSYM getblaster
%ifndef __LINUX__
mov edx,.string2s mov edx,.string2s
push edx push edx
call getenv call getenv
@@ -733,6 +734,7 @@ NEWSYM getblaster
mov edx,.blasterstr2b mov edx,.blasterstr2b
call PrintStr call PrintStr
call WaitForKey call WaitForKey
%endif
ret ret
SECTION .data SECTION .data
@@ -807,6 +809,7 @@ SECTION .text
AllocateLDTDescriptor: AllocateLDTDescriptor:
%ifndef __LINUX__
;Get ZSNES Base ;Get ZSNES Base
mov ax,ds mov ax,ds
mov bx,ax mov bx,ax
@@ -818,10 +821,12 @@ AllocateLDTDescriptor:
ret ret
.FatalError .FatalError
; maybe dosexit? ; maybe dosexit?
%endif
ret ret
AllocateBlock: AllocateBlock:
%ifndef __LINUX__
mov eax,0501h mov eax,0501h
mov bx,[BlockSize+2] mov bx,[BlockSize+2]
mov cx,[BlockSize] mov cx,[BlockSize]
@@ -840,6 +845,7 @@ AllocateBlock:
ret ret
.FatalError .FatalError
mov ebx,1 mov ebx,1
%endif
ret ret
@@ -905,24 +911,28 @@ NEWSYM allocspc7110
ret ret
outofmemoryb outofmemoryb
cmp byte[OSPort],1 ; cmp byte[OSPort],1
ja .notdos ; ja .notdos
%ifdef __MSDOS__
mov ax,3 mov ax,3
int 10h int 10h
.notdos %endif
;.notdos
jmp outofmemory jmp outofmemory
NEWSYM allocptr NEWSYM allocptr
mov dword[cmemallocptr],memfreearray mov dword[cmemallocptr],memfreearray
cmp byte[OSPort],3 ; cmp byte[OSPort],3
jne near .nostate ; jne near .nostate
%ifndef __MSDOS__
AllocmemFail 4096*128*16+4096+65536*16,StateBackup,outofmemory AllocmemFail 4096*128*16+4096+65536*16,StateBackup,outofmemory
mov eax,[StateBackup] mov eax,[StateBackup]
add eax,4096*128*16 add eax,4096*128*16
mov [BitConv32Ptr],eax mov [BitConv32Ptr],eax
.nostate %endif
;.nostate
; Memory Allocation ; Memory Allocation
AllocmemFail 65536*4+4096,spcBuffera,outofmemory AllocmemFail 65536*4+4096,spcBuffera,outofmemory

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

@@ -16,23 +16,6 @@
;Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ;Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
EXTSYM GUIOn,HalfTrans
EXTSYM ClearScreen
EXTSYM Mode7HiRes,mosenng,mosszng,intrlng,mode7hr ;,VESAAddr
EXTSYM GUICPC, newgfx16b
EXTSYM vesa2_clbitng,vesa2_clbitng2,vesa2_clbitng3
EXTSYM granadd
EXTSYM SpecialLine
EXTSYM vidbufferofsb
;EXTSYM Super2xSaI
EXTSYM HalfTransB,HalfTransC
%include "video/2xsaimmx.inc"
SECTION .text SECTION .text
@@ -60,6 +43,7 @@ NEWSYM ResetTripleBuf
mov byte[CVidStartAd],0 mov byte[CVidStartAd],0
ret ret
%ifdef __MSDOS__
GUITripleBuffer: GUITripleBuffer:
cmp byte[TriplebufTech],0 cmp byte[TriplebufTech],0
je near .tech2 je near .tech2
@@ -238,6 +222,7 @@ PreTripleBuffer:
.failed .failed
mov byte[Triplebufen],0 mov byte[Triplebufen],0
ret ret
%endif
VidModeSize dd 0,0,320*240,320*240*2,640*480,640*480*2,512*384,512*384*2 VidModeSize dd 0,0,320*240,320*240*2,640*480,640*480*2,512*384,512*384*2
dd 0,320*480,320*480*2 dd 0,320*480,320*480*2
@@ -252,6 +237,7 @@ NEWSYM LastLineStart, dd 0
NEWSYM FlipWait, db 0 NEWSYM FlipWait, db 0
NEWSYM TriplebufTech, db 0 NEWSYM TriplebufTech, db 0
%ifdef __MSDOS__
NEWSYM DosDrawScreen NEWSYM DosDrawScreen
cmp byte[curblank],40h cmp byte[curblank],40h
je .nocopy je .nocopy
@@ -336,13 +322,13 @@ ScreenShowGUI:
cmp byte[cvidmode],0 cmp byte[cvidmode],0
je near copymodex je near copymodex
jmp copymodeq jmp copymodeq
%endif
;******************************************************* ;*******************************************************
; CopyModeX Copies buffer into unchained 320x240 ; CopyModeX Copies buffer into unchained 320x240
;******************************************************* ;*******************************************************
%ifdef __MSDOS__
NEWSYM copymodex NEWSYM copymodex
cmp byte[curblank],40h cmp byte[curblank],40h
jne .startcopy jne .startcopy
@@ -829,6 +815,7 @@ copyvesa2320x480x8ng:
;******************************************************* ;*******************************************************
; Copy VESA2 640x480x8b Copies buffer to 640x480x8bVBE2 ; Copy VESA2 640x480x8b Copies buffer to 640x480x8bVBE2
;******************************************************* ;*******************************************************
%endif
ALIGN32 ALIGN32
NEWSYM EagleHold, dd 0 NEWSYM EagleHold, dd 0
@@ -839,6 +826,7 @@ vesavaland dd 0,0
mmxvalanda dd 11111111110000001111111111000000b,11111111110000001111111111000000b mmxvalanda dd 11111111110000001111111111000000b,11111111110000001111111111000000b
mmxvalandb dd 00000000000111110000000000011111b,00000000000111110000000000011111b mmxvalandb dd 00000000000111110000000000011111b,00000000000111110000000000011111b
%ifdef __MSDOS__
NEWSYM copyvesa2640x480x8bgui NEWSYM copyvesa2640x480x8bgui
mov byte[CurrentGUIOn],1 mov byte[CurrentGUIOn],1
cmp byte[smallscreenon],1 cmp byte[smallscreenon],1
@@ -2016,6 +2004,7 @@ NEWSYM palresvalngb, dd 0,0
%macro copyb320x240 0 %macro copyb320x240 0
mov [es:edi+2],dx mov [es:edi+2],dx
%endmacro %endmacro
%endif
ALIGN32 ALIGN32
NEWSYM rescompareng, dd 0 NEWSYM rescompareng, dd 0
@@ -2026,6 +2015,8 @@ NEWSYM lineleft, dd 0
NEWSYM lineleft2, dd 0 NEWSYM lineleft2, dd 0
bankpos dd 0 bankpos dd 0
%ifdef __MSDOS__
;******************************************************* ;*******************************************************
; Copy VESA2 320x480x16b Copies buffer to 320x480x16bVB2 ; Copy VESA2 320x480x16b Copies buffer to 320x480x16bVB2
;******************************************************* ;*******************************************************
@@ -2180,7 +2171,7 @@ NEWSYM copyvesa2320x480x16bgui
jnz .loopabhq jnz .loopabhq
pop es pop es
ret ret
%endif
NEWSYM ConvertToAFormat NEWSYM ConvertToAFormat
cmp byte[GUIOn],1 cmp byte[GUIOn],1
@@ -2264,6 +2255,7 @@ NEWSYM UnConvertToAFormat
jnz .crgbloop jnz .crgbloop
ret ret
%ifdef __MSDOS__
NEWSYM copyvesa2320x480x16b NEWSYM copyvesa2320x480x16b
cmp byte[curblank],40h cmp byte[curblank],40h
jne .startcopy jne .startcopy
@@ -5393,12 +5385,12 @@ NEWSYM copyvesa12640x480x16b
jnz near .loopac jnz near .loopac
pop es pop es
ret ret
%endif
;******************************************************* ;*******************************************************
; Clear Screen ; Clear Screen
;******************************************************* ;*******************************************************
NEWSYM DOSClearScreen NEWSYM DOSClearScreen
%ifdef __MSDOS__
cmp byte[cvidmode],1 cmp byte[cvidmode],1
je near cscopymodeq je near cscopymodeq
cmp byte[cvidmode],2 cmp byte[cvidmode],2
@@ -5421,6 +5413,7 @@ NEWSYM DOSClearScreen
je near cscopyvesa2320x480x16b je near cscopyvesa2320x480x16b
cmp byte[cvidmode],0 cmp byte[cvidmode],0
je near cscopymodex je near cscopymodex
%endif
ret ret
%macro TripleBufferClear 0 %macro TripleBufferClear 0
@@ -5434,6 +5427,7 @@ NEWSYM DOSClearScreen
%%noclear %%noclear
%endmacro %endmacro
%ifdef __MSDOS__
NEWSYM cscopymodeq NEWSYM cscopymodeq
push es push es
mov ax,[selcA000] mov ax,[selcA000]
@@ -5579,21 +5573,24 @@ NEWSYM cscopyvesa2512x384x16b
jnz .loopb jnz .loopb
pop es pop es
ret ret
%endif
NEWSYM GetScreen NEWSYM GetScreen
cmp byte[OSPort],1 %ifdef __MSDOS__
jbe .getscreen ; cmp byte[OSPort],1
ret ; jbe .getscreen
.getscreen ; ret
;.getscreen
cmp byte[cvidmode],3 cmp byte[cvidmode],3
je near getcopyvesa2320x240x16b je near getcopyvesa2320x240x16b
cmp byte[cvidmode],5 cmp byte[cvidmode],5
; je near getcopyvesa2640x480x16b ; je near getcopyvesa2640x480x16b
cmp byte[cvidmode],7 cmp byte[cvidmode],7
; je near getcopyvesa2512x384x16b ; je near getcopyvesa2512x384x16b
%endif
ret ret
%ifdef __MSDOS__
NEWSYM getcopyvesa2320x240x16b NEWSYM getcopyvesa2320x240x16b
push es push es
mov ax,[vesa2selec] mov ax,[vesa2selec]
@@ -5691,13 +5688,4 @@ NEWSYM cscopyvesa12640x480x16b
jnz near .loopa jnz near .loopa
pop es pop es
ret ret
%endif
NEWSYM Clear2xSaIBuffer
mov ebx,[vidbufferofsb]
add ebx,288*2
mov ecx,144*239
.nextb
mov dword[ebx],0FFFFFFFFh
add ebx,4
loop .nextb
ret

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

@@ -53,6 +53,17 @@ EXTSYM ClearScreenSkip,debugdisble,cmovietimeint
EXTSYM ChatNick EXTSYM ChatNick
EXTSYM StringLength EXTSYM StringLength
EXTSYM chatstrLt EXTSYM chatstrLt
EXTSYM GUIOn,HalfTrans
EXTSYM ClearScreen
EXTSYM Mode7HiRes,mosenng,mosszng,intrlng,mode7hr ;,VESAAddr
EXTSYM GUICPC, newgfx16b
EXTSYM vesa2_clbitng,vesa2_clbitng2,vesa2_clbitng3
EXTSYM granadd
EXTSYM SpecialLine
EXTSYM vidbufferofsb
;EXTSYM Super2xSaI
EXTSYM HalfTransB,HalfTransC
NEWSYM ProcVidAsmStart NEWSYM ProcVidAsmStart
@@ -82,8 +93,10 @@ NEWSYM TempDebugV, dw 0 ; Temporary Debugging variable
%MACRO CopyFPU 0 %MACRO CopyFPU 0
%ENDMACRO %ENDMACRO
%include "video/2xsaimmx.inc"
%include "video/copyvid.inc" %include "video/copyvid.inc"
SECTION .text
NEWSYM FPUZero NEWSYM FPUZero
mov [.Zero],eax mov [.Zero],eax
mov [.Zero+4],eax mov [.Zero+4],eax
@@ -1551,7 +1564,9 @@ NEWSYM saveselect
jne .nong16b jne .nong16b
cmp byte[cbitmode],0 cmp byte[cbitmode],0
je .nong16b je .nong16b
%ifdef __MSDOS__
call GetScreen call GetScreen
%endif
.nong16b .nong16b
cmp dword[MessageOn],0 cmp dword[MessageOn],0
je .nochangem je .nochangem
@@ -1567,8 +1582,9 @@ NEWSYM saveselect
cmp byte[soundon],0 cmp byte[soundon],0
je .nosound je .nosound
mov byte[csounddisable],1 mov byte[csounddisable],1
cmp byte[OSPort],1 ;cmp byte[OSPort],1
ja .nosound ;ja .nosound
%ifdef __MSDOS__
push es push es
mov es,[sbselec] mov es,[sbselec]
mov edi,[sbpmofs] mov edi,[sbpmofs]
@@ -1579,6 +1595,7 @@ NEWSYM saveselect
dec ecx dec ecx
jnz .loopa jnz .loopa
pop es pop es
%endif
.nosound .nosound
cmp byte[cbitmode],1 cmp byte[cbitmode],1
je near .16b je near .16b
@@ -1771,8 +1788,9 @@ NEWSYM saveselect
.esc .esc
mov byte[pressed+1],0 mov byte[pressed+1],0
mov byte[pressed+28],0 mov byte[pressed+28],0
cmp byte[OSPort],1 ;cmp byte[OSPort],1
jbe .notpr28b ;jbe .notpr28b
%ifndef __MSDOS__
cmp byte[pressed+1],1 cmp byte[pressed+1],1
jne .notpr1b jne .notpr1b
mov byte[pressed+1],2 mov byte[pressed+1],2
@@ -1780,6 +1798,7 @@ NEWSYM saveselect
cmp byte[pressed+28],1 cmp byte[pressed+28],1
jne .notpr28b jne .notpr28b
mov byte[pressed+28],2 mov byte[pressed+28],2
%endif
.notpr28b .notpr28b
mov word[t1cc],0 mov word[t1cc],0
mov byte[csounddisable],0 mov byte[csounddisable],0
@@ -2086,8 +2105,9 @@ NEWSYM saveselect
mov ebx,[statefileloc] mov ebx,[statefileloc]
mov byte[fnamest+ebx],al mov byte[fnamest+ebx],al
.esc16b .esc16b
cmp byte[OSPort],1 ;cmp byte[OSPort],1
jbe .notprwin ;jbe .notprwin
%ifndef __MSDOS__
cmp byte[pressed+1],1 cmp byte[pressed+1],1
jne .notpr1 jne .notpr1
mov byte[pressed+1],2 mov byte[pressed+1],2
@@ -2097,6 +2117,7 @@ NEWSYM saveselect
mov byte[pressed+28],2 mov byte[pressed+28],2
.notpr28 .notpr28
jmp .prwin jmp .prwin
%endif
.notprwin .notprwin
mov byte[pressed+1],0 mov byte[pressed+1],0
mov byte[pressed+28],0 mov byte[pressed+28],0
@@ -2173,8 +2194,9 @@ NEWSYM testpressed8b
inc bl inc bl
mov byte[pressed+77],2 mov byte[pressed+77],2
.noright .noright
cmp byte[OSPort],3 ;cmp byte[OSPort],3
jne near .nowin32 ;jne near .nowin32
%ifndef __MSDOS__
%ifdef __LINUX__ %ifdef __LINUX__
test byte[pressed+05Ch],1 test byte[pressed+05Ch],1
%else %else
@@ -2205,7 +2227,8 @@ NEWSYM testpressed8b
mov byte[pressed+0CDh],2 mov byte[pressed+0CDh],2
%endif %endif
.noright2 .noright2
.nowin32 ;.nowin32
%endif
ret ret
;******************************************************* ;*******************************************************
@@ -3301,11 +3324,13 @@ NEWSYM ChatType
pushad pushad
mov dl,'L' mov dl,'L'
; call NetAddChar ; call NetAddChar
cmp byte[OSPort],2 ;cmp byte[OSPort],2
jb .dos ;jb .dos
%ifndef __MSDOS__
cmp dword[chatstrL+1],'/ME ' cmp dword[chatstrL+1],'/ME '
je .action je .action
.dos %endif
;.dos
mov esi,ChatNick mov esi,ChatNick
call WritetochatBuffer call WritetochatBuffer
mov esi,chatstrL mov esi,chatstrL
@@ -3508,9 +3533,11 @@ NEWSYM vidpaste
jne .novsync jne .novsync
cmp byte[curblank],0h cmp byte[curblank],0h
jne .novsync jne .novsync
cmp byte[OSPort],1 ; cmp byte[OSPort],1
ja .novsync ; ja .novsync
%ifdef __MSDOS__
call waitvsync call waitvsync
%endif
.novsync .novsync
cmp byte[cbitmode],1 cmp byte[cbitmode],1
je .nopal je .nopal
@@ -3622,6 +3649,17 @@ NEWSYM vidpaste
.SSRedCo dw 0 .SSRedCo dw 0
NEWSYM Clear2xSaIBuffer
mov ebx,[vidbufferofsb]
add ebx,288*2
mov ecx,144*239
.nextb
mov dword[ebx],0FFFFFFFFh
add ebx,4
loop .nextb
ret
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

5
zsnes/src/win/winintrf.asm
View File

@@ -94,14 +94,13 @@ EXTSYM res480
EXTSYM AddSub256,InitVesa2,cbitmode,cvidmode EXTSYM AddSub256,InitVesa2,cbitmode,cvidmode
EXTSYM scanlines,vesa2_bits EXTSYM scanlines,vesa2_bits
EXTSYM vesa2_x,vesa2_y EXTSYM vesa2_x,vesa2_y
EXTSYM vesa2selec,InitVesa12,videotroub EXTSYM vesa2selec,videotroub
EXTSYM genfulladdtab EXTSYM genfulladdtab
EXTSYM DosDrawScreen,dosvidpastecopyscr,GUICPC EXTSYM GUICPC
EXTSYM drawscreenwin EXTSYM drawscreenwin
EXTSYM ConvertToAFormat EXTSYM ConvertToAFormat
EXTSYM UnusedBit,HalfTrans,UnusedBitXor,UnusedBit,UnusedBitXor EXTSYM UnusedBit,HalfTrans,UnusedBitXor,UnusedBit,UnusedBitXor
EXTSYM ngrposng,nggposng,ngbposng,HalfTransB,HalfTransC EXTSYM ngrposng,nggposng,ngbposng,HalfTransB,HalfTransC
EXTSYM DOSClearScreen
EXTSYM DosUpdateDevices EXTSYM DosUpdateDevices
EXTSYM WinUpdateDevices EXTSYM WinUpdateDevices
EXTSYM DOSJoyRead EXTSYM DOSJoyRead