|
@@ -34,6 +34,15 @@ begin
|
|
|
{ this is not allways necessary but I don't know yet
|
|
|
how to tell if it is or not PM }
|
|
|
res:=200;
|
|
|
+ {$ifdef SYSTEM_DEBUG}
|
|
|
+ if assigned(ucontext^.uc_mcontext.fpstate) then
|
|
|
+ begin
|
|
|
+ writeln('magic: $',hexstr(ucontext^.uc_mcontext.fpstate^.magic,4));
|
|
|
+ writeln('magic1: $',hexstr(ucontext^.uc_mcontext.fpstate^.sw_reserved.magic1,8));
|
|
|
+ end
|
|
|
+ else
|
|
|
+ writeln('fpstate=nil');
|
|
|
+ {$endif SYSTEM_DEBUG}
|
|
|
if SigInfo^.si_code<>FPE_INTDIV then
|
|
|
begin
|
|
|
if assigned(ucontext^.uc_mcontext.fpstate) then
|
|
@@ -51,42 +60,47 @@ begin
|
|
|
else if (FpuState and FPU_Underflow)<>0 then
|
|
|
res:=206
|
|
|
else if (FpuState and FPU_Denormal)<>0 then
|
|
|
- res:=216
|
|
|
+ res:=206
|
|
|
else
|
|
|
res:=207; {'Coprocessor Error'}
|
|
|
- end;
|
|
|
- { SSE data? }
|
|
|
- if ucontext^.uc_mcontext.fpstate^.magic<>$ffff then
|
|
|
+ end
|
|
|
+ else
|
|
|
begin
|
|
|
- MMState:=ucontext^.uc_mcontext.fpstate^.mxcsr;
|
|
|
- if (MMState and MM_ExceptionMask)<>0 then
|
|
|
+ { SSE data? }
|
|
|
+ if ucontext^.uc_mcontext.fpstate^.magic=0 then
|
|
|
begin
|
|
|
- { first check the more precise options }
|
|
|
- if (MMState and MM_DivisionByZero)<>0 then
|
|
|
- res:=208
|
|
|
- else if (MMState and MM_Invalid)<>0 Then
|
|
|
- res:=207
|
|
|
- else if (MMState and MM_Overflow)<>0 then
|
|
|
- res:=205
|
|
|
- else if (MMState and MM_Underflow)<>0 then
|
|
|
- res:=206
|
|
|
- else if (MMState and MM_Denormal)<>0 then
|
|
|
- res:=216
|
|
|
- else
|
|
|
- res:=207; {'Coprocessor Error'}
|
|
|
+ MMState:=ucontext^.uc_mcontext.fpstate^.mxcsr;
|
|
|
+ if (MMState and MM_ExceptionMask)<>0 then
|
|
|
+ begin
|
|
|
+ { first check the more precise options }
|
|
|
+ if (MMState and MM_DivisionByZero)<>0 then
|
|
|
+ res:=208
|
|
|
+ else if (MMState and MM_Invalid)<>0 Then
|
|
|
+ res:=207
|
|
|
+ else if (MMState and MM_Overflow)<>0 then
|
|
|
+ res:=205
|
|
|
+ else if (MMState and MM_Underflow)<>0 then
|
|
|
+ res:=206
|
|
|
+ else if (MMState and MM_Denormal)<>0 then
|
|
|
+ res:=206
|
|
|
+ else
|
|
|
+ res:=207; {'Coprocessor Error'}
|
|
|
+ end;
|
|
|
end;
|
|
|
end;
|
|
|
- with ucontext^.uc_mcontext.fpstate^ do
|
|
|
- begin
|
|
|
- { Reset Status word }
|
|
|
- sw:=sw and not FPU_ExceptionMask;
|
|
|
- { Restoree default control word }
|
|
|
- cw:=Default8087CW;
|
|
|
- { Reset Tag word to $ffff for all empty }
|
|
|
- tag:=$ffff;
|
|
|
- end;
|
|
|
end;
|
|
|
end;
|
|
|
+ if assigned(ucontext^.uc_mcontext.fpstate) then
|
|
|
+ with ucontext^.uc_mcontext.fpstate^ do
|
|
|
+ begin
|
|
|
+ { Reset Status word }
|
|
|
+ sw:=sw and not(FPU_ExceptionMask);
|
|
|
+ if magic=0 then
|
|
|
+ mxcsr:=mxcsr and not(MM_ExceptionMask);
|
|
|
+ cw:=Default8087CW;
|
|
|
+ { Reset Tag word to $ffff for all empty }
|
|
|
+ tag:=$ffff;
|
|
|
+ end;
|
|
|
end;
|
|
|
SIGBUS:
|
|
|
res:=214;
|
|
@@ -107,13 +121,14 @@ begin
|
|
|
res:=233;
|
|
|
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
|
|
|
- begin
|
|
|
- ucontext^.uc_mcontext.eax := res;
|
|
|
- ucontext^.uc_mcontext.edx := ucontext^.uc_mcontext.eip;
|
|
|
- ucontext^.uc_mcontext.ecx := ucontext^.uc_mcontext.ebp;
|
|
|
- ucontext^.uc_mcontext.eip := ptruint(@SignalToHandleErrorAddrFrame);
|
|
|
- end;
|
|
|
+ begin
|
|
|
+ ucontext^.uc_mcontext.eax := res;
|
|
|
+ ucontext^.uc_mcontext.edx := ucontext^.uc_mcontext.eip;
|
|
|
+ ucontext^.uc_mcontext.ecx := ucontext^.uc_mcontext.ebp;
|
|
|
+ ucontext^.uc_mcontext.eip := ptruint(@SignalToHandleErrorAddrFrame);
|
|
|
+ end;
|
|
|
end;
|
|
|
|