From 85b8810b5f8e0d68b169429cd1ce8f3e44010179 Mon Sep 17 00:00:00 2001 From: pagefault <> Date: Thu, 20 Sep 2001 18:08:10 +0000 Subject: [PATCH] Renamed MMX support variable --- zsnes/src/cfgload.asm | 2 +- zsnes/src/dos/dosintrf.asm | 1 - zsnes/src/dos/zloader.c | 6 +-- zsnes/src/gui/gui.asm | 6 +-- zsnes/src/gui/guikeys.inc | 2 +- zsnes/src/gui/guimouse.inc | 15 +------ zsnes/src/gui/guiwindp.inc | 4 +- zsnes/src/init.asm | 2 +- zsnes/src/linux/copyvwin.asm | 26 ++++++------ zsnes/src/linux/gl_draw.c | 2 +- zsnes/src/linux/sdlintrf.asm | 1 - zsnes/src/linux/sw_draw.c | 6 +-- zsnes/src/linux/zloaderw.c | 6 +-- zsnes/src/ui.asm | 6 +-- zsnes/src/vcache.asm | 29 ------------- zsnes/src/video/copyvid.inc | 81 +++++++++++++----------------------- zsnes/src/video/makev16b.asm | 9 ---- zsnes/src/video/makev16t.asm | 12 +++--- zsnes/src/video/newgfx16.asm | 4 +- zsnes/src/video/procvid.asm | 4 +- zsnes/src/win/copyvwin.asm | 26 ++++++------ zsnes/src/win/winintrf.asm | 1 - zsnes/src/win/winlink.cpp | 12 +++--- zsnes/src/win/zloaderw.c | 6 +-- 24 files changed, 96 insertions(+), 173 deletions(-) diff --git a/zsnes/src/cfgload.asm b/zsnes/src/cfgload.asm index 1118bd3d..3539695f 100644 --- a/zsnes/src/cfgload.asm +++ b/zsnes/src/cfgload.asm @@ -22,7 +22,7 @@ EXTSYM JoyXC,JoyYC,LoadDir,LoadDrive,SRAMDrive,mode7tab EXTSYM pl1selk,pl1startk,pl1upk,pl2Ak,pl2Bk,pl2Lk,pl2Rk EXTSYM pl2Xk,pl2Yk,pl2contrl,pl2downk,pl2leftk,pl2rightk 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 newengen,per2exec,pl1Ak,pl1Bk,pl1Lk,pl1Rk,pl1Xk,pl1Yk EXTSYM pl1contrl,pl1downk,pl1leftk,pl1rightk,scanlines,soundon diff --git a/zsnes/src/dos/dosintrf.asm b/zsnes/src/dos/dosintrf.asm index 49911176..ed76d0c5 100644 --- a/zsnes/src/dos/dosintrf.asm +++ b/zsnes/src/dos/dosintrf.asm @@ -24,7 +24,6 @@ EXTSYM ccmdline EXTSYM InitDir,InitDrive EXTSYM DOScreatenewcfg,ExecGUISaveVars EXTSYM allocptr -EXTSYM FPUCopy EXTSYM ZOpenFile,ZOpenMode,CurrentHandle,ZFileSeek,ZOpenFileName,ZFileSeekMode EXTSYM ZFileSeekPos,ZFileSeekHandle EXTSYM ZFileWriteHandle,ZFileWriteSize,ZFileWriteBlock,ZFileWrite diff --git a/zsnes/src/dos/zloader.c b/zsnes/src/dos/zloader.c index 9b53f9ef..baae777d 100644 --- a/zsnes/src/dos/zloader.c +++ b/zsnes/src/dos/zloader.c @@ -31,7 +31,7 @@ extern void displayparams(void); extern void makeextension(void); extern unsigned char Palette0, SPC700sh, OffBy1Line, DSPDisable, - FPUCopy, Force8b, ForcePal, GUIClick, MouseDis, + MMXSupport, Force8b, ForcePal, GUIClick, MouseDis, MusicRelVol, ScreenScale, SoundCompD, SoundQuality, StereoSound, V8Mode, antienab, cvidmode, debugdisble, debugger, enterpress, finterleave, frameskip, @@ -354,12 +354,12 @@ int pccmdline(void) { if(nn == 'm') { - FPUCopy=2; + MMXSupport=1; pp++; } else { - FPUCopy=0; + MMXSupport=0; } break; } diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm index bdf11ea4..08fbb9fb 100644 --- a/zsnes/src/gui/gui.asm +++ b/zsnes/src/gui/gui.asm @@ -65,7 +65,7 @@ %include "macros.mac" 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 endprog, continueprog, spcBuffera, spcRamcmp, cbitmode, makepal EXTSYM t1cc, LoadDir, SRAMDir, LoadDrive,SRAMDrive, initsnes, romloadskip @@ -551,7 +551,7 @@ NEWSYM KeyRewind, dd 0 NEWSYM ChatNick, times 16 db 0 NEWSYM KeySlowDown, dd 0 -NEWSYM UseCubicSpline, db 1 +NEWSYM MMXSupport, db 1 NEWSYM LargeSoundBuf, db 0 NEWSYM HighPriority, db 0 @@ -1516,7 +1516,7 @@ NEWSYM StartGUI jne .notexttb mov byte[Triplebufen],0 .notexttb - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 jne .2xSaIdis cmp byte[newgfx16b],0 je .2xSaIdis diff --git a/zsnes/src/gui/guikeys.inc b/zsnes/src/gui/guikeys.inc index 37098555..1d300548 100644 --- a/zsnes/src/gui/guikeys.inc +++ b/zsnes/src/gui/guikeys.inc @@ -833,7 +833,7 @@ GUIOptionKeys: .noautoincsave cmp dh,'M' jne .nommxcopy - xor byte[FPUCopy],2 + xor byte[MMXSupport],1 .nommxcopy cmp dh,'U' jne .nousepl34 diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc index af7f62e8..81829974 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -1316,19 +1316,6 @@ GUIWinClicked: %%noclick %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 cmp eax,%1+1 jl %%noclick @@ -2179,7 +2166,7 @@ DisplayGUIOptionClick: GUIClickCButton2 11,36,byte[newengen],byte[cfgnewgfx],1 .invalidng GUIClickCButtonAS 11,46,byte[AutoIncSaveSlot] - GUIClickCButtonMMX 11,56,byte[FPUCopy] + GUIClickCButton 11,56,byte[MMXSupport] GUIClickCButtonM 11,66,byte[pl12s34] %ifdef __MSDOS__ GUIClickCButton 11,76,byte[SidewinderFix] diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc index 4d368f5a..11ed2fdf 100644 --- a/zsnes/src/gui/guiwindp.inc +++ b/zsnes/src/gui/guiwindp.inc @@ -1458,7 +1458,7 @@ DisplayGUIOption: .nocheckbox2 GUIDisplayIconWin 4,11,46,[GUITemp] mov dword[GUITemp],GUIIconDataCheckBoxUC - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 jne .nocheckbox3 mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckbox3 @@ -1626,7 +1626,7 @@ DisplayGUIVideo: jne .notexttb mov byte[Triplebufen],0 .notexttb - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 jne .2xSaIdis cmp byte[newgfx16b],0 je .2xSaIdis diff --git a/zsnes/src/init.asm b/zsnes/src/init.asm index cc31f92f..c921de86 100644 --- a/zsnes/src/init.asm +++ b/zsnes/src/init.asm @@ -22,7 +22,7 @@ EXTSYM makesprprtable,romloadskip,start65816,startdebugger,SfxR0 EXTSYM MovieProcessing EXTSYM MovieFileHand,filefound,inittable,SA1inittable 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 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 diff --git a/zsnes/src/linux/copyvwin.asm b/zsnes/src/linux/copyvwin.asm index 259386bd..a9083156 100644 --- a/zsnes/src/linux/copyvwin.asm +++ b/zsnes/src/linux/copyvwin.asm @@ -17,7 +17,7 @@ %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 lineleft,_2xSaILineW,_2xSaISuperEagleLineW, _2xSaISuper2xSaILineW EXTSYM newengen,cfield,HalfTrans @@ -58,7 +58,7 @@ NEWSYM copy640x480x16bwin cmp byte[GUIOn2],1 je .nointerp .yi - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 jne .nommx cmp byte[En2xSaI],0 jne near Process2xSaIwin @@ -89,7 +89,7 @@ NEWSYM copy640x480x16bwin cmp byte[ebx],1 ja near .yeshiresng .ignorehr - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmx .a mov ax,[esi] @@ -120,7 +120,7 @@ NEWSYM copy640x480x16bwin jnz near .loopa pop es xor byte[res512switch],1 - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je .mmx2 ret .mmx2 @@ -234,7 +234,7 @@ NEWSYM copy640x480x16bwin call HighResProc jmp .returnb .ignorehrb - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmxsl .ab mov ax,[esi] @@ -260,7 +260,7 @@ NEWSYM copy640x480x16bwin jnz .loopab pop es xor byte[res512switch],1 - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmx2 ret .yeshiresb @@ -313,7 +313,7 @@ NEWSYM copy640x480x16bwin call HighResProc jmp .returnbh .ignorehrbh - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmxslh mov ecx,256 .abh @@ -346,7 +346,7 @@ NEWSYM copy640x480x16bwin dec dl jnz near .loopabh pop es - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmx2 ret .mmxslh @@ -409,7 +409,7 @@ NEWSYM copy640x480x16bwin call HighResProc jmp .returnbh2 .ignorehrbh2 - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmxslh2 mov ecx,256 .abh2 @@ -446,7 +446,7 @@ NEWSYM copy640x480x16bwin dec byte[lineleft] jnz near .loopabh2 pop es - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmx2 ret .mmxslh2 @@ -528,7 +528,7 @@ HighResProc: .nofielde ret .hiresmode7 - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je .yeshiresngmmxmode7 .a2 mov ax,[esi] @@ -587,7 +587,7 @@ HighResProc: sub esi,75036*4 ret .hires - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .yeshiresngmmx .bng mov eax,[esi+75036*4-2] @@ -1247,7 +1247,7 @@ MMXInterpolwin: ret NEWSYM interpolate640x480x16bwin - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near MMXInterpolwin mov ebx,hirestiledat+1 diff --git a/zsnes/src/linux/gl_draw.c b/zsnes/src/linux/gl_draw.c index 0ed5c677..e2872d26 100644 --- a/zsnes/src/linux/gl_draw.c +++ b/zsnes/src/linux/gl_draw.c @@ -122,7 +122,7 @@ void gl_end() extern DWORD AddEndBytes; extern DWORD NumBytesPerLine; extern unsigned char *WinVidMemStart; -extern unsigned char FPUCopy; +extern unsigned char MMXSupport; extern unsigned char NGNoTransp; extern unsigned char newengen; extern void copy640x480x16bwin(void); diff --git a/zsnes/src/linux/sdlintrf.asm b/zsnes/src/linux/sdlintrf.asm index 0b96facf..7f38d8c2 100644 --- a/zsnes/src/linux/sdlintrf.asm +++ b/zsnes/src/linux/sdlintrf.asm @@ -32,7 +32,6 @@ EXTSYM allocptr EXTSYM putchar EXTSYM getchar EXTSYM exit -EXTSYM FPUCopy EXTSYM ZOpenFile,ZOpenMode,CurrentHandle,ZFileSeek,ZOpenFileName,ZFileSeekMode EXTSYM ZFileSeekPos,ZFileSeekHandle EXTSYM ZFileWriteHandle,ZFileWriteSize,ZFileWriteBlock,ZFileWrite diff --git a/zsnes/src/linux/sw_draw.c b/zsnes/src/linux/sw_draw.c index 47c9aa07..982af324 100644 --- a/zsnes/src/linux/sw_draw.c +++ b/zsnes/src/linux/sw_draw.c @@ -102,7 +102,7 @@ static void UnlockSurface(void) extern DWORD AddEndBytes; extern DWORD NumBytesPerLine; extern unsigned char *WinVidMemStart; -extern unsigned char FPUCopy; +extern unsigned char MMXSupport; extern unsigned char NGNoTransp; extern unsigned char newengen; extern unsigned short resolutn; @@ -196,7 +196,7 @@ void sw_drawwin() if (SurfaceX == 256 && SurfaceY == 224) { switch(BitDepth) { case 16: - if (FPUCopy){ + if (MMXSupport){ __asm__ __volatile__ ( " pushw %%es\n" \ " movw %%ds, %%ax\n" \ @@ -329,7 +329,7 @@ void sw_drawwin() } else if (SurfaceX == 320 && SurfaceY == 240) { switch(BitDepth) { case 16: - if (FPUCopy) { + if (MMXSupport) { __asm__ __volatile__ ( " pushw %%es\n" \ " movw %%ds, %%ax\n" \ diff --git a/zsnes/src/linux/zloaderw.c b/zsnes/src/linux/zloaderw.c index d19d39b2..faaa3c23 100644 --- a/zsnes/src/linux/zloaderw.c +++ b/zsnes/src/linux/zloaderw.c @@ -37,7 +37,7 @@ extern void displayparams(void); extern void makeextension(void); extern unsigned char Palette0, SPC700sh, OffBy1Line, DSPDisable, - FPUCopy, Force8b, ForcePal, ForceNTSC, GUIClick, MouseDis, + MMXSupport, Force8b, ForcePal, ForceNTSC, GUIClick, MouseDis, MusicRelVol, ScreenScale, SoundCompD, SoundQuality, StereoSound, V8Mode, antienab, cvidmode, debugdisble, debugger, enterpress, finterleave, frameskip, @@ -249,10 +249,10 @@ int main (int argc, char *argv[]) { case 'o': { if (strcmp(optarg,"m") == 0) { - FPUCopy = 2; + MMXSupport = 1; pp++; } else { - FPUCopy = 0; + MMXSupport = 0; } break; } diff --git a/zsnes/src/ui.asm b/zsnes/src/ui.asm index b1818d22..ef4c70ea 100644 --- a/zsnes/src/ui.asm +++ b/zsnes/src/ui.asm @@ -28,7 +28,7 @@ EXTSYM ram7fa,wramdataa EXTSYM malloc,free EXTSYM StateBackup ;EXTSYM OSPort -EXTSYM ADSRGAINSwitch,FPUCopy,ScreenScale,SoundQuality +EXTSYM ADSRGAINSwitch,MMXSupport,ScreenScale,SoundQuality EXTSYM debugger,pl1contrl,pl2contrl,romtype,smallscreence EXTSYM smallscreenon,spcon EXTSYM statefileloc,LatestSave,firstsaveinc @@ -1642,7 +1642,7 @@ NEWSYM MMXCheck jz .nommx ; MMX support - mov byte[FPUCopy],0 + mov byte[MMXSupport],0 mov eax,1 CPUID @@ -1653,7 +1653,7 @@ NEWSYM MMXCheck test edx,1 << 23 jz .nommx - mov byte[FPUCopy],2 + mov byte[MMXSupport],1 mov edx,YesMMX call PrintStr .nommx diff --git a/zsnes/src/vcache.asm b/zsnes/src/vcache.asm index 0f6aeb08..22dffe77 100644 --- a/zsnes/src/vcache.asm +++ b/zsnes/src/vcache.asm @@ -895,8 +895,6 @@ NEWSYM docache je .skipbgclear cmp byte[newengen],1 jne .skipbgclear -; cmp byte[FPUCopy],1 -; je near ClearBGFPUCopy mov edi,[vidbuffer] xor eax,eax add edi,16 @@ -917,33 +915,6 @@ NEWSYM yesblank pop ebx 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 .Zero2 dd 0,0 diff --git a/zsnes/src/video/copyvid.inc b/zsnes/src/video/copyvid.inc index b9e3e5e3..85ad3f7f 100644 --- a/zsnes/src/video/copyvid.inc +++ b/zsnes/src/video/copyvid.inc @@ -839,7 +839,7 @@ NEWSYM copymodeq224 add esi,16+256+32 mov edi,256 mov dl,222 - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .loopb .loopa mov ecx,64 @@ -880,7 +880,7 @@ NEWSYM copymodeq240 add esi,16+256+32 mov dl,[resolutn] sub dl,2 - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .loopb .loopa mov ecx,64 @@ -925,7 +925,7 @@ NEWSYM copymodeq256 mov dl,[resolutn] dec dl dec dl - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .loopb .loopa mov ecx,64 @@ -982,10 +982,8 @@ NEWSYM copyvesa2320x240x8b mov dl,[resolutn] dec dl dec dl - cmp byte[FPUCopy],1 - je .loopb - cmp byte[FPUCopy],2 - je near .loopc + cmp byte[MMXSupport],1 + je near .loopb .loopa mov ecx,64 rep movsd @@ -996,14 +994,6 @@ NEWSYM copyvesa2320x240x8b pop es ret .loopb - CopyFPU - add esi,32 - add edi,64 - dec dl - jnz near .loopa - pop es - ret -.loopc mov ecx,16 MMXStuff add esi,32 @@ -2346,10 +2336,8 @@ NEWSYM copyvesa2320x240x16b mov dl,[resolutn] dec dl dec dl - cmp byte[FPUCopy],1 - je .loopb - cmp byte[FPUCopy],2 - je near .loopc + cmp byte[MMXSupport],1 + je near .loopb .loopa mov ecx,128 rep movsd @@ -2360,15 +2348,6 @@ NEWSYM copyvesa2320x240x16b pop es ret .loopb - CopyFPU - CopyFPU - add esi,64 - add edi,128 - dec dl - jnz near .loopb - pop es - ret -.loopc mov ecx,32 MMXStuff add esi,64 @@ -2612,7 +2591,7 @@ NEWSYM ConvertToAFormat mov dl,[resolutn] dec dl dec dl - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmxconv .crgbloop mov ecx,128 @@ -2714,7 +2693,7 @@ NEWSYM copyvesa2320x480x16b je near .quartscanlines .loopa mov ecx,128 - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmx rep movsd sub esi,256*2 @@ -2728,7 +2707,7 @@ NEWSYM copyvesa2320x480x16b dec dl jnz .loopa pop es - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je .mmx2 ret .mmx2 @@ -2762,7 +2741,7 @@ NEWSYM copyvesa2320x480x16b .scanlines .loopab mov ecx,128 - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmxsl .ab mov eax,[esi] @@ -2778,7 +2757,7 @@ NEWSYM copyvesa2320x480x16b dec dl jnz .loopab pop es - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmx2 ret .mmxsl @@ -2796,7 +2775,7 @@ NEWSYM copyvesa2320x480x16b .halfscanlines .loopabh - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmxslh mov ecx,128 .abh @@ -2825,7 +2804,7 @@ NEWSYM copyvesa2320x480x16b dec dl jnz .loopabh pop es - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmx2 ret .mmxslh @@ -2871,7 +2850,7 @@ NEWSYM copyvesa2320x480x16b .quartscanlines mov [lineleft],dl .loopabh2 - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmxslh2 mov ecx,128 .abh2 @@ -2904,7 +2883,7 @@ NEWSYM copyvesa2320x480x16b dec byte[lineleft] jnz near .loopabh2 pop es - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmx2 ret .mmxslh2 @@ -3438,7 +3417,7 @@ NEWSYM copyvesa2640x480x16b cmp byte[GUIOn],1 je .nointerp .yi - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 jne .nommx cmp byte[newgfx16b],0 je .nommx @@ -3472,7 +3451,7 @@ NEWSYM copyvesa2640x480x16b cmp byte[ebx],1 ja near .yeshiresng .ignorehr - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmx .a mov ax,[esi] @@ -3506,7 +3485,7 @@ NEWSYM copyvesa2640x480x16b je .ignorehr2 xor byte[res512switch],1 .ignorehr2 - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je .mmx2 ret .mmx2 @@ -3596,7 +3575,7 @@ NEWSYM copyvesa2640x480x16b call HighResProc jmp .returnb .ignorehrb - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmxsl .ab mov ax,[esi] @@ -3618,7 +3597,7 @@ NEWSYM copyvesa2640x480x16b je .ignorehr2b xor byte[res512switch],1 .ignorehr2b - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmx2 ret .yeshiresb @@ -3671,7 +3650,7 @@ NEWSYM copyvesa2640x480x16b call HighResProc jmp .returnbh .ignorehrbh - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmxslh mov ecx,256 .abh @@ -3704,7 +3683,7 @@ NEWSYM copyvesa2640x480x16b dec dl jnz near .loopabh pop es - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmx2 ret .mmxslh @@ -3767,7 +3746,7 @@ NEWSYM copyvesa2640x480x16b call HighResProc jmp .returnbh2 .ignorehrbh2 - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmxslh2 mov ecx,256 .abh2 @@ -3804,7 +3783,7 @@ NEWSYM copyvesa2640x480x16b dec byte[lineleft] jnz near .loopabh2 pop es - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmx2 ret .mmxslh2 @@ -3886,7 +3865,7 @@ HighResProc: .nofielde ret .hiresmode7 - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je .yeshiresngmmxmode7 .a2 mov ax,[esi] @@ -3945,7 +3924,7 @@ HighResProc: sub esi,75036*4 ret .hires - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .yeshiresngmmx .bng mov eax,[esi+75036*4-2] @@ -4357,7 +4336,7 @@ NEWSYM smallscreen640x480x16b je .nointerpolat cmp byte[antienab],1 jne .nointerpolat - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near MMXInterpolFS .nointerpolat push es @@ -4982,9 +4961,9 @@ NEWSYM InterPtr, resd 1 SECTION .text NEWSYM interpolate640x480x16b - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near MMXInterpol - mov byte[FPUCopy],0 + mov byte[MMXSupport],0 mov ebx,hirestiledat+1 cmp byte[GUIOn],1 diff --git a/zsnes/src/video/makev16b.asm b/zsnes/src/video/makev16b.asm index e7efd6f9..fccd955f 100644 --- a/zsnes/src/video/makev16b.asm +++ b/zsnes/src/video/makev16b.asm @@ -802,8 +802,6 @@ NEWSYM clearback16b shl eax,16 mov ax,bx mov edi,[curvidoffset] -; cmp byte[FPUCopy],1 -; je .dofpuclear mov ecx,128 rep stosd xor eax,eax @@ -813,17 +811,10 @@ NEWSYM clearback16b mov ax,[pal16b] shl eax,16 mov ax,[pal16b] -; cmp byte[FPUCopy],1 -; je .dofpuclear mov ecx,128 rep stosd xor eax,eax ret -.dofpuclear - mov ecx,32 - call FPUZero - xor eax,eax - ret ;******************************************************* ; Set palette 16bit diff --git a/zsnes/src/video/makev16t.asm b/zsnes/src/video/makev16t.asm index 78139eb7..a3197f1b 100644 --- a/zsnes/src/video/makev16t.asm +++ b/zsnes/src/video/makev16t.asm @@ -19,7 +19,7 @@ EXTSYM cwinptr,dualstartprocess,dualwinbg,dualwinsp,dwinptrproc,pwinbgenab 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 mode7set,mosaicon,mosaicsz,scrnon,winbg1en,winenabm EXTSYM drawmode716textbg,drawmode716textbg2 @@ -1469,7 +1469,7 @@ NEWSYM clearback16bts mov edi,[curvidoffset] or eax,eax jz near clearback16bts0.clearing - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je .dommxclear mov ecx,128 rep stosd @@ -1540,7 +1540,7 @@ NEWSYM clearback16bts0b mov edi,[curvidoffset] or eax,eax jz near clearback16bts0.clearing - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je .dommxclear mov ecx,128 rep stosd @@ -1574,7 +1574,7 @@ NEWSYM clearback16bts0 jnz .notnotransp mov byte[DoTransp],1 .notnotransp - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je .dommxclear mov ecx,128 rep stosd @@ -2036,7 +2036,7 @@ NEWSYM clearback16t xor eax,eax ret .subcopy - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je .dommxcopy mov ecx,128 xor ebx,ebx @@ -2068,7 +2068,7 @@ NEWSYM clearback16t mov ax,[pal16b] shl eax,16 mov ax,[pal16b] - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je .dommxclear rep stosd xor eax,eax diff --git a/zsnes/src/video/newgfx16.asm b/zsnes/src/video/newgfx16.asm index fac41df1..d801e5da 100644 --- a/zsnes/src/video/newgfx16.asm +++ b/zsnes/src/video/newgfx16.asm @@ -63,7 +63,7 @@ EXTSYM ngwinptr,objwlrpos,objwen,objclineptr,CSprWinPtr EXTSYM BuildWindow2 EXTSYM NGNumSpr EXTSYM fulladdtab -EXTSYM FPUCopy,bgtxadd2 +EXTSYM MMXSupport,bgtxadd2 NEWSYM NewGfx16AsmStart @@ -2773,7 +2773,7 @@ ProcessTransparencies: je .yestransp ret .yestransp - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near ProcessTransparenciesMMX mov esi,[vidbuffer] add esi,16*2+288*2 diff --git a/zsnes/src/video/procvid.asm b/zsnes/src/video/procvid.asm index 64d6e2da..f79731f8 100644 --- a/zsnes/src/video/procvid.asm +++ b/zsnes/src/video/procvid.asm @@ -28,7 +28,7 @@ EXTSYM vesa2_clbit,vesa2_gpos,vesa2_rpos,vesa2red10,vesa2selec,vidbuffer EXTSYM vidbufferm,vram,vsyncon,vbufdptr,KeyStateSelct,forceblnk,soundon EXTSYM Open_File,Read_File,Close_File,Create_File,Write_File,Get_File_Date EXTSYM Triplebufen,makepal,changepal,saveselectpal,displayfpspal,superscopepal -EXTSYM DrawScreen +EXTSYM DrawScreen,MMXSupport EXTSYM Get_MouseData,Get_MousePositionDisplacement EXTSYM GUIEnableTransp EXTSYM GUIFontData @@ -116,8 +116,6 @@ NEWSYM FPUZero .Zero dd 0,0 .Zero2 dd 0,0 -NEWSYM FPUCopy, db 0 - ;******************************************************* ; ShowVideo Processes & displays video ;******************************************************* diff --git a/zsnes/src/win/copyvwin.asm b/zsnes/src/win/copyvwin.asm index e0ce39be..63bc57b0 100644 --- a/zsnes/src/win/copyvwin.asm +++ b/zsnes/src/win/copyvwin.asm @@ -17,7 +17,7 @@ %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 lineleft,_2xSaILineW,_2xSaISuperEagleLineW, _2xSaISuper2xSaILineW EXTSYM newengen,cfield,HalfTrans @@ -60,7 +60,7 @@ NEWSYM copy640x480x16bwin cmp byte[GUIOn2],1 je .nointerp .yi - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 jne .nommx cmp byte[En2xSaI],0 jne near Process2xSaIwin @@ -91,7 +91,7 @@ NEWSYM copy640x480x16bwin cmp byte[ebx],1 ja near .yeshiresng .ignorehr - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmx .a mov ax,[esi] @@ -122,7 +122,7 @@ NEWSYM copy640x480x16bwin jnz near .loopa pop es xor byte[res512switch],1 - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je .mmx2 ret .mmx2 @@ -236,7 +236,7 @@ NEWSYM copy640x480x16bwin call HighResProc jmp .returnb .ignorehrb - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmxsl .ab mov ax,[esi] @@ -262,7 +262,7 @@ NEWSYM copy640x480x16bwin jnz .loopab pop es xor byte[res512switch],1 - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmx2 ret .yeshiresb @@ -315,7 +315,7 @@ NEWSYM copy640x480x16bwin call HighResProc jmp .returnbh .ignorehrbh - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmxslh mov ecx,256 .abh @@ -348,7 +348,7 @@ NEWSYM copy640x480x16bwin dec dl jnz near .loopabh pop es - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmx2 ret .mmxslh @@ -411,7 +411,7 @@ NEWSYM copy640x480x16bwin call HighResProc jmp .returnbh2 .ignorehrbh2 - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmxslh2 mov ecx,256 .abh2 @@ -448,7 +448,7 @@ NEWSYM copy640x480x16bwin dec byte[lineleft] jnz near .loopabh2 pop es - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .mmx2 ret .mmxslh2 @@ -530,7 +530,7 @@ HighResProc: .nofielde ret .hiresmode7 - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je .yeshiresngmmxmode7 .a2 mov ax,[esi] @@ -589,7 +589,7 @@ HighResProc: sub esi,75036*4 ret .hires - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near .yeshiresngmmx .bng mov eax,[esi+75036*4-2] @@ -1249,7 +1249,7 @@ MMXInterpolwin: ret NEWSYM interpolate640x480x16bwin - cmp byte[FPUCopy],2 + cmp byte[MMXSupport],1 je near MMXInterpolwin mov ebx,hirestiledat+1 diff --git a/zsnes/src/win/winintrf.asm b/zsnes/src/win/winintrf.asm index c37b8710..cae2746d 100644 --- a/zsnes/src/win/winintrf.asm +++ b/zsnes/src/win/winintrf.asm @@ -32,7 +32,6 @@ EXTSYM allocptr extsym putchar EXTSYM getch EXTSYM exit -EXTSYM FPUCopy EXTSYM ZOpenFile,ZOpenMode,CurrentHandle,ZFileSeek,ZOpenFileName,ZFileSeekMode EXTSYM ZFileSeekPos,ZFileSeekHandle EXTSYM ZFileWriteHandle,ZFileWriteSize,ZFileWriteBlock,ZFileWrite diff --git a/zsnes/src/win/winlink.cpp b/zsnes/src/win/winlink.cpp index 9585021d..7e77e225 100644 --- a/zsnes/src/win/winlink.cpp +++ b/zsnes/src/win/winlink.cpp @@ -1842,7 +1842,7 @@ void CheckTimers(void) } } -extern "C" BYTE FPUCopy; +extern unsigned char MMXSupport; void UpdateVFrame(void) { @@ -1892,7 +1892,7 @@ void UpdateVFrame(void) int buffer_ptr = (int)&Buffer[0]; if (T36HZEnabled == 1) - if (FPUCopy == 2) + if (MMXSupport == 1) _asm { mov edi,buffer_ptr @@ -1920,7 +1920,7 @@ _blank_top: jne _blank_top } else - if (FPUCopy == 2) + if (MMXSupport == 1) _asm { mov esi,DSPBuffer1 @@ -1979,7 +1979,7 @@ extern DWORD AddEndBytes; extern DWORD NumBytesPerLine; extern unsigned char * WinVidMemStart; extern void copy640x480x16bwin(void); -extern unsigned char FPUCopy; +extern unsigned char MMXSupport; extern unsigned char NGNoTransp; extern unsigned char newengen; @@ -2080,7 +2080,7 @@ void drawscreenwin(void) switch (BitDepth) { case 16: - if (FPUCopy == 2) { + if (MMXSupport == 1) { _asm { push es mov ax,ds @@ -2208,7 +2208,7 @@ void drawscreenwin(void) switch (BitDepth) { case 16: - if (FPUCopy == 2) { + if (MMXSupport == 1) { _asm { push es mov ax,ds diff --git a/zsnes/src/win/zloaderw.c b/zsnes/src/win/zloaderw.c index 0a0b5744..28055e93 100644 --- a/zsnes/src/win/zloaderw.c +++ b/zsnes/src/win/zloaderw.c @@ -32,7 +32,7 @@ extern void displayparams(void); extern void makeextension(void); extern unsigned char Palette0, SPC700sh, OffBy1Line, DSPDisable, - FPUCopy, Force8b, ForcePal, GUIClick, MouseDis, + MMXSupport, Force8b, ForcePal, GUIClick, MouseDis, MusicRelVol, ScreenScale, SoundCompD, SoundQuality, StereoSound, V8Mode, antienab, cvidmode, debugdisble, debugger, enterpress, finterleave, frameskip, @@ -483,12 +483,12 @@ int pccmdline(void) { if(nn == 'm') { - FPUCopy=2; + MMXSupport=1; pp++; } else { - FPUCopy=0; + MMXSupport=0; } break; }