* synchronized with trunk

git-svn-id: branches/wasm@47784 -

compiler/i386/i386prop.inc

@@ -988,8 +988,8 @@
 (Ch: [Ch_Rop1, Ch_Rop2, Ch_Rop3, Ch_Wop4]),
 (Ch: [Ch_Wop2, Ch_Rop1]),
 (Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
-(Ch: [Ch_All]),
-(Ch: [Ch_All]),
+(Ch: [Ch_Wop4, Ch_Rop3, Ch_Rop2]),
+(Ch: [Ch_Wop4, Ch_Rop3, Ch_Rop2]),
 (Ch: [Ch_Wop2, Ch_Rop1]),
 (Ch: [Ch_Wop2, Ch_Rop1]),
 (Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
@@ -1003,10 +1003,10 @@
 (Ch: [Ch_All]),
 (Ch: [Ch_Rop1, Ch_Rop2, Ch_WZeroFlag, Ch_WParityFlag, Ch_WCarryFlag, Ch_W0OverflowFlag, Ch_W0SignFlag, Ch_W0AuxiliaryFlag]),
 (Ch: [Ch_Rop1, Ch_Rop2, Ch_WZeroFlag, Ch_WParityFlag, Ch_WCarryFlag, Ch_W0OverflowFlag, Ch_W0SignFlag, Ch_W0AuxiliaryFlag]),
-(Ch: [Ch_All]),
-(Ch: [Ch_All]),
-(Ch: [Ch_All]),
-(Ch: [Ch_All]),
+(Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
+(Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
+(Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
+(Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
 (Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
 (Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
 (Ch: [Ch_All]),

compiler/i8086/i8086prop.inc

@@ -988,8 +988,8 @@
 (Ch: [Ch_Rop1, Ch_Rop2, Ch_Rop3, Ch_Wop4]),
 (Ch: [Ch_Wop2, Ch_Rop1]),
 (Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
-(Ch: [Ch_All]),
-(Ch: [Ch_All]),
+(Ch: [Ch_Wop4, Ch_Rop3, Ch_Rop2]),
+(Ch: [Ch_Wop4, Ch_Rop3, Ch_Rop2]),
 (Ch: [Ch_Wop2, Ch_Rop1]),
 (Ch: [Ch_Wop2, Ch_Rop1]),
 (Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
@@ -1003,10 +1003,10 @@
 (Ch: [Ch_All]),
 (Ch: [Ch_Rop1, Ch_Rop2, Ch_WZeroFlag, Ch_WParityFlag, Ch_WCarryFlag, Ch_W0OverflowFlag, Ch_W0SignFlag, Ch_W0AuxiliaryFlag]),
 (Ch: [Ch_Rop1, Ch_Rop2, Ch_WZeroFlag, Ch_WParityFlag, Ch_WCarryFlag, Ch_W0OverflowFlag, Ch_W0SignFlag, Ch_W0AuxiliaryFlag]),
-(Ch: [Ch_All]),
-(Ch: [Ch_All]),
-(Ch: [Ch_All]),
-(Ch: [Ch_All]),
+(Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
+(Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
+(Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
+(Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
 (Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
 (Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
 (Ch: [Ch_All]),

compiler/verbose.pas

@@ -1054,12 +1054,12 @@ implementation
             WritePointer := 'nil';
           1..$FFFF:
             WritePointer := '$' + hexstr(PtrUInt(P), 4);
+    {$if sizeof(Pointer) > 4}
           $10000..$FFFFFFFF:
             WritePointer := '$' + hexstr(PtrUInt(P), 8);
-    {$ifdef CPU64}
+    {$ifend sizeof(Pointer) > 4}
           else
-            WritePointer := '$' + hexstr(PtrUInt(P), 16);
-    {$endif CPU64}
+            WritePointer := '$' + hexstr(PtrUInt(P), 2*sizeof(Pointer));
         end;
       end;
 
@@ -1071,12 +1071,12 @@ implementation
             WriteConstPUInt := 'nil';
           1..$FFFF:
             WriteConstPUInt := '$' + hexstr(P, 4);
+    {$if sizeof(TConstPtrUInt) > 4}
           $10000..$FFFFFFFF:
             WriteConstPUInt := '$' + hexstr(P, 8);
-    {$ifdef CPU64BITADDR}
+    {$ifend sizeof(TConstPtrUInt) >= 4}
           else
-            WriteConstPUInt := '$' + hexstr(P, 16);
-    {$endif CPU64BITADDR}
+            WriteConstPUInt := '$' + hexstr(P, 2*sizeof(TConstPtrUInt));
         end;
       end;
 

compiler/x86/x86ins.dat

@@ -5750,7 +5750,7 @@ xmmreg,xmmreg,mem32                  \333\362\370\1\x52\75\120            AVX,SA
 xmmreg,xmmreg,xmmreg                 \333\362\370\1\x52\75\120            AVX,SANDYBRIDGE
 
 [VSHUFPD]
-(Ch_All)
+(Ch_Wop4, Ch_Rop3, Ch_Rop2)
 xmmreg_mz,xmmreg,xmmrm,imm8               \350\352\361\362\370\1\xC6\75\120\27      AVX,SANDYBRIDGE,TFV
 xmmreg_mz,xmmreg,bmem64,imm8              \350\352\361\370\1\xC6\75\120\27          AVX512,TFV
 ymmreg_mz,ymmreg,ymmrm,imm8               \350\352\361\362\364\370\1\xC6\75\120\27  AVX,SANDYBRIDGE,TFV
@@ -5760,7 +5760,7 @@ zmmreg_mz,zmmreg,bmem64,imm8              \350\351\352\361\370\1\xC6\75\120\27
 
 
 [VSHUFPS]
-(Ch_All)
+(Ch_Wop4, Ch_Rop3, Ch_Rop2)
 xmmreg_mz,xmmreg,xmmrm,imm8               \350\362\370\1\xC6\75\120\27              AVX,SANDYBRIDGE,TFV
 xmmreg_mz,xmmreg,bmem32,imm8              \350\370\1\xC6\75\120\27                  AVX512,TFV
 ymmreg_mz,ymmreg,ymmrm,imm8               \350\362\364\370\1\xC6\75\120\27          AVX,SANDYBRIDGE,TFV
@@ -5864,7 +5864,7 @@ xmmreg,xmmreg_sae                         \350\362\370\1\x2E\110
 
 
 [VUNPCKHPD]
-(Ch_All)
+(Ch_Wop3, Ch_Rop2, Ch_Rop1)
 xmmreg_mz,xmmreg,xmmrm                    \350\352\361\362\370\1\x15\75\120         AVX,SANDYBRIDGE,TFV
 xmmreg_mz,xmmreg,bmem64                   \350\352\361\370\1\x15\75\120             AVX512,TFV
 ymmreg_mz,ymmreg,ymmrm                    \350\352\361\362\364\370\1\x15\75\120     AVX,SANDYBRIDGE,TFV
@@ -5874,7 +5874,7 @@ zmmreg_mz,zmmreg,bmem64                   \350\351\352\361\370\1\x15\75\120
 
 
 [VUNPCKHPS]
-(Ch_All)
+(Ch_Wop3, Ch_Rop2, Ch_Rop1)
 xmmreg_mz,xmmreg,xmmrm                    \350\362\370\1\x15\75\120                 AVX,SANDYBRIDGE,TFV
 xmmreg_mz,xmmreg,bmem32                   \350\370\1\x15\75\120                     AVX512,TFV
 ymmreg_mz,ymmreg,ymmrm                    \350\362\364\370\1\x15\75\120             AVX,SANDYBRIDGE,TFV
@@ -5884,7 +5884,7 @@ zmmreg_mz,zmmreg,bmem32                   \350\351\370\1\x15\75\120
 
 
 [VUNPCKLPD]
-(Ch_All)
+(Ch_Wop3, Ch_Rop2, Ch_Rop1)
 xmmreg_mz,xmmreg,xmmrm                    \350\352\361\362\370\1\x14\75\120         AVX,SANDYBRIDGE,TFV
 xmmreg_mz,xmmreg,bmem64                   \350\352\361\370\1\x14\75\120             AVX512,TFV
 ymmreg_mz,ymmreg,ymmrm                    \350\352\361\362\364\370\1\x14\75\120     AVX,SANDYBRIDGE,TFV
@@ -5894,7 +5894,7 @@ zmmreg_mz,zmmreg,bmem64                   \350\351\352\361\370\1\x14\75\120
 
 
 [VUNPCKLPS]
-(Ch_All)
+(Ch_Wop3, Ch_Rop2, Ch_Rop1)
 xmmreg_mz,xmmreg,xmmrm                    \350\362\370\1\x14\75\120                 AVX,SANDYBRIDGE,TFV
 xmmreg_mz,xmmreg,bmem32                   \350\370\1\x14\75\120                     AVX512,TFV
 ymmreg_mz,ymmreg,ymmrm                    \350\362\364\370\1\x14\75\120             AVX,SANDYBRIDGE,TFV

compiler/x86_64/x8664pro.inc

@@ -984,8 +984,8 @@
 (Ch: [Ch_Rop1, Ch_Rop2, Ch_Rop3, Ch_Wop4]),
 (Ch: [Ch_Wop2, Ch_Rop1]),
 (Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
-(Ch: [Ch_All]),
-(Ch: [Ch_All]),
+(Ch: [Ch_Wop4, Ch_Rop3, Ch_Rop2]),
+(Ch: [Ch_Wop4, Ch_Rop3, Ch_Rop2]),
 (Ch: [Ch_Wop2, Ch_Rop1]),
 (Ch: [Ch_Wop2, Ch_Rop1]),
 (Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
@@ -999,10 +999,10 @@
 (Ch: [Ch_All]),
 (Ch: [Ch_Rop1, Ch_Rop2, Ch_WZeroFlag, Ch_WParityFlag, Ch_WCarryFlag, Ch_W0OverflowFlag, Ch_W0SignFlag, Ch_W0AuxiliaryFlag]),
 (Ch: [Ch_Rop1, Ch_Rop2, Ch_WZeroFlag, Ch_WParityFlag, Ch_WCarryFlag, Ch_W0OverflowFlag, Ch_W0SignFlag, Ch_W0AuxiliaryFlag]),
-(Ch: [Ch_All]),
-(Ch: [Ch_All]),
-(Ch: [Ch_All]),
-(Ch: [Ch_All]),
+(Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
+(Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
+(Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
+(Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
 (Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
 (Ch: [Ch_Wop3, Ch_Rop2, Ch_Rop1]),
 (Ch: [Ch_All]),