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

* Replace labeltable with dynamic array

Browse Source
This commit is contained in:
Michaël Van Canneyt 2025-03-17 15:38:08 +01:00
parent b58469a7bd
commit 07a2c6b37e
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/aopt.pas
View File

@ -142,8 +142,7 @@ Unit aopt;
begin
If (LabelDif <> 0) Then
Begin
GetMem(LabelTable, LabelDif*SizeOf(TLabelTableItem));
FillChar(LabelTable^, LabelDif*SizeOf(TLabelTableItem), 0);
SetLength(LabelTable, LabelDif);
end;
p := BlockStart;
While (P <> BlockEnd) Do
@ -158,7 +157,7 @@ Unit aopt;
LabelIdx:=tai_label(p).labsym.labelnr-LowLabel;
if LabelIdx>int64(LabelDif) then
internalerror(200604202);
LabelTable^[LabelIdx].PaiObj := p;
LabelTable[LabelIdx].PaiObj := p;
end;
end;
ait_regAlloc:
@ -255,8 +254,7 @@ Unit aopt;
begin
if assigned(LabelInfo^.labeltable) then
begin
freemem(LabelInfo^.labeltable);
LabelInfo^.labeltable := nil;
LabelInfo^.labeltable:=Nil;
end;
LabelInfo^.labeldif:=0;
LabelInfo^.lowlabel:=high(longint);
@ -317,8 +315,7 @@ Unit aopt;
Destructor TAsmOptimizer.Destroy;
Begin
ReleaseUsedRegs(TmpUsedRegs);
if assigned(LabelInfo^.LabelTable) then
Freemem(LabelInfo^.LabelTable);
LabelInfo^.LabelTable:=nil;
Dispose(LabelInfo);
inherited Destroy;
End;

7
compiler/aoptobj.pas
View File

@ -222,8 +222,7 @@ Unit AoptObj;
PaiObj: Tai;
End;
TLabelTable = Array[0..2500000] Of TLabelTableItem;
PLabelTable = ^TLabelTable;
TLabelTable = Array Of TLabelTableItem;
PLabelInfo = ^TLabelInfo;
TLabelInfo = Record
{ the highest and lowest label number occurring in the current code }
@ -232,7 +231,7 @@ Unit AoptObj;
LabelDif: cardinal;
{ table that contains the addresses of the Pai_Label objects associated
with each label number }
LabelTable: PLabelTable;
LabelTable: TLabelTable;
End;
{ ************************************************************************* }
@ -1667,7 +1666,7 @@ Unit AoptObj;
begin
if (int64(sym.labelnr) >= int64(labelinfo^.lowlabel)) and
(int64(sym.labelnr) <= int64(labelinfo^.highlabel)) then { range check, a jump can go past an assembler block! }
getlabelwithsym := labelinfo^.labeltable^[sym.labelnr-labelinfo^.lowlabel].paiobj
getlabelwithsym := labelinfo^.labeltable[sym.labelnr-labelinfo^.lowlabel].paiobj
else
getlabelwithsym := nil;
end;