From: Pascal Packaging Team <pkg-pascal-devel@lists.alioth.debian.org>
Date: Mon, 30 Oct 2017 19:32:33 +0000 (+0000)
Subject: armhf-fix-vstr-vld-offset
X-Git-Tag: archive/raspbian/3.0.4+dfsg-2+rpi1^2^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ab4a1520a02a660fb4775f7cea8dbeb884842b35;p=fpc.git

armhf-fix-vstr-vld-offset


Gbp-Pq: Name armhf-fix-vstr-vld-offset.patch
---

diff --git a/fpcsrc/compiler/arm/rgcpu.pas b/fpcsrc/compiler/arm/rgcpu.pas
index be21c685..25cfb14d 100644
--- a/fpcsrc/compiler/arm/rgcpu.pas
+++ b/fpcsrc/compiler/arm/rgcpu.pas
@@ -189,7 +189,7 @@ unit rgcpu;
 
       { Lets remove the bits we can fold in later and check if the result can be easily with an add or sub }
       a:=abs(spilltemp.offset);
-      if GenerateThumbCode then
+      if GenerateThumbCode or (getregtype(tempreg)=R_MMREGISTER) then
         begin
           {$ifdef DEBUG_SPILLING}
           helplist.concat(tai_comment.create(strpnew('Spilling: Use a_load_const_reg to fix spill offset')));
@@ -243,9 +243,10 @@ unit rgcpu;
     end;
 
 
-   function fix_spilling_offset(offset : ASizeInt) : boolean;
+   function fix_spilling_offset(regtype : TRegisterType;offset : ASizeInt) : boolean;
      begin
        result:=(abs(offset)>4095) or
+         ((regtype=R_MMREGISTER) and (abs(offset)>1020)) or
           ((GenerateThumbCode) and ((offset<0) or (offset>1020)));
      end;
 
@@ -255,7 +256,7 @@ unit rgcpu;
         { don't load spilled register between
           mov lr,pc
           mov pc,r4
-          but befure the mov lr,pc
+          but before the mov lr,pc
         }
         if assigned(pos.previous) and
           (pos.typ=ait_instruction) and
@@ -266,7 +267,7 @@ unit rgcpu;
           (taicpu(pos).oper[1]^.reg=NR_PC) then
           pos:=tai(pos.previous);
 
-        if fix_spilling_offset(spilltemp.offset) then
+        if fix_spilling_offset(getregtype(tempreg),spilltemp.offset) then
           spilling_create_load_store(list, pos, spilltemp, tempreg, false)
         else
           inherited do_spill_read(list,pos,spilltemp,tempreg);
@@ -275,7 +276,7 @@ unit rgcpu;
 
     procedure trgcpu.do_spill_written(list:TAsmList;pos:tai;const spilltemp:treference;tempreg:tregister);
       begin
-        if fix_spilling_offset(spilltemp.offset) then
+        if fix_spilling_offset(getregtype(tempreg),spilltemp.offset) then
           spilling_create_load_store(list, pos, spilltemp, tempreg, true)
         else
           inherited do_spill_written(list,pos,spilltemp,tempreg);