paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-07 23:48:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

* get rid of fpc_Resume

Browse Source 
git-svn-id: branches/debug_eh@41476 -
This commit is contained in:
florian 2019-02-25 21:43:56 +00:00
parent 6b34e511a0
commit 0657ce7c02
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/psabiehpi.pas
View File

@ -630,12 +630,12 @@ implementation
psabiehprocinfo.PushLandingPad(psabiehprocinfo.NoAction);
end;
pd:=search_system_proc('fpc_resume');
pd:=search_system_proc('_unwind_resume');
cgpara1.init;
paramanager.getintparaloc(list,pd,1,cgpara1);
hlcg.a_load_reg_cgpara(list,voidpointertype,t.unwind_info,cgpara1);
paramanager.freecgpara(list,cgpara1);
hlcg.g_call_system_proc(current_asmdata.CurrAsmList,'fpc_resume',[@cgpara1],nil).resetiftemp;
hlcg.g_call_system_proc(current_asmdata.CurrAsmList,'_unwind_resume',[@cgpara1],nil).resetiftemp;
{ we do not have to clean up the stack, we never return }
cgpara1.done;

12
rtl/inc/psabieh.inc
View File

@ -1204,18 +1204,6 @@ procedure fpc_ReRaise; [public,alias:'FPC_RERAISE']; compilerproc;
RunError(217);
end;
{$if defined(cpui386) and not defined(cpullvm)}
{$define FPC_SYSTEM_HAS_RESUME}
procedure fpc_Resume(exception_object: PFPC_Unwind_Exception); [public,alias:'FPC_RESUME']; compilerproc; assembler; nostackframe;
asm
popl %ecx
pushl %eax
pushl %ecx
jmp _Unwind_Resume
end;
{$endif}
{$define FPC_SYSTEM_HAS_RAISENESTED}
procedure fpc_raise_nested;compilerproc;
var

5
rtl/inc/psabiehh.inc
View File

@ -57,7 +57,7 @@ type
end;
function _Unwind_RaiseException(exception_object: PFPC_Unwind_Exception): FPC_Unwind_Reason_Code; cdecl; external;
procedure _Unwind_Resume(exception_object: PFPC_Unwind_Exception); cdecl; external;
procedure _Unwind_Resume(exception_object: PFPC_Unwind_Exception); compilerproc; cdecl; external;
type
TFPC_psabieh_exceptionClass = record
@ -80,9 +80,6 @@ function _FPC_psabieh_personality_v0(version: longint; actions: FPC_Unwind_Actio
{$endif}
function FPC_psabi_begin_catch(exc:PFPC_Unwind_Exception): pointer; compilerproc;
procedure FPC_psabi_end_catch; cdecl; compilerproc;
{$if defined(cpui386) and not defined(cpullvm)}
Procedure fpc_Resume(exception_object: PFPC_Unwind_Exception); compilerproc;
{$endif}
{ llvm cannot create a catch/cleanup block if there is no call inside the
try block to a routine that can raise an exception. Hence, we will call