Fix up sections variables are created in, major code cleanup, remove protection removal. - Round 4

This commit is contained in:
n-a-c-h
2005-01-03 15:15:17 +00:00
parent 737db97030
commit 0c0097b919
32 changed files with 13 additions and 265 deletions

View File

@@ -34,13 +34,6 @@ EXTSYM Create_File,Write_File,Close_File
EXTSYM TextFile, InitDir, InitDrive, Change_Dir EXTSYM TextFile, InitDir, InitDrive, Change_Dir
%endif %endif
NEWSYM CfgLoadAsmStart
; [BITS 32]
; [ORG 0]
; .CFG variables ; .CFG variables
SECTION .data SECTION .data
NEWSYM cfgsoundon, db 0 NEWSYM cfgsoundon, db 0
@@ -1955,7 +1948,3 @@ section .data
.str3 dd 10 .str3 dd 10
db 'REINITTIME' db 'REINITTIME'
.usespace db 0 .usespace db 0
SECTION .text
NEWSYM CfgLoadAsmEnd

View File

@@ -29,10 +29,6 @@
EXTSYM regaccessbankr8,regaccessbankr16,regaccessbankw8,regaccessbankw16 EXTSYM regaccessbankr8,regaccessbankr16,regaccessbankw8,regaccessbankw16
NEWSYM Dsp2ProcAsmStart
;%define _USE_DEVDSP2
DSP2F_HALT equ 1 DSP2F_HALT equ 1
DSP2F_AUTO_BUFFER_SHIFT equ 2 DSP2F_AUTO_BUFFER_SHIFT equ 2
DSP2F_NO_ADDR_CHK equ 4 DSP2F_NO_ADDR_CHK equ 4
@@ -610,5 +606,3 @@ NEWSYM DSP2Write16b
xor eax,eax xor eax,eax
.leave .leave
ret ret
NEWSYM Dsp2ProcAsmEnd

View File

@@ -20,8 +20,6 @@
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"
@@ -613,5 +611,3 @@ NEWSYM FxOpcBF ; FROM rn set source register
mov byte[SfxOverflow],al mov byte[SfxOverflow],al
CLRFLAGS CLRFLAGS
ret ret
NEWSYM FxEmu2BAsmEnd

View File

@@ -30,8 +30,6 @@ 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"
@@ -2553,5 +2551,3 @@ NEWSYM FxOpdFFA2 ; SM (XX),RN store word in RAM
mov [eax+ebx],dh mov [eax+ebx],dh
CLRFLAGS CLRFLAGS
FXReturn FXReturn
NEWSYM FxEmu2CAsmEnd

View File

@@ -25,16 +25,9 @@ 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
@@ -672,5 +665,3 @@ NEWSYM sfxaccessbankw16d
mov [ebx+ecx+65536*3],ax mov [ebx+ecx+65536*3],ax
xor ebx,ebx xor ebx,ebx
ret ret
NEWSYM SfxProcAsmEnd

View File

@@ -27,12 +27,6 @@ EXTSYM execloopdeb
EXTSYM nmiv8 EXTSYM nmiv8
EXTSYM membank0r8,membank0w8 EXTSYM membank0r8,membank0w8
NEWSYM IrqAsmStart
; NMI Hardware 00FFFA,B 00FFEA,B 3 -> 000108 ; NMI Hardware 00FFFA,B 00FFEA,B 3 -> 000108
; RES Hardware 00FFFC.D 00FFFC,D 1 ; RES Hardware 00FFFC.D 00FFFC,D 1
; BRK Software 00FFFE,F 00FFE6,7 N/A ; BRK Software 00FFFE,F 00FFE6,7 N/A
@@ -556,4 +550,3 @@ NEWSYM NMIemulmodedeb
add esi,eax add esi,eax
jmp execloopdeb jmp execloopdeb
NEWSYM IrqAsmEnd

View File

@@ -21,18 +21,11 @@ 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"
%include "cpu/se65816.inc" %include "cpu/se65816.inc"
; global variables ; global variables
;tableA times 256 ; Table addresses (M:0,X:0,D:0) ;tableA times 256 ; Table addresses (M:0,X:0,D:0)
;tableB times 256 ; Table addresses (M:1,X:0,D:0) ;tableB times 256 ; Table addresses (M:1,X:0,D:0)

View File

