paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-17 06:39:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for multiple exception troubles

Browse Source 
git-svn-id: trunk@14218 -
This commit is contained in:
pierre 2009-11-19 21:25:04 +00:00
parent 08350fcc9a
commit 79ec403774
2 changed files with 29 additions and 5 deletions
rtl/solaris
i386
sighnd.inc
system.pp

29
rtl/solaris/i386/sighnd.inc
View File

@ -25,7 +25,7 @@ const
FPE_FLTINV = 7;
FPE_FLTSUB = 8;
procedure SignalToRunerror(sig : longint; SigInfo: PSigInfo; SigContext: PSigContext);public name '_FPC_DEFAULTSIGHANDLER';cdecl;
var
res : word;
@ -59,9 +59,19 @@ begin
res:=206;
else
res:=207;
end;
end;
SIGILL,
end;
with sigcontext^.uc_mcontext.fpregs.fpchip_state do
status:=status and not FPU_ExceptionMask;
end;
SIGILL:
if sse_check then
begin
os_supports_sse:=false;
res:=0;
inc(sigcontext^.uc_mcontext.gregs[REG_EIP],3);
end
else
res:=216;
SIGSEGV :
begin
res:=216;
@ -77,8 +87,17 @@ begin
end;
reenable_signal(sig);
{ give runtime error at the position where the signal was raised }
{if res<>0 then
HandleErrorAddrFrame(res,addr,frame);}
{ give runtime error at the position where the signal was raised }
if res<>0 then
HandleErrorAddrFrame(res,addr,frame);
begin
sigcontext^.uc_mcontext.gregs[REG_EAX] := res;
sigcontext^.uc_mcontext.gregs[REG_EDX] := sigcontext^.uc_mcontext.gregs[REG_EIP];
sigcontext^.uc_mcontext.gregs[REG_ECX] := sigcontext^.uc_mcontext.gregs[REG_EBP];
sigcontext^.uc_mcontext.gregs[REG_EIP] := ptruint(@HandleErrorAddrFrame);
end;
end;

5
rtl/solaris/system.pp
View File

@ -245,6 +245,11 @@ Begin
{ Setup heap }
InitHeap;
SysInitExceptions;
{$if defined(cpui386) or defined(cpuarm)}
fpc_cpucodeinit;
{$endif cpui386}
{ Setup stdin, stdout and stderr }
SysInitStdIO;
{ Reset IO Error }