Browse Source

Use value $00000F00 instead of $F0000000 for IF_FPMASK, and adapt all floating point constants, to avoid IF_VFPv4 having the same value as IF_PASS2

git-svn-id: trunk@49096 -
pierre 4 years ago
parent
commit
8ea95e9b95
1 changed files with 7 additions and 7 deletions
  1. 7 7
      compiler/arm/aasmcpu.pas

+ 7 - 7
compiler/arm/aasmcpu.pas

@@ -166,14 +166,14 @@ uses
       IF_ARMv7M     = $00F00000;
       IF_ARMv7M     = $00F00000;
       IF_ARMv7EM    = $01000000;
       IF_ARMv7EM    = $01000000;
 
 
-      IF_FPMASK     = $F0000000;
-      IF_FPA        = $10000000;
-      IF_VFPv2      = $20000000;
-      IF_VFPv3      = $40000000;
-      IF_VFPv4      = $80000000;
+      IF_FPMASK     = $00000F00;
+      IF_FPA        = $00000100;
+      IF_VFPv2      = $00000200;
+      IF_VFPv3      = $00000400;
+      IF_VFPv4      = $00000800;
 
 
       { if the instruction can change in a second pass }
       { if the instruction can change in a second pass }
-      IF_PASS2  = longint($80000000);
+      IF_PASS2  = $80000000;
 
 
     type
     type
       TInsTabCache=array[TasmOp] of longint;
       TInsTabCache=array[TasmOp] of longint;
@@ -278,7 +278,7 @@ uses
       private
       private
          { arm version info }
          { arm version info }
          fArmVMask,
          fArmVMask,
-         fArmMask  : longint;
+         fArmMask  : longword;
          { next fields are filled in pass1, so pass2 is faster }
          { next fields are filled in pass1, so pass2 is faster }
          inssize   : shortint;
          inssize   : shortint;
          insoffset : longint;
          insoffset : longint;