Renamed MMX support variable

This commit is contained in:
pagefault
2001-09-20 18:08:10 +00:00
parent 708e453b3d
commit 85b8810b5f
24 changed files with 96 additions and 173 deletions

View File

@@ -22,7 +22,7 @@ EXTSYM JoyXC,JoyYC,LoadDir,LoadDrive,SRAMDrive,mode7tab
EXTSYM pl1selk,pl1startk,pl1upk,pl2Ak,pl2Bk,pl2Lk,pl2Rk EXTSYM pl1selk,pl1startk,pl1upk,pl2Ak,pl2Bk,pl2Lk,pl2Rk
EXTSYM pl2Xk,pl2Yk,pl2contrl,pl2downk,pl2leftk,pl2rightk EXTSYM pl2Xk,pl2Yk,pl2contrl,pl2downk,pl2leftk,pl2rightk
EXTSYM pl2selk,pl2startk,pl2upk,DontSavePath EXTSYM pl2selk,pl2startk,pl2upk,DontSavePath
EXTSYM FPUCopy,Force8b,MusicRelVol,SRAMDir,SoundCompD,SoundQuality EXTSYM Force8b,MusicRelVol,SRAMDir,SoundCompD,SoundQuality
EXTSYM StereoSound,antienab,cvidmode,enterpress,frameskip,guioff EXTSYM StereoSound,antienab,cvidmode,enterpress,frameskip,guioff
EXTSYM newengen,per2exec,pl1Ak,pl1Bk,pl1Lk,pl1Rk,pl1Xk,pl1Yk EXTSYM newengen,per2exec,pl1Ak,pl1Bk,pl1Lk,pl1Rk,pl1Xk,pl1Yk
EXTSYM pl1contrl,pl1downk,pl1leftk,pl1rightk,scanlines,soundon EXTSYM pl1contrl,pl1downk,pl1leftk,pl1rightk,scanlines,soundon

View File

@@ -24,7 +24,6 @@ EXTSYM ccmdline
EXTSYM InitDir,InitDrive EXTSYM InitDir,InitDrive
EXTSYM DOScreatenewcfg,ExecGUISaveVars EXTSYM DOScreatenewcfg,ExecGUISaveVars
EXTSYM allocptr EXTSYM allocptr
EXTSYM FPUCopy
EXTSYM ZOpenFile,ZOpenMode,CurrentHandle,ZFileSeek,ZOpenFileName,ZFileSeekMode EXTSYM ZOpenFile,ZOpenMode,CurrentHandle,ZFileSeek,ZOpenFileName,ZFileSeekMode
EXTSYM ZFileSeekPos,ZFileSeekHandle EXTSYM ZFileSeekPos,ZFileSeekHandle
EXTSYM ZFileWriteHandle,ZFileWriteSize,ZFileWriteBlock,ZFileWrite EXTSYM ZFileWriteHandle,ZFileWriteSize,ZFileWriteBlock,ZFileWrite

View File

@@ -31,7 +31,7 @@ extern void displayparams(void);
extern void makeextension(void); extern void makeextension(void);
extern unsigned char Palette0, SPC700sh, OffBy1Line, DSPDisable, extern unsigned char Palette0, SPC700sh, OffBy1Line, DSPDisable,
FPUCopy, Force8b, ForcePal, GUIClick, MouseDis, MMXSupport, Force8b, ForcePal, GUIClick, MouseDis,
MusicRelVol, ScreenScale, SoundCompD, SoundQuality, MusicRelVol, ScreenScale, SoundCompD, SoundQuality,
StereoSound, V8Mode, antienab, cvidmode, debugdisble, StereoSound, V8Mode, antienab, cvidmode, debugdisble,
debugger, enterpress, finterleave, frameskip, debugger, enterpress, finterleave, frameskip,
@@ -354,12 +354,12 @@ int pccmdline(void)
{ {
if(nn == 'm') if(nn == 'm')
{ {
FPUCopy=2; MMXSupport=1;
pp++; pp++;
} }
else else
{ {
FPUCopy=0; MMXSupport=0;
} }
break; break;
} }

View File

@@ -65,7 +65,7 @@
%include "macros.mac" %include "macros.mac"
EXTSYM dssel, curblank, vidpastecopyscr, frameskip, newengen, vsyncon, cantinitmodem EXTSYM dssel, curblank, vidpastecopyscr, frameskip, newengen, vsyncon, cantinitmodem
EXTSYM FPUCopy, cvidmode, antienab, smallscreenon, smallscreence,NetQuit EXTSYM cvidmode, antienab, smallscreenon, smallscreence,NetQuit
EXTSYM soundon, StereoSound, SoundCompD, SoundQuality, MusicRelVol,UartType EXTSYM soundon, StereoSound, SoundCompD, SoundQuality, MusicRelVol,UartType
EXTSYM endprog, continueprog, spcBuffera, spcRamcmp, cbitmode, makepal EXTSYM endprog, continueprog, spcBuffera, spcRamcmp, cbitmode, makepal
EXTSYM t1cc, LoadDir, SRAMDir, LoadDrive,SRAMDrive, initsnes, romloadskip EXTSYM t1cc, LoadDir, SRAMDir, LoadDrive,SRAMDrive, initsnes, romloadskip
@@ -551,7 +551,7 @@ NEWSYM KeyRewind, dd 0
NEWSYM ChatNick, times 16 db 0 NEWSYM ChatNick, times 16 db 0
NEWSYM KeySlowDown, dd 0 NEWSYM KeySlowDown, dd 0
NEWSYM UseCubicSpline, db 1 NEWSYM MMXSupport, db 1
NEWSYM LargeSoundBuf, db 0 NEWSYM LargeSoundBuf, db 0
NEWSYM HighPriority, db 0 NEWSYM HighPriority, db 0
@@ -1516,7 +1516,7 @@ NEWSYM StartGUI
jne .notexttb jne .notexttb
mov byte[Triplebufen],0 mov byte[Triplebufen],0
.notexttb .notexttb
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
jne .2xSaIdis jne .2xSaIdis
cmp byte[newgfx16b],0 cmp byte[newgfx16b],0
je .2xSaIdis je .2xSaIdis