@@ -54,7 +54,6 @@ 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"
@@ -64,10 +63,6 @@ NEWSYM TableAsmStart
%include "cpu/regs.inc" ; start problem here %include "cpu/regs.inc" ; start problem here
%include "cpu/regsw.inc" %include "cpu/regsw.inc"
section .data section .data
; global variables ; global variables
@@ -1195,5 +1190,3 @@ NEWSYM settableDm16
mov dword[edi+0FDh*4],COpFDm16d mov dword[edi+0FDh*4],COpFDm16d
mov dword[edi+0FFh*4],COpFFm16d mov dword[edi+0FFh*4],COpFFm16d
ret ret
NEWSYM TableAsmEnd

View File

@@ -30,18 +30,11 @@ 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"
%include "cpu/e65816b.inc" %include "cpu/e65816b.inc"
; global variables ; global variables
;******************************************************* ;*******************************************************
@@ -721,5 +714,3 @@ settableDm16:
mov dword[edi+0FDh*4],COpFDm16d mov dword[edi+0FDh*4],COpFDm16d
mov dword[edi+0FFh*4],COpFFm16d mov dword[edi+0FFh*4],COpFFm16d
ret ret
NEWSYM TableBAsmEnd

View File

@@ -30,18 +30,11 @@ 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"
%include "cpu/e65816c.inc" %include "cpu/e65816c.inc"
; global variables ; global variables
;******************************************************* ;*******************************************************
@@ -721,5 +714,3 @@ settableDm16:
mov dword[edi+0FDh*4],COpFDm16d mov dword[edi+0FDh*4],COpFDm16d
mov dword[edi+0FFh*4],COpFFm16d mov dword[edi+0FFh*4],COpFFm16d
ret ret
NEWSYM TableCAsmEnd

View File

@@ -251,4 +251,3 @@ NEWSYM bg4change, resb 256
NEWSYM bgwinchange, resb 256 NEWSYM bgwinchange, resb 256
NEWSYM PrevPicture, resb 64*56*2 NEWSYM PrevPicture, resb 64*56*2
NEWSYM EndMemAsmEnd

View File

@@ -135,12 +135,6 @@ EXTSYM DSP2Read8b,DSP2Read16b,DSP2Write8b,DSP2Write16b,InitDSP2
%ifdef __LINUX__ %ifdef __LINUX__
EXTSYM LoadDir, popdir, pushdir EXTSYM LoadDir, popdir, pushdir
%endif %endif
;EXTSYM InitDSP4
NEWSYM InitAsmStart
; Initiation ; Initiation
@@ -3808,9 +3802,6 @@ NEWSYM yesoutofmemory, resb 1
SECTION .data SECTION .data
NEWSYM outofmemoryerror, db 'OUT OF MEMORY.',0 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
NEWSYM InitAsmEnd

View File

