paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-03 11:10:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

* properly return from the signal handler on ARM/Linux instead of calling

Browse Source 
HandleErrorAddrFrame directly (fixes psabieh exception handling, and
    generally is cleaner)

git-svn-id: trunk@42166 -
This commit is contained in:
Jonas Maebe 2019-06-02 18:33:01 +00:00
parent 322a717c44
commit dc681a75ec
1 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
rtl/linux/arm/sighnd.inc
View File

@ -15,9 +15,48 @@
**********************************************************************} **********************************************************************}
function GetHandleErrorAddrFrameAddr: pointer;
begin
result:=@HandleErrorAddrFrame;
end;
{$ifndef CPUTHUMB}
Procedure SignalToHandleErrorAddrFrame_ARM(Errno : longint;addr : CodePointer; frame : Pointer); nostackframe; assembler;
asm
.code 32
// the address is of the faulting instruction, and sigreturn will
// skip it -> start with a nop
nop
push {r0,r1,r2,r3}
bl GetHandleErrorAddrFrameAddr
// overwrite last stack slot with new return address
str r0, [sp,#12]
// lr := addr
ldr lr, [sp,#4]
pop {r0,r1,r2,pc}
.text
end;
{$endif not CPUTHUMB}
Procedure SignalToHandleErrorAddrFrame_Thumb(Errno : longint;addr : CodePointer; frame : Pointer); nostackframe; assembler;
asm
.thumb_func
.code 16
// the address is of the faulting instruction, and sigreturn will
// skip it -> start with a nop
nop
push {r0,r1,r2,r3}
bl GetHandleErrorAddrFrameAddr
// overwrite last stack slot with new return address
str r0, [sp,#12]
// lr := addr
ldr r0, [sp,#4]
mov lr, r0
pop {r0,r1,r2,pc}
.text
end;
procedure SignalToRunerror(Sig: longint; { _a2,_a3,_a4 : dword; } SigContext: PSigInfo; uContext : PuContext); public name '_FPC_DEFAULTSIGHANDLER'; cdecl; procedure SignalToRunerror(Sig: longint; { _a2,_a3,_a4 : dword; } SigContext: PSigInfo; uContext : PuContext); public name '_FPC_DEFAULTSIGHANDLER'; cdecl;
var var
res : word; res : word;
begin begin
@ -48,10 +87,23 @@ begin
SIGQUIT: SIGQUIT:
res:=233; res:=233;
end; end;
reenable_signal(sig);
{ give runtime error at the position where the signal was raised } { give runtime error at the position where the signal was raised }
if res<>0 then if res<>0 then
HandleErrorAddrFrame(res,pointer(uContext^.uc_mcontext.arm_pc),pointer(uContext^.uc_mcontext.arm_fp)); begin
ucontext^.uc_mcontext.arm_r0:=res;
ucontext^.uc_mcontext.arm_r1:=uContext^.uc_mcontext.arm_pc;
ucontext^.uc_mcontext.arm_r2:=uContext^.uc_mcontext.arm_fp;
{$ifndef CPUTHUMB}
if (ucontext^.uc_mcontext.arm_cpsr and (1 shl 5))=0 then
begin
ucontext^.uc_mcontext.arm_pc:=ptruint(@SignalToHandleErrorAddrFrame_ARM);
end
else
{$endif not CPUTHUMB}
begin
ucontext^.uc_mcontext.arm_pc:=ptruint(@SignalToHandleErrorAddrFrame_Thumb);
end;
end;
end; end;