View File

@@ -833,7 +833,7 @@ GUIOptionKeys:
.noautoincsave .noautoincsave
cmp dh,'M' cmp dh,'M'
jne .nommxcopy jne .nommxcopy
xor byte[FPUCopy],2 xor byte[MMXSupport],1
.nommxcopy .nommxcopy
cmp dh,'U' cmp dh,'U'
jne .nousepl34 jne .nousepl34

View File

@@ -1316,19 +1316,6 @@ GUIWinClicked:
%%noclick %%noclick
%endmacro %endmacro
%macro GUIClickCButtonMMX 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
xor %3,2
%%noclick
%endmacro
%macro GUIClickCButtonAS 3 %macro GUIClickCButtonAS 3
cmp eax,%1+1 cmp eax,%1+1
jl %%noclick jl %%noclick
@@ -2179,7 +2166,7 @@ DisplayGUIOptionClick:
GUIClickCButton2 11,36,byte[newengen],byte[cfgnewgfx],1 GUIClickCButton2 11,36,byte[newengen],byte[cfgnewgfx],1
.invalidng .invalidng
GUIClickCButtonAS 11,46,byte[AutoIncSaveSlot] GUIClickCButtonAS 11,46,byte[AutoIncSaveSlot]
GUIClickCButtonMMX 11,56,byte[FPUCopy] GUIClickCButton 11,56,byte[MMXSupport]
GUIClickCButtonM 11,66,byte[pl12s34] GUIClickCButtonM 11,66,byte[pl12s34]
%ifdef __MSDOS__ %ifdef __MSDOS__
GUIClickCButton 11,76,byte[SidewinderFix] GUIClickCButton 11,76,byte[SidewinderFix]

View File

@@ -1458,7 +1458,7 @@ DisplayGUIOption:
.nocheckbox2 .nocheckbox2
GUIDisplayIconWin 4,11,46,[GUITemp] GUIDisplayIconWin 4,11,46,[GUITemp]
mov dword[GUITemp],GUIIconDataCheckBoxUC mov dword[GUITemp],GUIIconDataCheckBoxUC
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
jne .nocheckbox3 jne .nocheckbox3
mov dword[GUITemp],GUIIconDataCheckBoxC mov dword[GUITemp],GUIIconDataCheckBoxC
.nocheckbox3 .nocheckbox3
@@ -1626,7 +1626,7 @@ DisplayGUIVideo:
jne .notexttb jne .notexttb
mov byte[Triplebufen],0 mov byte[Triplebufen],0
.notexttb .notexttb
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
jne .2xSaIdis jne .2xSaIdis
cmp byte[newgfx16b],0 cmp byte[newgfx16b],0
je .2xSaIdis je .2xSaIdis

View File

@@ -22,7 +22,7 @@ EXTSYM makesprprtable,romloadskip,start65816,startdebugger,SfxR0
EXTSYM MovieProcessing EXTSYM MovieProcessing
EXTSYM MovieFileHand,filefound,inittable,SA1inittable EXTSYM MovieFileHand,filefound,inittable,SA1inittable
EXTSYM MessageOn,Msgptr,MsgCount,sndrot,GenerateBank0Table,SnowTimer EXTSYM MessageOn,Msgptr,MsgCount,sndrot,GenerateBank0Table,SnowTimer
EXTSYM inittableb,inittablec,FPUCopy,newgfx16b,cfgreinittime,EndMessage EXTSYM inittableb,inittablec,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,Create_File EXTSYM Remove_Dir,Change_Single_Dir,Create_Dir,Get_Memfree,Create_File

View File

