From 64ba860478568d06829dabd29aa397a85a2d156c Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Sat, 17 Nov 2018 09:40:26 +0000 Subject: [PATCH] * added psabi eh helpers called from the code generator to the interface of the system unit * changed a cint to longint as C types are not available there git-svn-id: branches/debug_eh@40333 - --- rtl/inc/psabieh.inc | 2 +- rtl/inc/psabiehh.inc | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rtl/inc/psabieh.inc b/rtl/inc/psabieh.inc index f23a65ffd8..cab32202c7 100644 --- a/rtl/inc/psabieh.inc +++ b/rtl/inc/psabieh.inc @@ -517,7 +517,7 @@ function FPC_psabieh_find_handler(const info: FPC_psabieh_lsda_header_info; cons procedure __gxx_personality_v0(version: cint; actions: FPC_Unwind_Action; exceptionClass: cuint64; libunwind_exception: PFPC_Unwind_Exception; context: PFPC_Unwind_Context); cdecl; external; {$endif FPC_PSABIEH_CPLUSPLUSSUPPORT} -function FPC_psabieh_personality_v0(version: cint; actions: FPC_Unwind_Action; exceptionClass: cuint64; libunwind_exception: PFPC_Unwind_Exception; context: PFPC_Unwind_Context): FPC_Unwind_Reason_Code; cdecl; +function _FPC_psabieh_personality_v0(version: longint; actions: FPC_Unwind_Action; exceptionClass: qword; libunwind_exception: PFPC_Unwind_Exception; context: PFPC_Unwind_Context): FPC_Unwind_Reason_Code; cdecl; var WrappedException: PExceptObject; found_type: FPC_psabieh_found_handler_type; diff --git a/rtl/inc/psabiehh.inc b/rtl/inc/psabiehh.inc index 51dd5442ee..49948371fc 100644 --- a/rtl/inc/psabiehh.inc +++ b/rtl/inc/psabiehh.inc @@ -57,5 +57,8 @@ const (a: 'FPC1PAS'#0); {$pop} +function _FPC_psabieh_personality_v0(version: longint; actions: FPC_Unwind_Action; exceptionClass: qword; libunwind_exception: PFPC_Unwind_Exception; context: PFPC_Unwind_Context): FPC_Unwind_Reason_Code; cdecl; +function FPC_psabi_begin_catch(exc:PFPC_Unwind_Exception): pointer; cdecl; compilerproc; +procedure FPC_psabi_end_catch; cdecl; compilerproc; {$packrecords default}