Fix up sections variables are created in, major code cleanup, remove protection removal. - Round 4
This commit is contained in:
@@ -33,10 +33,6 @@ EXTSYM WinVidMemStart
|
||||
EXTSYM BitConv32Ptr
|
||||
EXTSYM RGBtoYUVPtr
|
||||
|
||||
%ifdef __MINGW__
|
||||
NEWSYM CopyVWinAsmStart
|
||||
%endif
|
||||
|
||||
SECTION .bss
|
||||
NEWSYM prevline, resd 1
|
||||
NEWSYM nextline, resd 1
|
||||
@@ -2166,7 +2162,3 @@ FuncTable2
|
||||
SECTION .bss
|
||||
InterPtr resd 1
|
||||
SECTION .text
|
||||
|
||||
%ifdef __MINGW__
|
||||
NEWSYM CopyVWinAsmEnd
|
||||
%endif
|
||||
|
||||
@@ -36,10 +36,6 @@ EXTSYM prevline, nextline, deltaptr, xcounter
|
||||
EXTSYM w1, w2, w3, w4, w5, w6, w7, w8, w9
|
||||
EXTSYM reg_blank, const3, const5, const6, const14, cross, threshold
|
||||
|
||||
%ifdef __MINGW__
|
||||
NEWSYM CopyVWinAsmStart
|
||||
%endif
|
||||
|
||||
SECTION .bss
|
||||
NEWSYM c1, resd 1
|
||||
NEWSYM c2, resd 1
|
||||
@@ -2139,7 +2135,3 @@ FuncTable2
|
||||
SECTION .bss
|
||||
InterPtr resd 1
|
||||
SECTION .text
|
||||
|
||||
%ifdef __MINGW__
|
||||
NEWSYM CopyVWinAsmEnd
|
||||
%endif
|
||||
|
||||
@@ -36,10 +36,6 @@ EXTSYM prevline, nextline, deltaptr, xcounter
|
||||
EXTSYM w1, w2, w3, w4, w5, w6, w7, w8, w9
|
||||
EXTSYM reg_blank, const7, cross, threshold
|
||||
|
||||
%ifdef __MINGW__
|
||||
NEWSYM CopyVWinAsmStart
|
||||
%endif
|
||||
|
||||
SECTION .text
|
||||
|
||||
%macro TestDiff 2
|
||||
@@ -2755,7 +2751,3 @@ FuncTable2
|
||||
SECTION .bss
|
||||
InterPtr resd 1
|
||||
SECTION .text
|
||||
|
||||
%ifdef __MINGW__
|
||||
NEWSYM CopyVWinAsmEnd
|
||||
%endif
|
||||
|
||||
@@ -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 reg_blank, const7, cross, threshold
|
||||
|
||||
%ifdef __MINGW__
|
||||
NEWSYM CopyVWinAsmStart
|
||||
%endif
|
||||
|
||||
SECTION .text
|
||||
|
||||
%macro TestDiff 2
|
||||
@@ -2818,7 +2814,3 @@ FuncTable2
|
||||
SECTION .bss
|
||||
InterPtr resd 1
|
||||
SECTION .text
|
||||
|
||||
%ifdef __MINGW__
|
||||
NEWSYM CopyVWinAsmEnd
|
||||
%endif
|
||||
|
||||
@@ -36,10 +36,6 @@ EXTSYM prevline, nextline, deltaptr, xcounter
|
||||
EXTSYM w1, w2, w3, w4, w5, w6, w7, w8, w9
|
||||
EXTSYM reg_blank, const3, const5, const6, const7, cross, threshold
|
||||
|
||||
%ifdef __MINGW__
|
||||
NEWSYM CopyVWinAsmStart
|
||||
%endif
|
||||
|
||||
SECTION .text
|
||||
|
||||
%macro AUXADDRESS 0
|
||||
@@ -4282,7 +4278,3 @@ FuncTable
|
||||
SECTION .bss
|
||||
InterPtr resd 1
|
||||
SECTION .text
|
||||
|
||||
%ifdef __MINGW__
|
||||
NEWSYM CopyVWinAsmEnd
|
||||
%endif
|
||||
|
||||
@@ -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 reg_blank, const3, const5, const6, const7, cross, threshold
|
||||
|
||||
%ifdef __MINGW__
|
||||
NEWSYM CopyVWinAsmStart
|
||||
%endif
|
||||
|
||||
SECTION .text
|
||||
|
||||
%macro AUXADDRESS 0
|
||||
@@ -4207,6 +4203,3 @@ SECTION .bss
|
||||
InterPtr resd 1
|
||||
SECTION .text
|
||||
|
||||
%ifdef __MINGW__
|
||||
NEWSYM CopyVWinAsmEnd
|
||||
%endif
|
||||
|
||||
@@ -60,13 +60,8 @@ EXTSYM ofsmcptr,ofsmady,ofsmadx,yposng,yposngom,flipyposng,flipyposngom
|
||||
EXTSYM ofsmtptr,ofsmmptr,ofsmcyps,bgtxadd,bg1ptrx,bg1ptry
|
||||
EXTSYM a16x16xinc,a16x16yinc
|
||||
|
||||
NEWSYM MakeV16TAsmStart
|
||||
%include "video/vidmacro.mac"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
; clearback16bts clearback16bdual
|
||||
|
||||
;*******************************************************
|
||||
@@ -5322,4 +5317,3 @@ NEWSYM draw16x1616tswinon
|
||||
dec byte[tileleft16b]
|
||||
jnz near .loopa
|
||||
ret
|
||||
NEWSYM MakeV16TAsmEnd
|
||||
|
||||
@@ -27,16 +27,10 @@ EXTSYM scrndis
|
||||
EXTSYM vidbright,prevbrightdc,Gendcolortable
|
||||
EXTSYM mode7ab,mode7cd,BGMA
|
||||
EXTSYM BG1SXl,BG1SYl
|
||||
EXTSYM processmode7hires
|
||||
EXTSYM processmode7hires
|
||||
|
||||
NEWSYM Mode716AsmStart
|
||||
%include "video/mode716.mac"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
;*******************************************************
|
||||
; Processes & Draws Mode 7
|
||||
;*******************************************************
|
||||
@@ -690,5 +684,3 @@ NEWSYM processmode7hires16bd
|
||||
pop esi
|
||||
.nogo
|
||||
ret
|
||||
|
||||
NEWSYM Mode716AsmEnd
|
||||
|
||||
@@ -22,13 +22,8 @@ EXTSYM mode7A,mode7B,mode7C,mode7D,mode7X0,mode7Y0,mode7set
|
||||
EXTSYM pal16b,vram,vrama,winon,mode7tab,xtravbuf,drawmode7dcolor
|
||||
EXTSYM cwinptr
|
||||
|
||||
NEWSYM Mode716BAsmStart
|
||||
%include "video/mode7.mac"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
;*******************************************************
|
||||
; Processes & Draws Mode 7
|
||||
;*******************************************************
|
||||
@@ -189,4 +184,3 @@ SECTION .text
|
||||
Mode7Process Mode7Window, domosaic16b, 2
|
||||
.nextval3w
|
||||
Mode7ProcessB Mode7Window, domosaic16b, 2
|
||||
NEWSYM Mode716BAsmEnd
|
||||
|
||||
@@ -21,14 +21,8 @@ EXTSYM curmosaicsz,curvidoffset,domosaic16b,winptrref,scaddset
|
||||
EXTSYM mode7A,mode7B,mode7C,mode7D,mode7X0,mode7Y0,mode7set,cwinptr
|
||||
EXTSYM pal16b,vram,vrama,winon,mode7tab,xtravbuf,dcolortab,vidbright
|
||||
|
||||
NEWSYM Mode716DAsmStart
|
||||
%include "video/mode7.mac"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
NEWSYM Gendcolortable
|
||||
; generate Direct Color Table
|
||||
push eax
|
||||
@@ -235,4 +229,3 @@ SECTION .text
|
||||
Mode7Process Mode7Window, domosaic16b, 2
|
||||
.nextval3w
|
||||
Mode7ProcessB Mode7Window, domosaic16b, 2
|
||||
NEWSYM Mode716DAsmEnd
|
||||
|
||||
@@ -22,11 +22,6 @@ EXTSYM mode7A,mode7B,mode7C,mode7D,mode7X0,mode7Y0,mode7set
|
||||
EXTSYM pal16b,vram,vrama,winon,mode7tab,xtravbuf,drawmode7dcolor
|
||||
EXTSYM cwinptr
|
||||
|
||||
|
||||
NEWSYM Mode716EAsmStart
|
||||
|
||||
|
||||
|
||||
;*******************************************************
|
||||
; Processes & Draws Mode 7
|
||||
;*******************************************************
|
||||
@@ -1264,4 +1259,3 @@ NEWSYM drawmode716extbg2
|
||||
cmp dh,1
|
||||
jne near domosaic16b
|
||||
ret
|
||||
NEWSYM Mode716EAsmEnd
|
||||
|
||||
@@ -26,7 +26,6 @@ EXTSYM nglogicval,winlogicaval,ProcessMode7ngwinD,ProcessMode7ngwinC
|
||||
EXTSYM ngwinen, winbg1enval, BuildWindow, ngwintable, ngcwinptr
|
||||
EXTSYM ProcessMode7ngwin,ProcessMode7ngwinB
|
||||
|
||||
NEWSYM Mode7ExtAsmStart
|
||||
%include "video/mode7.mac"
|
||||
|
||||
|
||||
@@ -1322,5 +1321,3 @@ NEWSYM drawmode7ngextbg2
|
||||
cmp dh,1
|
||||
jne near domosaic
|
||||
ret
|
||||
|
||||
NEWSYM Mode7ExtAsmEnd
|
||||
|
||||
@@ -28,8 +28,6 @@ EXTSYM pal16bxcl
|
||||
EXTSYM coadder16
|
||||
EXTSYM a16x16xinc,a16x16yinc,curypos,yflipadd
|
||||
|
||||
|
||||
NEWSYM MV16TMSAsmStart
|
||||
%include "video/vidmacro.mac"
|
||||
|
||||
|
||||
@@ -1501,4 +1499,3 @@ NEWSYM draw16x1616tswinonms
|
||||
dec byte[tileleft16b]
|
||||
jnz near .loopa
|
||||
ret
|
||||
NEWSYM MV16TMSAsmEnd
|
||||
|
||||
@@ -31,8 +31,6 @@ EXTSYM vidmemch2s,vidmemch4s,vidmemch8s
|
||||
EXTSYM cpalval,bgtxadd2
|
||||
EXTSYM SpecialLine
|
||||
|
||||
NEWSYM NewG162AsmStart
|
||||
|
||||
%include "video/vidmacro.mac"
|
||||
%include "video/newg162.mac"
|
||||
%include "video/newgfx16.mac"
|
||||
@@ -1402,5 +1400,3 @@ drawlineng4b16bmsom16x16:
|
||||
drawline16bmacroom16x16 tltype4b,preparet4ba,cachesingle4bng,ngpalcon4b,test4ba,0Fh,procpixelsmst,procpixelstmst
|
||||
drawlineng4b16bmsntom16x16
|
||||
drawline16bmacroom16x16 tltype4b,preparet4ba,cachesingle4bng,ngpalcon4b,test4ba,0Fh,procpixelsmsnt,procpixelstmsnt
|
||||
|
||||
NEWSYM NewG162AsmEnd
|
||||
|
||||
@@ -3465,7 +3465,6 @@ NEWSYM HalfTransB, dd 00001000010000010000100001000001b,000010000100000100001000
|
||||
NEWSYM HalfTransC, dd 11110111100111101111011110011110b,11110111100111101111011110011110b
|
||||
NEWSYM NGNoTransp, dd 0
|
||||
section .text
|
||||
NEWSYM NewGfx16AsmEnd
|
||||
|
||||
%macro SCMainA 0
|
||||
%endmacro
|
||||
|
||||
@@ -26,21 +26,12 @@ EXTSYM ngpalcon2b,tleftnb,tltype2b,tltype4b,tltype8b,yposng,flipyposng
|
||||
EXTSYM ofsmcptr,ofsmtptr,ofsmmptr,ofsmcyps,ofsmady,ofsmadx
|
||||
EXTSYM yposngom,flipyposngom,cbgval,ofsmval,ofsmvalh,vram,bgtxadd2
|
||||
|
||||
NEWSYM NewGfx2AsmStart
|
||||
|
||||
%include "video/vidmacro.mac"
|
||||
%include "video/newgfx2.mac"
|
||||
%include "video/newgfx.mac"
|
||||
%include "video/newgfxwn.mac"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
;******************************************
|
||||
; 8x8 tiles - tile engine
|
||||
;******************************************
|
||||
@@ -673,4 +664,3 @@ Processwinclipom4b:
|
||||
cmp dword[ngcwinmode],1
|
||||
je near drawlinengom4bwin.winclipped
|
||||
jmp drawlinengom4bwin.loop
|
||||
NEWSYM NewGfx2AsmEnd
|
||||
|
||||
Reference in New Issue
Block a user