@@ -17,34 +17,14 @@
#include "gblhdr.h" #include "gblhdr.h"
extern void SfxProcAsmStart();
extern void SfxProcAsmEnd();
extern void FxEmu2AsmStart();
extern void FxEmu2AsmEnd();
extern void FxEmu2CAsmStart();
extern void FxEmu2CAsmEnd();
extern void WinIntRFAsmStart();
extern void WinIntRFAsmEnd();
extern void CfgLoadAsmStart(); extern void CfgLoadAsmStart();
extern void CfgLoadAsmEnd(); extern void CfgLoadAsmEnd();
extern void IrqAsmStart();
extern void IrqAsmEnd();
extern void TableAsmStart();
extern void TableAsmEnd();
extern void TableBAsmStart();
extern void TableBAsmEnd();
extern void TableCAsmStart();
extern void TableCAsmEnd();
extern void CopyVWinAsmStart(); extern void CopyVWinAsmStart();
extern void CopyVWinAsmEnd(); extern void CopyVWinAsmEnd();
extern void DebugAsmStart(); extern void DebugAsmStart();
extern void DebugAsmEnd(); extern void DebugAsmEnd();
extern void JoyAsmStart(); extern void JoyAsmStart();
extern void JoyAsmEnd(); extern void JoyAsmEnd();
extern void InitAsmStart();
extern void InitAsmEnd();
extern void UIAsmStart();
extern void UIAsmEnd();
extern void DosModemRTNAsmStart(); extern void DosModemRTNAsmStart();
extern void DosModemRTNAsmEnd(); extern void DosModemRTNAsmEnd();
extern void Vesa2AsmStart(); extern void Vesa2AsmStart();
@@ -57,24 +37,6 @@ extern void GPProAsmStart();
extern void GPProAsmEnd(); extern void GPProAsmEnd();
extern void Vesa12AsmStart(); extern void Vesa12AsmStart();
extern void Vesa12AsmEnd(); extern void Vesa12AsmEnd();
extern void MakeV16TAsmStart();
extern void MakeV16TAsmEnd();
extern void Mode716BAsmStart();
extern void Mode716BAsmEnd();
extern void Mode716DAsmStart();
extern void Mode716DAsmEnd();
extern void Mode716EAsmStart();
extern void Mode716EAsmEnd();
extern void Mode7ExtAsmStart();
extern void Mode7ExtAsmEnd();
extern void MV16TMSAsmStart();
extern void MV16TMSAsmEnd();
extern void NewG162AsmStart();
extern void NewG162AsmEnd();
extern void NewGfx2AsmStart();
extern void NewGfx2AsmEnd();
extern void VCacheAsmStart();
extern void VCacheAsmEnd();
#define MakeCodeWriteable(a, b) MakeCodeWriteable_f (a, b, #a) #define MakeCodeWriteable(a, b) MakeCodeWriteable_f (a, b, #a)
@@ -99,32 +61,13 @@ void MakeCodeWriteable_f (unsigned long startaddr, unsigned long length, const c
void UnProtectMemory(void) void UnProtectMemory(void)
{ {
MakeCodeWriteable((long) SfxProcAsmStart, (long) SfxProcAsmEnd - (long) SfxProcAsmStart);
MakeCodeWriteable((long) FxEmu2CAsmStart, (long) FxEmu2CAsmEnd - (long) FxEmu2CAsmStart);
MakeCodeWriteable((long) WinIntRFAsmStart, (long) WinIntRFAsmEnd - (long) WinIntRFAsmStart);
MakeCodeWriteable((long) CfgLoadAsmStart, (long) CfgLoadAsmEnd - (long) CfgLoadAsmStart);
MakeCodeWriteable((long) IrqAsmStart, (long) IrqAsmEnd - (long) IrqAsmStart);
MakeCodeWriteable((long) TableAsmStart, (long) TableAsmEnd - (long) TableAsmStart);
MakeCodeWriteable((long) TableBAsmStart, (long) TableBAsmEnd - (long) TableBAsmStart);
MakeCodeWriteable((long) TableCAsmStart, (long) TableCAsmEnd - (long) TableCAsmStart);
MakeCodeWriteable((long) CopyVWinAsmStart, (long) CopyVWinAsmEnd - (long) CopyVWinAsmStart); MakeCodeWriteable((long) CopyVWinAsmStart, (long) CopyVWinAsmEnd - (long) CopyVWinAsmStart);
MakeCodeWriteable((long) DebugAsmStart, (long) DebugAsmEnd - (long) DebugAsmStart); MakeCodeWriteable((long) DebugAsmStart, (long) DebugAsmEnd - (long) DebugAsmStart);
MakeCodeWriteable((long) JoyAsmStart, (long) JoyAsmEnd - (long) JoyAsmStart); MakeCodeWriteable((long) JoyAsmStart, (long) JoyAsmEnd - (long) JoyAsmStart);
MakeCodeWriteable((long) InitAsmStart, (long) InitAsmEnd - (long) InitAsmStart);
MakeCodeWriteable((long) UIAsmStart, (long) UIAsmEnd - (long) UIAsmStart);
MakeCodeWriteable((long) DosModemRTNAsmStart, (long) DosModemRTNAsmEnd - (long) DosModemRTNAsmStart); MakeCodeWriteable((long) DosModemRTNAsmStart, (long) DosModemRTNAsmEnd - (long) DosModemRTNAsmStart);
MakeCodeWriteable((long) Vesa2AsmStart, (long) Vesa2AsmEnd - (long) Vesa2AsmStart); MakeCodeWriteable((long) Vesa2AsmStart, (long) Vesa2AsmEnd - (long) Vesa2AsmStart);
MakeCodeWriteable((long) InitVidAsmStart, (long) InitVidAsmEnd - (long) InitVidAsmStart); MakeCodeWriteable((long) InitVidAsmStart, (long) InitVidAsmEnd - (long) InitVidAsmStart);
MakeCodeWriteable((long) SWAsmStart, (long) SWAsmEnd - (long) SWAsmStart); MakeCodeWriteable((long) SWAsmStart, (long) SWAsmEnd - (long) SWAsmStart);
MakeCodeWriteable((long) GPProAsmStart, (long) GPProAsmEnd - (long) GPProAsmStart); MakeCodeWriteable((long) GPProAsmStart, (long) GPProAsmEnd - (long) GPProAsmStart);
MakeCodeWriteable((long) Vesa12AsmStart, (long) Vesa12AsmEnd - (long) Vesa12AsmStart); MakeCodeWriteable((long) Vesa12AsmStart, (long) Vesa12AsmEnd - (long) Vesa12AsmStart);
MakeCodeWriteable((long) MakeV16TAsmStart, (long) MakeV16TAsmEnd - (long) MakeV16TAsmStart);
MakeCodeWriteable((long) Mode716BAsmStart, (long) Mode716BAsmEnd - (long) Mode716BAsmStart);
MakeCodeWriteable((long) Mode716DAsmStart, (long) Mode716DAsmEnd - (long) Mode716DAsmStart);
MakeCodeWriteable((long) Mode716EAsmStart, (long) Mode716EAsmEnd - (long) Mode716EAsmStart);
MakeCodeWriteable((long) Mode7ExtAsmStart, (long) Mode7ExtAsmEnd - (long) Mode7ExtAsmStart);
MakeCodeWriteable((long) MV16TMSAsmStart, (long) MV16TMSAsmEnd - (long) MV16TMSAsmStart);
MakeCodeWriteable((long) NewG162AsmStart, (long) NewG162AsmEnd - (long) NewG162AsmStart);
MakeCodeWriteable((long) NewGfx2AsmStart, (long) NewGfx2AsmEnd - (long) NewGfx2AsmStart);
MakeCodeWriteable((long) VCacheAsmStart, (long) VCacheAsmEnd - (long) VCacheAsmStart);
} }

View File

@@ -121,8 +121,6 @@ EXTSYM V8Mode,GrayscaleMode
EXTSYM PrevWinMode,PrevFSMode EXTSYM PrevWinMode,PrevFSMode
EXTSYM sem_sleep EXTSYM sem_sleep
NEWSYM WinIntRFAsmStart
; NOTE: For timing, Game60hzcall should be called at 50hz or 60hz (depending ; NOTE: For timing, Game60hzcall should be called at 50hz or 60hz (depending
; on romispal) after a call to InitPreGame and before DeInitPostGame are ; on romispal) after a call to InitPreGame and before DeInitPostGame are
; made. GUI36hzcall should be called at 36hz after a call GUIInit and ; made. GUI36hzcall should be called at 36hz after a call GUIInit and
@@ -514,12 +512,12 @@ RefreshKeybBuffer:
mov [Keybtail],al mov [Keybtail],al
.none .none
ret ret
SECTION .data
Keybhead db 0 Keybhead db 0
Keybtail db 0 Keybtail db 0
HoldKey dd 0 HoldKey dd 0
PKeyBuf times 100h db 0 PKeyBuf times 100h db 0
SECTION .data
NEWSYM CurKeyPos, dd 0 NEWSYM CurKeyPos, dd 0
NEWSYM CurKeyReadPos, dd 0 NEWSYM CurKeyReadPos, dd 0
NEWSYM KeyBuffer, times 16 dd 0 NEWSYM KeyBuffer, times 16 dd 0
@@ -1257,13 +1255,14 @@ NEWSYM Check60hz
popad popad
ret ret
SECTION .data
BitPosR db 11 BitPosR db 11
BitPosG db 5 BitPosG db 5
BitPosB db 0 BitPosB db 0
BitSizeR db 5 BitSizeR db 5
BitSizeG db 6 BitSizeG db 6
BitSizeB db 5 BitSizeB db 5
SECTION .text
InitializeGfxStuff: InitializeGfxStuff:
; Process Red Stuff ; Process Red Stuff
@@ -1490,7 +1489,9 @@ NEWSYM TCPIPWaitForConnection
popad popad
mov eax,-1 mov eax,-1
ret ret
SECTION .data
.temp dd 0 .temp dd 0
SECTION .text
NEWSYM TCPIPInitConnectToServer NEWSYM TCPIPInitConnectToServer
pushad pushad
@@ -1543,7 +1544,9 @@ NEWSYM TCPIPConnectToServer
popad popad
mov eax,[.temp] mov eax,[.temp]
ret ret
SECTION .data
.temp dd 0 .temp dd 0
SECTION .text
NEWSYM TCPIPConnectToServerW NEWSYM TCPIPConnectToServerW
; int ConnectServer(char *servername, unsigned short port) ; int ConnectServer(char *servername, unsigned short port)
@@ -1561,7 +1564,9 @@ NEWSYM TCPIPConnectToServerW
popad popad
mov eax,[.temp] mov eax,[.temp]
ret ret
SECTION .data
.temp dd 0 .temp dd 0
SECTION .text
NEWSYM TCPIPStoreByte NEWSYM TCPIPStoreByte
; Store al into the array ; Store al into the array
@@ -1743,5 +1748,3 @@ NEWSYM GetTimeInSeconds
movzx ebx,word[SystemTimewSecond] movzx ebx,word[SystemTimewSecond]
add eax,ebx add eax,ebx
ret ret
NEWSYM WinIntRFAsmEnd

View File

@@ -45,13 +45,6 @@ EXTSYM GetFilename
EXTSYM OSPC_Init EXTSYM OSPC_Init
%endif %endif
NEWSYM UIAsmStart
; Function 0501h ; Function 0501h
; User Interface ; User Interface
@@ -1311,5 +1304,3 @@ NEWSYM MMXCheck
.noprintstr .noprintstr
.nommx .nommx
ret ret
NEWSYM UIAsmEnd

View File

@@ -57,10 +57,6 @@ EXTSYM tltype2b
EXTSYM tltype8b,objwlrpos EXTSYM tltype8b,objwlrpos
EXTSYM snesinputdefault,cycleinputdevice EXTSYM snesinputdefault,cycleinputdevice
NEWSYM VCacheAsmStart
; Process stuff & Cache sprites ; Process stuff & Cache sprites
SECTION .bss SECTION .bss
@@ -3917,4 +3913,3 @@ NEWSYM cachesingle8bng
pop edi pop edi
pop esi pop esi
ret ret
NEWSYM VCacheAsmEnd

View File

@@ -33,10 +33,6 @@ EXTSYM WinVidMemStart
EXTSYM BitConv32Ptr EXTSYM BitConv32Ptr
EXTSYM RGBtoYUVPtr EXTSYM RGBtoYUVPtr
%ifdef __MINGW__
NEWSYM CopyVWinAsmStart
%endif
SECTION .bss SECTION .bss
NEWSYM prevline, resd 1 NEWSYM prevline, resd 1
NEWSYM nextline, resd 1 NEWSYM nextline, resd 1
@@ -2166,7 +2162,3 @@ FuncTable2
SECTION .bss SECTION .bss
InterPtr resd 1 InterPtr resd 1
SECTION .text SECTION .text
%ifdef __MINGW__
NEWSYM CopyVWinAsmEnd
%endif

View File

@@ -36,10 +36,6 @@ EXTSYM prevline, nextline, deltaptr, xcounter
EXTSYM w1, w2, w3, w4, w5, w6, w7, w8, w9 EXTSYM w1, w2, w3, w4, w5, w6, w7, w8, w9
EXTSYM reg_blank, const3, const5, const6, const14, cross, threshold EXTSYM reg_blank, const3, const5, const6, const14, cross, threshold
%ifdef __MINGW__
NEWSYM CopyVWinAsmStart
%endif
SECTION .bss SECTION .bss
NEWSYM c1, resd 1 NEWSYM c1, resd 1
NEWSYM c2, resd 1 NEWSYM c2, resd 1
@@ -2139,7 +2135,3 @@ FuncTable2
SECTION .bss SECTION .bss
InterPtr resd 1 InterPtr resd 1
SECTION .text SECTION .text
%ifdef __MINGW__
NEWSYM CopyVWinAsmEnd
%endif

View File

@@ -36,10 +36,6 @@ EXTSYM prevline, nextline, deltaptr, xcounter
EXTSYM w1, w2, w3, w4, w5, w6, w7, w8, w9 EXTSYM w1, w2, w3, w4, w5, w6, w7, w8, w9
EXTSYM reg_blank, const7, cross, threshold EXTSYM reg_blank, const7, cross, threshold
%ifdef __MINGW__
NEWSYM CopyVWinAsmStart
%endif
SECTION .text SECTION .text
%macro TestDiff 2 %macro TestDiff 2
@@ -2755,7 +2751,3 @@ FuncTable2
SECTION .bss SECTION .bss
InterPtr resd 1 InterPtr resd 1
SECTION .text SECTION .text
%ifdef __MINGW__
NEWSYM CopyVWinAsmEnd
%endif

View File

@@ -37,10 +37,6 @@ EXTSYM w1, w2, w3, w4, w5, w6, w7, w8, w9
EXTSYM c1, c2, c3, c4, c5, c6, c7, c8, c9 EXTSYM c1, c2, c3, c4, c5, c6, c7, c8, c9
EXTSYM reg_blank, const7, cross, threshold EXTSYM reg_blank, const7, cross, threshold
%ifdef __MINGW__
NEWSYM CopyVWinAsmStart
%endif
SECTION .text SECTION .text
%macro TestDiff 2 %macro TestDiff 2
@@ -2818,7 +2814,3 @@ FuncTable2
SECTION .bss SECTION .bss
InterPtr resd 1 InterPtr resd 1
SECTION .text SECTION .text
%ifdef __MINGW__
NEWSYM CopyVWinAsmEnd
%endif

View File

@@ -36,10 +36,6 @@ EXTSYM prevline, nextline, deltaptr, xcounter
EXTSYM w1, w2, w3, w4, w5, w6, w7, w8, w9 EXTSYM w1, w2, w3, w4, w5, w6, w7, w8, w9
EXTSYM reg_blank, const3, const5, const6, const7, cross, threshold EXTSYM reg_blank, const3, const5, const6, const7, cross, threshold
%ifdef __MINGW__
NEWSYM CopyVWinAsmStart
%endif
SECTION .text SECTION .text
%macro AUXADDRESS 0 %macro AUXADDRESS 0
@@ -4282,7 +4278,3 @@ FuncTable
SECTION .bss SECTION .bss
InterPtr resd 1 InterPtr resd 1
SECTION .text SECTION .text
%ifdef __MINGW__
NEWSYM CopyVWinAsmEnd
%endif

View File

@@ -37,10 +37,6 @@ EXTSYM w1, w2, w3, w4, w5, w6, w7, w8, w9
EXTSYM c1, c2, c3, c4, c5, c6, c7, c8, c9 EXTSYM c1, c2, c3, c4, c5, c6, c7, c8, c9
EXTSYM reg_blank, const3, const5, const6, const7, cross, threshold EXTSYM reg_blank, const3, const5, const6, const7, cross, threshold
%ifdef __MINGW__
NEWSYM CopyVWinAsmStart
%endif
SECTION .text SECTION .text
%macro AUXADDRESS 0 %macro AUXADDRESS 0
@@ -4207,6 +4203,3 @@ SECTION .bss
InterPtr resd 1 InterPtr resd 1
SECTION .text SECTION .text
%ifdef __MINGW__
NEWSYM CopyVWinAsmEnd
%endif

View File

@@ -60,13 +60,8 @@ 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"
; clearback16bts clearback16bdual ; clearback16bts clearback16bdual
;******************************************************* ;*******************************************************
@@ -5322,4 +5317,3 @@ NEWSYM draw16x1616tswinon
dec byte[tileleft16b] dec byte[tileleft16b]
jnz near .loopa jnz near .loopa
ret ret
NEWSYM MakeV16TAsmEnd

View File

@@ -27,16 +27,10 @@ EXTSYM scrndis
EXTSYM vidbright,prevbrightdc,Gendcolortable EXTSYM vidbright,prevbrightdc,Gendcolortable
EXTSYM mode7ab,mode7cd,BGMA EXTSYM mode7ab,mode7cd,BGMA
EXTSYM BG1SXl,BG1SYl EXTSYM BG1SXl,BG1SYl
EXTSYM processmode7hires EXTSYM processmode7hires
NEWSYM Mode716AsmStart
%include "video/mode716.mac" %include "video/mode716.mac"
;******************************************************* ;*******************************************************
; Processes & Draws Mode 7 ; Processes & Draws Mode 7
;******************************************************* ;*******************************************************
@@ -690,5 +684,3 @@ NEWSYM processmode7hires16bd
pop esi pop esi
.nogo .nogo
ret ret
NEWSYM Mode716AsmEnd

View File

@@ -22,13 +22,8 @@ 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"
;******************************************************* ;*******************************************************
; Processes & Draws Mode 7 ; Processes & Draws Mode 7
;******************************************************* ;*******************************************************
@@ -189,4 +184,3 @@ SECTION .text
Mode7Process Mode7Window, domosaic16b, 2 Mode7Process Mode7Window, domosaic16b, 2
.nextval3w .nextval3w
Mode7ProcessB Mode7Window, domosaic16b, 2 Mode7ProcessB Mode7Window, domosaic16b, 2
NEWSYM Mode716BAsmEnd

View File

@@ -21,14 +21,8 @@ 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"
NEWSYM Gendcolortable NEWSYM Gendcolortable
; generate Direct Color Table ; generate Direct Color Table
push eax push eax
@@ -235,4 +229,3 @@ SECTION .text
Mode7Process Mode7Window, domosaic16b, 2 Mode7Process Mode7Window, domosaic16b, 2
.nextval3w .nextval3w
Mode7ProcessB Mode7Window, domosaic16b, 2 Mode7ProcessB Mode7Window, domosaic16b, 2
NEWSYM Mode716DAsmEnd

View File

@@ -22,11 +22,6 @@ 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 Mode716EAsmStart
;******************************************************* ;*******************************************************
; Processes & Draws Mode 7 ; Processes & Draws Mode 7
;******************************************************* ;*******************************************************
@@ -1264,4 +1259,3 @@ NEWSYM drawmode716extbg2
cmp dh,1 cmp dh,1
jne near domosaic16b jne near domosaic16b
ret ret
NEWSYM Mode716EAsmEnd

View File

@@ -26,7 +26,6 @@ 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"
@@ -1322,5 +1321,3 @@ NEWSYM drawmode7ngextbg2
cmp dh,1 cmp dh,1
jne near domosaic jne near domosaic
ret ret
NEWSYM Mode7ExtAsmEnd

View File

@@ -28,8 +28,6 @@ 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"
@@ -1501,4 +1499,3 @@ NEWSYM draw16x1616tswinonms
dec byte[tileleft16b] dec byte[tileleft16b]
jnz near .loopa jnz near .loopa
ret ret
NEWSYM MV16TMSAsmEnd

View File

@@ -31,8 +31,6 @@ EXTSYM vidmemch2s,vidmemch4s,vidmemch8s
EXTSYM cpalval,bgtxadd2 EXTSYM cpalval,bgtxadd2
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"
@@ -1402,5 +1400,3 @@ drawlineng4b16bmsom16x16:
drawline16bmacroom16x16 tltype4b,preparet4ba,cachesingle4bng,ngpalcon4b,test4ba,0Fh,procpixelsmst,procpixelstmst drawline16bmacroom16x16 tltype4b,preparet4ba,cachesingle4bng,ngpalcon4b,test4ba,0Fh,procpixelsmst,procpixelstmst
drawlineng4b16bmsntom16x16 drawlineng4b16bmsntom16x16
drawline16bmacroom16x16 tltype4b,preparet4ba,cachesingle4bng,ngpalcon4b,test4ba,0Fh,procpixelsmsnt,procpixelstmsnt drawline16bmacroom16x16 tltype4b,preparet4ba,cachesingle4bng,ngpalcon4b,test4ba,0Fh,procpixelsmsnt,procpixelstmsnt
NEWSYM NewG162AsmEnd

View File

@@ -3465,7 +3465,6 @@ NEWSYM HalfTransB, dd 00001000010000010000100001000001b,000010000100000100001000
NEWSYM HalfTransC, dd 11110111100111101111011110011110b,11110111100111101111011110011110b NEWSYM HalfTransC, dd 11110111100111101111011110011110b,11110111100111101111011110011110b
NEWSYM NGNoTransp, dd 0 NEWSYM NGNoTransp, dd 0
section .text section .text
NEWSYM NewGfx16AsmEnd
%macro SCMainA 0 %macro SCMainA 0
%endmacro %endmacro

View File

@@ -26,21 +26,12 @@ 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,bgtxadd2 EXTSYM yposngom,flipyposngom,cbgval,ofsmval,ofsmvalh,vram,bgtxadd2
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"
%include "video/newgfxwn.mac" %include "video/newgfxwn.mac"
;****************************************** ;******************************************
; 8x8 tiles - tile engine ; 8x8 tiles - tile engine
;****************************************** ;******************************************
@@ -673,4 +664,3 @@ 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