diff --git a/compiler/aasmtai.pas b/compiler/aasmtai.pas index e01c5c82b0..433549826f 100644 --- a/compiler/aasmtai.pas +++ b/compiler/aasmtai.pas @@ -420,7 +420,7 @@ interface toper = record ot : longint; {$ifdef x86} - vopext: byte; + vopext: smallint; {$ENDIF} case typ : toptype of top_none : (); diff --git a/compiler/i386/i386att.inc b/compiler/i386/i386att.inc index 68ec910597..41a5681234 100644 --- a/compiler/i386/i386att.inc +++ b/compiler/i386/i386att.inc @@ -1112,5 +1112,6 @@ 'rdrand', 'rdseed', 'xgetbv', -'prefetchwt1' +'prefetchwt1', +'kandb' ); diff --git a/compiler/i386/i386atts.inc b/compiler/i386/i386atts.inc index 3d9024c499..560f590d2e 100644 --- a/compiler/i386/i386atts.inc +++ b/compiler/i386/i386atts.inc @@ -1112,5 +1112,6 @@ attsufNONE, attsufNONE, attsufNONE, attsufNONE, -attsufINT +attsufINT, +attsufNONE ); diff --git a/compiler/i386/i386int.inc b/compiler/i386/i386int.inc index 99061e8412..e46f8ae768 100644 --- a/compiler/i386/i386int.inc +++ b/compiler/i386/i386int.inc @@ -1112,5 +1112,6 @@ 'rdrand', 'rdseed', 'xgetbv', -'prefetchwt1' +'prefetchwt1', +'kandb' ); diff --git a/compiler/i386/i386nop.inc b/compiler/i386/i386nop.inc index 3bc72c2604..427158ec50 100644 --- a/compiler/i386/i386nop.inc +++ b/compiler/i386/i386nop.inc @@ -1,2 +1,2 @@ { don't edit, this file is generated from x86ins.dat } -2118; +2127; diff --git a/compiler/i386/i386op.inc b/compiler/i386/i386op.inc index ebbdd236c8..b3414fda75 100644 --- a/compiler/i386/i386op.inc +++ b/compiler/i386/i386op.inc @@ -1112,5 +1112,6 @@ A_XTEST, A_RDRAND, A_RDSEED, A_XGETBV, -A_PREFETCHWT1 +A_PREFETCHWT1, +A_KANDB ); diff --git a/compiler/i386/i386prop.inc b/compiler/i386/i386prop.inc index 1b19212a46..2843c70138 100644 --- a/compiler/i386/i386prop.inc +++ b/compiler/i386/i386prop.inc @@ -1112,5 +1112,6 @@ (Ch: [Ch_Wop1, Ch_WFlags]), (Ch: [Ch_Wop1, Ch_WFlags]), (Ch: [Ch_WEAX, Ch_WEDX, Ch_RECX]), -(Ch: [Ch_All]) +(Ch: [Ch_All]), +(Ch: [Ch_Mop3, Ch_Rop2, Ch_Rop1]) ); diff --git a/compiler/i386/i386tab.inc b/compiler/i386/i386tab.inc index 71b0e18f2d..4b17eb93b8 100644 --- a/compiler/i386/i386tab.inc +++ b/compiler/i386/i386tab.inc @@ -8711,15 +8711,22 @@ ( opcode : A_VADDPD; ops : 3; - optypes : (ot_xmmreg,ot_xmmreg,ot_xmmrm,ot_none); - code : #241#242#248#1#88#61#80; + optypes : (ot_xmmreg_mz,ot_xmmreg,ot_xmmrm,ot_none); + code : #232#234#241#242#248#1#88#61#80; flags : [if_avx,if_sandybridge] ), ( opcode : A_VADDPD; ops : 3; - optypes : (ot_ymmreg,ot_ymmreg,ot_ymmrm,ot_none); - code : #241#242#244#248#1#88#61#80; + optypes : (ot_ymmreg_mz,ot_ymmreg,ot_ymmrm,ot_none); + code : #232#234#241#242#244#248#1#88#61#80; + flags : [if_avx,if_sandybridge] + ), + ( + opcode : A_VADDPD; + ops : 3; + optypes : (ot_zmmreg_mz,ot_zmmreg,ot_zmmrm_er,ot_none); + code : #232#233#234#241#248#1#88#61#80; flags : [if_avx,if_sandybridge] ), ( @@ -8970,29 +8977,29 @@ ( opcode : A_VBROADCASTSS; ops : 2; - optypes : (ot_ymmreg,ot_memory or ot_bits32,ot_none,ot_none); - code : #241#242#244#249#1#24#72; + optypes : (ot_ymmreg_mz,ot_memory or ot_bits32,ot_none,ot_none); + code : #232#241#242#244#249#1#24#72; flags : [if_avx,if_sandybridge] ), ( opcode : A_VBROADCASTSS; ops : 2; - optypes : (ot_xmmreg,ot_memory or ot_bits32,ot_none,ot_none); - code : #241#242#249#1#24#72; + optypes : (ot_xmmreg_mz,ot_memory or ot_bits32,ot_none,ot_none); + code : #232#241#242#249#1#24#72; flags : [if_avx,if_sandybridge] ), ( opcode : A_VBROADCASTSS; ops : 2; - optypes : (ot_ymmreg,ot_xmmreg,ot_none,ot_none); - code : #241#242#244#249#1#24#72; + optypes : (ot_ymmreg_mz,ot_xmmreg,ot_none,ot_none); + code : #232#241#242#244#249#1#24#72; flags : [if_avx2] ), ( opcode : A_VBROADCASTSS; ops : 2; - optypes : (ot_xmmreg,ot_xmmreg,ot_none,ot_none); - code : #241#242#249#1#24#72; + optypes : (ot_xmmreg_mz,ot_xmmreg,ot_none,ot_none); + code : #232#241#242#249#1#24#72; flags : [if_avx2] ), ( @@ -9919,6 +9926,13 @@ code : #242#244#248#1#194#61#80#23; flags : [if_avx,if_sandybridge] ), + ( + opcode : A_VCMPPS; + ops : 4; + optypes : (ot_kreg,ot_xmmreg,ot_xmmrm,ot_immediate or ot_bits8); + code : #232#248#1#194#61#80#23; + flags : [if_avx512] + ), ( opcode : A_VCMPSD; ops : 4; @@ -9971,8 +9985,8 @@ ( opcode : A_VCOMISS; ops : 2; - optypes : (ot_xmmreg,ot_xmmreg,ot_none,ot_none); - code : #242#248#1#47#72; + optypes : (ot_xmmreg,ot_xmmreg_sae,ot_none,ot_none); + code : #232#242#248#1#47#72; flags : [if_avx,if_sandybridge] ), ( @@ -10686,14 +10700,14 @@ opcode : A_VMOVD; ops : 2; optypes : (ot_xmmreg,ot_rm_gpr or ot_bits32,ot_none,ot_none); - code : #241#242#248#1#110#72; + code : #232#241#242#248#1#110#72; flags : [if_avx,if_sandybridge] ), ( opcode : A_VMOVD; ops : 2; optypes : (ot_rm_gpr or ot_bits32,ot_xmmreg,ot_none,ot_none); - code : #241#242#248#1#126#65; + code : #232#241#242#248#1#126#65; flags : [if_avx,if_sandybridge] ), ( @@ -12845,6 +12859,20 @@ code : #241#242#248#1#114#60#138#22; flags : [if_avx,if_sandybridge] ), + ( + opcode : A_VPSRLD; + ops : 3; + optypes : (ot_xmmreg_mz or ot_signed,ot_xmmrm,ot_immediate or ot_bits8,ot_none); + code : #232#172#241#242#248#1#114#60#138#22; + flags : [if_avx512] + ), + ( + opcode : A_VPSRLD; + ops : 3; + optypes : (ot_xmmreg_mz or ot_signed,ot_bmem32,ot_immediate or ot_bits8,ot_none); + code : #232#172#241#242#248#1#114#60#138#22; + flags : [if_avx512] + ), ( opcode : A_VPSRLD; ops : 3; @@ -13807,10 +13835,38 @@ ( opcode : A_VPERMD; ops : 3; - optypes : (ot_ymmregmz,ot_ymmreg,ot_ymmrm,ot_none); - code : #232#236#241#242#244#249#1#54#61#80; + optypes : (ot_ymmreg,ot_ymmreg,ot_ymmrm,ot_none); + code : #232#241#242#244#249#1#54#61#80; flags : [if_avx2] ), + ( + opcode : A_VPERMD; + ops : 3; + optypes : (ot_ymmreg_mz,ot_ymmreg,ot_ymmrm,ot_none); + code : #232#241#242#244#249#1#54#61#80; + flags : [if_avx512] + ), + ( + opcode : A_VPERMD; + ops : 3; + optypes : (ot_ymmreg_mz,ot_ymmreg,ot_bmem32,ot_none); + code : #232#241#242#244#249#1#54#61#80; + flags : [if_avx512] + ), + ( + opcode : A_VPERMD; + ops : 3; + optypes : (ot_zmmreg_mz,ot_zmmreg,ot_zmmrm,ot_none); + code : #232#233#241#242#244#249#1#54#61#80; + flags : [if_avx512] + ), + ( + opcode : A_VPERMD; + ops : 3; + optypes : (ot_zmmreg_mz,ot_zmmreg,ot_bmem32,ot_none); + code : #232#233#241#242#244#249#1#54#61#80; + flags : [if_avx512] + ), ( opcode : A_VPERMPD; ops : 3; @@ -14825,5 +14881,12 @@ optypes : (ot_memory,ot_none,ot_none,ot_none); code : #2#15#13#130; flags : [if_prefetchwt1] + ), + ( + opcode : A_KANDB; + ops : 3; + optypes : (ot_kreg,ot_kreg,ot_kreg,ot_none); + code : #241#242#244#248#1#65#61#80; + flags : [if_avx512] ) ); diff --git a/compiler/i386/r386ot.inc b/compiler/i386/r386ot.inc index 6df7c45206..be34ab5aa3 100644 --- a/compiler/i386/r386ot.inc +++ b/compiler/i386/r386ot.inc @@ -97,11 +97,11 @@ OT_ZMMREG, OT_ZMMREG, OT_ZMMREG, OT_ZMMREG, -OT_REG_VECTORMASK, -OT_REG_VECTORMASK, -OT_REG_VECTORMASK, -OT_REG_VECTORMASK, -OT_REG_VECTORMASK, -OT_REG_VECTORMASK, -OT_REG_VECTORMASK, -OT_REG_VECTORMASK +OT_KREG, +OT_KREG, +OT_KREG, +OT_KREG, +OT_KREG, +OT_KREG, +OT_KREG, +OT_KREG diff --git a/compiler/i8086/i8086att.inc b/compiler/i8086/i8086att.inc index 48122eada8..dc25798025 100644 --- a/compiler/i8086/i8086att.inc +++ b/compiler/i8086/i8086att.inc @@ -1126,5 +1126,6 @@ 'rdrand', 'rdseed', 'xgetbv', -'prefetchwt1' +'prefetchwt1', +'kandb' ); diff --git a/compiler/i8086/i8086atts.inc b/compiler/i8086/i8086atts.inc index a920ca7ef1..8e91eb535e 100644 --- a/compiler/i8086/i8086atts.inc +++ b/compiler/i8086/i8086atts.inc @@ -1126,5 +1126,6 @@ attsufNONE, attsufNONE, attsufNONE, attsufNONE, -attsufINT +attsufINT, +attsufNONE ); diff --git a/compiler/i8086/i8086int.inc b/compiler/i8086/i8086int.inc index 6aaa02b6c3..cb2c854e20 100644 --- a/compiler/i8086/i8086int.inc +++ b/compiler/i8086/i8086int.inc @@ -1126,5 +1126,6 @@ 'rdrand', 'rdseed', 'xgetbv', -'prefetchwt1' +'prefetchwt1', +'kandb' ); diff --git a/compiler/i8086/i8086nop.inc b/compiler/i8086/i8086nop.inc index 2094aa4a56..82a03c4be5 100644 --- a/compiler/i8086/i8086nop.inc +++ b/compiler/i8086/i8086nop.inc @@ -1,2 +1,2 @@ { don't edit, this file is generated from x86ins.dat } -2150; +2159; diff --git a/compiler/i8086/i8086op.inc b/compiler/i8086/i8086op.inc index e72640742e..9ca4af15e3 100644 --- a/compiler/i8086/i8086op.inc +++ b/compiler/i8086/i8086op.inc @@ -1126,5 +1126,6 @@ A_XTEST, A_RDRAND, A_RDSEED, A_XGETBV, -A_PREFETCHWT1 +A_PREFETCHWT1, +A_KANDB ); diff --git a/compiler/i8086/i8086prop.inc b/compiler/i8086/i8086prop.inc index 8da688f713..a673e5333f 100644 --- a/compiler/i8086/i8086prop.inc +++ b/compiler/i8086/i8086prop.inc @@ -1126,5 +1126,6 @@ (Ch: [Ch_Wop1, Ch_WFlags]), (Ch: [Ch_Wop1, Ch_WFlags]), (Ch: [Ch_WEAX, Ch_WEDX, Ch_RECX]), -(Ch: [Ch_All]) +(Ch: [Ch_All]), +(Ch: [Ch_Mop3, Ch_Rop2, Ch_Rop1]) ); diff --git a/compiler/i8086/i8086tab.inc b/compiler/i8086/i8086tab.inc index 234c6402b9..1e733f1269 100644 --- a/compiler/i8086/i8086tab.inc +++ b/compiler/i8086/i8086tab.inc @@ -8739,15 +8739,22 @@ ( opcode : A_VADDPD; ops : 3; - optypes : (ot_xmmreg,ot_xmmreg,ot_xmmrm,ot_none); - code : #241#242#248#1#88#61#80; + optypes : (ot_xmmreg_mz,ot_xmmreg,ot_xmmrm,ot_none); + code : #232#234#241#242#248#1#88#61#80; flags : [if_avx,if_sandybridge] ), ( opcode : A_VADDPD; ops : 3; - optypes : (ot_ymmreg,ot_ymmreg,ot_ymmrm,ot_none); - code : #241#242#244#248#1#88#61#80; + optypes : (ot_ymmreg_mz,ot_ymmreg,ot_ymmrm,ot_none); + code : #232#234#241#242#244#248#1#88#61#80; + flags : [if_avx,if_sandybridge] + ), + ( + opcode : A_VADDPD; + ops : 3; + optypes : (ot_zmmreg_mz,ot_zmmreg,ot_zmmrm_er,ot_none); + code : #232#233#234#241#248#1#88#61#80; flags : [if_avx,if_sandybridge] ), ( @@ -8998,29 +9005,29 @@ ( opcode : A_VBROADCASTSS; ops : 2; - optypes : (ot_ymmreg,ot_memory or ot_bits32,ot_none,ot_none); - code : #241#242#244#249#1#24#72; + optypes : (ot_ymmreg_mz,ot_memory or ot_bits32,ot_none,ot_none); + code : #232#241#242#244#249#1#24#72; flags : [if_avx,if_sandybridge] ), ( opcode : A_VBROADCASTSS; ops : 2; - optypes : (ot_xmmreg,ot_memory or ot_bits32,ot_none,ot_none); - code : #241#242#249#1#24#72; + optypes : (ot_xmmreg_mz,ot_memory or ot_bits32,ot_none,ot_none); + code : #232#241#242#249#1#24#72; flags : [if_avx,if_sandybridge] ), ( opcode : A_VBROADCASTSS; ops : 2; - optypes : (ot_ymmreg,ot_xmmreg,ot_none,ot_none); - code : #241#242#244#249#1#24#72; + optypes : (ot_ymmreg_mz,ot_xmmreg,ot_none,ot_none); + code : #232#241#242#244#249#1#24#72; flags : [if_avx2] ), ( opcode : A_VBROADCASTSS; ops : 2; - optypes : (ot_xmmreg,ot_xmmreg,ot_none,ot_none); - code : #241#242#249#1#24#72; + optypes : (ot_xmmreg_mz,ot_xmmreg,ot_none,ot_none); + code : #232#241#242#249#1#24#72; flags : [if_avx2] ), ( @@ -9947,6 +9954,13 @@ code : #242#244#248#1#194#61#80#23; flags : [if_avx,if_sandybridge] ), + ( + opcode : A_VCMPPS; + ops : 4; + optypes : (ot_kreg,ot_xmmreg,ot_xmmrm,ot_immediate or ot_bits8); + code : #232#248#1#194#61#80#23; + flags : [if_avx512] + ), ( opcode : A_VCMPSD; ops : 4; @@ -9999,8 +10013,8 @@ ( opcode : A_VCOMISS; ops : 2; - optypes : (ot_xmmreg,ot_xmmreg,ot_none,ot_none); - code : #242#248#1#47#72; + optypes : (ot_xmmreg,ot_xmmreg_sae,ot_none,ot_none); + code : #232#242#248#1#47#72; flags : [if_avx,if_sandybridge] ), ( @@ -10714,14 +10728,14 @@ opcode : A_VMOVD; ops : 2; optypes : (ot_xmmreg,ot_rm_gpr or ot_bits32,ot_none,ot_none); - code : #241#242#248#1#110#72; + code : #232#241#242#248#1#110#72; flags : [if_avx,if_sandybridge] ), ( opcode : A_VMOVD; ops : 2; optypes : (ot_rm_gpr or ot_bits32,ot_xmmreg,ot_none,ot_none); - code : #241#242#248#1#126#65; + code : #232#241#242#248#1#126#65; flags : [if_avx,if_sandybridge] ), ( @@ -12873,6 +12887,20 @@ code : #241#242#248#1#114#60#138#22; flags : [if_avx,if_sandybridge] ), + ( + opcode : A_VPSRLD; + ops : 3; + optypes : (ot_xmmreg_mz or ot_signed,ot_xmmrm,ot_immediate or ot_bits8,ot_none); + code : #232#172#241#242#248#1#114#60#138#22; + flags : [if_avx512] + ), + ( + opcode : A_VPSRLD; + ops : 3; + optypes : (ot_xmmreg_mz or ot_signed,ot_bmem32,ot_immediate or ot_bits8,ot_none); + code : #232#172#241#242#248#1#114#60#138#22; + flags : [if_avx512] + ), ( opcode : A_VPSRLD; ops : 3; @@ -13835,10 +13863,38 @@ ( opcode : A_VPERMD; ops : 3; - optypes : (ot_ymmregmz,ot_ymmreg,ot_ymmrm,ot_none); - code : #232#236#241#242#244#249#1#54#61#80; + optypes : (ot_ymmreg,ot_ymmreg,ot_ymmrm,ot_none); + code : #232#241#242#244#249#1#54#61#80; flags : [if_avx2] ), + ( + opcode : A_VPERMD; + ops : 3; + optypes : (ot_ymmreg_mz,ot_ymmreg,ot_ymmrm,ot_none); + code : #232#241#242#244#249#1#54#61#80; + flags : [if_avx512] + ), + ( + opcode : A_VPERMD; + ops : 3; + optypes : (ot_ymmreg_mz,ot_ymmreg,ot_bmem32,ot_none); + code : #232#241#242#244#249#1#54#61#80; + flags : [if_avx512] + ), + ( + opcode : A_VPERMD; + ops : 3; + optypes : (ot_zmmreg_mz,ot_zmmreg,ot_zmmrm,ot_none); + code : #232#233#241#242#244#249#1#54#61#80; + flags : [if_avx512] + ), + ( + opcode : A_VPERMD; + ops : 3; + optypes : (ot_zmmreg_mz,ot_zmmreg,ot_bmem32,ot_none); + code : #232#233#241#242#244#249#1#54#61#80; + flags : [if_avx512] + ), ( opcode : A_VPERMPD; ops : 3; @@ -15049,5 +15105,12 @@ optypes : (ot_memory,ot_none,ot_none,ot_none); code : #2#15#13#130; flags : [if_prefetchwt1] + ), + ( + opcode : A_KANDB; + ops : 3; + optypes : (ot_kreg,ot_kreg,ot_kreg,ot_none); + code : #241#242#244#248#1#65#61#80; + flags : [if_avx512] ) ); diff --git a/compiler/i8086/r8086ot.inc b/compiler/i8086/r8086ot.inc index 6df7c45206..be34ab5aa3 100644 --- a/compiler/i8086/r8086ot.inc +++ b/compiler/i8086/r8086ot.inc @@ -97,11 +97,11 @@ OT_ZMMREG, OT_ZMMREG, OT_ZMMREG, OT_ZMMREG, -OT_REG_VECTORMASK, -OT_REG_VECTORMASK, -OT_REG_VECTORMASK, -OT_REG_VECTORMASK, -OT_REG_VECTORMASK, -OT_REG_VECTORMASK, -OT_REG_VECTORMASK, -OT_REG_VECTORMASK +OT_KREG, +OT_KREG, +OT_KREG, +OT_KREG, +OT_KREG, +OT_KREG, +OT_KREG, +OT_KREG diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg index ef784d04ac..2e0cdd3f74 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -2834,6 +2834,7 @@ asmr_e_local_label_cannot_be_declared_public=07138_E_Local label $1 cannot be de 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}) # # Assembler/binary writers # diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index 8c4892ae64..8d2172cc1e 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -828,6 +828,7 @@ const asmr_e_multiple_segment_overrides=07139; asmr_w_multiple_segment_overrides=07140; asmr_w_segment_override_ignored_in_64bit_mode=07141; + asmr_e_mismatch_broadcasting_elements=07142; asmw_f_too_many_asm_files=08000; asmw_f_assembler_output_not_supported=08001; asmw_f_comp_not_supported=08002; @@ -1101,9 +1102,9 @@ const option_info=11024; option_help_pages=11025; - MsgTxtSize = 82280; + MsgTxtSize = 82348; MsgIdxMax : array[1..20] of longint=( - 28,106,347,126,96,59,142,34,221,67, + 28,106,347,126,96,59,143,34,221,67, 62,20,30,1,1,1,1,1,1,1 ); diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index 0a3d63ddbc..cca73cfb2a 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -1,8 +1,8 @@ const msgtxt_codepage=20127; {$ifdef Delphi} -const msgtxt : array[0..000342] of string[240]=( +const msgtxt : array[0..000343] of string[240]=( {$else Delphi} -const msgtxt : array[0..000342,1..240] of char=( +const msgtxt : array[0..000343,1..240] of char=( {$endif Delphi} '01000_T_Compiler: $1'#000+ '01001_D_Compiler OS: $1'#000+ @@ -1022,341 +1022,340 @@ const msgtxt : array[0..000342,1..240] of char=( ')'#000+ '07141_W_Segment base $1 will be generated, but is ignored by the CPU i'+ 'n 64-bit mode'#000+ + '07142_E_Mismatch broadcasting elements (expecte','d: {$1} found: {$2})'#000+ '08000_F_Too many assembler files'#000+ - '08001_F_Select','ed assembler output not supported'#000+ + '08001_F_Selected assembler output not supported'#000+ '08002_F_Comp not supported'#000+ '08003_F_Direct not support for binary writers'#000+ '08004_E_Allocating of data is only allowed in bss section'#000+ - '08005_F_No binary writer selected'#000+ + '08005_F','_No binary writer selected'#000+ '08006_E_Asm: Opcode $1 not in table'#000+ - '08007','_E_Asm: $1 invalid combination of opcode and operands'#000+ + '08007_E_Asm: $1 invalid combination of opcode and operands'#000+ '08008_E_Asm: 16 Bit references not supported'#000+ '08009_E_Asm: Invalid effective address'#000+ - '08010_E_Asm: Immediate or reference expected'#000+ + '08010_E_Asm: Immediate or referenc','e expected'#000+ '08011_E_Asm: $1 value exceeds bounds $2'#000+ - '08012_E_Asm: Shor','t jump is out of range $1'#000+ + '08012_E_Asm: Short jump is out of range $1'#000+ '08013_E_Asm: Undefined label $1'#000+ '08014_E_Asm: Comp type not supported for this target'#000+ '08015_E_Asm: Extended type not supported for this target'#000+ - '08016_E_Asm: Duplicate label $1'#000+ + '0801','6_E_Asm: Duplicate label $1'#000+ '08017_E_Asm: Redefined label $1'#000+ - '08018_E_','Asm: First defined here'#000+ + '08018_E_Asm: First defined here'#000+ '08019_E_Asm: Invalid register $1'#000+ '08020_E_Asm: 16 or 32 Bit references not supported'#000+ '08021_E_Asm: 64 Bit operands not supported'#000+ - '08022_E_Asm: AH,BH,CH or DH cannot be used in an instruction requiring'+ - ' REX prefix'#000+ - '08023_E','_Missing .seh_endprologue directive'#000+ + '08022_E_Asm: AH,BH,CH',' or DH cannot be used in an instruction requiri'+ + 'ng REX prefix'#000+ + '08023_E_Missing .seh_endprologue directive'#000+ '08024_E_Function prologue exceeds 255 bytes'#000+ '08025_E_.seh_handlerdata directive without preceding .seh_handler'#000+ - '08026_F_Relocation count for section $1 exceeds 65535'#000+ - '08027_N_Change of bind type of symbol $1',' from $2 to $3 after use'#000+ + '08026_F_Relocation count f','or section $1 exceeds 65535'#000+ + '08027_N_Change of bind type of symbol $1 from $2 to $3 after use'#000+ '08028_H_Change of bind type of symbol $1 from $2 to $3 after use'#000+ '08029_E_Asm: 32 Bit references not supported'#000+ '08030_F_Code segment too large'#000+ - '08031_F_Data segment too large'#000+ - '08032_E_Instruction not supported by the se','lected instruction set'#000+ + '08031_','F_Data segment too large'#000+ + '08032_E_Instruction not supported by the selected instruction set'#000+ '08033_E_Asm: conditional branch destination is out of range'#000+ '09000_W_Source operating system redefined'#000+ '09001_I_Assembling (pipe) $1'#000+ - '09002_E_Can'#039't create assembler file: $1'#000+ - '09003_E_Can'#039't create object file: $1 (error co','de: $2)'#000+ + '09002_E_Can'#039't crea','te assembler file: $1'#000+ + '09003_E_Can'#039't create object file: $1 (error code: $2)'#000+ '09004_E_Can'#039't create archive file: $1'#000+ '09005_E_Assembler $1 not found, switching to external assembling'#000+ '09006_T_Using assembler: $1'#000+ - '09007_E_Error while assembling exitcode $1'#000+ - '09008_E_Can'#039't call the assembler, error $1 switching to ex','ternal'+ - ' assembling'#000+ + '09007_E_Error while assembling ex','itcode $1'#000+ + '09008_E_Can'#039't call the assembler, error $1 switching to external a'+ + 'ssembling'#000+ '09009_I_Assembling $1'#000+ '09010_I_Assembling with smartlinking $1'#000+ '09011_W_Object $1 not found, Linking may fail !'#000+ - '09012_W_Library $1 not found, Linking may fail !'#000+ + '09012_W_Library $1 not found, Linking may fa','il !'#000+ '09013_E_Error while linking'#000+ - '09014_E_Can'#039't call the linker, swit','ching to external linking'#000+ + '09014_E_Can'#039't call the linker, switching to external linking'#000+ '09015_I_Linking $1'#000+ '09016_E_Util $1 not found, switching to external linking'#000+ '09017_T_Using util $1'#000+ '09018_E_Creation of Executables not supported'#000+ - '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+ - '09035_E_Cre','ation of Static Libraries not supported'#000+ + '09','019_E_Creation of Dynamic/Shared Libraries not supported'#000+ + '09035_E_Creation of Static Libraries not supported'#000+ '09020_I_Closing script $1'#000+ '09021_E_resource compiler "$1" not found, switching to external mode'#000+ '09022_I_Compiling resource $1'#000+ - '09023_T_unit $1 cannot be statically linked, switching to smart linkin'+ - 'g'#000+ - '090','24_T_unit $1 cannot be smart linked, switching to static linking'#000+ + '09023_T','_unit $1 cannot be statically linked, switching to smart link'+ + 'ing'#000+ + '09024_T_unit $1 cannot be smart linked, switching to static linking'#000+ '09025_T_unit $1 cannot be shared linked, switching to static linking'#000+ - '09026_E_unit $1 cannot be smart or static linked'#000+ + '09026_E_unit $1 cannot be smart or sta','tic linked'#000+ '09027_E_unit $1 cannot be shared or static linked'#000+ - '09028_D','_Calling resource compiler "$1" with "$2" as command line'#000+ + '09028_D_Calling resource compiler "$1" with "$2" as command line'#000+ '09029_E_Error while compiling resources'#000+ '09030_E_Can'#039't call the resource compiler "$1", switching to extern'+ - 'al mode'#000+ + 'al mode'#000, '09031_E_Can'#039't open resource file "$1"'#000+ - '09032_E_Can'#039't write resource f','ile "$1"'#000+ + '09032_E_Can'#039't write resource file "$1"'#000+ '09033_N_File "$1" not found for backquoted cat command'#000+ '09034_W_"$1" not found, this will probably cause a linking failure'#000+ - '09128_F_Can'#039't post process executable $1'#000+ + '09128_F_Can'#039't post process executable $1'#000, '09129_F_Can'#039't open executable $1'#000+ '09130_X_Size of Code: $1 bytes'#000+ - '0913','1_X_Size of initialized data: $1 bytes'#000+ + '09131_X_Size of initialized data: $1 bytes'#000+ '09132_X_Size of uninitialized data: $1 bytes'#000+ '09133_X_Stack space reserved: $1 bytes'#000+ '09134_X_Stack space committed: $1 bytes'#000+ - '09200_F_Executable image size is too big for $1 target.'#000+ - '09201_W_Object file "','$1" contains 32-bit absolute relocation to symb'+ - 'ol "$2".'#000+ + '09200_F_E','xecutable image size is too big for $1 target.'#000+ + '09201_W_Object file "$1" contains 32-bit absolute relocation to symbol'+ + ' "$2".'#000+ '09202_E_Program segment too large (exceeds 64k by $1 bytes)'#000+ - '09203_E_Code segment "$1" too large (exceeds 64k by $2 bytes)'#000+ - '09204_E_Data segment "$1" too large (exceeds 64k by $2 bytes)'#000, + '09203_E_Code segment "$1" too large (exceeds 64k by $2 b','ytes)'#000+ + '09204_E_Data segment "$1" too large (exceeds 64k by $2 bytes)'#000+ '09205_E_Segment "$1" too large (exceeds 64k by $2 bytes)'#000+ '09206_E_Group "$1" too large (exceeds 64k by $2 bytes)'#000+ - '09207_E_Cannot create a .COM file, because the program contains segmen'+ - 't relocations'#000+ - '09208_W_Program "$1" uses experimental Check','Pointer option'#000+ + '09207_E_Cannot create a .COM file, because the program conta','ins segm'+ + 'ent relocations'#000+ + '09208_W_Program "$1" uses experimental CheckPointer option'#000+ '09209_E_Multiple defined symbol "$1"'#000+ '09210_E_COMDAT selection mode $1 not supported (section: "$1")'#000+ - '09211_E_Associative section expected for COMDAT section "$1"'#000+ - '09212_E_COMDAT section selection mode doesn'#039't match for section ','"'+ - '$1" and symbol "$2"'#000+ + '09211_E_Associative section expected for COMDAT section "','$1"'#000+ + '09212_E_COMDAT section selection mode doesn'#039't match for section "$'+ + '1" and symbol "$2"'#000+ '09213_E_Associative COMDAT section for section "$1" not found'#000+ '09214_D_Discarding duplicate symbol "$1" due to COMDAT selection mode'#000+ - '09215_D_Discarding duplicate symbol "$1" with same size due to COMDAT '+ - 'selection mode'#000+ - '09','216_D_Discarding duplicate symbol "$1" with same content due to CO'+ - 'MDAT selection mode'#000+ - '09217_D_Replacing duplicate symbol "$1" with smaller size due to COMDA'+ + '09215_D_Discarding ','duplicate symbol "$1" with same size due to COMDA'+ 'T selection mode'#000+ + '09216_D_Discarding duplicate symbol "$1" with same content due to COMD'+ + 'AT selection mode'#000+ + '09217_D_Replacing duplicate symbol "$1" with smaller size due to COMDA'+ + 'T selection mode',#000+ '09218_E_Size of duplicate COMDAT symbol "$1" differs'#000+ - '09219_E_Conten','t of duplicate COMDAT symbol "$1" differs'#000+ + '09219_E_Content of duplicate COMDAT symbol "$1" differs'#000+ '09220_E_COMDAT selection mode for symbol "$1" differs'#000+ '10000_T_Unitsearch: $1'#000+ '10001_T_PPU Loading $1'#000+ '10002_U_PPU Name: $1'#000+ - '10003_U_PPU Flags: $1'#000+ + '10003_U_P','PU Flags: $1'#000+ '10004_U_PPU Crc: $1'#000+ '10005_U_PPU Time: $1'#000+ - '10006_U_PPU Fi','le too short'#000+ + '10006_U_PPU File too short'#000+ '10007_U_PPU Invalid Header (no PPU at the begin)'#000+ '10008_U_PPU Invalid Version $1'#000+ '10009_U_PPU is compiled for another processor'#000+ - '10010_U_PPU is compiled for another target'#000+ + '10010_U_PPU is compiled for anoth','er target'#000+ '10011_U_PPU Source: $1'#000+ '10012_U_Writing $1'#000+ - '10013_F_Can'#039't Wr','ite PPU-File'#000+ + '10013_F_Can'#039't Write PPU-File'#000+ '10014_F_Error reading PPU-File'#000+ '10015_F_unexpected end of PPU-File'#000+ '10016_F_Invalid PPU-File entry: $1'#000+ '10017_F_PPU Dbx count problem'#000+ - '10018_E_Illegal unit name: $1 (expecting $2)'#000+ + '10018_E_Illegal unit name: $','1 (expecting $2)'#000+ '10019_F_Too much units'#000+ - '10020_F_Circular unit refere','nce between $1 and $2'#000+ + '10020_F_Circular unit reference between $1 and $2'#000+ '10021_F_Can'#039't compile unit $1, no sources available'#000+ '10022_F_Can'#039't find unit $1 used by $2'#000+ '10023_W_Unit $1 was not found but $2 exists'#000+ - '10024_F_Unit $1 searched but $2 found'#000+ - '10025_W_Compiling the system unit requires the',' -Us switch'#000+ + '10024_F_Unit $1 ','searched but $2 found'#000+ + '10025_W_Compiling the system unit requires the -Us switch'#000+ '10026_F_There were $1 errors compiling module, stopping'#000+ '10027_U_Load from $1 ($2) unit $3'#000+ '10028_U_Recompiling $1, checksum changed for $2'#000+ - '10029_U_Recompiling $1, source found only'#000+ - '10030_U_Recompiling unit, static lib is older th','an ppufile'#000+ + '10029_U_Recompiling $1',', source found only'#000+ + '10030_U_Recompiling unit, static lib is older than ppufile'#000+ '10031_U_Recompiling unit, shared lib is older than ppufile'#000+ '10032_U_Recompiling unit, obj and asm are older than ppufile'#000+ - '10033_U_Recompiling unit, obj is older than asm'#000+ + '10033_U_Recompiling unit, obj is older th','an asm'#000+ '10034_U_Parsing interface of $1'#000+ - '10035_U_Parsing implementatio','n of $1'#000+ + '10035_U_Parsing implementation of $1'#000+ '10036_U_Second load for unit $1'#000+ '10037_U_PPU Check file $1 time $2'#000+ '10040_W_Can'#039't recompile unit $1, but found modified include files'#000+ - '10041_U_File $1 is newer than the one used for creating PPU file $2'#000+ - '10042_U_Trying to use a unit whi','ch was compiled with a different FPU'+ - ' mode'#000+ + '10041_U_File $1 is newer than th','e one used for creating PPU file $2'#000+ + '10042_U_Trying to use a unit which was compiled with a different FPU m'+ + 'ode'#000+ '10043_U_Loading interface units from $1'#000+ '10044_U_Loading implementation units from $1'#000+ '10045_U_Interface CRC changed for unit $1'#000+ - '10046_U_Implementation CRC changed for unit $1'#000+ - '10047_U_Finished compili','ng unit $1'#000+ + '100','46_U_Implementation CRC changed for unit $1'#000+ + '10047_U_Finished compiling unit $1'#000+ '10048_U_Adding dependency: $1 depends on $2'#000+ '10049_U_No reload, is caller: $1'#000+ '10050_U_No reload, already in second compile: $1'#000+ '10051_U_Flag for reload: $1'#000+ - '10052_U_Forced reloading'#000+ + '10052_U','_Forced reloading'#000+ '10053_U_Previous state of $1: $2'#000+ - '10054_U_Already c','ompiling $1, setting second compile'#000+ + '10054_U_Already compiling $1, setting second compile'#000+ '10055_U_Loading unit $1'#000+ '10056_U_Finished loading unit $1'#000+ '10057_U_Registering new unit $1'#000+ '10058_U_Re-resolving unit $1'#000+ - '10059_U_Skipping re-resolving unit $1, still loading used units'#000+ - '10060_U_Unloading reso','urce unit $1 (not needed)'#000+ + '10059_U_Skipping r','e-resolving unit $1, still loading used units'#000+ + '10060_U_Unloading resource unit $1 (not needed)'#000+ '10061_E_Unit $1 was compiled using a different whole program optimizat'+ 'ion feedback input ($2, $3); recompile it without wpo or use the same '+ - 'wpo feedback input file for this compilation invocation'#000+ - '10062_U_Indirect i','nterface (objects/classes) CRC changed for unit $1'+ - #000+ + 'wpo fe','edback input file for this compilation invocation'#000+ + '10062_U_Indirect interface (objects/classes) CRC changed for unit $1'#000+ '10063_U_PPU is compiled for another i8086 memory model'#000+ '10064_U_Loading unit $1 from package $2'#000+ - '10065_F_Internal type "$1" was not found. Check if you use the correct'+ - ' run time library.'#000+ - '10066','_F_Internal type "$1" does not look as expected. Check if you u'+ - 'se the correct run time library.'#000+ + '10065_F_Internal type "$1"',' was not found. Check if you use the corre'+ + 'ct run time library.'#000+ + '10066_F_Internal type "$1" does not look as expected. Check if you use'+ + ' the correct run time library.'#000+ '11000_O_$1 [options] [options]'#000+ - '11001_W_Only one source file supported, changing source file to compil'+ - 'e from "$1" into "$2"'#000+ - '11002_W_D','EF file can be created only for OS/2'#000+ + '11001_W_Only one source file supp','orted, changing source file to comp'+ + 'ile from "$1" into "$2"'#000+ + '11002_W_DEF file can be created only for OS/2'#000+ '11003_E_nested response files are not supported'#000+ '11004_F_No source file name in command line'#000+ '11005_N_No option inside $1 config file'#000+ - '11006_E_Illegal parameter: $1'#000+ + '110','06_E_Illegal parameter: $1'#000+ '11007_H_-? writes help pages'#000+ - '11008_F_Too ','many config files nested'#000+ + '11008_F_Too many config files nested'#000+ '11009_F_Unable to open file $1'#000+ '11010_D_Reading further options from $1'#000+ '11011_W_Target is already set to: $1'#000+ - '11012_W_Shared libs not supported on DOS platform, reverting to static'+ - #000+ - '11013_F_In options file $1 at line $','2 too many #IF(N)DEFs encountere'+ - 'd'#000+ + '11012_W_Shared libs not supported on DO','S platform, reverting to stat'+ + 'ic'#000+ + '11013_F_In options file $1 at line $2 too many #IF(N)DEFs encountered'#000+ '11014_F_In options file $1 at line $2 unexpected #ENDIFs encountered'#000+ '11015_F_Open conditional at the end of the options file'#000+ - '11016_W_Debug information generation is not supported by this executab'+ - 'le'#000+ - '11017_H_','Try recompiling with -dGDB'#000+ + '11016_W_Debug',' information generation is not supported by this execut'+ + 'able'#000+ + '11017_H_Try recompiling with -dGDB'#000+ '11018_W_You are using the obsolete switch $1'#000+ '11019_W_You are using the obsolete switch $1, please use $2'#000+ - '11020_N_Switching assembler to default source writing assembler'#000+ - '11021_W_Assembler output selected "$1" is no','t compatible with "$2"'#000+ + '11020_N_Switching assembler to default s','ource writing assembler'#000+ + '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+ '11022_W_"$1" assembler use forced'#000+ '11026_T_Reading options from file $1'#000+ '11027_T_Reading options from environment $1'#000+ '11028_D_Handling option "$1"'#000+ - '11029_O_*** press enter ***'#000+ + '11029','_O_*** press enter ***'#000+ '11030_H_Start of reading config file $1'#000+ - '11031','_H_End of reading config file $1'#000+ + '11031_H_End of reading config file $1'#000+ '11032_D_interpreting option "$1"'#000+ '11036_D_interpreting firstpass option "$1"'#000+ '11033_D_interpreting file option "$1"'#000+ - '11034_D_Reading config file "$1"'#000+ + '11034_D_Reading config fi','le "$1"'#000+ '11035_D_found source file name "$1"'#000+ - '11039_E_Unknown codepage',' "$1"'#000+ + '11039_E_Unknown codepage "$1"'#000+ '11040_F_Config file $1 is a directory'#000+ '11041_W_Assembler output selected "$1" cannot generate debug info, deb'+ 'ugging disabled'#000+ - '11042_W_Use of ppc386.cfg is deprecated, please use fpc.cfg instead'#000+ - '11043_F_In options file $1 at line $2 #ELS','E directive without #IF(N)'+ - 'DEF found'#000+ + '11042_W_Use of ppc386.cfg is deprecated, p','lease use fpc.cfg instead'#000+ + '11043_F_In options file $1 at line $2 #ELSE directive without #IF(N)DE'+ + 'F found'#000+ '11044_F_Option "$1" is not, or not yet, supported on the current targe'+ 't platform'#000+ - '11045_F_The feature "$1" is not, or not yet, supported on the selected'+ - ' target platform'#000+ - '11046_N_DWARF debug information cann','ot be used with smart linking on'+ - ' this target, switching to static linking'#000+ + '11045_F_The feature "$1" is not, or not yet, supported ','on the select'+ + 'ed target platform'#000+ + '11046_N_DWARF debug information cannot be used with smart linking on t'+ + 'his target, switching to static linking'#000+ '11047_W_Option "$1" is ignored for the current target platform.'#000+ - '11048_W_Disabling external debug information because it is unsupported'+ - ' for the selected target/debug f','ormat combination.'#000+ + '11048_W_Disabling external debug i','nformation because it is unsupport'+ + 'ed for the selected target/debug format combination.'#000+ '11049_N_DWARF debug information cannot be used with smart linking with'+ ' external assembler, disabling static library creation.'#000+ - '11050_E_Invalid value for MACOSX_DEPLOYMENT_TARGET environment variabl'+ - 'e: $1'#000+ - '11051_E_Invalid val','ue for IPHONEOS_DEPLOYMENT_TARGET environment var'+ - 'iable: $1'#000+ + '11050_E_Invalid value for M','ACOSX_DEPLOYMENT_TARGET environment varia'+ + 'ble: $1'#000+ + '11051_E_Invalid value for IPHONEOS_DEPLOYMENT_TARGET environment varia'+ + 'ble: $1'#000+ '11052_E_You must use a FPU type of VFPV2, VFPV3 or VFPV3_D16 when usin'+ 'g the EABIHF ABI target'#000+ - '11053_W_The selected debug format is not supported on the current targ'+ - 'et, not changing ','the current setting'#000+ + '11053_W_The selecte','d debug format is not supported on the current ta'+ + 'rget, not changing the current setting'#000+ '11054_E_argument to "$1" is missing'#000+ '11055_E_malformed parameter: $1'#000+ '11056_W_Smart linking requires external linker'#000+ - '11057_E_Creating .COM files is not supported in the current memory mod'+ - 'el. Only the tiny memory model supp','orts making .COM files.'#000+ + '11057_E_Creating .COM files is not su','pported in the current memory m'+ + 'odel. Only the tiny memory model supports making .COM files.'#000+ '11058_W_Experimental CheckPointer option not enabled because it is inc'+ 'omptatible with -Ur option.'#000+ - '11059_E_Unsupported target architecture -P$1, invoke the "fpc" compile'+ - 'r driver instead.'#000+ - '11060_E_Feature switches are o','nly supported while compiling the syst'+ - 'em unit.'#000+ + '11059_E_Unsupported target architecture -P$1, invo','ke the "fpc" compi'+ + 'ler driver instead.'#000+ + '11060_E_Feature switches are only supported while compiling the system'+ + ' unit.'#000+ '11061_N_The selected debug format is not supported by the internal lin'+ 'ker, switching to external linking'#000+ - '12000_F_Cannot open whole program optimization feedback file "$1"'#000+ - '12001_D_Processing who','le program optimization information in wpo fee'+ - 'dback file "$1"'#000+ + '12000_F_Cannot open ','whole program optimization feedback file "$1"'#000+ + '12001_D_Processing whole program optimization information in wpo feedb'+ + 'ack file "$1"'#000+ '12002_D_Finished processing the whole program optimization information'+ ' in wpo feedback file "$1"'#000+ - '12003_E_Expected section header, but got "$2" at line $1 of wpo feedba'+ - 'ck file'#000+ - '120','04_W_No handler registered for whole program optimization section'+ - ' "$2" at line $1 of wpo feedback file, ignoring'#000+ - '12005_D_Found whole program optimization section "$1" with information'+ - ' about "$2"'#000+ - '12006_F_The selected whole program optimizati','ons require a previousl'+ - 'y generated feedback file (use -Fw to specify)'#000+ + '12003_E_Expec','ted section header, but got "$2" at line $1 of wpo feed'+ + 'back file'#000+ + '12004_W_No handler registered for whole program optimization section "'+ + '$2" at line $1 of wpo feedback file, ignoring'#000+ + '12005_D_Found whole program optimization section "$1" with ','informati'+ + 'on about "$2"'#000+ + '12006_F_The selected whole program optimizations require a previously '+ + 'generated feedback file (use -Fw to specify)'#000+ '12007_E_No collected information necessary to perform "$1" whole progr'+ 'am optimization found'#000+ - '12008_F_Specify a whole program optimization feedback file to store th'+ - 'e genera','ted info in (using -FW)'#000+ + '12008_F_Sp','ecify a whole program optimization feedback file to store '+ + 'the generated info in (using -FW)'#000+ '12009_E_Not generating any whole program optimization information, yet'+ ' a feedback file was specified (using -FW)'#000+ - '12010_E_Not performing any whole program optimizations, yet an input f'+ - 'eedback file was specified (using',' -Fw)'#000+ + '12010_E_Not performing any whole pr','ogram optimizations, yet an input'+ + ' feedback file was specified (using -Fw)'#000+ '12011_D_Skipping whole program optimization section "$1", because not '+ 'needed by the requested optimizations'#000+ - '12012_W_Overriding previously read information for "$1" from feedback '+ - 'input file using information in section "$2"'#000+ - '12013_E_Can','not extract symbol liveness information from program when'+ - ' stripping symbols, use -Xs-'#000+ + '12012_W_Overriding previously read information for "$1" fr','om feedbac'+ + 'k input file using information in section "$2"'#000+ + '12013_E_Cannot extract symbol liveness information from program when s'+ + 'tripping symbols, use -Xs-'#000+ '12014_E_Cannot extract symbol liveness information from program when w'+ - 'hen not linking'#000+ - '12015_F_Cannot find "$1" or "$2" to extract symbol liveness informat','i'+ - 'on from linked program'#000+ + 'hen not linking'#000, + '12015_F_Cannot find "$1" or "$2" to extract symbol liveness informatio'+ + 'n from linked program'#000+ '12016_E_Error during reading symbol liveness information produced by "'+ '$1"'#000+ '12017_F_Error executing "$1" (exitcode: $2) to extract symbol informat'+ - 'ion from linked program'#000+ - '12018_E_Collection of symbol liveness informatio','n can only help when'+ - ' using smart linking, use -CX -XX'#000+ + 'ion ','from linked program'#000+ + '12018_E_Collection of symbol liveness information can only help when u'+ + 'sing smart linking, use -CX -XX'#000+ '12019_E_Cannot create specified whole program optimisation feedback fi'+ 'le "$1"'#000+ '13001_F_Can'#039't find package $1'#000+ - '13002_U_PCP file for package $1 found'#000+ + '13002_U_PC','P file for package $1 found'#000+ '13003_E_Duplicate package $1'#000+ - '13004_E_Uni','t $1 can not be part of a package'#000+ + '13004_E_Unit $1 can not be part of a package'#000+ '13005_N_Unit $1 is implicitely imported into package $2'#000+ '13006_F_Failed to create PCP file $2 for package $1'#000+ - '13007_F_Failed to read PCP file for package $1'#000+ + '13007_F_Failed to read PCP fil','e for package $1'#000+ '13008_T_PCP loading $1'#000+ '13009_U_PCP Name: $1'#000+ - '13010_U','_PCP Flags: $1'#000+ + '13010_U_PCP Flags: $1'#000+ '13011_U_PCP Crc: $1'#000+ '13012_U_PCP Time: $1'#000+ '13013_U_PCP File too short'#000+ '13014_U_PCP Invalid Header (no PCP at the begin)'#000+ '13015_U_PCP Invalid Version $1'#000+ - '13016_U_PCP is compiled for another processor'#000+ - '13017_U_PCP is compiled for ano','ther target'#000+ + '13016_U_P','CP is compiled for another processor'#000+ + '13017_U_PCP is compiled for another target'#000+ '13018_U_Writing $1'#000+ '13019_F_Can'#039't Write PCP-File'#000+ '13020_F_Error reading PCP-File'#000+ '13021_F_unexpected end of PCP-File'#000+ '13022_F_Invalid PCP-File entry: $1'#000+ - '13023_U_Trying to use a unit which was compiled with a different FPU m'+ - 'ode'#000+ - '13024','_T_Packagesearch: $1'#000+ + '13023_U_Try','ing to use a unit which was compiled with a different FPU'+ + ' mode'#000+ + '13024_T_Packagesearch: $1'#000+ '13025_U_Required package $1'#000+ '13026_U_Contained unit $1'#000+ '13027_E_Unit $1 is already contained in package $2'#000+ - '13028_W_Unit $1 is imported from indirectly required package $2'#000+ + '13028_W_Unit $1 is imported from indirectly re','quired package $2'#000+ '13029_U_PPL filename $1'#000+ - '11023_Free Pascal Compiler',' version $FPCFULLVERSION [$FPCDATE] for $F'+ - 'PCCPU'#010+ + '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+ + 'CPU'#010+ 'Copyright (c) 1993-2018 by Florian Klaempfl and others'#000+ '11024_Free Pascal Compiler version $FPCVERSION'#010+ #010+ - 'Compiler date : $FPCDATE'#010+ + 'Compiler date : ','$FPCDATE'#010+ 'Compiler CPU target: $FPCCPU'#010+ #010+ - 'Supported targets (targets ma','rked with '#039'{*}'#039' are under devel'+ - 'opment):'#010+ + 'Supported targets (targets marked with '#039'{*}'#039' are under develop'+ + 'ment):'#010+ ' $OSTARGETS'#010+ #010+ 'Supported CPU instruction sets:'#010+ @@ -1365,10 +1364,10 @@ const msgtxt : array[0..000342,1..240] of char=( 'Supported FPU instruction sets:'#010+ ' $FPUINSTRUCTIONSETS'#010+ #010+ - 'Supported inline assembler modes:'#010+ + 'Supported i','nline assembler modes:'#010+ ' $ASMMODES'#010+ #010+ - 'Recognized compiler and RTL feat','ures:'#010+ + 'Recognized compiler and RTL features:'#010+ ' $FEATURELIST'#010+ #010+ 'Supported ABI targets:'#010+ @@ -1381,328 +1380,328 @@ const msgtxt : array[0..000342,1..240] of char=( ' All'#010+ ' $WPOPTIMIZATIONS'#010+ #010+ - 'Supported Microcontroller types:$\n $CONTROLLERTYPES$\n'#010+ - 'This program co','mes under the GNU General Public Licence'#010+ + 'Supp','orted Microcontroller types:$\n $CONTROLLERTYPES$\n'#010+ + 'This program comes under the GNU General Public Licence'#010+ 'For more information read COPYING.v2'#010+ #010+ 'Please report bugs in our bug tracker on:'#010+ ' http://bugs.freepascal.org'#010+ #010+ - 'More information may be found on our WWW pages (including directions'#010+ - 'for m','ailing lists useful for asking questions or discussing potentia'+ - 'l'#010+ + 'More i','nformation may be found on our WWW pages (including directions'+ + #010+ + 'for mailing lists useful for asking questions or discussing potential'#010+ 'new features, etc.):'#010+ ' http://www.freepascal.org'#000+ - '11025_F*0*_Only options valid for the default or selected platform are'+ - ' listed.'#010+ - '**0*_Put + after a boolean switc','h option to enable it, - to disable '+ - 'it.'#010+ + '11025_F*0*_Only options valid for the defau','lt or selected platform a'+ + 're listed.'#010+ + '**0*_Put + after a boolean switch option to enable it, - to disable it'+ + '.'#010+ '**1@_Read compiler options from in addition to the default fpc.'+ 'cfg'#010+ - '**1a_The compiler does not delete the generated assembler file'#010+ - '**2a5_Don'#039't generate Big Obj COFF files for GNU Binutils older ','t'+ - 'han 2.25 (Windows, NativeNT)'#010+ + '**1a_The compiler does not delete the generated assembler ','file'#010+ + '**2a5_Don'#039't generate Big Obj COFF files for GNU Binutils older tha'+ + 'n 2.25 (Windows, NativeNT)'#010+ '**2al_List sourcecode lines in assembler file'#010+ '**2an_List node info in assembler file (-dEXTDEBUG compiler)'#010+ - '**2ao_Add an extra option to external assembler call (ignored for inte'+ - 'rnal)'#010+ - '*L2ap_Use pipes instead of ','creating temporary assembler files'#010+ + '**2ao_Add an extra option to extern','al assembler call (ignored for in'+ + 'ternal)'#010+ + '*L2ap_Use pipes instead of creating temporary assembler files'#010+ '**2ar_List register allocation/release info in assembler file'#010+ '**2at_List temp allocation/release info in assembler file'#010+ - '**1A_Output format:'#010+ + '**1A_Output fo','rmat:'#010+ '**2Adefault_Use default assembler'#010+ - '3*2Aas_Assemble using GNU AS',#010+ + '3*2Aas_Assemble using GNU AS'#010+ '3*2Amacho_Mach-O (Darwin, Intel 32 bit) using internal writer'#010+ '8*2Anasm_Assemble using Nasm'#010+ '8*2Anasmobj_Assemble using Nasm'#010+ '3*2Anasm_Assemble using Nasm'#010+ - '3*2Anasmcoff_COFF (Go32v2) file using Nasm'#010+ + '3*2Anasmcoff_COFF (','Go32v2) file using Nasm'#010+ '3*2Anasmelf_ELF32 (Linux) file using Nasm'#010+ - '3*','2Anasmwin32_Win32 object file using Nasm'#010+ + '3*2Anasmwin32_Win32 object file using Nasm'#010+ '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+ '3*2Anasmdarwin_macho32 object file using Nasm (experimental)'#010+ - '3*2Awasm_Obj file using Wasm (Watcom)'#010+ + '3*2Awasm_Obj file usi','ng Wasm (Watcom)'#010+ '3*2Anasmobj_Obj file using Nasm'#010+ - '3*2Amasm_Obj file u','sing Masm (Microsoft)'#010+ + '3*2Amasm_Obj file using Masm (Microsoft)'#010+ '3*2Atasm_Obj file using Tasm (Borland)'#010+ '3*2Aelf_ELF (Linux) using internal writer'#010+ '3*2Acoff_COFF (Go32v2) using internal writer'#010+ - '3*2Apecoff_PE-COFF (Win32) using internal writer'#010+ - '3*2Ayasm_Assemble using Yasm (experimental)',#010+ + '3*2Apecoff_PE-COFF (Win3','2) using internal writer'#010+ + '3*2Ayasm_Assemble using Yasm (experimental)'#010+ '4*2Aas_Assemble using GNU AS'#010+ '4*2Agas_Assemble using GNU GAS'#010+ '4*2Agas-darwin_Assemble darwin Mach-O64 using GNU GAS'#010+ '4*2Amasm_Win64 object file using ml64 (Microsoft)'#010+ - '4*2Apecoff_PE-COFF (Win64) using internal writer'#010+ - '4*2Aelf_ELF (Linux-64bit) ','using internal writer'#010+ + '4*2Apec','off_PE-COFF (Win64) using internal writer'#010+ + '4*2Aelf_ELF (Linux-64bit) using internal writer'#010+ '4*2Ayasm_Assemble using Yasm (experimental)'#010+ '4*2Anasm_Assemble using Nasm (experimental)'#010+ - '4*2Anasmwin64_Assemble Win64 object file using Nasm (experimental)'#010+ - '4*2Anasmelf_Assemble Linux-64bit object file using Nasm (experi','menta'+ - 'l)'#010+ + '4*2Anasmwin64_Assemble Win64 object file using Nasm (experimen','tal)'#010+ + '4*2Anasmelf_Assemble Linux-64bit object file using Nasm (experimental)'+ + #010+ '4*2Anasmdarwin_Assemble darwin macho64 object file using Nasm (experim'+ 'ental)'#010+ '6*2Aas_Unix o-file using GNU AS'#010+ '6*2Agas_GNU Motorola assembler'#010+ - '6*2Amit_MIT Syntax (old GAS)'#010+ + '6*2Amit_MIT Syntax (old ','GAS)'#010+ '6*2Amot_Standard Motorola assembler'#010+ - 'A*2Aas_Assemble using GNU A','S'#010+ + 'A*2Aas_Assemble using GNU AS'#010+ 'P*2Aas_Assemble using GNU AS'#010+ 'S*2Aas_Assemble using GNU AS'#010+ '**1b_Generate browser info'#010+ '**2bl_Generate local symbol info'#010+ '**1B_Build all modules'#010+ - '**1C_Code generation options:'#010+ + '**1C_Code generation optio','ns:'#010+ '**2C3_Turn on ieee error checking for constants'#010+ - '**2Ca_Select ','ABI; see fpc -i or fpc -ia for possible values'#010+ + '**2Ca_Select ABI; see fpc -i or fpc -ia for possible values'#010+ '**2Cb_Generate code for a big-endian variant of the target architectur'+ 'e'#010+ '**2Cc_Set default calling convention to '#010+ - '**2CD_Create also dynamic library (not supported)'#010+ - '**2Ce_Compilation with e','mulated floating point opcodes'#010+ + '**2CD_','Create also dynamic library (not supported)'#010+ + '**2Ce_Compilation with emulated floating point opcodes'#010+ '**2Cf_Select fpu instruction set to use; see fpc -i or fpc -if for '+ 'possible values'#010+ - '**2CF_Minimal floating point constant precision (default, 32, 64)'#010+ + '**2CF_Minimal floating point constant precision (def','ault, 32, 64)'+ + #010+ '**2Cg_Generate PIC code'#010+ - '**2Ch[,m]_ bytes min hea','p size (between 1023 and 67107840) and'+ - ' optionally [m] max heap size'#010+ + '**2Ch[,m]_ bytes min heap size (between 1023 and 67107840) and o'+ + 'ptionally [m] max heap size'#010+ '**2Ci_IO-checking'#010+ 'A*2CI_Select instruction set on ARM: ARM or THUMB'#010+ '**2Cn_Omit linking stage'#010+ - 'P*2CN_Generate nil-pointer checks (AIX-only)'#010+ - '**2Co_Check overflow of integer',' operations'#010+ + 'P*2CN_Ge','nerate nil-pointer checks (AIX-only)'#010+ + '**2Co_Check overflow of integer operations'#010+ '**2CO_Check for possible overflow of integer operations'#010+ '**2Cp_Select instruction set; see fpc -i or fpc -ic for possible va'+ 'lues'#010+ - '**2CP=_ packing settings'#010+ - '**3CPPACKSET=_ set allocation: 0, 1 or DEFAULT or NORMAL, 2',', '+ - '4 and 8'#010+ + '**2CP=_ packing setting','s'#010+ + '**3CPPACKSET=_ set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+ + 'and 8'#010+ '**3CPPACKENUM=_ enum packing: 0, 1, 2 and 4 or DEFAULT or NORMA'+ 'L'#010+ '**3CPPACKRECORD=_ record packing: 0 or DEFAULT or NORMAL, 1, 2,'+ ' 4, 8, 16 and 32'#010+ - '**2Cr_Range checking'#010+ + '**2','Cr_Range checking'#010+ '**2CR_Verify object method call validity'#010+ - '**2Cs_','Set stack checking size to '#010+ + '**2Cs_Set stack checking size to '#010+ '**2Ct_Stack checking (for testing only, see manual)'#010+ '8*2CT_Target-specific code generation options'#010+ - '3*2CT_Target-specific code generation options'#010+ + '3*2CT_Target-specific code generation',' options'#010+ '4*2CT_Target-specific code generation options'#010+ - 'p*2CT_T','arget-specific code generation options'#010+ + 'p*2CT_Target-specific code generation options'#010+ 'P*2CT_Target-specific code generation options'#010+ 'J*2CT_Target-specific code generation options'#010+ - 'A*2CT_Target-specific code generation options'#010+ - 'p*3CTsmalltoc_ Generate smaller TOCs at the expense of',' execution spe'+ - 'ed (AIX)'#010+ + 'A*2CT_Target-specific code gener','ation options'#010+ + 'p*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+ + ' (AIX)'#010+ 'P*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+ ' (AIX)'#010+ 'J*3CTautogetterprefix=X_ Automatically create getters for properties '+ + 'wi','th prefix X (empty string disables)'#010+ + 'J*3CTautosetterprefix=X_ Automatically create setters for properties '+ 'with prefix X (empty string disables)'#010+ - 'J*3CTautosetterprefix=X_ Automa','tically create setters for propertie'+ - 's with prefix X (empty string disables)'#010+ '8*3CTcld_ Emit a CLD instruction before using the x86 '+ 'string instructions'#010+ - '3*3CTcld_ Emit a CLD instruction before using the x86 '+ - 'stri','ng instructions'#010+ + '3*3CTc','ld_ Emit a CLD instruction before using the x8'+ + '6 string instructions'#010+ '4*3CTcld_ Emit a CLD instruction before using the x86 '+ 'string instructions'#010+ - '8*3CTfarprocspushoddbp_ Increment BP before pushing it in the pr'+ - 'ologue of far functions'#010+ - 'J*3CTcompactintarrayinit_ Generate small','er (but potentially slower) '+ - 'code for initializing integer array constants'#010+ + '8*3CTfarprocspushoddbp_ Increment BP before pushing it in th','e '+ + 'prologue of far functions'#010+ + 'J*3CTcompactintarrayinit_ Generate smaller (but potentially slower) co'+ + 'de for initializing integer array constants'#010+ 'J*3CTenumfieldinit_ Initialize enumeration fields in constructor'+ - 's to enumtype(0), after calling inherited constructors'#010+ - 'J*3CTinitlocals_ Initialize loca','l variables that trigger a '+ - 'JVM bytecode verification error if used uninitialized (slows down code'+ - ')'#010+ + 's to enumtype(0), after call','ing inherited constructors'#010+ + 'J*3CTinitlocals_ Initialize local variables that trigger a JV'+ + 'M bytecode verification error if used uninitialized (slows down code)'#010+ 'J*3CTlowercaseprocstart_ Lowercase the first character of procedure/f'+ - 'unction/method names'#010+ - 'A*3CTthumbinterworking_ Generate Thumb interworkin','g-safe code if pos'+ - 'sible'#010+ + 'unc','tion/method names'#010+ + 'A*3CTthumbinterworking_ Generate Thumb interworking-safe code if possi'+ + 'ble'#010+ 'J*2Cv_Var/out parameter copy-out checking'#010+ '**2CX_Create also smartlinked library'#010+ '**1d_Defines the symbol '#010+ '**1D_Generate a DEF file'#010+ - '**2Dd_Set description to '#010+ + '**2Dd_Set',' description to '#010+ '**2Dv_Set DLL version to '#010+ - '*O2Dw_PM applica','tion'#010+ + '*O2Dw_PM application'#010+ '**1e_Set path to executable'#010+ '**1E_Same as -Cn'#010+ '**1fPIC_Same as -Cg'#010+ '**1F_Set file names and paths:'#010+ - '**2Fa[,y]_(for a program) load units and [y] before uses is par'+ - 'sed'#010+ + '**2Fa[,y]_(for a program) load units and [y] before uses i','s p'+ + 'arsed'#010+ '**2Fc_Set input codepage to '#010+ - '**2FC_Set RC compiler',' binary name to '#010+ + '**2FC_Set RC compiler binary name to '#010+ '**2Fd_Disable the compiler'#039's internal directory cache'#010+ '**2FD_Set the directory where to search for compiler utilities'#010+ - '**2Fe_Redirect error output to '#010+ + '**2Fe_Redirect error output t','o '#010+ '**2Ff_Add to framework path (Darwin only)'#010+ - '**2FE_Set ','exe/unit output path to '#010+ + '**2FE_Set exe/unit output path to '#010+ '**2Fi_Add to include path'#010+ '**2Fl_Add to library path'#010+ '**2FL_Use as dynamic linker'#010+ - '**2Fm_Load unicode conversion table from .txt in the compiler di'+ - 'r'#010+ - '**2FM_Set the directory where to sea','rch for unicode binary files'#010+ + '**2Fm_Load unicode conversion table from',' .txt in the compiler '+ + 'dir'#010+ + '**2FM_Set the directory where to search for unicode binary files'#010+ '**2FN_Add to list of default unit scopes (namespaces)'#010+ '**2Fo_Add to object path'#010+ '**2Fr_Load error message file '#010+ - '**2FR_Set resource (.res) linker to '#010+ + '**2FR_Set ','resource (.res) linker to '#010+ '**2Fu_Add to unit path'#010+ - '**2FU','_Set unit output path to , overrides -FE'#010+ + '**2FU_Set unit output path to , overrides -FE'#010+ '**2FW_Store generated whole-program optimization feedback in '#010+ - '**2Fw_Load previously stored whole-program optimization feedback fr'+ - 'om '#010+ - '*g1g_Generate debug information (default format for',' target)'#010+ + '**2Fw_Load previously stored whole-program optimization f','eedback '+ + 'from '#010+ + '*g1g_Generate debug information (default format for target)'#010+ '*g2gc_Generate checks for pointers (experimental, only available on so'+ 'me targets, might generate false positive)'#010+ - '*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+ - '*g2gl_Use line info unit (show more info with backtrac','es)'#010+ + '*g2gh_Use heaptrace unit (for memory leak/corrupti','on debugging)'#010+ + '*g2gl_Use line info unit (show more info with backtraces)'#010+ '*g2gm_Generate Microsoft CodeView debug information (experimental)'#010+ '*g2go_Set debug information options'#010+ - '*g3godwarfsets_ Enable DWARF '#039'set'#039' type debug information (bre'+ + '*g3godwarfsets_ Enable DWARF '#039'set'#039' type debug information (bre', 'aks gdb < 6.5)'#010+ - '*g3gostabsabsincludes_ Store absolute/full include fi','le paths in Sta'+ - 'bs'#010+ + '*g3gostabsabsincludes_ Store absolute/full include file paths in Stabs'+ + #010+ '*g3godwarfmethodclassprefix_ Prefix method names in DWARF with class n'+ 'ame'#010+ '*g3godwarfcpp_ Simulate C++ debug information in DWARF'#010+ - '*g3godwarfomflinnum_ Generate line number information in OMF LINNUM re'+ - 'cords in MS LINK format',' in addition to the DWARF debug information ('+ + '*g3godwarfomflinnum_ Gene','rate line number information in OMF LINNUM '+ + 'records in MS LINK format in addition to the DWARF debug information ('+ 'Open Watcom Debugger/Linker compatibility)'#010+ '*g2gp_Preserve case in stabs symbol names'#010+ '*g2gs_Generate Stabs debug information'#010+ - '*g2gt_Trash local variables (to detect uninitialized uses; multiple '#039+ - 't'#039,' changes the trashing value)'#010+ + '*g2','gt_Trash local variables (to detect uninitialized uses; multiple '+ + #039't'#039' changes the trashing value)'#010+ '*g2gv_Generates programs traceable with Valgrind'#010+ '*g2gw_Generate DWARFv2 debug information (same as -gw2)'#010+ - '*g2gw2_Generate DWARFv2 debug information'#010+ + '*g2gw2_Generate DWARFv2 debug informat','ion'#010+ '*g2gw3_Generate DWARFv3 debug information'#010+ - '*g2gw4_Generate DWARFv','4 debug information (experimental)'#010+ + '*g2gw4_Generate DWARFv4 debug information (experimental)'#010+ '**1i_Information'#010+ '**2iD_Return compiler date'#010+ '**2iSO_Return compiler OS'#010+ '**2iSP_Return compiler host processor'#010+ '**2iTO_Return target OS'#010+ - '**2iTP_Return target processor'#010+ + '**2iT','P_Return target processor'#010+ '**2iV_Return short compiler version'#010+ - '**2iW_','Return full compiler version'#010+ + '**2iW_Return full compiler version'#010+ '**2ia_Return list of supported ABI targets'#010+ '**2ic_Return list of supported CPU instruction sets'#010+ - '**2if_Return list of supported FPU instruction sets'#010+ + '**2if_Return list of supported FPU instruction s','ets'#010+ '**2ii_Return list of supported inline assembler modes'#010+ - '**2io_Retu','rn list of supported optimizations'#010+ + '**2io_Return list of supported optimizations'#010+ '**2ir_Return list of recognized compiler and RTL features'#010+ '**2it_Return list of supported targets'#010+ - '**2iu_Return list of supported microcontroller types'#010+ - '**2iw_Return list of supported whole program optimizati','ons'#010+ + '**2iu_Return list of supported microcont','roller types'#010+ + '**2iw_Return list of supported whole program optimizations'#010+ '**1I_Add to include path'#010+ '**1k_Pass to the linker'#010+ '**1l_Write logo'#010+ '**1M_Set language mode to '#010+ '**2Mfpc_Free Pascal dialect (default)'#010+ - '**2Mobjfpc_FPC mode with Object Pascal support'#010+ - '**2Mdelphi_Delphi 7 compatibility mode'#010, + '**2Mobjfpc_FPC mod','e with Object Pascal support'#010+ + '**2Mdelphi_Delphi 7 compatibility mode'#010+ '**2Mtp_TP/BP 7.0 compatibility mode'#010+ '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+ '**2Miso_ISO 7185 mode'#010+ '**2Mextendedpascal_ISO 10206 mode'#010+ - '**2Mdelphiunicode_Delphi 2009 and later compatibility mode'#010+ - '**1n_Do not read the default conf','ig files'#010+ + '**2Mdelphiunicode_Delphi',' 2009 and later compatibility mode'#010+ + '**1n_Do not read the default config files'#010+ '**1o_Change the name of the executable produced to '#010+ '**1O_Optimizations:'#010+ '**2O-_Disable optimizations'#010+ - '**2O1_Level 1 optimizations (quick and debugger friendly)'#010+ + '**2O1_Level 1 optimizations (quick and debugger friend','ly)'#010+ '**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+ - '**2O3_Le','vel 3 optimizations (-O2 + slow optimizations)'#010+ + '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+ '**2O4_Level 4 optimizations (-O3 + optimizations which might have unex'+ 'pected side effects)'#010+ '**2Oa=_Set alignment'#010+ - '**2Oo[NO]_Enable or disable optimizations; see fpc -i or fpc -io fo'+ - 'r pos','sible values'#010+ + '**2Oo[N','O]_Enable or disable optimizations; see fpc -i or fpc -io '+ + 'for possible values'#010+ '**2Op_Set target cpu for optimizing; see fpc -i or fpc -ic for poss'+ 'ible values'#010+ '**2OW_Generate whole-program optimization feedback for optimization'+ - ' ; see fpc -i or fpc -iw for possible values'#010+ - '**2Ow_Perform whole-prog','ram optimization ; see fpc -i or fpc -'+ - 'iw for possible values'#010+ + ' ; s','ee fpc -i or fpc -iw for possible values'#010+ + '**2Ow_Perform whole-program optimization ; see fpc -i or fpc -iw'+ + ' for possible values'#010+ '**2Os_Optimize for size rather than speed'#010+ '**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+ - 'F*1P_Target CPU / compiler related options:'#010+ - 'F*2PB_Show default compiler',' binary'#010+ + 'F*1P_Target CPU / compiler related options:'#010+ + 'F*2PB_Show default compiler binary'#010+ 'F*2PP_Show default target cpu'#010+ 'F*2P_Set target CPU (aarch64,arm,avr,i386,i8086,jvm,m68k,mips,mipse'+ 'l,powerpc,powerpc64,sparc,x86_64)'#010+ - '**1R_Assembler reading style:'#010+ + '**1R_Assembler reading styl','e:'#010+ '**2Rdefault_Use default assembler for target'#010+ - '3*2Ratt_Read AT&T st','yle assembler'#010+ + '3*2Ratt_Read AT&T style assembler'#010+ '3*2Rintel_Read Intel style assembler'#010+ '4*2Ratt_Read AT&T style assembler'#010+ '4*2Rintel_Read Intel style assembler'#010+ '8*2Ratt_Read AT&T style assembler'#010+ - '8*2Rintel_Read Intel style assembler'#010+ + '8*2Rintel_Read I','ntel style assembler'#010+ '6*2RMOT_Read Motorola style assembler'#010+ - '**1S_S','yntax options:'#010+ + '**1S_Syntax options:'#010+ '**2S2_Same as -Mobjfpc'#010+ '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+ '**2Sa_Turn on assertions'#010+ '**2Sd_Same as -Mdelphi'#010+ - '**2Se_Error options. is a combination of the following:'#010+ - '**3*_ : Compiler halts after the er','rors (default is 1)'#010+ + '**2Se_Error options. is a comb','ination of the following:'#010+ + '**3*_ : Compiler halts after the errors (default is 1)'#010+ '**3*_w : Compiler also halts after warnings'#010+ '**3*_n : Compiler also halts after notes'#010+ '**3*_h : Compiler also halts after hints'#010+ - '**2Sf_Enable certain features in compiler and RTL; see fpc -i or fpc -'+ - 'ir for possible values)'#010, + '**2Sf_Enable certain featu','res in compiler and RTL; see fpc -i or fpc'+ + ' -ir for possible values)'#010+ '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+ '**2Sh_Use reference counted strings (ansistring by default) instead of'+ ' shortstrings'#010+ - '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+ - '**2Sj_Allows typed constants ','to be writeable (default in all modes)'#010+ + '**2Si_Turn on inlining of pro','cedures/functions declared as "inline"'#010+ + '**2Sj_Allows typed constants to be writeable (default in all modes)'#010+ '**2Sk_Load fpcylix unit'#010+ '**2SI_Set interface style to '#010+ '**3SIcom_COM compatible interface (default)'#010+ - '**3SIcorba_CORBA compatible interface'#010+ + '**3SIcorba_CORBA compatible i','nterface'#010+ '**2Sm_Support macros like C (global)'#010+ '**2So_Same as -Mtp'#010+ - '**2','Sr_Transparent file names in ISO mode'#010+ + '**2Sr_Transparent file names in ISO mode'#010+ '**2Ss_Constructor name must be init (destructor must be done)'#010+ '**2Sv_Support vector processing (use CPU vector extensions if availabl'+ - 'e)'#010+ + 'e)',#010+ '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+ - '**','2Sy_@ returns a typed pointer, same as $T+'#010+ + '**2Sy_@ returns a typed pointer, same as $T+'#010+ '**1s_Do not call assembler and linker'#010+ '**2sh_Generate script to link on host'#010+ '**2st_Generate script to link on target'#010+ - '**2sr_Skip register allocation phase (use with -alr)'#010+ - '**1T_Target oper','ating system:'#010+ + '**2s','r_Skip register allocation phase (use with -alr)'#010+ + '**1T_Target operating system:'#010+ '3*2Tandroid_Android'#010+ '3*2Taros_AROS'#010+ '3*2Tbeos_BeOS'#010+ '3*2Tdarwin_Darwin/Mac OS X'#010+ '3*2Tembedded_Embedded'#010+ '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+ - '3*2Tfreebsd_FreeBSD'#010+ + '3*2Tfreebsd','_FreeBSD'#010+ '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+ - '3*2Thaiku_H','aiku'#010+ + '3*2Thaiku_Haiku'#010+ '3*2Tiphonesim_iPhoneSimulator from iOS SDK 3.2+ (older versions: -Tdar'+ 'win)'#010+ '3*2Tlinux_Linux'#010+ '3*2Tnativent_Native NT API (experimental)'#010+ '3*2Tnetbsd_NetBSD'#010+ - '3*2Tnetware_Novell Netware Module (clib)'#010+ + '3*2Tnetware_Nove','ll Netware Module (clib)'#010+ '3*2Tnetwlibc_Novell Netware Module (libc)'#010+ - '3','*2Topenbsd_OpenBSD'#010+ + '3*2Topenbsd_OpenBSD'#010+ '3*2Tos2_OS/2 / eComStation'#010+ '3*2Tsymbian_Symbian OS'#010+ '3*2Tsolaris_Solaris'#010+ '3*2Twatcom_Watcom compatible DOS extender'#010+ '3*2Twdosx_WDOSX DOS extender'#010+ - '3*2Twin32_Windows 32 Bit'#010+ + '3*2Twin32_Wi','ndows 32 Bit'#010+ '3*2Twince_Windows CE'#010+ '4*2Taros_AROS'#010+ - '4*2Tdarwin_Darwin/Ma','c OS X'#010+ + '4*2Tdarwin_Darwin/Mac OS X'#010+ '4*2Tdragonfly_DragonFly BSD'#010+ '4*2Tembedded_Embedded'#010+ '4*2Tfreebsd_FreeBSD'#010+ @@ -1710,9 +1709,9 @@ const msgtxt : array[0..000342,1..240] of char=( '4*2Tlinux_Linux'#010+ '4*2Tnetbsd_NetBSD'#010+ '4*2Topenbsd_OpenBSD'#010+ - '4*2Tsolaris_Solaris'#010+ + '4*2Tsolaris','_Solaris'#010+ '4*2Twin64_Win64 (64 bit Windows systems)'#010+ - '6*2Tamiga_Commodor','e Amiga'#010+ + '6*2Tamiga_Commodore Amiga'#010+ '6*2Tatari_Atari ST/STe/TT'#010+ '6*2Tembedded_Embedded'#010+ '6*2Tlinux_Linux'#010+ @@ -1720,10 +1719,10 @@ const msgtxt : array[0..000342,1..240] of char=( '6*2Tmacos_Mac OS'#010+ '6*2Tpalmos_PalmOS'#010+ '8*2Tembedded_Embedded'#010+ - '8*2Tmsdos_MS-DOS (and compatible)'#010+ + '8*2Tmsdos_MS-DOS (and com','patible)'#010+ '8*2Twin16_Windows 16 Bit'#010+ 'A*2Tandroid_Android'#010+ - 'A*2Taros_AROS'#010, + 'A*2Taros_AROS'#010+ 'A*2Tdarwin_Darwin/iPhoneOS/iOS'#010+ 'A*2Tembedded_Embedded'#010+ 'A*2Tgba_Game Boy Advance'#010+ @@ -1732,10 +1731,10 @@ const msgtxt : array[0..000342,1..240] of char=( 'A*2Tnetbsd_NetBSD'#010+ 'A*2Tpalmos_PalmOS'#010+ 'A*2Tsymbian_Symbian'#010+ - 'A*2Twince_Windows CE'#010+ + 'A*','2Twince_Windows CE'#010+ 'a*2Tdarwin_Darwin/iOS'#010+ 'a*2Tlinux_Linux'#010+ - 'J*2Tandroid','_Android'#010+ + 'J*2Tandroid_Android'#010+ 'J*2Tjava_Java'#010+ 'm*2Tandroid_Android'#010+ 'm*2Tembedded_Embedded'#010+ @@ -1744,10 +1743,10 @@ const msgtxt : array[0..000342,1..240] of char=( 'M*2Tlinux_Linux'#010+ 'P*2Taix_AIX'#010+ 'P*2Tamiga_AmigaOS'#010+ - 'P*2Tdarwin_Darwin/Mac OS X'#010+ + 'P*2Tdarwin_Darwin/Mac O','S X'#010+ 'P*2Tembedded_Embedded'#010+ 'P*2Tlinux_Linux'#010+ - 'P*2Tmacos_Mac OS (classic)',#010+ + 'P*2Tmacos_Mac OS (classic)'#010+ 'P*2Tmorphos_MorphOS'#010+ 'P*2Tnetbsd_NetBSD'#010+ 'P*2Twii_Wii'#010+ @@ -1757,148 +1756,147 @@ const msgtxt : array[0..000342,1..240] of char=( 'p*2Tlinux_Linux'#010+ 'S*2Tlinux_Linux'#010+ 'S*2Tsolaris_Solaris'#010+ - 's*2Tlinux_Linux'#010+ + 's*2Tlinu','x_Linux'#010+ 'V*2Tembedded_Embedded'#010+ '**1u_Undefines the symbol '#010+ - '**1U_','Unit options:'#010+ + '**1U_Unit options:'#010+ '**2Un_Do not check where the unit name matches the file name'#010+ '**2Ur_Generate release unit files (never automatically recompiled)'#010+ '**2Us_Compile a system unit'#010+ - '**1v_Be verbose. is a combination of the following letters:'#010+ - '**2','*_e : Show errors (default) 0 : Show nothing (except errors'+ - ')'#010+ + '**','1v_Be verbose. is a combination of the following letters:'#010+ + '**2*_e : Show errors (default) 0 : Show nothing (except errors)'#010+ '**2*_w : Show warnings u : Show unit info'#010+ - '**2*_n : Show notes t : Show tried/used files'#010+ - '**2*_h : Show hints c : Show conditio','nals'#010+ + '**2*_n : Show notes t : Show tri','ed/used files'#010+ + '**2*_h : Show hints c : Show conditionals'#010+ '**2*_i : Show general info d : Show debug info'#010+ '**2*_l : Show linenumbers r : Rhide/GCC compatibility mode'#010+ - '**2*_s : Show time stamps q : Show message numbers'#010+ - '**2*_a : Show everything x : Show ','info about invoked too'+ - 'ls'#010+ + '**2*_s : Show time stamps q :',' Show message numbers'#010+ + '**2*_a : Show everything x : Show info about invoked tools'+ + #010+ '**2*_b : Write file names messages p : Write tree.log with parse tre'+ 'e'#010+ '**2*_ with full path v : Write fpcdebug.txt with'#010+ - '**2*_z : Write output to stderr lots of debugging info'#010+ - '**2*_m, ',': Do not show messages numbered and '#010+ + '**2*_z : W','rite output to stderr lots of debugging info'#010+ + '**2*_m, : Do not show messages numbered and '#010+ 'F*1V_Append '#039'-'#039' to the used compiler binary name (e.g. f'+ 'or version)'#010+ '**1W_Target-specific options (targets)'#010+ - '3*2WA_Specify native type application (Windows)'#010+ - '4*2WA_Specify native type applic','ation (Windows)'#010+ + '3*2WA_Specif','y native type application (Windows)'#010+ + '4*2WA_Specify native type application (Windows)'#010+ 'A*2WA_Specify native type application (Windows)'#010+ '3*2Wb_Create a bundle instead of a library (Darwin)'#010+ 'P*2Wb_Create a bundle instead of a library (Darwin)'#010+ - 'p*2Wb_Create a bundle instead of a library (Darwin)'#010+ - 'a*2Wb_Create a bundl','e instead of a library (Darwin)'#010+ + 'p*2W','b_Create a bundle instead of a library (Darwin)'#010+ + 'a*2Wb_Create a bundle instead of a library (Darwin)'#010+ 'A*2Wb_Create a bundle instead of a library (Darwin)'#010+ '4*2Wb_Create a bundle instead of a library (Darwin)'#010+ - '3*2WB_Create a relocatable image (Windows, Symbian)'#010+ + '3*2WB_Create a relocatable image (Wi','ndows, Symbian)'#010+ '3*2WB_Set image base to (Windows, Symbian)'#010+ - '4*','2WB_Create a relocatable image (Windows)'#010+ + '4*2WB_Create a relocatable image (Windows)'#010+ '4*2WB_Set image base to (Windows)'#010+ 'A*2WB_Create a relocatable image (Windows, Symbian)'#010+ - 'A*2WB_Set image base to (Windows, Symbian)'#010+ - '3*2WC_Specify console type application (EMX, OS/2, Windo','ws)'#010+ + 'A*2WB_Set image base to (Window','s, Symbian)'#010+ + '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+ '4*2WC_Specify console type application (Windows)'#010+ 'A*2WC_Specify console type application (Windows)'#010+ 'P*2WC_Specify console type application (Classic Mac OS)'#010+ - '3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+ - '4*2WD_Use DEFFILE to',' export functions of DLL or EXE (Windows)'#010+ + '3*2WD_Use DEFF','ILE to export functions of DLL or EXE (Windows)'#010+ + '4*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+ 'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+ '3*2We_Use external resources (Darwin)'#010+ - '4*2We_Use external resources (Darwin)'#010+ + '4*2We_Use external resources (','Darwin)'#010+ 'a*2We_Use external resources (Darwin)'#010+ - 'A*2We_Use external res','ources (Darwin)'#010+ + 'A*2We_Use external resources (Darwin)'#010+ 'P*2We_Use external resources (Darwin)'#010+ 'p*2We_Use external resources (Darwin)'#010+ '3*2WF_Specify full-screen type application (EMX, OS/2)'#010+ - '3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+ - '4*2WG_Specify graphic type applic','ation (Windows)'#010+ + '3*2WG_Specify graphic typ','e application (EMX, OS/2, Windows)'#010+ + '4*2WG_Specify graphic type application (Windows)'#010+ 'A*2WG_Specify graphic type application (Windows)'#010+ 'P*2WG_Specify graphic type application (Classic Mac OS)'#010+ '3*2Wi_Use internal resources (Darwin)'#010+ - '4*2Wi_Use internal resources (Darwin)'#010+ + '4*2Wi_Use int','ernal resources (Darwin)'#010+ 'a*2Wi_Use internal resources (Darwin)'#010+ - 'A*2Wi','_Use internal resources (Darwin)'#010+ + 'A*2Wi_Use internal resources (Darwin)'#010+ 'P*2Wi_Use internal resources (Darwin)'#010+ 'p*2Wi_Use internal resources (Darwin)'#010+ '3*2WI_Turn on/off the usage of import sections (Windows)'#010+ - '4*2WI_Turn on/off the usage of import sections (Windows)'#010+ - 'A*2WI_Turn on/off',' the usage of import sections (Windows)'#010+ + '4*2WI_','Turn on/off the usage of import sections (Windows)'#010+ + 'A*2WI_Turn on/off the usage of import sections (Windows)'#010+ '8*2Wh_Use huge code for units (ignored for models with CODE in a uniqu'+ 'e segment)'#010+ '8*2Wm_Set memory model'#010+ - '8*3WmTiny_Tiny memory model'#010+ + '8*3WmTiny_Tiny memory mod','el'#010+ '8*3WmSmall_Small memory model (default)'#010+ - '8*3WmMedium_Medium memory',' model'#010+ + '8*3WmMedium_Medium memory model'#010+ '8*3WmCompact_Compact memory model'#010+ '8*3WmLarge_Large memory model'#010+ '8*3WmHuge_Huge memory model'#010+ '3*2WM_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+ + 'n)'#010, + '4*2WM_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+ 'n)'#010+ - '4*2WM_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Dar','w'+ - 'in)'#010+ 'p*2WM_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+ 'n)'#010+ 'P*2WM_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+ 'n)'#010+ - '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ - '4*2WN_Do not genera','te relocation code, needed for debugging (Windows'+ + '3*2WN_Do not generate',' relocation code, needed for debugging (Windows'+ ')'#010+ + '4*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ 'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ - 'A*2Wp_Specify the controller type; see fpc -i or fpc -iu for possib'+ - 'le values'#010+ - 'm*2Wp_Specify the controller type; s','ee fpc -i or fpc -iu for poss'+ + 'A*2Wp_Specify the controller type; see fpc -i or',' fpc -iu for poss'+ 'ible values'#010+ + 'm*2Wp_Specify the controller type; see fpc -i or fpc -iu for possib'+ + 'le values'#010+ 'V*2Wp_Specify the controller type; see fpc -i or fpc -iu for possib'+ 'le values'#010+ - '3*2WP_Minimum iOS deployment version: 3.0, 5.0.1, ... (iphonesim)'#010+ - '4*2WP_Minimum iOS deployment version: 8.0, 8.0.','2, ... (iphonesim)'+ + '3*2WP_Minimum iOS deployment version: 3.0, 5.0.1',', ... (iphonesim)'+ #010+ + '4*2WP_Minimum iOS deployment version: 8.0, 8.0.2, ... (iphonesim)'#010+ 'a*2WP_Minimum iOS deployment version: 7.0, 7.1.2, ... (Darwin)'#010+ 'A*2WP_Minimum iOS deployment version: 3.0, 5.0.1, ... (Darwin)'#010+ - '3*2WR_Generate relocation code (Windows)'#010+ + '3*2WR_Generate reloca','tion code (Windows)'#010+ '4*2WR_Generate relocation code (Windows)'#010+ - 'A*2WR_G','enerate relocation code (Windows)'#010+ + 'A*2WR_Generate relocation code (Windows)'#010+ '8*2Wt_Set the target executable format'#010+ '8*3Wtexe_Create a DOS .EXE file (default)'#010+ - '8*3Wtcom_Create a DOS .COM file (requires tiny memory model)'#010+ + '8*3Wtcom_Create a DOS .COM file (requires tiny memory ','model)'#010+ 'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+ - '**2W','X_Enable executable stack (Linux)'#010+ + '**2WX_Enable executable stack (Linux)'#010+ '**1X_Executable options:'#010+ '**2X9_Generate linkerscript for GNU Binutils ld older than version 2.1'+ '9.1 (Linux)'#010+ - '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+ - 'ux)'#010+ - '**2Xd_Do not search defau','lt library path (sometimes required for cro'+ - 'ss-compiling when not using -XR)'#010+ + '**2Xc_Pass --shared/-dynamic to',' the linker (BeOS, Darwin, FreeBSD, L'+ + 'inux)'#010+ + '**2Xd_Do not search default library path (sometimes required for cross'+ + '-compiling when not using -XR)'#010+ '**2Xe_Use external linker'#010+ '**2Xf_Substitute pthread library name for linking (BSD)'#010+ - '**2Xg_Create debuginfo in a separate file and add a debuglink section '+ - 'to executabl','e'#010+ + '**2Xg_Create d','ebuginfo in a separate file and add a debuglink sectio'+ + 'n to executable'#010+ '**2XD_Try to link units dynamically (defines FPC_LINK_DYNAMIC)'#010+ '**2Xi_Use internal linker'#010+ '**2XLA_Define library substitutions for linking'#010+ - '**2XLO_Define order of library linking'#010+ + '**2XLO_Define order of libra','ry linking'#010+ '**2XLD_Exclude default order of standard libraries'#010+ - '**2Xm_','Generate link map'#010+ + '**2Xm_Generate link map'#010+ '**2XM_Set the name of the '#039'main'#039' program routine (default i'+ 's '#039'main'#039')'#010+ '**2Xn_Use target system native linker instead of GNU ld (Solaris, AIX)'+ #010+ - 'F*2Xp_First search for the compiler binary in the directory '#010+ - '**2XP_Pre','pend the binutils names with the prefix '#010+ + 'F*2Xp_Fi','rst search for the compiler binary in the directory '#010+ + '**2XP_Prepend the binutils names with the prefix '#010+ '**2Xr_Set the linker'#039's rlink-path to (needed for cross comp'+ 'ile, see the ld manual for more information) (BeOS, Linux)'#010+ - '**2XR_Prepend to all linker search paths (BeOS, Darwin, FreeBSD'+ - ',',' Linux, Mac OS, Solaris)'#010+ + '**2','XR_Prepend to all linker search paths (BeOS, Darwin, FreeB'+ + 'SD, Linux, Mac OS, Solaris)'#010+ '**2Xs_Strip all symbols from executable'#010+ '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+ - '**2Xt_Link with static libraries (-static is passed to linker)'#010+ - '**2Xv_Generate table for Virtual Entry cal','ls'#010+ + '**2Xt_Link with static libraries (-st','atic is passed to linker)'#010+ + '**2Xv_Generate table for Virtual Entry calls'#010+ '**2XV_Use VLink as external linker (default on Amiga, MorphOS)'#010+ '**2XX_Try to smartlink units (defines FPC_LINK_SMART)'#010+ '**1*_'#010+ '**1?_Show this help'#010+ - '**1h_Shows this help without waiting' + '**1h_Sho','ws this help without waiting' ); diff --git a/compiler/x86/aasmcpu.pas b/compiler/x86/aasmcpu.pas index 31cf70b052..2bcd7fc590 100644 --- a/compiler/x86/aasmcpu.pas +++ b/compiler/x86/aasmcpu.pas @@ -59,8 +59,16 @@ interface OT_VECTORMASK = $1000000000; { OPTIONAL VECTORMASK AVX512} OT_VECTORZERO = $2000000000; { OPTIONAL ZERO-FLAG AVX512} + OT_VECTORBCST = $4000000000; { BROADCAST-MEM-FLAG AVX512} + OT_VECTORSAE = $8000000000; { OPTIONAL SAE-FLAG AVX512} + OT_VECTORER = $10000000000; { OPTIONAL ER-FLAG-FLAG AVX512} - OT_VECTOR_EXT_MASK = OT_VECTORMASK or OT_VECTORZERO; + + OT_BITSB32 = OT_BITS32 or OT_VECTORBCST; + OT_BITSB64 = OT_BITS64 or OT_VECTORBCST; + + + OT_VECTOR_EXT_MASK = OT_VECTORMASK or OT_VECTORZERO or OT_VECTORBCST; OT_BITS80 = $00000010; { FPU only } OT_FAR = $00000020; { this means 16:16 or 16:32, like in CALL/JMP } @@ -172,31 +180,44 @@ interface OT_XMEM32 = OT_REGNORM or otf_reg_xmm or otf_reg_gpr or OT_BITS32; OT_XMEM64 = OT_REGNORM or otf_reg_xmm or otf_reg_gpr or OT_BITS64; - OT_XMMREGM = OT_XMMREG or OT_VECTORMASK; - OT_XMMREGMZ = OT_XMMREG or OT_VECTORMASK or OT_VECTORZERO; + OT_XMMREG_M = OT_XMMREG or OT_VECTORMASK; + OT_XMMREG_MZ = OT_XMMREG or OT_VECTORMASK or OT_VECTORZERO; + OT_XMMREG_SAE = OT_XMMREG or OT_VECTORSAE; + OT_XMMRM_SAE = OT_XMMRM or OT_VECTORSAE; + OT_XMMREG_ER = OT_XMMREG or OT_VECTORER; + OT_XMMRM_ER = OT_XMMRM or OT_VECTORER; + { register class 5: YMM (both reg and r/m) } - OT_YMMREG = OT_REGNORM or otf_reg_ymm; - OT_YMMRM = OT_REGMEM or otf_reg_ymm; - OT_YMEM32 = OT_REGNORM or otf_reg_ymm or otf_reg_gpr or OT_BITS32; - OT_YMEM64 = OT_REGNORM or otf_reg_ymm or otf_reg_gpr or OT_BITS64; + OT_YMMREG = OT_REGNORM or otf_reg_ymm; + OT_YMMRM = OT_REGMEM or otf_reg_ymm; + OT_YMEM32 = OT_REGNORM or otf_reg_ymm or otf_reg_gpr or OT_BITS32; + OT_YMEM64 = OT_REGNORM or otf_reg_ymm or otf_reg_gpr or OT_BITS64; - OT_YMMREGM = OT_YMMREG or OT_VECTORMASK; - OT_YMMREGMZ = OT_YMMREG or OT_VECTORMASK or OT_VECTORZERO; + OT_YMMREG_M = OT_YMMREG or OT_VECTORMASK; + OT_YMMREG_MZ = OT_YMMREG or OT_VECTORMASK or OT_VECTORZERO; + OT_YMMREG_SAE = OT_YMMREG or OT_VECTORSAE; + OT_YMMRM_SAE = OT_YMMRM or OT_VECTORSAE; + OT_YMMREG_ER = OT_YMMREG or OT_VECTORER; + OT_YMMRM_ER = OT_YMMRM or OT_VECTORER; { register class 5: ZMM (both reg and r/m) } - OT_ZMMREG = OT_REGNORM or otf_reg_zmm; - OT_ZMMRM = OT_REGMEM or otf_reg_zmm; - OT_ZMEM32 = OT_REGNORM or otf_reg_zmm or otf_reg_gpr or OT_BITS32; - OT_ZMEM64 = OT_REGNORM or otf_reg_zmm or otf_reg_gpr or OT_BITS64; + OT_ZMMREG = OT_REGNORM or otf_reg_zmm; + OT_ZMMRM = OT_REGMEM or otf_reg_zmm; + OT_ZMEM32 = OT_REGNORM or otf_reg_zmm or otf_reg_gpr or OT_BITS32; + OT_ZMEM64 = OT_REGNORM or otf_reg_zmm or otf_reg_gpr or OT_BITS64; - OT_ZMMREGM = OT_ZMMREG or OT_VECTORMASK; - OT_ZMMREGMZ = OT_ZMMREG or OT_VECTORMASK or OT_VECTORZERO; + OT_ZMMREG_M = OT_ZMMREG or OT_VECTORMASK; + OT_ZMMREG_MZ = OT_ZMMREG or OT_VECTORMASK or OT_VECTORZERO; + OT_ZMMREG_SAE = OT_ZMMREG or OT_VECTORSAE; + OT_ZMMRM_SAE = OT_ZMMRM or OT_VECTORSAE; + OT_ZMMREG_ER = OT_ZMMREG or OT_VECTORER; + OT_ZMMRM_ER = OT_ZMMRM or OT_VECTORER; - OT_REG_VECTORMASK = OT_REGNORM or otf_reg_k; + OT_KREG = OT_REGNORM or otf_reg_k; { Vector-Memory operands } OT_VMEM_ANY = OT_XMEM32 or OT_XMEM64 or OT_YMEM32 or OT_YMEM64 or OT_ZMEM32 or OT_ZMEM64; @@ -205,12 +226,17 @@ interface OT_MEM8 = OT_MEMORY or OT_BITS8; OT_MEM16 = OT_MEMORY or OT_BITS16; OT_MEM32 = OT_MEMORY or OT_BITS32; + OT_BMEM32 = OT_MEMORY or OT_BITS32 or OT_VECTORBCST; OT_MEM64 = OT_MEMORY or OT_BITS64; + OT_BMEM64 = OT_MEMORY or OT_BITS64 or OT_VECTORBCST; OT_MEM128 = OT_MEMORY or OT_BITS128; OT_MEM256 = OT_MEMORY or OT_BITS256; OT_MEM512 = OT_MEMORY or OT_BITS512; OT_MEM80 = OT_MEMORY or OT_BITS80; + + + OT_MEM_OFFS = OT_MEMORY or otf_sub0; { special type of EA } { simple [address] offset } @@ -226,12 +252,25 @@ interface OT_ONENESS = otf_sub0; { special type of immediate operand } OT_UNITY = OT_IMMEDIATE or OT_ONENESS; { for shift/rotate instructions } - OTVE_VECTOR_SAE = 1 shl 4; - OTVE_VECTOR_ER = 1 shl 5; - OTVE_VECTORMASK_ZERO = 1 shl 6; - OTVE_VECTORMASK_WRITEMASK = 1 shl 7; + OTVE_VECTOR_SAE = 1 shl 8; + OTVE_VECTOR_ER = 1 shl 9; + OTVE_VECTOR_ZERO = 1 shl 10; + OTVE_VECTOR_WRITEMASK = 1 shl 11; + OTVE_VECTOR_BCST = 1 shl 12; + OTVE_VECTOR_BCST2 = 0; + OTVE_VECTOR_BCST4 = 1 shl 4; + OTVE_VECTOR_BCST8 = 1 shl 5; + OTVE_VECTOR_BCST16 = 3 shl 4; + OTVE_VECTOR_RNSAE = OTVE_VECTOR_ER or 0; + OTVE_VECTOR_RDSAE = OTVE_VECTOR_ER or 1 shl 6; + OTVE_VECTOR_RUSAE = OTVE_VECTOR_ER or 1 shl 7; + OTVE_VECTOR_RZSAE = OTVE_VECTOR_ER or 3 shl 6; - OTVE_VECTOR_MASK = OTVE_VECTOR_SAE or OTVE_VECTOR_ER or OTVE_VECTORMASK_ZERO or OTVE_VECTORMASK_WRITEMASK; + + OTVE_VECTOR_BCST_MASK = OTVE_VECTOR_BCST2 or OTVE_VECTOR_BCST4 or OTVE_VECTOR_BCST8 or OTVE_VECTOR_BCST16; + OTVE_VECTOR_ER_MASK = OTVE_VECTOR_RNSAE or OTVE_VECTOR_RDSAE or OTVE_VECTOR_RUSAE or OTVE_VECTOR_RZSAE; + + OTVE_VECTOR_MASK = OTVE_VECTOR_SAE or OTVE_VECTOR_ER or OTVE_VECTOR_ZERO or OTVE_VECTOR_WRITEMASK or OTVE_VECTOR_BCST; { Size of the instruction table converted by nasmconv.pas } {$if defined(x86_64)} @@ -301,16 +340,20 @@ interface msiMultiple, msiMultiple8, msiMultiple16, msiMultiple32, msiMultiple64, msiMultiple128, msiMultiple256, msiMultiple512, msiMemRegSize, msiMemRegx16y32, msiMemRegx32y64, msiMemRegx64y128, msiMemRegx64y256, - msiMem8, msiMem16, msiMem32, msiMem64, msiMem128, msiMem256, msiMem512, + msiMem8, msiMem16, msiMem32, msiBMem32, msiMem64, msiBMem64, msiMem128, msiMem256, msiMem512, msiXMem32, msiXMem64, msiYMem32, msiYMem64, msiZMem32, msiZMem64, msiVMemMultiple, msiVMemRegSize); + TMemRefSizeInfoBCST = (msbUnknown, msbBCST32, msbBCST64); + TConstSizeInfo = (csiUnkown, csiMultiple, csiNoSize, csiMem8, csiMem16, csiMem32, csiMem64); TInsTabMemRefSizeInfoRec = record - MemRefSize : TMemRefSizeInfo; - ExistsSSEAVX: boolean; - ConstSize : TConstSizeInfo; + MemRefSize : TMemRefSizeInfo; + MemRefSizeBCST : TMemRefSizeInfoBCST; + BCSTXMMMultiplicator : byte; + ExistsSSEAVX : boolean; + ConstSize : TConstSizeInfo; end; const @@ -379,6 +422,7 @@ interface IF_SSE42, IF_AVX, IF_AVX2, + IF_AVX512, IF_BMI1, IF_BMI2, IF_16BITONLY, @@ -1231,6 +1275,37 @@ implementation if (ot and OT_SIGNED)<>0 then s:=s+'s'; end; + + if vopext <> 0 then + begin + str(vopext and $07, regnr); + if vopext and OTVE_VECTOR_WRITEMASK = OTVE_VECTOR_WRITEMASK then + s := s + ' {k' + regnr + '}'; + + if vopext and OTVE_VECTOR_ZERO = OTVE_VECTOR_ZERO then + s := s + ' {z}'; + + if vopext and OTVE_VECTOR_SAE = OTVE_VECTOR_SAE then + s := s + ' {sae}'; + + + if vopext and OTVE_VECTOR_BCST = OTVE_VECTOR_BCST then + case vopext and OTVE_VECTOR_BCST_MASK of + OTVE_VECTOR_BCST2: s := s + ' {1to2}'; + OTVE_VECTOR_BCST4: s := s + ' {1to4}'; + OTVE_VECTOR_BCST8: s := s + ' {1to8}'; + OTVE_VECTOR_BCST16: s := s + ' {1to16}'; + end; + + if vopext and OTVE_VECTOR_ER = OTVE_VECTOR_ER then + case vopext and OTVE_VECTOR_ER_MASK of + OTVE_VECTOR_RNSAE: s := s + ' {rn-sae}'; + OTVE_VECTOR_RDSAE: s := s + ' {rd-sae}'; + OTVE_VECTOR_RUSAE: s := s + ' {ru-sae}'; + OTVE_VECTOR_RZSAE: s := s + ' {rz-sae}'; + end; + + end; end; end; GetString:=s+']'; @@ -1710,12 +1785,23 @@ implementation // check vectoroperand-extention e.g. {k1} {z} vopext := 0; - if (oper[i]^.vopext and OTVE_VECTORMASK_WRITEMASK) = OTVE_VECTORMASK_WRITEMASK then - vopext := vopext or OT_VECTORMASK; - if (oper[i]^.vopext and OTVE_VECTORMASK_ZERO) = OTVE_VECTORMASK_ZERO then - vopext := vopext or OT_VECTORZERO; + if (oper[i]^.vopext and OTVE_VECTOR_WRITEMASK) = OTVE_VECTOR_WRITEMASK then + begin + vopext := vopext or OT_VECTORMASK; + + if (oper[i]^.vopext and OTVE_VECTOR_ZERO) = OTVE_VECTOR_ZERO then + vopext := vopext or OT_VECTORZERO; + end; + + if (oper[i]^.vopext and OTVE_VECTOR_BCST) = OTVE_VECTOR_BCST then + vopext := vopext or OT_VECTORBCST; + + if (oper[i]^.vopext and OTVE_VECTOR_ER) = OTVE_VECTOR_ER then + vopext := vopext or OT_VECTORER; + + if (oper[i]^.vopext and OTVE_VECTOR_SAE) = OTVE_VECTOR_SAE then + vopext := vopext or OT_VECTORSAE; - //TG TODO SAE,ER if p^.optypes[i] and vopext <> vopext then exit; end; @@ -1824,8 +1910,6 @@ implementation if (oper[i]^.vopext and OTVE_VECTOR_MASK) <> 0 then result := true; - - //TG TODO k1 + z end; end; @@ -2106,7 +2190,7 @@ implementation maxsupreg: array[tregistertype] of tsuperregister= {$ifdef x86_64} //(0, 16, 9, 8, 16, 32, 0, 0); - (0, 16, 9, 8, 32, 32, 0, 0); //TG + (0, 16, 9, 8, 32, 32, 8, 0); //TG {$else x86_64} (0, 8, 9, 8, 8, 32, 0, 0); {$endif x86_64} @@ -2473,7 +2557,7 @@ implementation begin { 16 bit address? } - if ((ir<>NR_NO) and (isub in [R_SUBMMX,R_SUBMMY]) and + if ((ir<>NR_NO) and (isub in [R_SUBMMX,R_SUBMMY,]R_SUBMMZ) and (br<>NR_NO) and (bsub=R_SUBD) ) then begin @@ -2726,7 +2810,7 @@ implementation {$endif x86_64} begin //TG TODO delete - if p^.opcode = a_VPERMD then + if p^.opcode = a_VADDPS then begin len:=0; end; @@ -3010,6 +3094,8 @@ implementation begin if exists_vex then begin + inc(len,2); + if exists_prefix_66 then dec(len); if exists_prefix_F2 then dec(len); if exists_prefix_F3 then dec(len); @@ -3432,15 +3518,13 @@ implementation opidx := c and 7; if ops > opidx then - if (oper[opidx]^.typ=top_reg) and - (getregtype(oper[opidx]^.reg) = R_MMREGISTER) then + if (oper[opidx]^.typ=top_reg) then if getsupreg(oper[opidx]^.reg) and $10 = $0 then EVEXr := 1; //TG TODO check opidx := (c shr 3) and 7; if ops > opidx then - if (oper[opidx]^.typ=top_reg) and - (getregtype(oper[opidx]^.reg) = R_MMREGISTER) then + if (oper[opidx]^.typ=top_reg) then if getsupreg(oper[opidx]^.reg) and $10 = $0 then EVEXx := 1; //TG TODO check end; @@ -3456,9 +3540,7 @@ implementation end; &350: needed_EVEX := true; // AVX512 instruction or AVX128/256/512-instruction (depended on operands [x,y,z]mm16..) &351: EVEXll := $02; // vectorlength = 512 bits AND no scalar - &352: EVEXw0 := $01; - &353: EVEXw1 := $01; - &354: EVEXb := $01; //TG TODO anpassen - nur zum Testen + &352: EVEXw1 := $01; &361: begin VEXvvvv := VEXvvvv OR $01; // set SIMD-prefix $66 VEXpp := $01; // set SIMD-prefix $66 @@ -3514,6 +3596,7 @@ implementation begin VEXvvvv := VEXvvvv or ($0F shl 3); // set VEXvvvv bits (bits 6-3) to 1 EVEXvvvv := $0F; //TG TODO check + EVEXv := 1; //TG TODO check end else if oper[opmode]^.typ = top_reg then begin @@ -3562,16 +3645,45 @@ implementation if needed_EVEX then begin + EVEXaaa:= 0; + EVEXz := 0; + for i := 0 to ops - 1 do if (oper[i]^.vopext and OTVE_VECTOR_MASK) <> 0 then begin - if oper[i]^.vopext and OTVE_VECTORMASK_WRITEMASK = OTVE_VECTORMASK_WRITEMASK then - EVEXaaa := oper[i]^.vopext and $07; - if oper[i]^.vopext and OTVE_VECTORMASK_ZERO = OTVE_VECTORMASK_ZERO then - EVEXz := 1; + if oper[i]^.vopext and OTVE_VECTOR_WRITEMASK = OTVE_VECTOR_WRITEMASK then + begin + EVEXaaa := oper[i]^.vopext and $07; + if oper[i]^.vopext and OTVE_VECTOR_ZERO = OTVE_VECTOR_ZERO then EVEXz := 1; + end; + + if oper[i]^.vopext and OTVE_VECTOR_BCST = OTVE_VECTOR_BCST then + begin + EVEXb := 1; + end; + + // flag EVEXb is multiple use (broadcast, sae and er) + if oper[i]^.vopext and OTVE_VECTOR_SAE = OTVE_VECTOR_SAE then + begin + EVEXb := 1; + end; + + if oper[i]^.vopext and OTVE_VECTOR_ER = OTVE_VECTOR_ER then + begin + EVEXb := 1; + + case oper[i]^.vopext and OTVE_VECTOR_ER_MASK of + OTVE_VECTOR_RNSAE: EVEXll := 0; + OTVE_VECTOR_RDSAE: EVEXll := 1; + OTVE_VECTOR_RUSAE: EVEXll := 2; + OTVE_VECTOR_RZSAE: EVEXll := 3; + else EVEXll := 0; + end; + end; + //TG TODO ER, SAE - break; + //break; end; // if (insentry.optypes[i] and OT_VECTORMASK) = OT_VECTORMASK then @@ -3587,9 +3699,9 @@ implementation i := rex and 7; //bytes[1] := ((VEXmmmmm and $03) shl 0) or ((not(rex) and $07) shl 4) and EVEXr and EVEXb; bytes[1] := ((EVEXmm and $03) shl 0) or - ((not(rex) and $07) shl 5) or - ((EVEXr and $01) shl 4) ; // or - //((EVEXx and $01) shl 6); + ((not(rex) and $05) shl 5) or + ((EVEXr and $01) shl 4) or + ((EVEXx and $01) shl 6); bytes[2] := ((EVEXpp and $03) shl 0) or ((1 and $01) shl 2) or // fixed in AVX512 @@ -4452,6 +4564,10 @@ implementation RegXMMSizeMask: int64; RegYMMSizeMask: int64; RegZMMSizeMask: int64; + RegBCSTSizeMask: int64; + RegBCSTXMMSizeMask: int64; + RegBCSTYMMSizeMask: int64; + RegBCSTZMMSizeMask: int64; bitcount: integer; @@ -4482,19 +4598,25 @@ implementation if i >= 0 then begin - InsTabMemRefSizeInfoCache^[AsmOp].MemRefSize := msiUnkown; - InsTabMemRefSizeInfoCache^[AsmOp].ConstSize := csiUnkown; - InsTabMemRefSizeInfoCache^[AsmOp].ExistsSSEAVX := false; + InsTabMemRefSizeInfoCache^[AsmOp].MemRefSize := msiUnkown; + InsTabMemRefSizeInfoCache^[AsmOp].MemRefSizeBCST := msbUnknown; + InsTabMemRefSizeInfoCache^[AsmOp].BCSTXMMMultiplicator := 0; + InsTabMemRefSizeInfoCache^[AsmOp].ConstSize := csiUnkown; + InsTabMemRefSizeInfoCache^[AsmOp].ExistsSSEAVX := false; insentry:=@instab[i]; RegMMXSizeMask := 0; RegXMMSizeMask := 0; RegYMMSizeMask := 0; RegZMMSizeMask := 0; + RegBCSTSizeMask:= 0; + RegBCSTXMMSizeMask := 0; + RegBCSTYMMSizeMask := 0; + RegBCSTZMMSizeMask := 0; //TG TODO delete - if AsmOp = a_vpermd then + if AsmOp = A_VPERMD then begin RegMMXSizeMask := 0; end; @@ -4574,7 +4696,7 @@ implementation begin inc(actMemCount); - actMemSize:=actMemSize or (insentry^.optypes[j] and OT_SIZE_MASK); + actMemSize:=actMemSize or (insentry^.optypes[j] and (OT_SIZE_MASK OR OT_VECTORBCST)); if (insentry^.optypes[j] and OT_REGMEM) = OT_REGMEM then begin actRegMemTypes := actRegMemTypes or insentry^.optypes[j]; @@ -4677,62 +4799,89 @@ implementation end else begin - if (actMemCount=2) and ((AsmOp=A_MOVS) or (AsmOp=A_CMPS)) then - actMemCount:=1; - case actMemCount of - 0: ; // nothing todo - 1: begin - MRefInfo := msiUnkown; - case actRegMemTypes and (OT_MMXRM or OT_XMMRM or OT_YMMRM or OT_ZMMRM or OT_REG_EXTRA_MASK) of - OT_MMXRM: actMemSize := actMemSize or OT_BITS64; - OT_XMMRM: actMemSize := actMemSize or OT_BITS128; - OT_YMMRM: actMemSize := actMemSize or OT_BITS256; - OT_ZMMRM: actMemSize := actMemSize or OT_BITS512; - end; + if (actMemCount=2) and ((AsmOp=A_MOVS) or (AsmOp=A_CMPS)) then actMemCount:=1; - case actMemSize of - 0: MRefInfo := msiNoSize; - OT_BITS8: MRefInfo := msiMem8; - OT_BITS16: MRefInfo := msiMem16; - OT_BITS32: MRefInfo := msiMem32; - OT_BITS64: MRefInfo := msiMem64; - OT_BITS128: MRefInfo := msiMem128; - OT_BITS256: MRefInfo := msiMem256; - OT_BITS512: MRefInfo := msiMem512; - OT_BITS80, - OT_FAR, - OT_NEAR, - OT_SHORT: ; // ignore + case actMemCount of + 0: ; // nothing todo + 1: begin + MRefInfo := msiUnkown; + case actRegMemTypes and (OT_MMXRM or OT_XMMRM or OT_YMMRM or OT_ZMMRM or OT_REG_EXTRA_MASK) of + OT_MMXRM: actMemSize := actMemSize or OT_BITS64; + OT_XMMRM: actMemSize := actMemSize or OT_BITS128; + OT_YMMRM: actMemSize := actMemSize or OT_BITS256; + OT_ZMMRM: actMemSize := actMemSize or OT_BITS512; + end; + + case actMemSize of + 0: MRefInfo := msiNoSize; + OT_BITS8: MRefInfo := msiMem8; + OT_BITS16: MRefInfo := msiMem16; + OT_BITS32: MRefInfo := msiMem32; + OT_BITSB32: MRefInfo := msiBMem32; + OT_BITS64: MRefInfo := msiMem64; + OT_BITSB64: MRefInfo := msiBMem64; + OT_BITS128: MRefInfo := msiMem128; + OT_BITS256: MRefInfo := msiMem256; + OT_BITS512: MRefInfo := msiMem512; + OT_BITS80, + OT_FAR, + OT_NEAR, + OT_SHORT: ; // ignore + else + begin + bitcount := bitcnt(actMemSize); + + if bitcount > 1 then MRefInfo := msiMultiple + else InternalError(777203); + end; + end; + + if InsTabMemRefSizeInfoCache^[AsmOp].MemRefSize = msiUnkown then + begin + InsTabMemRefSizeInfoCache^[AsmOp].MemRefSize := MRefInfo; + end else + begin + // ignore broadcast-memory + if not(MRefInfo in [msiBMem32, msiBMem64]) then begin - bitcount := bitcnt(actMemSize); - - if bitcount > 1 then MRefInfo := msiMultiple - else InternalError(777203); + if InsTabMemRefSizeInfoCache^[AsmOp].MemRefSize <> MRefInfo then + begin + with InsTabMemRefSizeInfoCache^[AsmOp] do + begin + if ((MemRefSize = msiMem8) OR (MRefInfo = msiMem8)) then MemRefSize := msiMultiple8 + else if ((MemRefSize = msiMem16) OR (MRefInfo = msiMem16)) then MemRefSize := msiMultiple16 + else if ((MemRefSize = msiMem32) OR (MRefInfo = msiMem32)) then MemRefSize := msiMultiple32 + else if ((MemRefSize = msiMem64) OR (MRefInfo = msiMem64)) then MemRefSize := msiMultiple64 + else if ((MemRefSize = msiMem128) OR (MRefInfo = msiMem128)) then MemRefSize := msiMultiple128 + else if ((MemRefSize = msiMem256) OR (MRefInfo = msiMem256)) then MemRefSize := msiMultiple256 + else if ((MemRefSize = msiMem512) OR (MRefInfo = msiMem512)) then MemRefSize := msiMultiple512 + else MemRefSize := msiMultiple; + end; + end; end; - end; + end; - if InsTabMemRefSizeInfoCache^[AsmOp].MemRefSize = msiUnkown then + //if not(MRefInfo in [msiBMem32, msiBMem64]) and (actRegCount > 0) then + if actRegCount > 0 then begin - InsTabMemRefSizeInfoCache^[AsmOp].MemRefSize := MRefInfo; - end - else if InsTabMemRefSizeInfoCache^[AsmOp].MemRefSize <> MRefInfo then - begin - with InsTabMemRefSizeInfoCache^[AsmOp] do + if MRefInfo in [msiBMem32, msiBMem64] then begin - if ((MemRefSize = msiMem8) OR (MRefInfo = msiMem8)) then MemRefSize := msiMultiple8 - else if ((MemRefSize = msiMem16) OR (MRefInfo = msiMem16)) then MemRefSize := msiMultiple16 - else if ((MemRefSize = msiMem32) OR (MRefInfo = msiMem32)) then MemRefSize := msiMultiple32 - else if ((MemRefSize = msiMem64) OR (MRefInfo = msiMem64)) then MemRefSize := msiMultiple64 - else if ((MemRefSize = msiMem128) OR (MRefInfo = msiMem128)) then MemRefSize := msiMultiple128 - else if ((MemRefSize = msiMem256) OR (MRefInfo = msiMem256)) then MemRefSize := msiMultiple256 - else if ((MemRefSize = msiMem512) OR (MRefInfo = msiMem512)) then MemRefSize := msiMultiple512 - else MemRefSize := msiMultiple; - end; - end; + // BROADCAST - OPERAND + RegBCSTSizeMask := RegBCSTSizeMask or actMemSize; - if actRegCount > 0 then - begin + case actRegTypes and (OT_XMMREG or OT_YMMREG or OT_ZMMREG or OT_REG_EXTRA_MASK) of + OT_XMMREG: RegBCSTXMMSizeMask := RegBCSTXMMSizeMask or actMemSize; + OT_YMMREG: RegBCSTYMMSizeMask := RegBCSTYMMSizeMask or actMemSize; + OT_ZMMREG: RegBCSTZMMSizeMask := RegBCSTZMMSizeMask or actMemSize; + else begin + RegBCSTXMMSizeMask := not(0); + RegBCSTYMMSizeMask := not(0); + RegBCSTZMMSizeMask := not(0); + end; + end; + end + else case actRegTypes and (OT_MMXREG or OT_XMMREG or OT_YMMREG or OT_ZMMREG or OT_REG_EXTRA_MASK) of OT_MMXREG: RegMMXSizeMask := RegMMXSizeMask or actMemSize; OT_XMMREG: RegXMMSizeMask := RegXMMSizeMask or actMemSize; @@ -4745,10 +4894,13 @@ implementation RegZMMSizeMask := not(0); end; end; - end; - end; - else InternalError(777202); - end; + end + else + + + end + else InternalError(777202); + end; end; inc(insentry); @@ -4799,6 +4951,22 @@ implementation ((RegXMMSizeMask or RegYMMSizeMask or RegZMMSizeMask) <> 0) then begin InsTabMemRefSizeInfoCache^[AsmOp].MemRefSize := msiMemRegSize; + + case RegBCSTSizeMask of + 0: ; // ignore; + OT_BITSB32: begin + InsTabMemRefSizeInfoCache^[AsmOp].MemRefSizeBCST := msbBCST32; + InsTabMemRefSizeInfoCache^[AsmOp].BCSTXMMMultiplicator := 4; + end; + OT_BITSB64: begin + InsTabMemRefSizeInfoCache^[AsmOp].MemRefSizeBCST := msbBCST64; + InsTabMemRefSizeInfoCache^[AsmOp].BCSTXMMMultiplicator := 2; + end; + else begin + //TG TODO - mixed broadcast + InsTabMemRefSizeInfoCache^[AsmOp].MemRefSize := msiMemRegSize; + end;; + end; end else if (RegXMMSizeMask = OT_BITS16) and (RegYMMSizeMask = OT_BITS32) then diff --git a/compiler/x86/cpubase.pas b/compiler/x86/cpubase.pas index 532183e7c9..b4ef21eed0 100644 --- a/compiler/x86/cpubase.pas +++ b/compiler/x86/cpubase.pas @@ -485,7 +485,12 @@ implementation {$endif x86_64} else reg_cgsize:=OS_32 - end + end; + R_ADDRESSREGISTER: + case reg of + NR_K0..NR_K7: reg_cgsize:=OS_64; + else internalerror(2003031801); + end; else internalerror(2003031801); end; diff --git a/compiler/x86/rax86.pas b/compiler/x86/rax86.pas index ab4eda7044..fc35dd3536 100644 --- a/compiler/x86/rax86.pas +++ b/compiler/x86/rax86.pas @@ -42,7 +42,8 @@ Procedure FWaitWarning; type Tx86Operand=class(TOperand) opsize : topsize; - vopext : byte; // bitmask: vector-operand extention AVX512 (e.g. vaddps xmm0 {k1} {z}) + vopext : smallint; // bitmask: vector-operand extention AVX512 (e.g. vaddps xmm0 {k1} {z}) + vbcst : byte; Procedure SetSize(_size:longint;force:boolean);override; Procedure SetCorrectSize(opcode:tasmop);override; Function CheckOperand: boolean; override; @@ -50,10 +51,15 @@ type Procedure SetupCode; { handles the @Data symbol } Procedure SetupData; + + constructor create; override; end; { Operands are always in AT&T order. Intel reader attaches them right-to-left, then shifts to start with 1 } + + { Tx86Instruction } + Tx86Instruction=class(TInstruction) opsize : topsize; constructor Create(optype : tcoperand);override; @@ -66,6 +72,7 @@ type procedure FixupOpcode;virtual; { opcode adding } function ConcatInstruction(p : TAsmList) : tai;override; + function getstring: string; end; const @@ -323,6 +330,13 @@ begin {$endif i8086} end; +constructor Tx86Operand.create; +begin + inherited; + + vopext := 0; + vbcst := 0; +end; {***************************************************************************** T386Instruction @@ -346,14 +360,20 @@ var ExistsMemRef: boolean; ExistsConstNoSize: boolean; ExistsLocalSymSize: boolean; + ExistsBCST: boolean; memrefsize: integer; memopsize: integer; memoffset: asizeint; + vbcst: byte; + mmregs: Set of TSubregister; + multiplicator: integer; + bcst1,bcst2: string; begin ExistsMemRefNoSize := false; ExistsMemRef := false; ExistsConstNoSize := false; ExistsLocalSymSize := false; + ExistsBCST := false; // EXIST A MEMORY- OR CONSTANT-OPERAND WITHOUT SIZE ? for i := 1 to ops do @@ -362,6 +382,9 @@ begin begin ExistsMemRef := true; + ExistsBCST := (MemRefInfo(opcode).ExistsSSEAVX) and + (tx86operand(operands[i]).vbcst <> 0); + if (tx86operand(operands[i]).opsize = S_NO) then begin ExistsMemRefNoSize := true; @@ -370,7 +393,6 @@ begin OPR_LOCAL: ExistsLocalSymSize := tx86operand(operands[i]).opr.localsym.getsize > 0; OPR_REFERENCE: ExistsLocalSymSize := true; end; - end; end else if operands[i].Opr.Typ in [OPR_CONSTANT] then @@ -400,6 +422,14 @@ begin begin memrefsize := -1; + if ExistsBCST then + begin + case MemRefInfo(opcode).MemRefSizeBCST of + msbBCST32: memrefsize := 32; + msbBCST64: memrefsize := 64; + end; + end + else case MemRefInfo(opcode).MemRefSize of msiMem8: memrefsize := 8; msiMem16: memrefsize := 16; @@ -407,8 +437,8 @@ begin msiMem64: memrefsize := 64; msiMem128: memrefsize := 128; msiMem256: memrefsize := 256; - msiMemRegSize - : for j := 1 to ops do + msiMemRegSize: + for j := 1 to ops do begin if operands[j].Opr.Typ = OPR_REGISTER then begin @@ -507,205 +537,221 @@ begin begin case operands[i].Opr.Typ of OPR_REFERENCE: - case MemRefInfo(opcode).MemRefSize of - msiMem8: - begin - tx86operand(operands[i]).opsize := S_B; - tx86operand(operands[i]).size := OS_8; - end; - msiMultiple8: - begin - tx86operand(operands[i]).opsize := S_B; - tx86operand(operands[i]).size := OS_8; + begin + if ExistsBCST then + begin + case MemRefInfo(opcode).MemRefSizeBCST of + msbBCST32: begin + tx86operand(operands[i]).opsize := S_L; + tx86operand(operands[i]).size := OS_32; + end; + msbBCST64: begin + tx86operand(operands[i]).opsize := S_Q; + tx86operand(operands[i]).size := OS_M64; + end; + end; + end + else - Message2(asmr_w_check_mem_operand_automap_multiple_size, std_op2str[opcode], '"8 bit memory operand"'); - end; - msiMem16: - begin - tx86operand(operands[i]).opsize := S_W; - tx86operand(operands[i]).size := OS_16; - end; - msiMultiple16: - begin - tx86operand(operands[i]).opsize := S_W; - tx86operand(operands[i]).size := OS_16; + case MemRefInfo(opcode).MemRefSize of + msiMem8: + begin + tx86operand(operands[i]).opsize := S_B; + tx86operand(operands[i]).size := OS_8; + end; + msiMultiple8: + begin + tx86operand(operands[i]).opsize := S_B; + tx86operand(operands[i]).size := OS_8; - Message2(asmr_w_check_mem_operand_automap_multiple_size, std_op2str[opcode], '"16 bit memory operand"'); - end; - msiMem32: - begin - tx86operand(operands[i]).opsize := S_L; - tx86operand(operands[i]).size := OS_32; - end; - msiMultiple32: - begin - tx86operand(operands[i]).opsize := S_L; - tx86operand(operands[i]).size := OS_32; - - Message2(asmr_w_check_mem_operand_automap_multiple_size, std_op2str[opcode], '"32 bit memory operand"'); - end; - msiMem64: - begin - tx86operand(operands[i]).opsize := S_Q; - tx86operand(operands[i]).size := OS_M64; - end; - msiMultiple64: - begin - tx86operand(operands[i]).opsize := S_Q; - tx86operand(operands[i]).size := OS_M64; - - Message2(asmr_w_check_mem_operand_automap_multiple_size, std_op2str[opcode], '"64 bit memory operand"'); - end; - msiMem128: - begin - tx86operand(operands[i]).opsize := S_XMM; - tx86operand(operands[i]).size := OS_M128; - end; - msiMultiple128: - begin - tx86operand(operands[i]).opsize := S_XMM; - tx86operand(operands[i]).size := OS_M128; - - Message2(asmr_w_check_mem_operand_automap_multiple_size, std_op2str[opcode], '"128 bit memory operand"'); - end; - msiMem256: - begin - tx86operand(operands[i]).opsize := S_YMM; - tx86operand(operands[i]).size := OS_M256; - opsize := S_YMM; - end; - msiMultiple256: - begin - tx86operand(operands[i]).opsize := S_YMM; - tx86operand(operands[i]).size := OS_M256; - opsize := S_YMM; - - Message2(asmr_w_check_mem_operand_automap_multiple_size, std_op2str[opcode], '"256 bit memory operand"'); - end; - msiMem512: - begin - tx86operand(operands[i]).opsize := S_ZMM; - tx86operand(operands[i]).size := OS_M512; - opsize := S_ZMM; - end; - msiMultiple512: - begin - tx86operand(operands[i]).opsize := S_ZMM; - tx86operand(operands[i]).size := OS_M512; - opsize := S_ZMM; - - Message2(asmr_w_check_mem_operand_automap_multiple_size, std_op2str[opcode], '"512 bit memory operand"'); - end; - - msiMemRegSize: - begin - // mem-ref-size = register size - for j := 1 to ops do + Message2(asmr_w_check_mem_operand_automap_multiple_size, std_op2str[opcode], '"8 bit memory operand"'); + end; + msiMem16: + begin + tx86operand(operands[i]).opsize := S_W; + tx86operand(operands[i]).size := OS_16; + end; + msiMultiple16: begin - if operands[j].Opr.Typ = OPR_REGISTER then + tx86operand(operands[i]).opsize := S_W; + tx86operand(operands[i]).size := OS_16; + + Message2(asmr_w_check_mem_operand_automap_multiple_size, std_op2str[opcode], '"16 bit memory operand"'); + end; + msiMem32: + begin + tx86operand(operands[i]).opsize := S_L; + tx86operand(operands[i]).size := OS_32; + end; + msiMultiple32: + begin + tx86operand(operands[i]).opsize := S_L; + tx86operand(operands[i]).size := OS_32; + + Message2(asmr_w_check_mem_operand_automap_multiple_size, std_op2str[opcode], '"32 bit memory operand"'); + end; + msiMem64: + begin + tx86operand(operands[i]).opsize := S_Q; + tx86operand(operands[i]).size := OS_M64; + end; + msiMultiple64: + begin + tx86operand(operands[i]).opsize := S_Q; + tx86operand(operands[i]).size := OS_M64; + + Message2(asmr_w_check_mem_operand_automap_multiple_size, std_op2str[opcode], '"64 bit memory operand"'); + end; + msiMem128: + begin + tx86operand(operands[i]).opsize := S_XMM; + tx86operand(operands[i]).size := OS_M128; + end; + msiMultiple128: + begin + tx86operand(operands[i]).opsize := S_XMM; + tx86operand(operands[i]).size := OS_M128; + + Message2(asmr_w_check_mem_operand_automap_multiple_size, std_op2str[opcode], '"128 bit memory operand"'); + end; + msiMem256: + begin + tx86operand(operands[i]).opsize := S_YMM; + tx86operand(operands[i]).size := OS_M256; + opsize := S_YMM; + end; + msiMultiple256: + begin + tx86operand(operands[i]).opsize := S_YMM; + tx86operand(operands[i]).size := OS_M256; + opsize := S_YMM; + + Message2(asmr_w_check_mem_operand_automap_multiple_size, std_op2str[opcode], '"256 bit memory operand"'); + end; + msiMem512: + begin + tx86operand(operands[i]).opsize := S_ZMM; + tx86operand(operands[i]).size := OS_M512; + opsize := S_ZMM; + end; + msiMultiple512: + begin + tx86operand(operands[i]).opsize := S_ZMM; + tx86operand(operands[i]).size := OS_M512; + opsize := S_ZMM; + + Message2(asmr_w_check_mem_operand_automap_multiple_size, std_op2str[opcode], '"512 bit memory operand"'); + end; + + msiMemRegSize: + begin + // mem-ref-size = register size + for j := 1 to ops do begin - if (tx86operand(operands[j]).opsize <> S_NO) and - (tx86operand(operands[j]).size <> OS_NO) then + if operands[j].Opr.Typ = OPR_REGISTER then begin - tx86operand(operands[i]).opsize := tx86operand(operands[j]).opsize; - tx86operand(operands[i]).size := tx86operand(operands[j]).size; - break; - end - else Message(asmr_e_unable_to_determine_reference_size); - end; - end; - end; - msiMemRegx16y32: - begin - for j := 1 to ops do - begin - if operands[j].Opr.Typ = OPR_REGISTER then - begin - case getsubreg(operands[j].opr.reg) of - R_SUBMMX: begin - tx86operand(operands[i]).opsize := S_L; - tx86operand(operands[i]).size := OS_M16; - break; - end; - R_SUBMMY: begin - tx86operand(operands[i]).opsize := S_Q; - tx86operand(operands[i]).size := OS_M32; - break; - end; - else Message(asmr_e_unable_to_determine_reference_size); - end; - end; - end; - end; - - msiMemRegx32y64: - begin - for j := 1 to ops do - begin - if operands[j].Opr.Typ = OPR_REGISTER then - begin - case getsubreg(operands[j].opr.reg) of - R_SUBMMX: begin - tx86operand(operands[i]).opsize := S_L; - tx86operand(operands[i]).size := OS_M32; - break; - end; - R_SUBMMY: begin - tx86operand(operands[i]).opsize := S_Q; - tx86operand(operands[i]).size := OS_M64; - break; - end; - else Message(asmr_e_unable_to_determine_reference_size); - end; - end; - end; - end; - msiMemRegx64y128: - begin - for j := 1 to ops do - begin - if operands[j].Opr.Typ = OPR_REGISTER then - begin - case getsubreg(operands[j].opr.reg) of - R_SUBMMX: begin - tx86operand(operands[i]).opsize := S_Q; - tx86operand(operands[i]).size := OS_M64; - break; - end; - R_SUBMMY: begin - tx86operand(operands[i]).opsize := S_XMM; - tx86operand(operands[i]).size := OS_M128; - break; - end; - else Message(asmr_e_unable_to_determine_reference_size); + if (tx86operand(operands[j]).opsize <> S_NO) and + (tx86operand(operands[j]).size <> OS_NO) then + begin + tx86operand(operands[i]).opsize := tx86operand(operands[j]).opsize; + tx86operand(operands[i]).size := tx86operand(operands[j]).size; + break; + end + else Message(asmr_e_unable_to_determine_reference_size); end; end; end; - end; - msiMemRegx64y256: - begin - for j := 1 to ops do + msiMemRegx16y32: begin - if operands[j].Opr.Typ = OPR_REGISTER then + for j := 1 to ops do begin - case getsubreg(operands[j].opr.reg) of - R_SUBMMX: begin - tx86operand(operands[i]).opsize := S_Q; - tx86operand(operands[i]).size := OS_M64; - break; - end; - R_SUBMMY: begin - tx86operand(operands[i]).opsize := S_YMM; - tx86operand(operands[i]).size := OS_M256; - break; - end; - else Message(asmr_e_unable_to_determine_reference_size); + if operands[j].Opr.Typ = OPR_REGISTER then + begin + case getsubreg(operands[j].opr.reg) of + R_SUBMMX: begin + tx86operand(operands[i]).opsize := S_L; + tx86operand(operands[i]).size := OS_M16; + break; + end; + R_SUBMMY: begin + tx86operand(operands[i]).opsize := S_Q; + tx86operand(operands[i]).size := OS_M32; + break; + end; + else Message(asmr_e_unable_to_determine_reference_size); + end; end; end; end; - end; - msiNoSize: ; // all memory-sizes are ok - msiMultiple: Message(asmr_e_unable_to_determine_reference_size); // TODO individual message + msiMemRegx32y64: + begin + for j := 1 to ops do + begin + if operands[j].Opr.Typ = OPR_REGISTER then + begin + case getsubreg(operands[j].opr.reg) of + R_SUBMMX: begin + tx86operand(operands[i]).opsize := S_L; + tx86operand(operands[i]).size := OS_M32; + break; + end; + R_SUBMMY: begin + tx86operand(operands[i]).opsize := S_Q; + tx86operand(operands[i]).size := OS_M64; + break; + end; + else Message(asmr_e_unable_to_determine_reference_size); + end; + end; + end; + end; + msiMemRegx64y128: + begin + for j := 1 to ops do + begin + if operands[j].Opr.Typ = OPR_REGISTER then + begin + case getsubreg(operands[j].opr.reg) of + R_SUBMMX: begin + tx86operand(operands[i]).opsize := S_Q; + tx86operand(operands[i]).size := OS_M64; + break; + end; + R_SUBMMY: begin + tx86operand(operands[i]).opsize := S_XMM; + tx86operand(operands[i]).size := OS_M128; + break; + end; + else Message(asmr_e_unable_to_determine_reference_size); + end; + end; + end; + end; + msiMemRegx64y256: + begin + for j := 1 to ops do + begin + if operands[j].Opr.Typ = OPR_REGISTER then + begin + case getsubreg(operands[j].opr.reg) of + R_SUBMMX: begin + tx86operand(operands[i]).opsize := S_Q; + tx86operand(operands[i]).size := OS_M64; + break; + end; + R_SUBMMY: begin + tx86operand(operands[i]).opsize := S_YMM; + tx86operand(operands[i]).size := OS_M256; + break; + end; + else Message(asmr_e_unable_to_determine_reference_size); + end; + end; + end; + end; + msiNoSize: ; // all memory-sizes are ok + msiMultiple: Message(asmr_e_unable_to_determine_reference_size); // TODO individual message + end; end; OPR_CONSTANT: case MemRefInfo(opcode).ConstSize of @@ -821,6 +867,48 @@ begin end; end; end; + + if MemRefInfo(opcode).ExistsSSEAVX then + begin + // validate broadcast-memory-operands + vbcst := 0; + mmregs := []; + + for i := 1 to ops do + if operands[i].Opr.Typ in [OPR_REFERENCE, OPR_LOCAL] then vbcst := tx86operand(operands[i]).vbcst + else if operands[i].Opr.Typ = OPR_REGISTER then + begin + if getsubreg(operands[i].opr.reg) in [R_SUBMMX, R_SUBMMY, R_SUBMMZ] then + begin + include(mmregs, getsubreg(operands[i].opr.reg)); + end; + end; + + if vbcst <> 0 then + begin + // found broadcast-memory-operand (e.g. "{1to8}") + // check is correct + + multiplicator := 0; + if mmregs = [R_SUBMMX] then multiplicator := 1 + else if mmregs = [R_SUBMMY] then multiplicator := 2 + else if mmregs = [R_SUBMMZ] then multiplicator := 3 + else + begin + //TG TODO + + end; + + if MemRefInfo(opcode).BCSTXMMMultiplicator * multiplicator <> vbcst then + begin + str(MemRefInfo(opcode).BCSTXMMMultiplicator * multiplicator, bcst1); + str(vbcst, bcst2); + Message2(asmr_e_mismatch_broadcasting_elements, '1to' + bcst1, '1to' + bcst2); + end; + end; + end; + + end; @@ -973,6 +1061,7 @@ begin else Message(asmr_e_size_suffix_and_dest_dont_match); end; + end; @@ -1040,6 +1129,8 @@ var asize : int64; ai : taicpu; + //TG TODO delete + ocode: tasmop; begin ConcatInstruction:=nil; @@ -1240,7 +1331,8 @@ begin Message(asmr_w_enter_not_supported_by_linux); - + //TG TODO delete + oCode := opcode; ai:=taicpu.op_none(opcode,siz); ai.fileinfo:=filepos; @@ -1346,4 +1438,104 @@ begin result:=ai; end; +function Tx86Instruction.getstring: string; +var + i : longint; + s, sval : string; + regnr: string; + addsize : boolean; +begin + s:='['+std_op2str[opcode]; + for i:=1 to ops do + begin + with operands[i] as Tx86Operand do + begin + if i=0 then + s:=s+' ' + else + s:=s+','; + { type } + addsize:=false; + + case operands[i].opr.typ of + OPR_CONSTANT : begin + str(operands[i].opr.val, sval); + s:=s+ sval; + end; + OPR_REGISTER : begin + regnr := ''; + str(getsupreg(opr.reg),regnr); + + if getsubreg(opr.reg)= R_SUBMMX then + s:=s+'xmmreg' + regnr + else + if getsubreg(opr.reg)= R_SUBMMY then + s:=s+'ymmreg' + regnr + else + if getsubreg(opr.reg)= R_SUBMMZ then + s:=s+'zmmreg' + regnr + else + if getregtype(opr.reg)= R_MMXREGISTER then + s:=s+'mmxreg' + else + if getregtype(opr.reg)= R_FPUREGISTER then + s:=s+'fpureg' + else + if getregtype(opr.reg)=R_INTREGISTER then + begin + s:=s+'reg'; + addsize:=true; + end; + end; + OPR_LOCAL, + OPR_REFERENCE: begin + s:=s + 'mem'; + addsize:=true; + end; + else s:=s + '???'; + end; + + if addsize then + begin + sval := ''; + str(tcgsize2size[size], sval); + + s := s + sval; + end; + + if vopext <> 0 then + begin + str(vopext and $07, regnr); + if vopext and OTVE_VECTOR_WRITEMASK = OTVE_VECTOR_WRITEMASK then + s := s + ' {k' + regnr + '}'; + + if vopext and OTVE_VECTOR_ZERO = OTVE_VECTOR_ZERO then + s := s + ' {z}'; + + if vopext and OTVE_VECTOR_SAE = OTVE_VECTOR_SAE then + s := s + ' {sae}'; + + + if vopext and OTVE_VECTOR_BCST = OTVE_VECTOR_BCST then + case vopext and OTVE_VECTOR_BCST_MASK of + OTVE_VECTOR_BCST2: s := s + ' {1to2}'; + OTVE_VECTOR_BCST4: s := s + ' {1to4}'; + OTVE_VECTOR_BCST8: s := s + ' {1to8}'; + OTVE_VECTOR_BCST16: s := s + ' {1to16}'; + end; + + if vopext and OTVE_VECTOR_ER = OTVE_VECTOR_ER then + case vopext and OTVE_VECTOR_ER_MASK of + OTVE_VECTOR_RNSAE: s := s + ' {rn-sae}'; + OTVE_VECTOR_RDSAE: s := s + ' {rd-sae}'; + OTVE_VECTOR_RUSAE: s := s + ' {ru-sae}'; + OTVE_VECTOR_RZSAE: s := s + ' {rz-sae}'; + end; + + end; + end; + end; + GetString:=s+']'; +end; + end. diff --git a/compiler/x86/rax86int.pas b/compiler/x86/rax86int.pas index cd6dda6426..12e31acf35 100644 --- a/compiler/x86/rax86int.pas +++ b/compiler/x86/rax86int.pas @@ -40,14 +40,15 @@ Unit Rax86int; AS_COMMA,AS_LBRACKET,AS_RBRACKET,AS_LPAREN, AS_RPAREN,AS_COLON,AS_DOT,AS_PLUS,AS_MINUS,AS_STAR, AS_SEPARATOR,AS_ID,AS_REGISTER,AS_OPCODE,AS_SLASH, - AS_LOPMASK,AS_VOPMASK,AS_LOPZEROMASK,AS_VOPZEROMASK, + AS_LOPMASK,AS_VOPMASK,AS_LOPZEROMASK,AS_VOPZEROMASK,AS_LOPBCST,AS_OPBCST1TO2,AS_OPBCST1TO4,AS_OPBCST1TO8,AS_OPBCST1TO16,AS_LOPSAE,AS_OPSAE, + AS_LOPER,AS_OPRNSAE,AS_OPRDSAE,AS_OPRUSAE,AS_OPRZSAE, {------------------ Assembler directives --------------------} AS_ALIGN,AS_DB,AS_DW,AS_DD,AS_DQ,AS_PUBLIC,AS_END, {------------------ Assembler Operators --------------------} AS_BYTE,AS_WORD,AS_DWORD,AS_QWORD,AS_TBYTE,AS_DQWORD,AS_OWORD,AS_XMMWORD,AS_YWORD,AS_YMMWORD,AS_ZWORD,AS_ZMMWORD,AS_NEAR,AS_FAR, AS_HIGH,AS_LOW,AS_OFFSET,AS_SIZEOF,AS_VMTOFFSET,AS_SEG,AS_TYPE,AS_PTR,AS_MOD,AS_SHL,AS_SHR,AS_NOT, - AS_AND,AS_OR,AS_XOR,AS_WRT,AS___GOTPCREL,AS_TARGET_DIRECTIVE - ,AS_BROADCAST + AS_AND,AS_OR,AS_XOR,AS_WRT,AS___GOTPCREL,AS_TARGET_DIRECTIVE,AS_RNSAE + ); type @@ -101,7 +102,7 @@ Unit Rax86int; procedure BuildConstantOperand(oper: tx86operand); procedure BuildOpCode(instr : tx86instruction); procedure BuildConstant(constsize: byte); - procedure consume_voperand_ext(aop: tx86operand); + procedure consume_voperand_ext(aop: tx86operand; aConsumeVOpExt: boolean = true); function is_targetdirective(const s: string): boolean;virtual; @@ -165,11 +166,12 @@ Unit Rax86int; ',','[',']','(', ')',':','.','+','-','*', ';','identifier','register','opcode','/', - '','','','', + '','','','','','','','','','','', + '','','','','', '','','','','','','END', '','','','','','','','','','','','','','', '','','','sizeof','vmtoffset','','type','ptr','mod','shl','shr','not', - 'and','or','xor','wrt','..gotpcrel','', '{1to8}' + 'and','or','xor','wrt','..gotpcrel','','{RN-SAE}' ); constructor tx86intreader.create; @@ -461,8 +463,20 @@ Unit Rax86int; c:=current_scanner.asmgetchar; end; end; - if prevasmtoken in [AS_LOPMASK,AS_LOPZEROMASK] then + if prevasmtoken in [AS_LOPMASK,AS_LOPZEROMASK,AS_LOPBCST,AS_LOPSAE,AS_LOPER] then begin + if (prevasmtoken = AS_LOPER) and (c = '-') then + begin + actasmpattern := actasmpattern + c; + c:=current_scanner.asmgetchar; + while c in ['A'..'Z','a'..'z'] do + begin + actasmpattern:=actasmpattern + c; + c:=current_scanner.asmgetchar; + end; + end; + + { allow spaces } while (c in [' ',#9]) do c:=current_scanner.asmgetchar; @@ -475,15 +489,44 @@ Unit Rax86int; (actasmpattern[2] in ['1'..'7']) then begin actasmtoken := AS_VOPMASK; - exit; end; AS_LOPZEROMASK: if (actasmpattern = 'z') or (actasmpattern = 'Z') then begin actasmtoken := AS_VOPZEROMASK; - exit; end; + AS_LOPBCST: + begin + actasmpattern_origcase:=actasmpattern; + uppervar(actasmpattern); + + if (actasmpattern = '1TO2') then actasmtoken := AS_OPBCST1TO2 + else if (actasmpattern = '1TO4') then actasmtoken := AS_OPBCST1TO4 + else if (actasmpattern = '1TO8') then actasmtoken := AS_OPBCST1TO8 + else if (actasmpattern = '1TO16') then actasmtoken := AS_OPBCST1TO16 + else actasmpattern := actasmpattern_origcase; + end; + AS_LOPSAE: + begin + actasmpattern_origcase:=actasmpattern; + uppervar(actasmpattern); + + if (actasmpattern = 'SAE') then actasmtoken := AS_OPSAE + else actasmpattern := actasmpattern_origcase; + end; + AS_LOPER: + begin + actasmpattern_origcase:=actasmpattern; + uppervar(actasmpattern); + + if (actasmpattern = 'RD-SAE') then actasmtoken := AS_OPRDSAE + else if (actasmpattern = 'RN-SAE') then actasmtoken := AS_OPRNSAE + else if (actasmpattern = 'RU-SAE') then actasmtoken := AS_OPRUSAE + else if (actasmpattern = 'RZ-SAE') then actasmtoken := AS_OPRZSAE + else actasmpattern := actasmpattern_origcase; + end + else ; // is completely comment =>> nothing todo end; @@ -764,52 +807,91 @@ Unit Rax86int; '0'..'9': begin - actasmpattern:=c; - c:=current_scanner.asmgetchar; - { Get the possible characters } - while c in ['0'..'9','A'..'F','a'..'f'] do - begin - actasmpattern:=actasmpattern + c; - c:=current_scanner.asmgetchar; - end; - { Get ending character } - actasmpattern_origcase:=actasmpattern; - uppervar(actasmpattern); - c:=upcase(c); - { possibly a binary number. } - if (actasmpattern[length(actasmpattern)] = 'B') and (c <> 'H') then - Begin - { Delete the last binary specifier } - delete(actasmpattern,length(actasmpattern),1); - actasmpattern:=tostr(ParseVal(actasmpattern,2)); - actasmtoken:=AS_INTNUM; - exit; - end - else - Begin - case c of - 'O' : - Begin - actasmpattern:=tostr(ParseVal(actasmpattern,8)); - actasmtoken:=AS_INTNUM; - c:=current_scanner.asmgetchar; - exit; - end; - 'H' : - Begin - actasmpattern:=tostr(ParseVal(actasmpattern,16)); - actasmtoken:=AS_INTNUM; - c:=current_scanner.asmgetchar; - exit; - end; - else { must be an integer number } - begin - actasmpattern:=tostr(ParseVal(actasmpattern,10)); - actasmtoken:=AS_INTNUM; - exit; - end; + if prevasmtoken = AS_LOPBCST then + begin + actasmpattern:=c; + c:=current_scanner.asmgetchar; + { Get the possible characters } + while c in ['1','2','4','6','8','t','T','o','O'] do + begin + actasmpattern:=actasmpattern + c; + c:=current_scanner.asmgetchar; end; - end; + + while (c in [' ',#9]) do + c:=current_scanner.asmgetchar; + + if c = '}' then + begin + actasmpattern_origcase:=actasmpattern; + uppervar(actasmpattern); + + if (actasmpattern = '1TO2') then actasmtoken := AS_OPBCST1TO2 + else if (actasmpattern = '1TO4') then actasmtoken := AS_OPBCST1TO4 + else if (actasmpattern = '1TO8') then actasmtoken := AS_OPBCST1TO8 + else if (actasmpattern = '1TO16') then actasmtoken := AS_OPBCST1TO16 + else actasmpattern := actasmpattern_origcase; + c:=current_scanner.asmgetchar; + end + else + begin + if c = '{' then current_scanner.inc_comment_level; + current_scanner.skipcomment(false); // is comment + end; + + actasmpattern := ''; + exit; + end + else + begin + + actasmpattern:=c; + c:=current_scanner.asmgetchar; + { Get the possible characters } + while c in ['0'..'9','A'..'F','a'..'f'] do + begin + actasmpattern:=actasmpattern + c; + c:=current_scanner.asmgetchar; + end; + { Get ending character } + actasmpattern_origcase:=actasmpattern; + uppervar(actasmpattern); + c:=upcase(c); + { possibly a binary number. } + if (actasmpattern[length(actasmpattern)] = 'B') and (c <> 'H') then + Begin + { Delete the last binary specifier } + delete(actasmpattern,length(actasmpattern),1); + actasmpattern:=tostr(ParseVal(actasmpattern,2)); + actasmtoken:=AS_INTNUM; + exit; + end + else + Begin + case c of + 'O' : + Begin + actasmpattern:=tostr(ParseVal(actasmpattern,8)); + actasmtoken:=AS_INTNUM; + c:=current_scanner.asmgetchar; + exit; + end; + 'H' : + Begin + actasmpattern:=tostr(ParseVal(actasmpattern,16)); + actasmtoken:=AS_INTNUM; + c:=current_scanner.asmgetchar; + exit; + end; + else { must be an integer number } + begin + actasmpattern:=tostr(ParseVal(actasmpattern,10)); + actasmtoken:=AS_INTNUM; + exit; + end; + end; + end; + end; end; #13,#10: @@ -850,13 +932,28 @@ Unit Rax86int; actasmtoken := AS_LOPZEROMASK; exit; end; + + '1': begin + actasmtoken := AS_LOPBCST; + exit; + end; + 's', + 'S': begin + actasmtoken := AS_LOPSAE; + exit; + end; + 'r', + 'R': begin + actasmtoken := AS_LOPER; + exit; + end; else begin current_scanner.skipcomment(false); end; end; end; - GetToken; + GetToken(check_operand_extention); end; else @@ -884,12 +981,13 @@ Unit Rax86int; // //if oper.reg //end; - procedure tx86intreader.consume_voperand_ext(aop: tx86operand); + procedure tx86intreader.consume_voperand_ext(aop: tx86operand; aConsumeVOpExt: boolean); var kreg: tregister; begin - Consume(actasmtoken); - if actasmtoken in [AS_VOPMASK, AS_VOPZEROMASK] then + Consume(actasmtoken, true); + if actasmtoken in [AS_VOPMASK, AS_VOPZEROMASK, AS_OPBCST1TO2, AS_OPBCST1TO4, AS_OPBCST1TO8, AS_OPBCST1TO16, + AS_OPSAE,AS_OPRNSAE,AS_OPRDSAE,AS_OPRUSAE,AS_OPRZSAE] then begin case actasmtoken of AS_VOPMASK: begin @@ -898,13 +996,35 @@ Unit Rax86int; (kreg <= NR_K7) then begin aop.vopext := aop.vopext or (tregisterrec(kreg).supreg and $07); //TG TODO check - aop.vopext := aop.vopext or OTVE_VECTORMASK_WRITEMASK; + aop.vopext := aop.vopext or OTVE_VECTOR_WRITEMASK; end; end; - AS_VOPZEROMASK: aop.vopext := aop.vopext or OTVE_VECTORMASK_ZERO; + AS_VOPZEROMASK: aop.vopext := aop.vopext or OTVE_VECTOR_ZERO; + AS_OPBCST1TO2: begin + aop.vopext := aop.vopext or OTVE_VECTOR_BCST or OTVE_VECTOR_BCST2; + aop.vbcst := 2; + end; + AS_OPBCST1TO4: begin + aop.vopext := aop.vopext or OTVE_VECTOR_BCST or OTVE_VECTOR_BCST4; + aop.vbcst := 4; + end; + AS_OPBCST1TO8: begin + aop.vopext := aop.vopext or OTVE_VECTOR_BCST or OTVE_VECTOR_BCST8; + aop.vbcst := 8; + end; + AS_OPBCST1TO16: begin + aop.vopext := aop.vopext or OTVE_VECTOR_BCST or OTVE_VECTOR_BCST16; + aop.vbcst := 16; + end; + AS_OPSAE: aop.vopext := aop.vopext or OTVE_VECTOR_SAE; + AS_OPRNSAE: aop.vopext := aop.vopext or OTVE_VECTOR_RNSAE; + AS_OPRDSAE: aop.vopext := aop.vopext or OTVE_VECTOR_RDSAE; + AS_OPRUSAE: aop.vopext := aop.vopext or OTVE_VECTOR_RUSAE; + AS_OPRZSAE: aop.vopext := aop.vopext or OTVE_VECTOR_RZSAE; end; - Consume(actasmtoken, true); + if aConsumeVOpExt then + Consume(actasmtoken, true); end; end; @@ -2050,7 +2170,7 @@ Unit Rax86int; Consume(AS_RBRACKET, true); //TG TODO check - while actasmtoken in [AS_LOPMASK,AS_LOPZEROMASK] do + while actasmtoken in [AS_LOPMASK,AS_LOPZEROMASK,AS_LOPBCST] do begin consume_voperand_ext(oper); end; @@ -2404,7 +2524,15 @@ Unit Rax86int; { is it a normal variable ? } Begin expr:=actasmpattern; - Consume(AS_ID); + Consume(AS_ID, true); + + //TG TODO check + while actasmtoken in [AS_LOPMASK,AS_LOPZEROMASK,AS_LOPBCST] do + begin + consume_voperand_ext(oper); + end; + + { typecasting? } if SearchType(expr,l) then begin @@ -2469,7 +2597,7 @@ Unit Rax86int; //TG TODO check if (getregtype(tempreg) = R_MMREGISTER) then begin - while actasmtoken in [AS_LOPMASK,AS_LOPZEROMASK] do + while actasmtoken in [AS_LOPMASK,AS_LOPZEROMASK, AS_LOPSAE, AS_LOPER] do begin consume_voperand_ext(oper); end; @@ -2728,7 +2856,7 @@ Unit Rax86int; Message(asmr_e_too_many_operands) else Dec(operandnum); - Consume(AS_COMMA); + Consume(AS_COMMA, true); //TG CHECK end; {Far constant, i.e. jmp $0000:$11111111.} @@ -2768,6 +2896,21 @@ Unit Rax86int; end; BuildOperand(instr.Operands[operandnum] as tx86operand,false); end; + AS_LOPSAE, + AS_LOPER: + if operandnum < max_operands then + begin + consume_voperand_ext(instr.Operands[operandnum + 1] as tx86operand, false); + if actasmtoken in [AS_OPSAE,AS_OPRNSAE,AS_OPRDSAE,AS_OPRUSAE,AS_OPRZSAE] then + begin + consume(actasmtoken); + // ignore operand + if actasmtoken in [AS_END,AS_SEPARATOR,AS_COMMA] then inc(operandnum) + else Message(asmr_e_syntax_error); + end + else Message(asmr_e_syntax_error); + end + else Message(asmr_e_syntax_error); else BuildOperand(instr.Operands[operandnum] as tx86operand,false); end; { end case } diff --git a/compiler/x86/x86ins.dat b/compiler/x86/x86ins.dat index 070156dca4..de2f9ac80d 100644 --- a/compiler/x86/x86ins.dat +++ b/compiler/x86/x86ins.dat @@ -3589,8 +3589,9 @@ void \326\1\xA7 X86_64 [VADDPD] (Ch_Wop3, Ch_Rop2, Ch_Rop1) -xmmreg,xmmreg,xmmrm \361\362\370\1\x58\75\120 AVX,SANDYBRIDGE -ymmreg,ymmreg,ymmrm \361\362\364\370\1\x58\75\120 AVX,SANDYBRIDGE +xmmreg_mz,xmmreg,xmmrm \350\352\361\362\370\1\x58\75\120 AVX,SANDYBRIDGE +ymmreg_mz,ymmreg,ymmrm \350\352\361\362\364\370\1\x58\75\120 AVX,SANDYBRIDGE +zmmreg_mz,zmmreg,zmmrm_er \350\351\352\361\370\1\x58\75\120 AVX,SANDYBRIDGE [VADDPS] (Ch_Wop3, Ch_Rop2, Ch_Rop1) @@ -3692,10 +3693,10 @@ ymmreg,xmmreg \361\362\364\371\1\x19\110 AVX2 [VBROADCASTSS] (Ch_All) -ymmreg,mem32 \361\362\364\371\1\x18\110 AVX,SANDYBRIDGE -xmmreg,mem32 \361\362\371\1\x18\110 AVX,SANDYBRIDGE -ymmreg,xmmreg \361\362\364\371\1\x18\110 AVX2 -xmmreg,xmmreg \361\362\371\1\x18\110 AVX2 +ymmreg_mz,mem32 \350\361\362\364\371\1\x18\110 AVX,SANDYBRIDGE +xmmreg_mz,mem32 \350\361\362\371\1\x18\110 AVX,SANDYBRIDGE +ymmreg_mz,xmmreg \350\361\362\364\371\1\x18\110 AVX2 +xmmreg_mz,xmmreg \350\361\362\371\1\x18\110 AVX2 [VCMPEQPS] (Ch_All) @@ -4028,10 +4029,12 @@ ymmreg,ymmreg,ymmrm \361\362\364\370\1\xC2\75\120\1\x1F AVX,SAND xmmreg,xmmreg,xmmrm,imm8 \361\362\370\1\xC2\75\120\27 AVX,SANDYBRIDGE ymmreg,ymmreg,ymmrm,imm8 \361\362\364\370\1\xC2\75\120\27 AVX,SANDYBRIDGE + [VCMPPS] (Ch_All) xmmreg,xmmreg,xmmrm,imm8 \362\370\1\xC2\75\120\27 AVX,SANDYBRIDGE ymmreg,ymmreg,ymmrm,imm8 \362\364\370\1\xC2\75\120\27 AVX,SANDYBRIDGE +kreg,xmmreg,xmmrm,imm8 \350\370\1\xC2\75\120\27 AVX512 [VCMPSD] (Ch_All) @@ -4051,7 +4054,8 @@ xmmreg,xmmreg \361\362\370\1\x2F\110 AVX,SA [VCOMISS] (Ch_Rop1, Ch_Rop2, Ch_WFlags) xmmreg,mem32 \362\370\1\x2F\110 AVX,SANDYBRIDGE -xmmreg,xmmreg \362\370\1\x2F\110 AVX,SANDYBRIDGE +xmmreg,xmmreg_sae \350\362\370\1\x2F\110 AVX,SANDYBRIDGE + [VCVTDQ2PD] (Ch_Wop2, Ch_Rop1) @@ -4293,8 +4297,8 @@ ymmrm,ymmreg \362\364\370\1\x29\101 AVX,SA [VMOVD] (Ch_Wop2, Ch_Rop1) -xmmreg,rm32 \361\362\370\1\x6E\110 AVX,SANDYBRIDGE -rm32,xmmreg \361\362\370\1\x7E\101 AVX,SANDYBRIDGE +xmmreg,rm32 \350\361\362\370\1\x6E\110 AVX,SANDYBRIDGE +rm32,xmmreg \350\361\362\370\1\x7E\101 AVX,SANDYBRIDGE [VMOVDDUP] (Ch_Wop2, Ch_Rop1) @@ -4380,12 +4384,12 @@ mem128,xmmreg \362\370\1\x2B\101 AVX,SA [VMOVQ] (Ch_Wop2, Ch_Rop1) -xmmreg,xmmreg \362\333\370\1\x7E\110 AVX,SANDYBRIDGE -xmmreg,mem64 \362\333\370\1\x7E\110 AVX,SANDYBRIDGE -xmmreg,xmmreg \362\361\370\1\xD6\101 AVX,SANDYBRIDGE -mem64,xmmreg \362\361\370\1\xD6\101 AVX,SANDYBRIDGE -rm64,xmmreg \362\361\363\370\1\x7E\101 AVX,SANDYBRIDGE,X86_64 -xmmreg,rm64 \362\361\363\370\1\x6E\110 AVX,SANDYBRIDGE,X86_64 +xmmreg,xmmreg \350\362\333\370\1\x7E\110 AVX,SANDYBRIDGE +xmmreg,mem64 \350\362\333\370\1\x7E\110 AVX,SANDYBRIDGE +xmmreg,xmmreg \350\362\361\370\1\xD6\101 AVX,SANDYBRIDGE +mem64,xmmreg \350\362\361\370\1\xD6\101 AVX,SANDYBRIDGE +rm64,xmmreg \350\362\361\363\370\1\x7E\101 AVX,SANDYBRIDGE,X86_64 +xmmreg,rm64 \350\362\361\363\370\1\x6E\110 AVX,SANDYBRIDGE,X86_64 [VMOVSD] ; the three ops must be handle by the compiler internally @@ -5006,11 +5010,14 @@ ymmreg,ymmreg,xmmrm \361\362\364\370\1\xE1\75\120 AVX2 [VPSRLD] (Ch_Rop1, Ch_Rop2, Ch_Wop3) xmmreg,xmmreg,imm8 \361\362\370\1\x72\74\212\26 AVX,SANDYBRIDGE +xmmreg_mz,xmmrm,imm8 \350\254\361\362\370\1\x72\74\212\26 AVX512 +xmmreg_mz,bmem32,imm8 \350\254\361\362\370\1\x72\74\212\26 AVX512 xmmreg,xmmreg,xmmrm \361\362\370\1\xD2\75\120 AVX,SANDYBRIDGE ymmreg,ymmreg,imm8 \361\362\364\370\1\x72\74\212\26 AVX2 ymmreg,ymmreg,xmmrm \361\362\364\370\1\xD2\75\120 AVX2 + [VPSRLDQ] (Ch_Rop1, Ch_Rop2, Ch_Wop3) xmmreg,xmmreg,imm8 \361\362\370\1\x73\74\213\26 AVX,SANDYBRIDGE @@ -5370,7 +5377,11 @@ ymmreg,ymmreg,ymmrm,imm8 \361\362\364\372\1\x46\75\120\27 AVX2 [VPERMD] (Ch_All) -ymmregmz,ymmreg,ymmrm \350\354\361\362\364\371\1\x36\75\120 AVX2 +ymmreg,ymmreg,ymmrm \350\361\362\364\371\1\x36\75\120 AVX2 +ymmreg_mz,ymmreg,ymmrm \350\361\362\364\371\1\x36\75\120 AVX512 +ymmreg_mz,ymmreg,bmem32 \350\361\362\364\371\1\x36\75\120 AVX512 +zmmreg_mz,zmmreg,zmmrm \350\351\361\362\364\371\1\x36\75\120 AVX512 +zmmreg_mz,zmmreg,bmem32 \350\351\361\362\364\371\1\x36\75\120 AVX512 [VPERMPD] @@ -5877,3 +5888,14 @@ void \3\x0F\x01\xD0 XSAVE (Ch_All) mem \2\x0F\x0D\202 PREFETCHWT1 + +;******************************************************************************* +;********** AVX 512 - MASKRegister ********************************************* +;******************************************************************************* + +[KANDB] +(Ch_Mop3, Ch_Rop2, Ch_Rop1) +kreg,kreg,kreg \361\362\364\370\1\x41\75\120 AVX512 + + + diff --git a/compiler/x86/x86reg.dat b/compiler/x86/x86reg.dat index 71493d8c61..a2ddd4b918 100644 --- a/compiler/x86/x86reg.dat +++ b/compiler/x86/x86reg.dat @@ -244,14 +244,14 @@ NR_ZMM29,$040E001D,zmm29,%zmm29,zmm29,zmm29,-1,-1,80,OT_ZMMREG,5,64 NR_ZMM30,$040E001E,zmm30,%zmm30,zmm30,zmm30,-1,-1,81,OT_ZMMREG,6,64 NR_ZMM31,$040E001F,zmm31,%zmm31,zmm31,zmm31,-1,-1,82,OT_ZMMREG,7,64 -NR_K0,$06000000,k0,%k0,k0,k0,-1,118,118,OT_REG_VECTORMASK,0 -NR_K1,$06000001,k1,%k1,k1,k1,-1,119,119,OT_REG_VECTORMASK,1 -NR_K2,$06000002,k2,%k2,k2,k2,-1,120,120,OT_REG_VECTORMASK,2 -NR_K3,$06000003,k3,%k3,k3,k3,-1,121,121,OT_REG_VECTORMASK,3 -NR_K4,$06000004,k4,%k4,k4,k4,-1,122,122,OT_REG_VECTORMASK,4 -NR_K5,$06000005,k5,%k5,k5,k5,-1,123,123,OT_REG_VECTORMASK,5 -NR_K6,$06000006,k6,%k6,k6,k6,-1,124,124,OT_REG_VECTORMASK,6 -NR_K7,$06000007,k7,%k7,k7,k7,-1,125,125,OT_REG_VECTORMASK,7 +NR_K0,$06000000,k0,%k0,k0,k0,-1,118,118,OT_KREG,0 +NR_K1,$06000001,k1,%k1,k1,k1,-1,119,119,OT_KREG,1 +NR_K2,$06000002,k2,%k2,k2,k2,-1,120,120,OT_KREG,2 +NR_K3,$06000003,k3,%k3,k3,k3,-1,121,121,OT_KREG,3 +NR_K4,$06000004,k4,%k4,k4,k4,-1,122,122,OT_KREG,4 +NR_K5,$06000005,k5,%k5,k5,k5,-1,123,123,OT_KREG,5 +NR_K6,$06000006,k6,%k6,k6,k6,-1,124,124,OT_KREG,6 +NR_K7,$06000007,k7,%k7,k7,k7,-1,125,125,OT_KREG,7 ; NR_BND0,$07000000,bnd0,%bnd0,bnd0,bnd0,-1,126,126,OT_REG_BND,0 ; NR_BND1,$07000001,bnd1,%bnd1,bnd1,bnd1,-1,127,127,OT_REG_BND,1 diff --git a/compiler/x86_64/r8664ot.inc b/compiler/x86_64/r8664ot.inc index f0b671a067..8262361f69 100644 --- a/compiler/x86_64/r8664ot.inc +++ b/compiler/x86_64/r8664ot.inc @@ -215,11 +215,11 @@ OT_ZMMREG, OT_ZMMREG, OT_ZMMREG, OT_ZMMREG, -OT_REG_VECTORMASK, -OT_REG_VECTORMASK, -OT_REG_VECTORMASK, -OT_REG_VECTORMASK, -OT_REG_VECTORMASK, -OT_REG_VECTORMASK, -OT_REG_VECTORMASK, -OT_REG_VECTORMASK +OT_KREG, +OT_KREG, +OT_KREG, +OT_KREG, +OT_KREG, +OT_KREG, +OT_KREG, +OT_KREG diff --git a/compiler/x86_64/x8664ats.inc b/compiler/x86_64/x8664ats.inc index 56551ab634..c193354771 100644 --- a/compiler/x86_64/x8664ats.inc +++ b/compiler/x86_64/x8664ats.inc @@ -1108,5 +1108,6 @@ attsufNONE, attsufNONE, attsufNONE, attsufNONE, -attsufINT +attsufINT, +attsufNONE ); diff --git a/compiler/x86_64/x8664att.inc b/compiler/x86_64/x8664att.inc index 5ab54627da..f18dcf6ff0 100644 --- a/compiler/x86_64/x8664att.inc +++ b/compiler/x86_64/x8664att.inc @@ -1108,5 +1108,6 @@ 'rdrand', 'rdseed', 'xgetbv', -'prefetchwt1' +'prefetchwt1', +'kandb' ); diff --git a/compiler/x86_64/x8664int.inc b/compiler/x86_64/x8664int.inc index a11631c734..0002f969b0 100644 --- a/compiler/x86_64/x8664int.inc +++ b/compiler/x86_64/x8664int.inc @@ -1108,5 +1108,6 @@ 'rdrand', 'rdseed', 'xgetbv', -'prefetchwt1' +'prefetchwt1', +'kandb' ); diff --git a/compiler/x86_64/x8664nop.inc b/compiler/x86_64/x8664nop.inc index 3c7dd73314..3bb43c87c3 100644 --- a/compiler/x86_64/x8664nop.inc +++ b/compiler/x86_64/x8664nop.inc @@ -1,2 +1,2 @@ { don't edit, this file is generated from x86ins.dat } -2171; +2180; diff --git a/compiler/x86_64/x8664op.inc b/compiler/x86_64/x8664op.inc index 367524ba49..480001e172 100644 --- a/compiler/x86_64/x8664op.inc +++ b/compiler/x86_64/x8664op.inc @@ -1108,5 +1108,6 @@ A_XTEST, A_RDRAND, A_RDSEED, A_XGETBV, -A_PREFETCHWT1 +A_PREFETCHWT1, +A_KANDB ); diff --git a/compiler/x86_64/x8664pro.inc b/compiler/x86_64/x8664pro.inc index de9d3ab58b..915c717ede 100644 --- a/compiler/x86_64/x8664pro.inc +++ b/compiler/x86_64/x8664pro.inc @@ -1108,5 +1108,6 @@ (Ch: [Ch_Wop1, Ch_WFlags]), (Ch: [Ch_Wop1, Ch_WFlags]), (Ch: [Ch_WEAX, Ch_WEDX, Ch_RECX]), -(Ch: [Ch_All]) +(Ch: [Ch_All]), +(Ch: [Ch_Mop3, Ch_Rop2, Ch_Rop1]) ); diff --git a/compiler/x86_64/x8664tab.inc b/compiler/x86_64/x8664tab.inc index 80c7312c86..f6e3edd6d5 100644 --- a/compiler/x86_64/x8664tab.inc +++ b/compiler/x86_64/x8664tab.inc @@ -9012,15 +9012,22 @@ ( opcode : A_VADDPD; ops : 3; - optypes : (ot_xmmreg,ot_xmmreg,ot_xmmrm,ot_none); - code : #241#242#248#1#88#61#80; + optypes : (ot_xmmreg_mz,ot_xmmreg,ot_xmmrm,ot_none); + code : #232#234#241#242#248#1#88#61#80; flags : [if_avx,if_sandybridge] ), ( opcode : A_VADDPD; ops : 3; - optypes : (ot_ymmreg,ot_ymmreg,ot_ymmrm,ot_none); - code : #241#242#244#248#1#88#61#80; + optypes : (ot_ymmreg_mz,ot_ymmreg,ot_ymmrm,ot_none); + code : #232#234#241#242#244#248#1#88#61#80; + flags : [if_avx,if_sandybridge] + ), + ( + opcode : A_VADDPD; + ops : 3; + optypes : (ot_zmmreg_mz,ot_zmmreg,ot_zmmrm_er,ot_none); + code : #232#233#234#241#248#1#88#61#80; flags : [if_avx,if_sandybridge] ), ( @@ -9271,29 +9278,29 @@ ( opcode : A_VBROADCASTSS; ops : 2; - optypes : (ot_ymmreg,ot_memory or ot_bits32,ot_none,ot_none); - code : #241#242#244#249#1#24#72; + optypes : (ot_ymmreg_mz,ot_memory or ot_bits32,ot_none,ot_none); + code : #232#241#242#244#249#1#24#72; flags : [if_avx,if_sandybridge] ), ( opcode : A_VBROADCASTSS; ops : 2; - optypes : (ot_xmmreg,ot_memory or ot_bits32,ot_none,ot_none); - code : #241#242#249#1#24#72; + optypes : (ot_xmmreg_mz,ot_memory or ot_bits32,ot_none,ot_none); + code : #232#241#242#249#1#24#72; flags : [if_avx,if_sandybridge] ), ( opcode : A_VBROADCASTSS; ops : 2; - optypes : (ot_ymmreg,ot_xmmreg,ot_none,ot_none); - code : #241#242#244#249#1#24#72; + optypes : (ot_ymmreg_mz,ot_xmmreg,ot_none,ot_none); + code : #232#241#242#244#249#1#24#72; flags : [if_avx2] ), ( opcode : A_VBROADCASTSS; ops : 2; - optypes : (ot_xmmreg,ot_xmmreg,ot_none,ot_none); - code : #241#242#249#1#24#72; + optypes : (ot_xmmreg_mz,ot_xmmreg,ot_none,ot_none); + code : #232#241#242#249#1#24#72; flags : [if_avx2] ), ( @@ -10220,6 +10227,13 @@ code : #242#244#248#1#194#61#80#23; flags : [if_avx,if_sandybridge] ), + ( + opcode : A_VCMPPS; + ops : 4; + optypes : (ot_kreg,ot_xmmreg,ot_xmmrm,ot_immediate or ot_bits8); + code : #232#248#1#194#61#80#23; + flags : [if_avx512] + ), ( opcode : A_VCMPSD; ops : 4; @@ -10272,8 +10286,8 @@ ( opcode : A_VCOMISS; ops : 2; - optypes : (ot_xmmreg,ot_xmmreg,ot_none,ot_none); - code : #242#248#1#47#72; + optypes : (ot_xmmreg,ot_xmmreg_sae,ot_none,ot_none); + code : #232#242#248#1#47#72; flags : [if_avx,if_sandybridge] ), ( @@ -11001,14 +11015,14 @@ opcode : A_VMOVD; ops : 2; optypes : (ot_xmmreg,ot_rm_gpr or ot_bits32,ot_none,ot_none); - code : #241#242#248#1#110#72; + code : #232#241#242#248#1#110#72; flags : [if_avx,if_sandybridge] ), ( opcode : A_VMOVD; ops : 2; optypes : (ot_rm_gpr or ot_bits32,ot_xmmreg,ot_none,ot_none); - code : #241#242#248#1#126#65; + code : #232#241#242#248#1#126#65; flags : [if_avx,if_sandybridge] ), ( @@ -13174,6 +13188,20 @@ code : #241#242#248#1#114#60#138#22; flags : [if_avx,if_sandybridge] ), + ( + opcode : A_VPSRLD; + ops : 3; + optypes : (ot_xmmreg_mz or ot_signed,ot_xmmrm,ot_immediate or ot_bits8,ot_none); + code : #232#172#241#242#248#1#114#60#138#22; + flags : [if_avx512] + ), + ( + opcode : A_VPSRLD; + ops : 3; + optypes : (ot_xmmreg_mz or ot_signed,ot_bmem32,ot_immediate or ot_bits8,ot_none); + code : #232#172#241#242#248#1#114#60#138#22; + flags : [if_avx512] + ), ( opcode : A_VPSRLD; ops : 3; @@ -14178,10 +14206,38 @@ ( opcode : A_VPERMD; ops : 3; - optypes : (ot_ymmregmz,ot_ymmreg,ot_ymmrm,ot_none); - code : #232#236#241#242#244#249#1#54#61#80; + optypes : (ot_ymmreg,ot_ymmreg,ot_ymmrm,ot_none); + code : #232#241#242#244#249#1#54#61#80; flags : [if_avx2] ), + ( + opcode : A_VPERMD; + ops : 3; + optypes : (ot_ymmreg_mz,ot_ymmreg,ot_ymmrm,ot_none); + code : #232#241#242#244#249#1#54#61#80; + flags : [if_avx512] + ), + ( + opcode : A_VPERMD; + ops : 3; + optypes : (ot_ymmreg_mz,ot_ymmreg,ot_bmem32,ot_none); + code : #232#241#242#244#249#1#54#61#80; + flags : [if_avx512] + ), + ( + opcode : A_VPERMD; + ops : 3; + optypes : (ot_zmmreg_mz,ot_zmmreg,ot_zmmrm,ot_none); + code : #232#233#241#242#244#249#1#54#61#80; + flags : [if_avx512] + ), + ( + opcode : A_VPERMD; + ops : 3; + optypes : (ot_zmmreg_mz,ot_zmmreg,ot_bmem32,ot_none); + code : #232#233#241#242#244#249#1#54#61#80; + flags : [if_avx512] + ), ( opcode : A_VPERMPD; ops : 3; @@ -15196,5 +15252,12 @@ optypes : (ot_memory,ot_none,ot_none,ot_none); code : #2#15#13#130; flags : [if_prefetchwt1] + ), + ( + opcode : A_KANDB; + ops : 3; + optypes : (ot_kreg,ot_kreg,ot_kreg,ot_none); + code : #241#242#244#248#1#65#61#80; + flags : [if_avx512] ) );