@@ -17,7 +17,7 @@
%include "macros.mac" %include "macros.mac"
EXTSYM vesa2selec,vidbuffer,GUIOn,FPUCopy,resolutn,En2xSaI,antienab,scanlines EXTSYM vesa2selec,vidbuffer,GUIOn,MMXSupport,resolutn,En2xSaI,antienab,scanlines
EXTSYM hirestiledat,res512switch,curblank,spritetablea EXTSYM hirestiledat,res512switch,curblank,spritetablea
EXTSYM lineleft,_2xSaILineW,_2xSaISuperEagleLineW, _2xSaISuper2xSaILineW EXTSYM lineleft,_2xSaILineW,_2xSaISuperEagleLineW, _2xSaISuper2xSaILineW
EXTSYM newengen,cfield,HalfTrans EXTSYM newengen,cfield,HalfTrans
@@ -58,7 +58,7 @@ NEWSYM copy640x480x16bwin
cmp byte[GUIOn2],1 cmp byte[GUIOn2],1
je .nointerp je .nointerp
.yi .yi
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
jne .nommx jne .nommx
cmp byte[En2xSaI],0 cmp byte[En2xSaI],0
jne near Process2xSaIwin jne near Process2xSaIwin
@@ -89,7 +89,7 @@ NEWSYM copy640x480x16bwin
cmp byte[ebx],1 cmp byte[ebx],1
ja near .yeshiresng ja near .yeshiresng
.ignorehr .ignorehr
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmx je near .mmx
.a .a
mov ax,[esi] mov ax,[esi]
@@ -120,7 +120,7 @@ NEWSYM copy640x480x16bwin
jnz near .loopa jnz near .loopa
pop es pop es
xor byte[res512switch],1 xor byte[res512switch],1
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je .mmx2 je .mmx2
ret ret
.mmx2 .mmx2
@@ -234,7 +234,7 @@ NEWSYM copy640x480x16bwin
call HighResProc call HighResProc
jmp .returnb jmp .returnb
.ignorehrb .ignorehrb
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmxsl je near .mmxsl
.ab .ab
mov ax,[esi] mov ax,[esi]
@@ -260,7 +260,7 @@ NEWSYM copy640x480x16bwin
jnz .loopab jnz .loopab
pop es pop es
xor byte[res512switch],1 xor byte[res512switch],1
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmx2 je near .mmx2
ret ret
.yeshiresb .yeshiresb
@@ -313,7 +313,7 @@ NEWSYM copy640x480x16bwin
call HighResProc call HighResProc
jmp .returnbh jmp .returnbh
.ignorehrbh .ignorehrbh
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmxslh je near .mmxslh
mov ecx,256 mov ecx,256
.abh .abh
@@ -346,7 +346,7 @@ NEWSYM copy640x480x16bwin
dec dl dec dl
jnz near .loopabh jnz near .loopabh
pop es pop es
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmx2 je near .mmx2
ret ret
.mmxslh .mmxslh
@@ -409,7 +409,7 @@ NEWSYM copy640x480x16bwin
call HighResProc call HighResProc
jmp .returnbh2 jmp .returnbh2
.ignorehrbh2 .ignorehrbh2
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmxslh2 je near .mmxslh2
mov ecx,256 mov ecx,256
.abh2 .abh2
@@ -446,7 +446,7 @@ NEWSYM copy640x480x16bwin
dec byte[lineleft] dec byte[lineleft]
jnz near .loopabh2 jnz near .loopabh2
pop es pop es
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmx2 je near .mmx2
ret ret
.mmxslh2 .mmxslh2
@@ -528,7 +528,7 @@ HighResProc:
.nofielde .nofielde
ret ret
.hiresmode7 .hiresmode7
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je .yeshiresngmmxmode7 je .yeshiresngmmxmode7
.a2 .a2
mov ax,[esi] mov ax,[esi]
@@ -587,7 +587,7 @@ HighResProc:
sub esi,75036*4 sub esi,75036*4
ret ret
.hires .hires
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .yeshiresngmmx je near .yeshiresngmmx
.bng .bng
mov eax,[esi+75036*4-2] mov eax,[esi+75036*4-2]
@@ -1247,7 +1247,7 @@ MMXInterpolwin:
ret ret
NEWSYM interpolate640x480x16bwin NEWSYM interpolate640x480x16bwin
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near MMXInterpolwin je near MMXInterpolwin
mov ebx,hirestiledat+1 mov ebx,hirestiledat+1

View File

@@ -122,7 +122,7 @@ void gl_end()
extern DWORD AddEndBytes; extern DWORD AddEndBytes;
extern DWORD NumBytesPerLine; extern DWORD NumBytesPerLine;
extern unsigned char *WinVidMemStart; extern unsigned char *WinVidMemStart;
extern unsigned char FPUCopy; extern unsigned char MMXSupport;
extern unsigned char NGNoTransp; extern unsigned char NGNoTransp;
extern unsigned char newengen; extern unsigned char newengen;
extern void copy640x480x16bwin(void); extern void copy640x480x16bwin(void);

View File

@@ -32,7 +32,6 @@ EXTSYM allocptr
EXTSYM putchar EXTSYM putchar
EXTSYM getchar EXTSYM getchar
EXTSYM exit EXTSYM exit
EXTSYM FPUCopy
EXTSYM ZOpenFile,ZOpenMode,CurrentHandle,ZFileSeek,ZOpenFileName,ZFileSeekMode EXTSYM ZOpenFile,ZOpenMode,CurrentHandle,ZFileSeek,ZOpenFileName,ZFileSeekMode
EXTSYM ZFileSeekPos,ZFileSeekHandle EXTSYM ZFileSeekPos,ZFileSeekHandle
EXTSYM ZFileWriteHandle,ZFileWriteSize,ZFileWriteBlock,ZFileWrite EXTSYM ZFileWriteHandle,ZFileWriteSize,ZFileWriteBlock,ZFileWrite

View File

