Fix up sections variables are created in, major code cleanup, remove protection removal. - Round 4
This commit is contained in:
@@ -17,34 +17,14 @@
|
||||
|
||||
#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 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 CopyVWinAsmEnd();
|
||||
extern void DebugAsmStart();
|
||||
extern void DebugAsmEnd();
|
||||
extern void JoyAsmStart();
|
||||
extern void JoyAsmEnd();
|
||||
extern void InitAsmStart();
|
||||
extern void InitAsmEnd();
|
||||
extern void UIAsmStart();
|
||||
extern void UIAsmEnd();
|
||||
extern void DosModemRTNAsmStart();
|
||||
extern void DosModemRTNAsmEnd();
|
||||
extern void Vesa2AsmStart();
|
||||
@@ -57,24 +37,6 @@ extern void GPProAsmStart();
|
||||
extern void GPProAsmEnd();
|
||||
extern void Vesa12AsmStart();
|
||||
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)
|
||||
|
||||
@@ -99,32 +61,13 @@ void MakeCodeWriteable_f (unsigned long startaddr, unsigned long length, const c
|
||||
|
||||
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) DebugAsmStart, (long) DebugAsmEnd - (long) DebugAsmStart);
|
||||
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) Vesa2AsmStart, (long) Vesa2AsmEnd - (long) Vesa2AsmStart);
|
||||
MakeCodeWriteable((long) InitVidAsmStart, (long) InitVidAsmEnd - (long) InitVidAsmStart);
|
||||
MakeCodeWriteable((long) SWAsmStart, (long) SWAsmEnd - (long) SWAsmStart);
|
||||
MakeCodeWriteable((long) GPProAsmStart, (long) GPProAsmEnd - (long) GPProAsmStart);
|
||||
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);
|
||||
}
|
||||
|
||||
@@ -121,8 +121,6 @@ EXTSYM V8Mode,GrayscaleMode
|
||||
EXTSYM PrevWinMode,PrevFSMode
|
||||
EXTSYM sem_sleep
|
||||
|
||||
NEWSYM WinIntRFAsmStart
|
||||
|
||||
; NOTE: For timing, Game60hzcall should be called at 50hz or 60hz (depending
|
||||
; on romispal) after a call to InitPreGame and before DeInitPostGame are
|
||||
; made. GUI36hzcall should be called at 36hz after a call GUIInit and
|
||||
@@ -273,7 +271,7 @@ NEWSYM OsExit
|
||||
NEWSYM OSExit
|
||||
jmp DosExit
|
||||
|
||||
SECTION .data
|
||||
SECTION .data
|
||||
NEWSYM TempHandle, dd 0
|
||||
|
||||
SECTION .text
|
||||
@@ -514,12 +512,12 @@ RefreshKeybBuffer:
|
||||
mov [Keybtail],al
|
||||
.none
|
||||
ret
|
||||
|
||||
SECTION .data
|
||||
Keybhead db 0
|
||||
Keybtail db 0
|
||||
HoldKey dd 0
|
||||
PKeyBuf times 100h db 0
|
||||
|
||||
SECTION .data
|
||||
NEWSYM CurKeyPos, dd 0
|
||||
NEWSYM CurKeyReadPos, dd 0
|
||||
NEWSYM KeyBuffer, times 16 dd 0
|
||||
@@ -1118,7 +1116,7 @@ NEWSYM Init_Mouse
|
||||
mov eax,01h
|
||||
ret
|
||||
|
||||
SECTION .data
|
||||
SECTION .data
|
||||
NEWSYM WMouseX, dd 0
|
||||
NEWSYM WMouseY, dd 0
|
||||
NEWSYM WMouseMoveX, dd 0
|
||||
@@ -1257,13 +1255,14 @@ NEWSYM Check60hz
|
||||
popad
|
||||
ret
|
||||
|
||||
SECTION .data
|
||||
BitPosR db 11
|
||||
BitPosG db 5
|
||||
BitPosB db 0
|
||||
BitSizeR db 5
|
||||
BitSizeG db 6
|
||||
BitSizeB db 5
|
||||
|
||||
SECTION .text
|
||||
|
||||
InitializeGfxStuff:
|
||||
; Process Red Stuff
|
||||
@@ -1490,7 +1489,9 @@ NEWSYM TCPIPWaitForConnection
|
||||
popad
|
||||
mov eax,-1
|
||||
ret
|
||||
SECTION .data
|
||||
.temp dd 0
|
||||
SECTION .text
|
||||
|
||||
NEWSYM TCPIPInitConnectToServer
|
||||
pushad
|
||||
@@ -1543,7 +1544,9 @@ NEWSYM TCPIPConnectToServer
|
||||
popad
|
||||
mov eax,[.temp]
|
||||
ret
|
||||
SECTION .data
|
||||
.temp dd 0
|
||||
SECTION .text
|
||||
|
||||
NEWSYM TCPIPConnectToServerW
|
||||
; int ConnectServer(char *servername, unsigned short port)
|
||||
@@ -1561,7 +1564,9 @@ NEWSYM TCPIPConnectToServerW
|
||||
popad
|
||||
mov eax,[.temp]
|
||||
ret
|
||||
SECTION .data
|
||||
.temp dd 0
|
||||
SECTION .text
|
||||
|
||||
NEWSYM TCPIPStoreByte
|
||||
; Store al into the array
|
||||
@@ -1743,5 +1748,3 @@ NEWSYM GetTimeInSeconds
|
||||
movzx ebx,word[SystemTimewSecond]
|
||||
add eax,ebx
|
||||
ret
|
||||
|
||||
NEWSYM WinIntRFAsmEnd
|
||||
|
||||
Reference in New Issue
Block a user