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

* patch by J. Gareth Moreton: fix building for armv6m after r43441

Browse Source 
git-svn-id: trunk@43466 -
This commit is contained in:
florian 2019-11-14 21:38:21 +00:00
parent 87b3b089d6
commit bf24882c33
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
compiler/aoptobj.pas
View File

@ -427,6 +427,9 @@ Unit AoptObj;
verbose,
aoptutils,
aasmcfi,
{$if defined(ARM)}
cpuinfo,
{$endif defined(ARM)}
procinfo;
@ -2354,24 +2357,30 @@ Unit AoptObj;
If an instruction needs the information of this, it can easily create a TempUsedRegs (FK)
UpdateUsedRegs(tai(p.next));
}
{$ifdef DEBUG_OPTALLOC}
{$ifdef DEBUG_OPTALLOC}
if p.Typ=ait_instruction then
InsertLLItem(tai(p.Previous),p,tai_comment.create(strpnew(GetAllocationString(UsedRegs))));
{$endif DEBUG_OPTALLOC}
{$endif DEBUG_OPTALLOC}
{ Handle Jmp Optimizations first }
if DoJumpOptimizations(p, stoploop) then
begin
UpdateUsedRegs(p);
if FirstInstruction then
{ Update StartPoint, since the old p was removed;
don't set FirstInstruction to False though, as
the new p might get removed too. }
StartPoint := p;
{$if defined(ARM)}
{ Cannot perform these jump optimisations if the ARM architecture has 16-bit thumb codes }
if not (
(current_settings.instructionset = is_thumb) and not(CPUARM_HAS_THUMB2 in cpu_capabilities[current_settings.cputype])
) then
{$endif defined(ARM)}
if DoJumpOptimizations(p, stoploop) then
begin
UpdateUsedRegs(p);
if FirstInstruction then
{ Update StartPoint, since the old p was removed;
don't set FirstInstruction to False though, as
the new p might get removed too. }
StartPoint := p;
if (p.typ = ait_instruction) and IsJumpToLabel(taicpu(p)) then
Continue;
end;
if (p.typ = ait_instruction) and IsJumpToLabel(taicpu(p)) then
Continue;
end;
if PeepHoleOptPass1Cpu(p) then
begin