* the prefetch bug handling is specific to x86_64

git-svn-id: trunk@44936 -
This commit is contained in:
svenbarth 2020-04-21 06:05:43 +00:00
parent f3c377f8d1
commit 25c6f3a667

View File

@ -412,12 +412,14 @@ var
begin begin
if (rec.ExceptionFlags and EXCEPTION_UNWIND)=0 then if (rec.ExceptionFlags and EXCEPTION_UNWIND)=0 then
begin begin
{$ifdef CPUX86_64}
{ Athlon prefetch bug? } { Athlon prefetch bug? }
if (rec.ExceptionCode=STATUS_ACCESS_VIOLATION) and is_prefetch(pointer(ContextGetIP(Context))) then if (rec.ExceptionCode=STATUS_ACCESS_VIOLATION) and is_prefetch(pointer(ContextGetIP(Context))) then
begin begin
result:=ExceptionContinueExecution; result:=ExceptionContinueExecution;
exit; exit;
end; end;
{$endif CPUX86_64}
PushException(rec,context,obj,True); PushException(rec,context,obj,True);
RtlUnwindEx(frame, @L1, @rec, nil, dispatch.ContextRecord, dispatch.HistoryTable); RtlUnwindEx(frame, @L1, @rec, nil, dispatch.ContextRecord, dispatch.HistoryTable);
end end
@ -502,12 +504,14 @@ begin
else if (ControlRva>=scope^.RvaStart) and (ControlRva<scope^.RvaEnd) and else if (ControlRva>=scope^.RvaStart) and (ControlRva<scope^.RvaEnd) and
(scope^.Typ<>SCOPE_FINALLY)then (scope^.Typ<>SCOPE_FINALLY)then
begin begin
{$ifdef CPUX86_64}
{ Athlon prefetch bug? } { Athlon prefetch bug? }
if (rec.ExceptionCode=STATUS_ACCESS_VIOLATION) and is_prefetch(pointer(ContextGetIP(Context))) then if (rec.ExceptionCode=STATUS_ACCESS_VIOLATION) and is_prefetch(pointer(ContextGetIP(Context))) then
begin begin
result:=ExceptionContinueExecution; result:=ExceptionContinueExecution;
exit; exit;
end; end;
{$endif CPUX86_64}
if scope^.Typ>SCOPE_IMPLICIT then // filtering needed if scope^.Typ>SCOPE_IMPLICIT then // filtering needed
begin begin