2
0
Эх сурвалжийг харах

Reenable check for Wide format flag.

git-svn-id: branches/laksen/armiw@29331 -
Jeppe Johansen 10 жил өмнө
parent
commit
9227a9fcf2

+ 3 - 3
compiler/arm/aasmcpu.pas

@@ -2115,8 +2115,8 @@ implementation
         { Check wideformat flag }
         { Check wideformat flag }
         if ((p^.flags and IF_WIDE)<>0) <> wideformat then
         if ((p^.flags and IF_WIDE)<>0) <> wideformat then
           begin
           begin
-            //matches:=0;
-            //exit;
+            matches:=0;
+            exit;
           end;
           end;
 
 
         { Check that no spurious colons or TOs are present }
         { Check that no spurious colons or TOs are present }
@@ -4745,7 +4745,7 @@ implementation
                   if (currsym.bind<>AB_LOCAL) and (currsym.objsection<>objdata.CurrObjSec) then
                   if (currsym.bind<>AB_LOCAL) and (currsym.objsection<>objdata.CurrObjSec) then
                     begin
                     begin
                       objdata.writereloc(oper[0]^.ref^.offset,0,currsym,RELOC_RELATIVE_24);
                       objdata.writereloc(oper[0]^.ref^.offset,0,currsym,RELOC_RELATIVE_24);
-                      offset:=$FFFFFF
+                      offset:=$FFFFFE
                     end
                     end
                   else
                   else
                     offset:=((currsym.offset-insoffset-8) shr 1) and $FFFFFF;
                     offset:=((currsym.offset-insoffset-8) shr 1) and $FFFFFF;