paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 10:19:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

* inside the Win64 system unit convert FPC_USE_WIN64_SEH to a SYSTEM_USE_WIN_SEH

Browse Source 
git-svn-id: trunk@44939 -
This commit is contained in:
svenbarth 2020-04-21 06:05:55 +00:00
parent 5c898fe795
commit bfa5bf80e2
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtl/win64/seh64.inc
View File

@ -194,7 +194,7 @@ procedure RtlUnwindEx(
{ FPC specific stuff } { FPC specific stuff }
{$ifdef FPC_USE_WIN64_SEH} {$ifdef SYSTEM_USE_WIN_SEH}
function ContextGetIP(const Context: TContext): PtrUInt; inline; function ContextGetIP(const Context: TContext): PtrUInt; inline;
begin begin
@ -571,5 +571,5 @@ begin
end; end;
end; end;
end; end;
{$endif FPC_USE_WIN64_SEH} {$endif SYSTEM_USE_WIN_SEH}

20
rtl/win64/system.pp
View File

@ -30,11 +30,15 @@ interface
{$define FPC_SYSTEM_HAS_SYSDLH} {$define FPC_SYSTEM_HAS_SYSDLH}
{$define FPC_HAS_SETCTRLBREAKHANDLER} {$define FPC_HAS_SETCTRLBREAKHANDLER}
{$ifdef FPC_USE_WIN64_SEH} {$if defined(FPC_USE_WIN64_SEH)}
{$define SYSTEM_USE_WIN_SEH}
{$endif}
{$ifdef SYSTEM_USE_WIN_SEH}
{$define FPC_SYSTEM_HAS_RAISEEXCEPTION} {$define FPC_SYSTEM_HAS_RAISEEXCEPTION}
{$define FPC_SYSTEM_HAS_RERAISE} {$define FPC_SYSTEM_HAS_RERAISE}
{$define FPC_SYSTEM_HAS_CAPTUREBACKTRACE} {$define FPC_SYSTEM_HAS_CAPTUREBACKTRACE}
{$endif FPC_USE_WIN64_SEH} {$endif SYSTEM_USE_WIN_SEH}
{ include system-independent routine headers } { include system-independent routine headers }
{$I systemh.inc} {$I systemh.inc}
@ -148,9 +152,9 @@ end;
System Dependent Exit code System Dependent Exit code
*****************************************************************************} *****************************************************************************}
{$ifndef FPC_USE_WIN64_SEH} {$ifndef SYSTEM_USE_WIN_SEH}
procedure install_exception_handlers;forward; procedure install_exception_handlers;forward;
{$endif FPC_USE_WIN64_SEH} {$endif SYSTEM_USE_WIN_SEH}
{$ifdef VER3_0} {$ifdef VER3_0}
procedure PascalMain;external name 'PASCALMAIN'; procedure PascalMain;external name 'PASCALMAIN';
{$endif VER3_0} {$endif VER3_0}
@ -219,9 +223,9 @@ procedure Exe_entry(constref info: TEntryInformation);[public,alias:'_FPC_EXE_En
IsLibrary:=false; IsLibrary:=false;
{ install the handlers for exe only ? { install the handlers for exe only ?
or should we install them for DLL also ? (PM) } or should we install them for DLL also ? (PM) }
{$ifndef FPC_USE_WIN64_SEH} {$ifndef SYSTEM_USE_WIN_SEH}
install_exception_handlers; install_exception_handlers;
{$endif FPC_USE_WIN64_SEH} {$endif SYSTEM_USE_WIN_SEH}
ExitCode:=0; ExitCode:=0;
{$ifdef CPUX86_64} {$ifdef CPUX86_64}
asm asm
@ -333,7 +337,7 @@ type
function AddVectoredExceptionHandler(FirstHandler : DWORD;VectoredHandler : TVectoredExceptionHandler) : longint; function AddVectoredExceptionHandler(FirstHandler : DWORD;VectoredHandler : TVectoredExceptionHandler) : longint;
external 'kernel32' name 'AddVectoredExceptionHandler'; external 'kernel32' name 'AddVectoredExceptionHandler';
{$ifndef FPC_USE_WIN64_SEH} {$ifndef SYSTEM_USE_WIN_SEH}
const const
MaxExceptionLevel = 16; MaxExceptionLevel = 16;
exceptLevel : Byte = 0; exceptLevel : Byte = 0;
@ -509,7 +513,7 @@ procedure install_exception_handlers;
begin begin
AddVectoredExceptionHandler(1,@syswin64_x86_64_exception_handler); AddVectoredExceptionHandler(1,@syswin64_x86_64_exception_handler);
end; end;
{$endif ndef FPC_USE_WIN64_SEH} {$endif ndef SYSTEM_USE_WIN_SEH}
{$ifdef VER3_0} {$ifdef VER3_0}
procedure LinkIn(p1,p2,p3: Pointer); inline; procedure LinkIn(p1,p2,p3: Pointer); inline;