@@ -102,7 +102,7 @@ static void UnlockSurface(void)
extern DWORD AddEndBytes; extern DWORD AddEndBytes;
extern DWORD NumBytesPerLine; extern DWORD NumBytesPerLine;
extern unsigned char *WinVidMemStart; extern unsigned char *WinVidMemStart;
extern unsigned char FPUCopy; extern unsigned char MMXSupport;
extern unsigned char NGNoTransp; extern unsigned char NGNoTransp;
extern unsigned char newengen; extern unsigned char newengen;
extern unsigned short resolutn; extern unsigned short resolutn;
@@ -196,7 +196,7 @@ void sw_drawwin()
if (SurfaceX == 256 && SurfaceY == 224) { if (SurfaceX == 256 && SurfaceY == 224) {
switch(BitDepth) { switch(BitDepth) {
case 16: case 16:
if (FPUCopy){ if (MMXSupport){
__asm__ __volatile__ ( __asm__ __volatile__ (
" pushw %%es\n" \ " pushw %%es\n" \
" movw %%ds, %%ax\n" \ " movw %%ds, %%ax\n" \
@@ -329,7 +329,7 @@ void sw_drawwin()
} else if (SurfaceX == 320 && SurfaceY == 240) { } else if (SurfaceX == 320 && SurfaceY == 240) {
switch(BitDepth) { switch(BitDepth) {
case 16: case 16:
if (FPUCopy) { if (MMXSupport) {
__asm__ __volatile__ ( __asm__ __volatile__ (
" pushw %%es\n" \ " pushw %%es\n" \
" movw %%ds, %%ax\n" \ " movw %%ds, %%ax\n" \

View File

@@ -37,7 +37,7 @@ extern void displayparams(void);
extern void makeextension(void); extern void makeextension(void);
extern unsigned char Palette0, SPC700sh, OffBy1Line, DSPDisable, extern unsigned char Palette0, SPC700sh, OffBy1Line, DSPDisable,
FPUCopy, Force8b, ForcePal, ForceNTSC, GUIClick, MouseDis, MMXSupport, Force8b, ForcePal, ForceNTSC, GUIClick, MouseDis,
MusicRelVol, ScreenScale, SoundCompD, SoundQuality, MusicRelVol, ScreenScale, SoundCompD, SoundQuality,
StereoSound, V8Mode, antienab, cvidmode, debugdisble, StereoSound, V8Mode, antienab, cvidmode, debugdisble,
debugger, enterpress, finterleave, frameskip, debugger, enterpress, finterleave, frameskip,
@@ -249,10 +249,10 @@ int main (int argc, char *argv[]) {
case 'o': { case 'o': {
if (strcmp(optarg,"m") == 0) { if (strcmp(optarg,"m") == 0) {
FPUCopy = 2; MMXSupport = 1;
pp++; pp++;
} else { } else {
FPUCopy = 0; MMXSupport = 0;
} }
break; break;
} }

View File

@@ -28,7 +28,7 @@ EXTSYM ram7fa,wramdataa
EXTSYM malloc,free EXTSYM malloc,free
EXTSYM StateBackup EXTSYM StateBackup
;EXTSYM OSPort ;EXTSYM OSPort
EXTSYM ADSRGAINSwitch,FPUCopy,ScreenScale,SoundQuality EXTSYM ADSRGAINSwitch,MMXSupport,ScreenScale,SoundQuality
EXTSYM debugger,pl1contrl,pl2contrl,romtype,smallscreence EXTSYM debugger,pl1contrl,pl2contrl,romtype,smallscreence
EXTSYM smallscreenon,spcon EXTSYM smallscreenon,spcon
EXTSYM statefileloc,LatestSave,firstsaveinc EXTSYM statefileloc,LatestSave,firstsaveinc
@@ -1642,7 +1642,7 @@ NEWSYM MMXCheck
jz .nommx jz .nommx
; MMX support ; MMX support
mov byte[FPUCopy],0 mov byte[MMXSupport],0
mov eax,1 mov eax,1
CPUID CPUID
@@ -1653,7 +1653,7 @@ NEWSYM MMXCheck
test edx,1 << 23 test edx,1 << 23
jz .nommx jz .nommx
mov byte[FPUCopy],2 mov byte[MMXSupport],1
mov edx,YesMMX mov edx,YesMMX
call PrintStr call PrintStr
.nommx .nommx

View File

@@ -895,8 +895,6 @@ NEWSYM docache
je .skipbgclear je .skipbgclear
cmp byte[newengen],1 cmp byte[newengen],1
jne .skipbgclear jne .skipbgclear
; cmp byte[FPUCopy],1
; je near ClearBGFPUCopy
mov edi,[vidbuffer] mov edi,[vidbuffer]
xor eax,eax xor eax,eax
add edi,16 add edi,16
@@ -917,33 +915,6 @@ NEWSYM yesblank
pop ebx pop ebx
ret ret
NEWSYM ClearBGFPUCopy
mov edi,[vidbuffer]
xor eax,eax
add edi,16
mov dl,[resolutn]
.loopa
mov ecx,16
.TopOfLoop
FLDZ
FLDZ
FISTP QWORD [EDI]
FISTP QWORD [EDI+8]
ADD EDI,16
DEC ECX
JNZ .TopOfLoop
add edi,32
dec dl
jnz .loopa
.skipbgclear
xor ecx,ecx
pop es
pop edx
pop edi
pop esi
pop ebx
ret
.Zero dd 0,0 .Zero dd 0,0
.Zero2 dd 0,0 .Zero2 dd 0,0

View File

@@ -839,7 +839,7 @@ NEWSYM copymodeq224
add esi,16+256+32 add esi,16+256+32
mov edi,256 mov edi,256
mov dl,222 mov dl,222
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .loopb je near .loopb
.loopa .loopa
mov ecx,64 mov ecx,64
@@ -880,7 +880,7 @@ NEWSYM copymodeq240
add esi,16+256+32 add esi,16+256+32
mov dl,[resolutn] mov dl,[resolutn]
sub dl,2 sub dl,2
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .loopb je near .loopb
.loopa .loopa
mov ecx,64 mov ecx,64
@@ -925,7 +925,7 @@ NEWSYM copymodeq256
mov dl,[resolutn] mov dl,[resolutn]
dec dl dec dl
dec dl dec dl
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .loopb je near .loopb
.loopa .loopa
mov ecx,64 mov ecx,64
@@ -982,10 +982,8 @@ NEWSYM copyvesa2320x240x8b
mov dl,[resolutn] mov dl,[resolutn]
dec dl dec dl
dec dl dec dl
cmp byte[FPUCopy],1 cmp byte[MMXSupport],1
je .loopb je near .loopb
cmp byte[FPUCopy],2
je near .loopc
.loopa .loopa
mov ecx,64 mov ecx,64
rep movsd rep movsd
@@ -996,14 +994,6 @@ NEWSYM copyvesa2320x240x8b
pop es pop es
ret ret
.loopb .loopb
CopyFPU
add esi,32
add edi,64
dec dl
jnz near .loopa
pop es
ret
.loopc
mov ecx,16 mov ecx,16
MMXStuff MMXStuff
add esi,32 add esi,32
@@ -2346,10 +2336,8 @@ NEWSYM copyvesa2320x240x16b
mov dl,[resolutn] mov dl,[resolutn]
dec dl dec dl
dec dl dec dl
cmp byte[FPUCopy],1 cmp byte[MMXSupport],1
je .loopb je near .loopb
cmp byte[FPUCopy],2
je near .loopc
.loopa .loopa
mov ecx,128 mov ecx,128
rep movsd rep movsd
@@ -2360,15 +2348,6 @@ NEWSYM copyvesa2320x240x16b
pop es pop es
ret ret
.loopb .loopb
CopyFPU
CopyFPU
add esi,64
add edi,128
dec dl
jnz near .loopb
pop es
ret
.loopc
mov ecx,32 mov ecx,32
MMXStuff MMXStuff
add esi,64 add esi,64
@@ -2612,7 +2591,7 @@ NEWSYM ConvertToAFormat
mov dl,[resolutn] mov dl,[resolutn]
dec dl dec dl
dec dl dec dl
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmxconv je near .mmxconv
.crgbloop .crgbloop
mov ecx,128 mov ecx,128
@@ -2714,7 +2693,7 @@ NEWSYM copyvesa2320x480x16b
je near .quartscanlines je near .quartscanlines
.loopa .loopa
mov ecx,128 mov ecx,128
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmx je near .mmx
rep movsd rep movsd
sub esi,256*2 sub esi,256*2
@@ -2728,7 +2707,7 @@ NEWSYM copyvesa2320x480x16b
dec dl dec dl
jnz .loopa jnz .loopa
pop es pop es
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je .mmx2 je .mmx2
ret ret
.mmx2 .mmx2
@@ -2762,7 +2741,7 @@ NEWSYM copyvesa2320x480x16b
.scanlines .scanlines
.loopab .loopab
mov ecx,128 mov ecx,128
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmxsl je near .mmxsl
.ab .ab
mov eax,[esi] mov eax,[esi]
@@ -2778,7 +2757,7 @@ NEWSYM copyvesa2320x480x16b
dec dl dec dl
jnz .loopab jnz .loopab
pop es pop es
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmx2 je near .mmx2
ret ret
.mmxsl .mmxsl
@@ -2796,7 +2775,7 @@ NEWSYM copyvesa2320x480x16b
.halfscanlines .halfscanlines
.loopabh .loopabh
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmxslh je near .mmxslh
mov ecx,128 mov ecx,128
.abh .abh
@@ -2825,7 +2804,7 @@ NEWSYM copyvesa2320x480x16b
dec dl dec dl
jnz .loopabh jnz .loopabh
pop es pop es
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmx2 je near .mmx2
ret ret
.mmxslh .mmxslh
@@ -2871,7 +2850,7 @@ NEWSYM copyvesa2320x480x16b
.quartscanlines .quartscanlines
mov [lineleft],dl mov [lineleft],dl
.loopabh2 .loopabh2
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmxslh2 je near .mmxslh2
mov ecx,128 mov ecx,128
.abh2 .abh2
@@ -2904,7 +2883,7 @@ NEWSYM copyvesa2320x480x16b
dec byte[lineleft] dec byte[lineleft]
jnz near .loopabh2 jnz near .loopabh2
pop es pop es
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmx2 je near .mmx2
ret ret
.mmxslh2 .mmxslh2
@@ -3438,7 +3417,7 @@ NEWSYM copyvesa2640x480x16b
cmp byte[GUIOn],1 cmp byte[GUIOn],1
je .nointerp je .nointerp
.yi .yi
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
jne .nommx jne .nommx
cmp byte[newgfx16b],0 cmp byte[newgfx16b],0
je .nommx je .nommx
@@ -3472,7 +3451,7 @@ NEWSYM copyvesa2640x480x16b
cmp byte[ebx],1 cmp byte[ebx],1
ja near .yeshiresng ja near .yeshiresng
.ignorehr .ignorehr
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmx je near .mmx
.a .a
mov ax,[esi] mov ax,[esi]
@@ -3506,7 +3485,7 @@ NEWSYM copyvesa2640x480x16b
je .ignorehr2 je .ignorehr2
xor byte[res512switch],1 xor byte[res512switch],1
.ignorehr2 .ignorehr2
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je .mmx2 je .mmx2
ret ret
.mmx2 .mmx2
@@ -3596,7 +3575,7 @@ NEWSYM copyvesa2640x480x16b
call HighResProc call HighResProc
jmp .returnb jmp .returnb
.ignorehrb .ignorehrb
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmxsl je near .mmxsl
.ab .ab
mov ax,[esi] mov ax,[esi]
@@ -3618,7 +3597,7 @@ NEWSYM copyvesa2640x480x16b
je .ignorehr2b je .ignorehr2b
xor byte[res512switch],1 xor byte[res512switch],1
.ignorehr2b .ignorehr2b
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmx2 je near .mmx2
ret ret
.yeshiresb .yeshiresb
@@ -3671,7 +3650,7 @@ NEWSYM copyvesa2640x480x16b
call HighResProc call HighResProc
jmp .returnbh jmp .returnbh
.ignorehrbh .ignorehrbh
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmxslh je near .mmxslh
mov ecx,256 mov ecx,256
.abh .abh
@@ -3704,7 +3683,7 @@ NEWSYM copyvesa2640x480x16b
dec dl dec dl
jnz near .loopabh jnz near .loopabh
pop es pop es
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmx2 je near .mmx2
ret ret
.mmxslh .mmxslh
@@ -3767,7 +3746,7 @@ NEWSYM copyvesa2640x480x16b
call HighResProc call HighResProc
jmp .returnbh2 jmp .returnbh2
.ignorehrbh2 .ignorehrbh2
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmxslh2 je near .mmxslh2
mov ecx,256 mov ecx,256
.abh2 .abh2
@@ -3804,7 +3783,7 @@ NEWSYM copyvesa2640x480x16b
dec byte[lineleft] dec byte[lineleft]
jnz near .loopabh2 jnz near .loopabh2
pop es pop es
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmx2 je near .mmx2
ret ret
.mmxslh2 .mmxslh2
@@ -3886,7 +3865,7 @@ HighResProc:
.nofielde .nofielde
ret ret
.hiresmode7 .hiresmode7
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je .yeshiresngmmxmode7 je .yeshiresngmmxmode7
.a2 .a2
mov ax,[esi] mov ax,[esi]
@@ -3945,7 +3924,7 @@ HighResProc:
sub esi,75036*4 sub esi,75036*4
ret ret
.hires .hires
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .yeshiresngmmx je near .yeshiresngmmx
.bng .bng
mov eax,[esi+75036*4-2] mov eax,[esi+75036*4-2]
@@ -4357,7 +4336,7 @@ NEWSYM smallscreen640x480x16b
je .nointerpolat je .nointerpolat
cmp byte[antienab],1 cmp byte[antienab],1
jne .nointerpolat jne .nointerpolat
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near MMXInterpolFS je near MMXInterpolFS
.nointerpolat .nointerpolat
push es push es
@@ -4982,9 +4961,9 @@ NEWSYM InterPtr, resd 1
SECTION .text SECTION .text
NEWSYM interpolate640x480x16b NEWSYM interpolate640x480x16b
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near MMXInterpol je near MMXInterpol
mov byte[FPUCopy],0 mov byte[MMXSupport],0
mov ebx,hirestiledat+1 mov ebx,hirestiledat+1
cmp byte[GUIOn],1 cmp byte[GUIOn],1

View File

@@ -802,8 +802,6 @@ NEWSYM clearback16b
shl eax,16 shl eax,16
mov ax,bx mov ax,bx
mov edi,[curvidoffset] mov edi,[curvidoffset]
; cmp byte[FPUCopy],1
; je .dofpuclear
mov ecx,128 mov ecx,128
rep stosd rep stosd
xor eax,eax xor eax,eax
@@ -813,17 +811,10 @@ NEWSYM clearback16b
mov ax,[pal16b] mov ax,[pal16b]
shl eax,16 shl eax,16
mov ax,[pal16b] mov ax,[pal16b]
; cmp byte[FPUCopy],1
; je .dofpuclear
mov ecx,128 mov ecx,128
rep stosd rep stosd
xor eax,eax xor eax,eax
ret ret
.dofpuclear
mov ecx,32
call FPUZero
xor eax,eax
ret
;******************************************************* ;*******************************************************
; Set palette 16bit ; Set palette 16bit

View File

@@ -19,7 +19,7 @@
EXTSYM cwinptr,dualstartprocess,dualwinbg,dualwinsp,dwinptrproc,pwinbgenab EXTSYM cwinptr,dualstartprocess,dualwinbg,dualwinsp,dwinptrproc,pwinbgenab
EXTSYM pwinbgtype,pwinspenab,pwinsptype,winbgdata,winlogicb,winonbtype EXTSYM pwinbgtype,pwinspenab,pwinsptype,winbgdata,winlogicb,winonbtype
EXTSYM winonstype,winspdata,interlval,FPUCopy EXTSYM winonstype,winspdata,interlval,MMXSupport
EXTSYM bg1scrolx,bg1scroly,curmosaicsz,curypos,drawmode716t,makewindow EXTSYM bg1scrolx,bg1scroly,curmosaicsz,curypos,drawmode716t,makewindow
EXTSYM mode7set,mosaicon,mosaicsz,scrnon,winbg1en,winenabm EXTSYM mode7set,mosaicon,mosaicsz,scrnon,winbg1en,winenabm
EXTSYM drawmode716textbg,drawmode716textbg2 EXTSYM drawmode716textbg,drawmode716textbg2
@@ -1469,7 +1469,7 @@ NEWSYM clearback16bts
mov edi,[curvidoffset] mov edi,[curvidoffset]
or eax,eax or eax,eax
jz near clearback16bts0.clearing jz near clearback16bts0.clearing
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je .dommxclear je .dommxclear
mov ecx,128 mov ecx,128
rep stosd rep stosd
@@ -1540,7 +1540,7 @@ NEWSYM clearback16bts0b
mov edi,[curvidoffset] mov edi,[curvidoffset]
or eax,eax or eax,eax
jz near clearback16bts0.clearing jz near clearback16bts0.clearing
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je .dommxclear je .dommxclear
mov ecx,128 mov ecx,128
rep stosd rep stosd
@@ -1574,7 +1574,7 @@ NEWSYM clearback16bts0
jnz .notnotransp jnz .notnotransp
mov byte[DoTransp],1 mov byte[DoTransp],1
.notnotransp .notnotransp
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je .dommxclear je .dommxclear
mov ecx,128 mov ecx,128
rep stosd rep stosd
@@ -2036,7 +2036,7 @@ NEWSYM clearback16t
xor eax,eax xor eax,eax
ret ret
.subcopy .subcopy
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je .dommxcopy je .dommxcopy
mov ecx,128 mov ecx,128
xor ebx,ebx xor ebx,ebx
@@ -2068,7 +2068,7 @@ NEWSYM clearback16t
mov ax,[pal16b] mov ax,[pal16b]
shl eax,16 shl eax,16
mov ax,[pal16b] mov ax,[pal16b]
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je .dommxclear je .dommxclear
rep stosd rep stosd
xor eax,eax xor eax,eax

View File

@@ -63,7 +63,7 @@ EXTSYM ngwinptr,objwlrpos,objwen,objclineptr,CSprWinPtr
EXTSYM BuildWindow2 EXTSYM BuildWindow2
EXTSYM NGNumSpr EXTSYM NGNumSpr
EXTSYM fulladdtab EXTSYM fulladdtab
EXTSYM FPUCopy,bgtxadd2 EXTSYM MMXSupport,bgtxadd2
NEWSYM NewGfx16AsmStart NEWSYM NewGfx16AsmStart
@@ -2773,7 +2773,7 @@ ProcessTransparencies:
je .yestransp je .yestransp
ret ret
.yestransp .yestransp
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near ProcessTransparenciesMMX je near ProcessTransparenciesMMX
mov esi,[vidbuffer] mov esi,[vidbuffer]
add esi,16*2+288*2 add esi,16*2+288*2

View File

@@ -28,7 +28,7 @@ EXTSYM vesa2_clbit,vesa2_gpos,vesa2_rpos,vesa2red10,vesa2selec,vidbuffer
EXTSYM vidbufferm,vram,vsyncon,vbufdptr,KeyStateSelct,forceblnk,soundon EXTSYM vidbufferm,vram,vsyncon,vbufdptr,KeyStateSelct,forceblnk,soundon
EXTSYM Open_File,Read_File,Close_File,Create_File,Write_File,Get_File_Date EXTSYM Open_File,Read_File,Close_File,Create_File,Write_File,Get_File_Date
EXTSYM Triplebufen,makepal,changepal,saveselectpal,displayfpspal,superscopepal EXTSYM Triplebufen,makepal,changepal,saveselectpal,displayfpspal,superscopepal
EXTSYM DrawScreen EXTSYM DrawScreen,MMXSupport
EXTSYM Get_MouseData,Get_MousePositionDisplacement EXTSYM Get_MouseData,Get_MousePositionDisplacement
EXTSYM GUIEnableTransp EXTSYM GUIEnableTransp
EXTSYM GUIFontData EXTSYM GUIFontData
@@ -116,8 +116,6 @@ NEWSYM FPUZero
.Zero dd 0,0 .Zero dd 0,0
.Zero2 dd 0,0 .Zero2 dd 0,0
NEWSYM FPUCopy, db 0
;******************************************************* ;*******************************************************
; ShowVideo Processes & displays video ; ShowVideo Processes & displays video
;******************************************************* ;*******************************************************

View File

@@ -17,7 +17,7 @@
%include "macros.mac" %include "macros.mac"
EXTSYM vesa2selec,vidbuffer,GUIOn,FPUCopy,resolutn,En2xSaI,antienab,scanlines EXTSYM vesa2selec,vidbuffer,GUIOn,MMXSupport,resolutn,En2xSaI,antienab,scanlines
EXTSYM hirestiledat,res512switch,curblank,spritetablea EXTSYM hirestiledat,res512switch,curblank,spritetablea
EXTSYM lineleft,_2xSaILineW,_2xSaISuperEagleLineW, _2xSaISuper2xSaILineW EXTSYM lineleft,_2xSaILineW,_2xSaISuperEagleLineW, _2xSaISuper2xSaILineW
EXTSYM newengen,cfield,HalfTrans EXTSYM newengen,cfield,HalfTrans
@@ -60,7 +60,7 @@ NEWSYM copy640x480x16bwin
cmp byte[GUIOn2],1 cmp byte[GUIOn2],1
je .nointerp je .nointerp
.yi .yi
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
jne .nommx jne .nommx
cmp byte[En2xSaI],0 cmp byte[En2xSaI],0
jne near Process2xSaIwin jne near Process2xSaIwin
@@ -91,7 +91,7 @@ NEWSYM copy640x480x16bwin
cmp byte[ebx],1 cmp byte[ebx],1
ja near .yeshiresng ja near .yeshiresng
.ignorehr .ignorehr
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmx je near .mmx
.a .a
mov ax,[esi] mov ax,[esi]
@@ -122,7 +122,7 @@ NEWSYM copy640x480x16bwin
jnz near .loopa jnz near .loopa
pop es pop es
xor byte[res512switch],1 xor byte[res512switch],1
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je .mmx2 je .mmx2
ret ret
.mmx2 .mmx2
@@ -236,7 +236,7 @@ NEWSYM copy640x480x16bwin
call HighResProc call HighResProc
jmp .returnb jmp .returnb
.ignorehrb .ignorehrb
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmxsl je near .mmxsl
.ab .ab
mov ax,[esi] mov ax,[esi]
@@ -262,7 +262,7 @@ NEWSYM copy640x480x16bwin
jnz .loopab jnz .loopab
pop es pop es
xor byte[res512switch],1 xor byte[res512switch],1
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmx2 je near .mmx2
ret ret
.yeshiresb .yeshiresb
@@ -315,7 +315,7 @@ NEWSYM copy640x480x16bwin
call HighResProc call HighResProc
jmp .returnbh jmp .returnbh
.ignorehrbh .ignorehrbh
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmxslh je near .mmxslh
mov ecx,256 mov ecx,256
.abh .abh
@@ -348,7 +348,7 @@ NEWSYM copy640x480x16bwin
dec dl dec dl
jnz near .loopabh jnz near .loopabh
pop es pop es
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmx2 je near .mmx2
ret ret
.mmxslh .mmxslh
@@ -411,7 +411,7 @@ NEWSYM copy640x480x16bwin
call HighResProc call HighResProc
jmp .returnbh2 jmp .returnbh2
.ignorehrbh2 .ignorehrbh2
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmxslh2 je near .mmxslh2
mov ecx,256 mov ecx,256
.abh2 .abh2
@@ -448,7 +448,7 @@ NEWSYM copy640x480x16bwin
dec byte[lineleft] dec byte[lineleft]
jnz near .loopabh2 jnz near .loopabh2
pop es pop es
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .mmx2 je near .mmx2
ret ret
.mmxslh2 .mmxslh2
@@ -530,7 +530,7 @@ HighResProc:
.nofielde .nofielde
ret ret
.hiresmode7 .hiresmode7
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je .yeshiresngmmxmode7 je .yeshiresngmmxmode7
.a2 .a2
mov ax,[esi] mov ax,[esi]
@@ -589,7 +589,7 @@ HighResProc:
sub esi,75036*4 sub esi,75036*4
ret ret
.hires .hires
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near .yeshiresngmmx je near .yeshiresngmmx
.bng .bng
mov eax,[esi+75036*4-2] mov eax,[esi+75036*4-2]
@@ -1249,7 +1249,7 @@ MMXInterpolwin:
ret ret
NEWSYM interpolate640x480x16bwin NEWSYM interpolate640x480x16bwin
cmp byte[FPUCopy],2 cmp byte[MMXSupport],1
je near MMXInterpolwin je near MMXInterpolwin
mov ebx,hirestiledat+1 mov ebx,hirestiledat+1

View File

@@ -32,7 +32,6 @@ EXTSYM allocptr
extsym putchar extsym putchar
EXTSYM getch EXTSYM getch
EXTSYM exit EXTSYM exit
EXTSYM FPUCopy
EXTSYM ZOpenFile,ZOpenMode,CurrentHandle,ZFileSeek,ZOpenFileName,ZFileSeekMode EXTSYM ZOpenFile,ZOpenMode,CurrentHandle,ZFileSeek,ZOpenFileName,ZFileSeekMode
EXTSYM ZFileSeekPos,ZFileSeekHandle EXTSYM ZFileSeekPos,ZFileSeekHandle
EXTSYM ZFileWriteHandle,ZFileWriteSize,ZFileWriteBlock,ZFileWrite EXTSYM ZFileWriteHandle,ZFileWriteSize,ZFileWriteBlock,ZFileWrite

View File

@@ -1842,7 +1842,7 @@ void CheckTimers(void)
} }
} }
extern "C" BYTE FPUCopy; extern unsigned char MMXSupport;
void UpdateVFrame(void) void UpdateVFrame(void)
{ {
@@ -1892,7 +1892,7 @@ void UpdateVFrame(void)
int buffer_ptr = (int)&Buffer[0]; int buffer_ptr = (int)&Buffer[0];
if (T36HZEnabled == 1) if (T36HZEnabled == 1)
if (FPUCopy == 2) if (MMXSupport == 1)
_asm _asm
{ {
mov edi,buffer_ptr mov edi,buffer_ptr
@@ -1920,7 +1920,7 @@ _blank_top:
jne _blank_top jne _blank_top
} }
else else
if (FPUCopy == 2) if (MMXSupport == 1)
_asm _asm
{ {
mov esi,DSPBuffer1 mov esi,DSPBuffer1
@@ -1979,7 +1979,7 @@ extern DWORD AddEndBytes;
extern DWORD NumBytesPerLine; extern DWORD NumBytesPerLine;
extern unsigned char * WinVidMemStart; extern unsigned char * WinVidMemStart;
extern void copy640x480x16bwin(void); extern void copy640x480x16bwin(void);
extern unsigned char FPUCopy; extern unsigned char MMXSupport;
extern unsigned char NGNoTransp; extern unsigned char NGNoTransp;
extern unsigned char newengen; extern unsigned char newengen;
@@ -2080,7 +2080,7 @@ void drawscreenwin(void)
switch (BitDepth) switch (BitDepth)
{ {
case 16: case 16:
if (FPUCopy == 2) { if (MMXSupport == 1) {
_asm { _asm {
push es push es
mov ax,ds mov ax,ds
@@ -2208,7 +2208,7 @@ void drawscreenwin(void)
switch (BitDepth) switch (BitDepth)
{ {
case 16: case 16:
if (FPUCopy == 2) { if (MMXSupport == 1) {
_asm { _asm {
push es push es
mov ax,ds mov ax,ds

View File

@@ -32,7 +32,7 @@ extern void displayparams(void);
extern void makeextension(void); extern void makeextension(void);
extern unsigned char Palette0, SPC700sh, OffBy1Line, DSPDisable, extern unsigned char Palette0, SPC700sh, OffBy1Line, DSPDisable,
FPUCopy, Force8b, ForcePal, GUIClick, MouseDis, MMXSupport, Force8b, ForcePal, GUIClick, MouseDis,
MusicRelVol, ScreenScale, SoundCompD, SoundQuality, MusicRelVol, ScreenScale, SoundCompD, SoundQuality,
StereoSound, V8Mode, antienab, cvidmode, debugdisble, StereoSound, V8Mode, antienab, cvidmode, debugdisble,
debugger, enterpress, finterleave, frameskip, debugger, enterpress, finterleave, frameskip,
@@ -483,12 +483,12 @@ int pccmdline(void)
{ {
if(nn == 'm') if(nn == 'm')
{ {
FPUCopy=2; MMXSupport=1;
pp++; pp++;
} }
else else
{ {
FPUCopy=0; MMXSupport=0;
} }
break; break;
} }