paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 15:29:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Clean up/refactor stack back-tracing code, reducing overall amount of checks and rejecting range from StackBottom to <current frame>.

Browse Source 
git-svn-id: trunk@27097 -
This commit is contained in:
sergei 2014-03-11 16:29:20 +00:00
parent 3b5552ae75
commit 5ddb267d57
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
rtl/inc/heaptrc.pp
View File

@ -533,17 +533,17 @@ begin
{ retrieve backtrace info } { retrieve backtrace info }
bp:=get_frame; bp:=get_frame;
pcaddr:=get_pc_addr; pcaddr:=get_pc_addr;
oldbp:=bp;
get_caller_stackinfo(bp,pcaddr); get_caller_stackinfo(bp,pcaddr);
{ valid bp? }
if (bp>=StackBottom) and (bp<(StackBottom + StackLength)) then for i:=1 to tracesize do
for i:=1 to tracesize do begin
begin if (bp<oldbp) or (bp>(StackBottom + StackLength)) then
oldbp:=bp; break;
get_caller_stackinfo(bp,pcaddr); oldbp:=bp;
pp^.calls[i]:=pcaddr; get_caller_stackinfo(bp,pcaddr);
if (bp<oldbp) or (bp>(StackBottom + StackLength)) then pp^.calls[i]:=pcaddr;
break; end;
end;
{ insert in the linked list } { insert in the linked list }
if loc_info^.heap_mem_root<>nil then if loc_info^.heap_mem_root<>nil then
@ -576,6 +576,7 @@ function CheckFreeMemSize(loc_info: pheap_info; pp: pheap_mem_info;
size, ppsize: ptruint): boolean; inline; size, ppsize: ptruint): boolean; inline;
var var
i: ptruint; i: ptruint;
oldbp,
bp : pointer; bp : pointer;
pcaddr : codepointer; pcaddr : codepointer;
ptext : ^text; ptext : ^text;
@ -638,16 +639,17 @@ begin
begin begin
bp:=get_frame; bp:=get_frame;
pcaddr:=get_pc_addr; pcaddr:=get_pc_addr;
oldbp:=bp;
get_caller_stackinfo(bp,pcaddr); get_caller_stackinfo(bp,pcaddr);
if (bp>=StackBottom) and (bp<(StackBottom + StackLength)) then for i:=(tracesize div 2)+1 to tracesize do
for i:=(tracesize div 2)+1 to tracesize do begin
begin if (bp<oldbp) or (bp>(StackBottom + StackLength)) then
get_caller_stackinfo(bp,pcaddr);
pp^.calls[i]:=pcaddr;
if not((bp>=StackBottom) and (bp<(StackBottom + StackLength))) then
break; break;
end; oldbp:=bp;
get_caller_stackinfo(bp,pcaddr);
pp^.calls[i]:=pcaddr;
end;
end; end;
inc(loc_info^.freemem_cnt); inc(loc_info^.freemem_cnt);
{ clear the memory, $F0 will lead to GFP if used as pointer ! } { clear the memory, $F0 will lead to GFP if used as pointer ! }
@ -920,16 +922,16 @@ begin
{ generate new backtrace } { generate new backtrace }
bp:=get_frame; bp:=get_frame;
pcaddr:=get_pc_addr; pcaddr:=get_pc_addr;
oldbp:=bp;
get_caller_stackinfo(bp,pcaddr); get_caller_stackinfo(bp,pcaddr);
if (bp>=StackBottom) and (bp<(StackBottom + StackLength)) then for i:=1 to tracesize do
for i:=1 to tracesize do begin
begin if (bp<oldbp) or (bp>(StackBottom + StackLength)) then
oldbp:=bp; break;
get_caller_stackinfo(bp,pcaddr); oldbp:=bp;
pp^.calls[i]:=pcaddr; get_caller_stackinfo(bp,pcaddr);
if (bp<oldbp) or (bp>(StackBottom + StackLength)) then pp^.calls[i]:=pcaddr;
break; end;
end;
{ regenerate signature } { regenerate signature }
if usecrc then if usecrc then
pp^.sig:=calculate_sig(pp); pp^.sig:=calculate_sig(pp);