Browse Source

Merge branch 'main' into httpserver_keepalive

Michaël Van Canneyt 3 years ago
parent
commit
db5b974a42

+ 1 - 1
compiler/i386/i386nop.inc

@@ -1,2 +1,2 @@
 { don't edit, this file is generated from x86ins.dat }
-4157;
+4164;

+ 1 - 1
compiler/i8086/i8086nop.inc

@@ -1,2 +1,2 @@
 { don't edit, this file is generated from x86ins.dat }
-4189;
+4196;

+ 6 - 2
compiler/msg/errore.msg

@@ -2582,7 +2582,7 @@ cg_w_interrupt_does_not_save_registers=06062_W_The target CPU does not support p
 #
 # Assembler reader
 #
-# 07145 is the last used one
+# 07146 is the last used one
 #
 asmr_d_start_reading=07000_DL_Starting $1 styled assembler parsing
 % This informs you that an assembler block is being parsed
@@ -2922,7 +2922,11 @@ asmr_e_multiple_segment_overrides=07139_E_Cannot use multiple segment overrides
 asmr_w_multiple_segment_overrides=07140_W_Multiple segment overrides (only the last one will take effect)
 asmr_w_segment_override_ignored_in_64bit_mode=07141_W_Segment base $1 will be generated, but is ignored by the CPU in 64-bit mode
 asmr_e_mismatch_broadcasting_elements=07142_E_Mismatch broadcasting elements (expected: {$1} found: {$2})
-asmr_e_not_supported_combination_attsuffix_memrefsize_type=07143_E_Not supported combination opcode: $1 - att-suffix-type {$2} and memrefsize-type {$3}
+asmr_e_invalid_arrangement=07143_E_Invalid arrangement specifier "$1"
+asmr_e_a64_invalid_regset=07144_E_Registers in a register set must be consecutive.
+asmr_e_unknown_field=07145_E_Unknown field identifier
+% The internal assembler read cannot find the passed field identifier.
+asmr_e_not_supported_combination_attsuffix_memrefsize_type=07146_E_Not supported combination opcode: $1 - att-suffix-type {$2} and memrefsize-type {$3}
 #
 # Assembler/binary writers
 #

+ 6 - 3
compiler/msgidx.inc

@@ -856,7 +856,10 @@ const
   asmr_w_multiple_segment_overrides=07140;
   asmr_w_segment_override_ignored_in_64bit_mode=07141;
   asmr_e_mismatch_broadcasting_elements=07142;
-  asmr_e_not_supported_combination_attsuffix_memrefsize_type=07143;
+  asmr_e_invalid_arrangement=07143;
+  asmr_e_a64_invalid_regset=07144;
+  asmr_e_unknown_field=07145;
+  asmr_e_not_supported_combination_attsuffix_memrefsize_type=07146;
   asmw_f_too_many_asm_files=08000;
   asmw_f_assembler_output_not_supported=08001;
   asmw_f_comp_not_supported=08002;
@@ -1138,9 +1141,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 88035;
+  MsgTxtSize = 88168;
 
   MsgIdxMax : array[1..20] of longint=(
-    28,107,361,131,99,63,144,37,223,68,
+    28,107,361,131,99,63,147,37,223,68,
     64,20,30,1,1,1,1,1,1,1
   );

File diff suppressed because it is too large
+ 338 - 333
compiler/msgtxt.inc


+ 8 - 8
compiler/x86/x86ins.dat

@@ -4241,7 +4241,6 @@ xmmreg_mz,xmmreg,mem64                    \334\350\352\362\370\1\x5A\75\120
 xmmreg_mz,xmmreg,xmmreg_er                \334\350\352\362\370\1\x5A\75\120         AVX,SANDYBRIDGE
 
 
-
 ; special handling - gas suffix "S" =>> instructions-opsize = source-operand
 [VCVTSI2SD,vcvtsi2sdS]
 (Ch_Wop3, Ch_Rop2, Ch_Rop1)
@@ -4250,6 +4249,7 @@ xmmreg,xmmreg_er,reg64                    \334\350\352\362\363\370\1\x2A\75\120
 xmmreg,xmmreg_er,mem32                    \334\350\362\370\1\x2A\75\120             AVX,SANDYBRIDGE,T1S
 xmmreg,xmmreg_er,mem64                    \334\350\352\362\363\370\1\x2A\75\120     AVX,SANDYBRIDGE,T1S
 
+; special handling - gas suffix "S" =>> instructions-opsize = source-operand
 [VCVTSI2SS,vcvtsi2ssS]
 (Ch_Wop3, Ch_Rop2, Ch_Rop1)
 xmmreg,xmmreg_er,reg32                    \333\350\362\370\1\x2A\75\120             AVX,SANDYBRIDGE
@@ -7285,7 +7285,7 @@ zmmreg_mz,zmmreg_er                       \350\351\352\361\370\1\x7B\110
 ; VCVTPD2UDQ xmmreg_mz,mem256 must come first - map MemRefSize 256,512bits correct
 ;                                               map all other MemrefSize (without broasdcast MemRef) to xmmreg, xmmrm
 [VCVTPD2UDQ, vcvtpd2udqN]
-(Ch_All)
+(Ch_Wop2, Ch_Rop1)
 xmmreg_mz,mem256                          \350\352\364\370\1\x79\110                AVX512,TFV
 xmmreg_mz,xmmrm                           \350\352\370\1\x79\110                    AVX512,TFV
 xmmreg_mz,bmem64                          \350\352\370\1\x79\110                    AVX512,BCST2,TFV
@@ -7349,7 +7349,7 @@ zmmreg_mz,zmmreg_er                       \333\350\351\352\370\1\xE6\110
 ; VCVTQQ2PS xmmreg_mz,mem256 must come first - map MemRefSize 256,512bits correct
 ;                                              map all other MemrefSize (without broasdcast MemRef) to xmmreg, xmmrm
 [VCVTQQ2PS,vcvtqq2psN]
-
+(Ch_Wop2, Ch_Rop1)
 xmmreg_mz,mem256                          \350\352\364\370\1\x5B\110                AVX512,TFV
 xmmreg_mz,xmmrm                           \350\352\370\1\x5B\110                    AVX512,TFV
 xmmreg_mz,bmem64                          \350\352\370\1\x5B\110                    AVX512,BCST2,TFV
@@ -7386,8 +7386,7 @@ zmmreg_mz,zmmreg_sae                      \350\351\352\361\370\1\x7A\110
 ; VCVTTPD2UDQ xmmreg_mz,mem256 must come first - map MemRefSize 256,512bits correct
 ;                                                map all other MemrefSize (without broasdcast MemRef) to kreg_m, xmmrm
 [VCVTTPD2UDQ,vcvttpd2udqN]
-(Ch_All)
-;xmmreg_mz,mem128                          \350\352\370\1\x78\110                    AVX512,TFV
+(Ch_Wop2, Ch_Rop1)
 xmmreg_mz,mem256                          \350\352\364\370\1\x78\110                AVX512,TFV
 xmmreg_mz,xmmrm                           \350\352\370\1\x78\110                    AVX512,TFV
 xmmreg_mz,bmem64                          \350\352\370\1\x78\110                    AVX512,BCST2,TFV
@@ -7486,7 +7485,7 @@ zmmreg_mz,zmmreg_er                       \333\350\351\352\370\1\x7A\110
 ; VCVTTUQQ2PSQ xmmreg_mz,mem256 must come first - map MemRefSize 256,512bits correct
 ;                                                 map all other MemrefSize (without broasdcast MemRef) to kreg_m, xmmrm
 [VCVTUQQ2PS,vcvtuqq2psN]
-(Ch_All)
+(Ch_Wop2, Ch_Rop1)
 xmmreg_mz,mem256                          \334\350\352\364\370\1\x7A\110            AVX512,TFV
 xmmreg_mz,xmmrm                           \334\350\352\370\1\x7A\110                AVX512,TFV
 xmmreg_mz,bmem64                          \334\350\352\370\1\x7A\110                AVX512,BCST2,TFV
@@ -7495,9 +7494,10 @@ xmmreg_mz,ymmreg                          \334\350\352\364\370\1\x7A\110
 ymmreg_mz,zmmrm_er                        \334\350\351\352\370\1\x7A\110            AVX512,TFV
 ymmreg_mz,bmem64                          \334\350\351\352\370\1\x7A\110            AVX512,BCST8,TFV
 
+
 ; special handling - gas suffix "S" =>> instructions-opsize = source-operand
 [VCVTUSI2SD,vcvtusi2sdS]
-(Ch_All)
+(Ch_Wop2, Ch_Rop1)
 xmmreg,xmmreg_er,reg32                    \334\350\370\1\x7B\75\120                 AVX512
 xmmreg,xmmreg_er,reg64                    \334\350\352\370\1\x7B\75\120             AVX512,X86_64
 xmmreg,xmmreg_er,mem32                    \334\350\370\1\x7B\75\120                 AVX512,T1S
@@ -7506,7 +7506,7 @@ xmmreg,xmmreg_er,mem64                    \334\350\352\370\1\x7B\75\120
 
 ; special handling - gas suffix "S" =>> instructions-opsize = source-operand
 [VCVTUSI2SS,vcvtusi2ssS]
-(Ch_All)
+(Ch_Wop2, Ch_Rop1)
 xmmreg,xmmreg_er,reg32                    \333\350\370\1\x7B\75\120                 AVX512
 xmmreg,xmmreg_er,reg64                    \333\350\352\370\1\x7B\75\120             AVX512,X86_64
 xmmreg,xmmreg_er,mem32                    \333\350\370\1\x7B\75\120                 AVX512,T1S

+ 1 - 1
compiler/x86_64/x8664nop.inc

@@ -1,2 +1,2 @@
 { don't edit, this file is generated from x86ins.dat }
-4221;
+4228;

Some files were not shown because too many files changed in this diff