From a499a30ca92c1365460c17f55c671faa1bdd5edb Mon Sep 17 00:00:00 2001 From: florian <florian@freepascal.org> Date: Fri, 19 Oct 2012 16:45:53 +0000 Subject: [PATCH] * fixes to avx support by Torsten Grundke git-svn-id: trunk@22773 - --- .gitattributes | 8 - compiler/msg/errore.msg | 4 +- compiler/msgidx.inc | 5 +- compiler/msgtxt.inc | 518 +++++++++++++++++++------------------- compiler/x86/aasmcpu.pas | 29 ++- compiler/x86/rax86.pas | 86 ++++++- compiler/x86/rax86att.pas | 33 ++- tests/test/tasm10.pp | 12 - tests/test/tasm11.pp | 12 - tests/test/tasm12.pp | 12 - tests/test/tasm13.pp | 12 - tests/test/tasm14.pp | 57 ----- tests/test/tasm15.pp | 12 - tests/test/tasm2.pp | 24 +- tests/test/tasm7.pp | 71 ++++-- tests/test/tasm8.pp | 12 - tests/test/tasm9.pp | 12 - 17 files changed, 465 insertions(+), 454 deletions(-) delete mode 100644 tests/test/tasm10.pp delete mode 100644 tests/test/tasm11.pp delete mode 100644 tests/test/tasm12.pp delete mode 100644 tests/test/tasm13.pp delete mode 100644 tests/test/tasm14.pp delete mode 100644 tests/test/tasm15.pp delete mode 100644 tests/test/tasm8.pp delete mode 100644 tests/test/tasm9.pp diff --git a/.gitattributes b/.gitattributes index 0122486221..e4ae07c10b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10416,20 +10416,12 @@ tests/test/tarrconstr2.pp svneol=native#text/pascal tests/test/tarrconstr3.pp svneol=native#text/pascal tests/test/tarrconstr4.pp svneol=native#text/pascal tests/test/tasm1.pp svneol=native#text/plain -tests/test/tasm10.pp svneol=native#text/plain -tests/test/tasm11.pp svneol=native#text/plain -tests/test/tasm12.pp svneol=native#text/plain -tests/test/tasm13.pp svneol=native#text/plain -tests/test/tasm14.pp svneol=native#text/plain -tests/test/tasm15.pp svneol=native#text/plain tests/test/tasm2.pp svneol=native#text/plain tests/test/tasm3.pp svneol=native#text/plain tests/test/tasm4.pp svneol=native#text/plain tests/test/tasm5.pp svneol=native#text/plain tests/test/tasm6.pp svneol=native#text/plain tests/test/tasm7.pp svneol=native#text/plain -tests/test/tasm8.pp svneol=native#text/plain -tests/test/tasm9.pp svneol=native#text/plain tests/test/tasmread.pp svneol=native#text/plain tests/test/tasout.pp svneol=native#text/plain tests/test/tassignmentoperator1.pp svneol=native#text/pascal diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg index 266ff9ef75..f84bda7507 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -2298,7 +2298,7 @@ cg_d_autoinlining=06055_DL_Auto inlining: $1 # # Assembler reader # -# 07123 is the last used one +# 07124 is the last used one # asmr_d_start_reading=07000_DL_Starting $1 styled assembler parsing % This informs you that an assembler block is being parsed @@ -2594,6 +2594,8 @@ asmr_w_check_mem_operand_size_offset=07122_W_Check size of memory operand "$1: m asmr_w_check_mem_operand_negative_offset=07123_W_Check "$1: offset of memory operand is negative "$2 byte" % The offset of memory operand is possible invalid. This is % probably an error in the assembler statement +asmr_w_check_mem_operand_automap_multiple_size=07124_W_Check "$1: size of memory operand is empty, but es exists different definitions of the memory size =>> map to $2 (smallest option)" +% The size of memory operand is empty and we have different definitions of possible memory sizes. Check it! # # Assembler/binary writers diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index 87c6a6327c..54d0f441df 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -754,6 +754,7 @@ const asmr_w_check_mem_operand_size3=07121; asmr_w_check_mem_operand_size_offset=07122; asmr_w_check_mem_operand_negative_offset=07123; + asmr_w_check_mem_operand_automap_multiple_size=07124; asmw_f_too_many_asm_files=08000; asmw_f_assembler_output_not_supported=08001; asmw_f_comp_not_supported=08002; @@ -956,9 +957,9 @@ const option_info=11024; option_help_pages=11025; - MsgTxtSize = 67045; + MsgTxtSize = 67185; MsgIdxMax : array[1..20] of longint=( - 26,92,325,120,87,56,124,26,202,63, + 26,92,325,120,87,56,125,26,202,63, 53,20,1,1,1,1,1,1,1,1 ); diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index 320b5071b6..83c32d4505 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -915,256 +915,259 @@ const msgtxt : array[0..000279,1..240] of char=( '07122_W_Check size of memory operand "$1: memory-operand-size is $2 bi'+ 'ts, but expected [$3 bits + $4 byte offset]"'#000+ '07123_W_Check "$1: offset of memory operand is negative "$2 byte"'#000+ + '07124_W_Check "$1: size of memory op','erand is empty, but es exists di'+ + 'fferent definitions of the memory size =>> map to $2 (smallest option)'+ + '"'#000+ '08000_F_Too many assembler files'#000+ - '080','01_F_Selected 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+ + '08003_F_Direct not support f','or binary writers'#000+ '08004_E_Allocating of data is only allowed in bss section'#000+ '08005_F_No binary writer selected'#000+ - '08006_E_Asm: Opcode $1 not in ','table'#000+ + '08006_E_Asm: Opcode $1 not in table'#000+ '08007_E_Asm: $1 invalid combination of opcode and operands'#000+ - '08008_E_Asm: 16 Bit references not supported'#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+ '08011_E_Asm: $1 value exceeds bounds $2'#000+ - '08012_','E_Asm: Short 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+ + '08014_E_Asm: Comp type not supp','orted for this target'#000+ '08015_E_Asm: Extended type not supported for this target'#000+ '08016_E_Asm: Duplicate label $1'#000+ - '08017_E_Asm: Redefined label ','$1'#000+ + '08017_E_Asm: Redefined label $1'#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+ + '08020_E_Asm: 16 or 32 Bit refere','nces 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 pre','fix'#000+ + ' 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+ + '08025_E_.','seh_handlerdata directive without preceding .seh_handler'#000+ '09000_W_Source operating system redefined'#000+ '09001_I_Assembling (pipe) $1'#000+ - '09002_E_Can'#039,'t create assembler file: $1'#000+ + '09002_E_Can'#039't create 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+ + '09004_E_Can'#039't crea','te 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 assembl','ing exitcode $1'#000+ + '09007_E_Error while assembling exitcode $1'#000+ '09008_E_Can'#039't call the assembler, error $1 switching to external a'+ 'ssembling'#000+ - '09009_I_Assembling $1'#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 fail !'#000+ '09013_E_Error while linking'#000+ - '09014_E_Can'#039't call the linker, switching 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 suppor','ted'#000+ + '09018_E_Creation of Executables not supported'#000+ '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+ '09020_I_Closing script $1'#000+ - '09021_E_resource compiler "$1" not found, switching to external mode'#000+ + '09021_E_res','ource compiler "$1" not found, switching to external mode'+ + #000+ '09022_I_Compiling resource $1'#000+ - '09023_T_unit $1 can'#039't be statically linked, switchin','g to smart l'+ - 'inking'#000+ + '09023_T_unit $1 can'#039't be statically linked, switching to smart lin'+ + 'king'#000+ '09024_T_unit $1 can'#039't be smart linked, switching to static linking'+ #000+ - '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+ - 'g'#000+ + '09025_T_unit $','1 can'#039't be shared linked, switching to static link'+ + 'ing'#000+ '09026_E_unit $1 can'#039't be smart or static linked'#000+ - '09027_E_unit $1 can'#039't be shared or sta','tic linked'#000+ + '09027_E_unit $1 can'#039't be shared or static linked'#000+ '09028_D_Calling resource compiler "$1" with "$2" as command line'#000+ - '09029_E_Error while compiling resources'#000+ + '09029_E_Error while comp','iling resources'#000+ '09030_E_Can'#039't call the resource compiler "$1", switching to extern'+ 'al mode'#000+ '09031_E_Can'#039't open resource file "$1"'#000+ - '09032_E_Can'#039,'t write resource file "$1"'#000+ + '09032_E_Can'#039't write resource file "$1"'#000+ '09033_N_File "$1" not found for backquoted cat command'#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+ '09131_X_Size of initialized data: $1 bytes'#000+ - '09132_X_Si','ze of uninitialized 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+ + '09134_X_Stack space commit','ted: $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 symbol', + '09201_W_Object file "$1" contains 32-bit absolute relocation to symbol'+ ' "$2".'#000+ '10000_T_Unitsearch: $1'#000+ '10001_T_PPU Loading $1'#000+ '10002_U_PPU Name: $1'#000+ '10003_U_PPU Flags: $1'#000+ - '10004_U_PPU Crc: $1'#000+ + '1000','4_U_PPU Crc: $1'#000+ '10005_U_PPU Time: $1'#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+ + '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+ - '10011_U_PPU Source: $1'#000+ + '10011_U','_PPU Source: $1'#000+ '10012_U_Writing $1'#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_In','valid PPU-File entry: $1'#000+ + '10016_F_Invalid PPU-File entry: $1'#000+ '10017_F_PPU Dbx count problem'#000+ '10018_E_Illegal unit name: $1'#000+ - '10019_F_Too much units'#000+ + '10019_F_Too muc','h units'#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 use','d by $2'#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+ + '10025_W_Co','mpiling 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+ - '10','028_U_Recompiling $1, checksum changed for $2'#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 than ppufile'#000+ + '10030_U_Reco','mpiling 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+ + '10032_U_Recompiling unit, obj and asm are older than ppufile'#000+ '10033_U_Recompiling unit, obj is older than asm'#000+ - '10034_U_Parsing interface of $1'#000+ + '10034_U_Parsing interface',' 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 modifed include files'+ - #000+ - '10041_U_File $1 is newer than the one used for creating PPU file $2'#000+ + '10040_W_Can'#039't recompile unit $1, but found modifed 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 which was compiled with a different FPU m'+ 'ode'#000+ '10043_U_Loading interface units from $1'#000+ - '10044_U_Loading impleme','ntation 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+ + '10046_U_Implementation CRC changed f','or 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+ + '10050_U_No reload, already in second compile: $1'#000+ '10051_U_Flag for reload: $1'#000+ '10052_U_Forced reloading'#000+ - '10053_U_Previous state of $1: $2'#000+ + '10053_U_Previou','s state of $1: $2'#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_Regi','stering new 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+ + '10059_U_Skipping re-resolving unit $1, still loadin','g 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 feedb','ack input ($2, $3); recompile it without wpo or use the sam'+ - 'e wpo feedback input file for this compilation invocation'#000+ + 'ion feedback input ($2, $3); recompile it without wpo or use the same '+ + 'wpo feedback input file for this compil','ation invocation'#000+ '10062_U_Indirect interface (objects/classes) CRC changed for unit $1'#000+ '11000_O_$1 [options] <inputfile> [options]'#000+ - '11001_W_Onl','y one source file supported, changing source file to comp'+ - 'ile from "$1" into "$2"'#000+ - '11002_W_DEF file can be created only for OS/2'#000+ + '11001_W_Only one source file supported, changing source file to compil'+ + 'e from "$1" into "$2"'#000+ + '11002_W_DEF file ca','n 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 ins','ide $1 config file'#000+ + '11005_N_No option inside $1 config file'#000+ '11006_E_Illegal parameter: $1'#000+ '11007_H_-? writes help pages'#000+ - '11008_F_Too many config files nested'#000+ + '11008_F_Too many confi','g 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 li','bs not supported on DOS platform, reverting to stat'+ - 'ic'#000+ - '11013_F_In options file $1 at line $2 too many \var{\#IF(N)DEFs} encou'+ - 'ntered'#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',' \var{\#IF(N)DEFs} enc'+ + 'ountered'#000+ '11014_F_In options file $1 at line $2 unexpected \var{\#ENDIFs} encoun'+ 'tered'#000+ - '11015_F_Open conditional at the e','nd of the options file'#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+ + '1101','7_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+ - '1102','0_N_Switching assembler to default source writing assembler'#000+ - '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+ + '11020_N_Switching assembler to default source writing assembler'#000+ + '11021_W_Assembler output selected "$1" i','s 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+ + '11027_T_Reading options from environment $1'#000+ '11028_D_Handling option "$1"'#000+ '11029_O_*** press enter ***'#000+ '11030_H_Start of reading config file $1'#000+ - '11031_H_End of reading config file $1'#000+ + '1','1031_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 o','ption "$1"'#000+ + '11033_D_interpreting file option "$1"'#000+ '11034_D_Reading config file "$1"'#000+ '11035_D_found source file name "$1"'#000+ - '11039_E_Unknown codepage "$1"'#000+ + '11039_E_Unknown code','page "$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 \var{\#ELSE} directive without \'+ - 'var{\#IF(N)DEF} found'#000+ + '11042_W_Use of ppc386.cfg is deprecated, please use fpc.cfg instead'#000+ + '11043_F_In options file $1 at line $2 ','\var{\#ELSE} directive without'+ + ' \var{\#IF(N)DEF} 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 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 t','arget platform.'#000+ + '11045_F_The feature "$1" is not, or not yet, supported on the selected'+ + ' target platform'#000+ + '11046_N_DWARF debu','g information cannot be used with smart linking on'+ + ' this 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 format combination.'#000+ + ' for the selec','ted target/debug format combination.'#000+ '11049_N_DWARF debug information cannot be used with smart linking with'+ - ' external assembler, disabling st','atic library creation.'#000+ + ' external assembler, disabling static library creation.'#000+ '11050_E_Invalid value for MACOSX_DEPLOYMENT_TARGET environment variabl'+ 'e: $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 wh','en us'+ - 'ing the EABIHF ABI target'#000+ + '1','1051_E_Invalid value for IPHONEOS_DEPLOYMENT_TARGET environment var'+ + 'iable: $1'#000+ + '11052_E_You must use a FPU type of VFPV2, VFPV3 or VFPV3_D16 when usin'+ + 'g the EABIHF ABI target'#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 ','informati'+ - 'on in wpo feedback file "$1"'#000+ - '12003_E_Expected section header, but got "$2" at line $1 of wpo feedba'+ - 'ck file'#000+ + '120','01_D_Processing whole program optimization information in wpo fee'+ + 'dback 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 wp','o 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 perfo','rm "$1" whole pro'+ - 'gram optimization found'#000+ - '12008_F_Specify a whole program optimization feedback file to store th'+ - 'e generated info in (using -FW)'#000+ + '12005_D_Found whole program optimization section "$1" with information'+ + ' about "$2"'#000+ + '12006_F_The selected whole',' program optimizations require a previousl'+ + 'y 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 '+ + 'the generated info in (using -FW)'#000+ '12009_E_Not generating any whole program optimization information, yet'+ - ' a feedback file was specif','ied (using -FW)'#000+ + ' 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+ + 'eedback file w','as 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 feedbac'+ - 'k input file using information in section "$2"'#000+ + '12012_W_Overriding previously read information for "$1" from feedback '+ + 'input file using information in secti','on "$2"'#000+ '12013_E_Cannot extract symbol liveness information from program when s'+ 'tripping symbols, use -Xs-'#000+ - '12014_E_Cannot extract symbol liven','ess information from program when'+ - ' when not linking'#000+ - '12015_F_Cannot find "$1" or "$2" to extract symbol liveness informatio'+ - 'n from linked program'#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 symbo','l liveness informat'+ + 'ion 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 inform'+ - 'ation 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',' '+ - 'file "$1"'#000+ + '12017_F_Error executing "$1" (exitcode: $2) to extract symbol informat'+ + 'ion from linked program'#000+ + '12018_E_Collection of symbol ','liveness information can only help when'+ + ' using smart linking, use -CX -XX'#000+ + '12019_E_Cannot create specified whole program optimisation feedback fi'+ + 'le "$1"'#000+ '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+ 'CPU'#010+ - 'Copyright (c) 1993-2012 by Florian Klaempfl and others'#000+ + 'Copyright (c) 1','993-2012 by Florian Klaempfl and others'#000+ '11024_Free Pascal Compiler version $FPCVERSION'#010+ #010+ 'Compiler Date : $FPCDATE'#010+ - 'Compiler CPU Target: $','FPCCPU'#010+ + 'Compiler CPU Target: $FPCCPU'#010+ #010+ 'Supported targets:'#010+ ' $OSTARGETS'#010+ @@ -1172,7 +1175,7 @@ const msgtxt : array[0..000279,1..240] of char=( 'Supported CPU instruction sets:'#010+ ' $INSTRUCTIONSETS'#010+ #010+ - 'Supported FPU instruction sets:'#010+ + 'Support','ed FPU instruction sets:'#010+ ' $FPUINSTRUCTIONSETS'#010+ #010+ 'Supported ABI targets:'#010+ @@ -1181,368 +1184,369 @@ const msgtxt : array[0..000279,1..240] of char=( 'Supported Optimizations:'#010+ ' $OPTIMIZATIONS'#010+ #010+ - 'Supported W','hole Program Optimizations:'#010+ + 'Supported Whole Program Optimizations:'#010+ ' All'#010+ ' $WPOPTIMIZATIONS'#010+ #010+ 'Supported Microcontroller types:'#010+ - ' $CONTROLLERTYPES'#010+ + ' $CONTROLLER','TYPES'#010+ #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 o','n:'#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+ + 'More information may be found on our WWW pages (incl','uding directions'+ + #010+ 'for mailing lists useful for asking questions or discussing potential'#010+ 'new features, etc.):'#010+ - ' http://www.free','pascal.org'#000+ + ' http://www.freepascal.org'#000+ '11025_**0*_Put + after a boolean switch option to enable it, - to disa'+ 'ble it'#010+ - '**1a_The compiler doesn'#039't delete the generated assembler file'#010+ + '**1a_The com','piler doesn'#039't delete the generated assembler file'#010+ '**2al_List sourcecode lines in assembler file'#010+ - '**2an_List node info in assembler file (-dEX','TDEBUG compiler)'#010+ + '**2an_List node info in assembler file (-dEXTDEBUG compiler)'#010+ '*L2ap_Use pipes instead of creating temporary assembler files'#010+ - '**2ar_List register allocation/release info in assembler file'#010+ + '**2ar_List register a','llocation/release info in assembler file'#010+ '**2at_List temp allocation/release info in assembler file'#010+ '**1A<x>_Output format:'#010+ - '**2Adefault_Use de','fault assembler'#010+ + '**2Adefault_Use default assembler'#010+ '3*2Aas_Assemble using GNU AS'#010+ - '3*2Amacho_Mach-O (Darwin, Intel 32 bit) using internal writer'#010+ + '3*2Amacho_Mach-O (Darwin, Intel 32 bit) using internal ','writer'#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*2An','asmwdosx_Win32/WDOSX object file using Nasm'#010+ + '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+ '3*2Awasm_Obj file using Wasm (Watcom)'#010+ - '3*2Anasmobj_Obj file using Nasm'#010+ + '3*2Anasmobj_Obj fi','le using Nasm'#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*2A','coff_COFF (Go32v2) using internal writer'#010+ + '3*2Acoff_COFF (Go32v2) using internal writer'#010+ '3*2Apecoff_PE-COFF (Win32) using internal writer'#010+ - '4*2Aas_Assemble using GNU AS'#010+ + '4*2Aas_Ass','emble 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 ml6','4 (Microsoft)'#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*2Aelf_ELF (Linux-64bit) using inter','nal writer'#010+ '6*2Aas_Unix o-file using GNU AS'#010+ '6*2Agas_GNU Motorola assembler'#010+ '6*2Amit_MIT Syntax (old GAS)'#010+ '6*2Amot_Standard Motorola assembler'#010+ - 'A','*2Aas_Assemble using GNU AS'#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+ + '**1b_Generate ','browser info'#010+ '**2bl_Generate local symbol info'#010+ '**1B_Build all modules'#010+ '**1C<x>_Code generation options:'#010+ - '**2C3<x>_Turn on ieee error checking f','or constants'#010+ + '**2C3<x>_Turn on ieee error checking for constants'#010+ '**2Ca<x>_Select ABI, see fpc -i for possible values'#010+ '**2Cb_Generate big-endian code'#010+ - '**2Cc<x>_Set default calling convention to <x>'#010+ + '**2C','c<x>_Set default calling convention to <x>'#010+ '**2CD_Create also dynamic library (not supported)'#010+ - '**2Ce_Compilation with emulated floating point ','opcodes'#010+ + '**2Ce_Compilation with emulated floating point opcodes'#010+ '**2Cf<x>_Select fpu instruction set to use, see fpc -i for possible va'+ 'lues'#010+ - '**2CF<x>_Minimal floating point constant precision (default, 32, 64)'#010+ + '**2CF<x>_Minimal ','floating point constant precision (default, 32, 64)'+ + #010+ '**2Cg_Generate PIC code'#010+ '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+ - '**2Ci_IO-che','cking'#010+ + '**2Ci_IO-checking'#010+ '**2Cn_Omit linking stage'#010+ 'P*2CN_Generate nil-pointer checks (AIX-only)'#010+ - '**2Co_Check overflow of integer operations'#010+ + '**2Co_Check overflow of ','integer operations'#010+ '**2CO_Check for possible overflow of integer operations'#010+ '**2Cp<x>_Select instruction set, see fpc -i for possible values'#010+ - '*','*2CP<x>=<y>_ packing settings'#010+ - '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+ + '**2CP<x>=<y>_ packing settings'#010+ + '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 ', 'and 8'#010+ '**2Cr_Range checking'#010+ '**2CR_Verify object method call validity'#010+ '**2Cs<n>_Set stack checking size to <n>'#010+ - '**2Ct_Stack checking (for testin','g only, see manual)'#010+ + '**2Ct_Stack checking (for testing only, see manual)'#010+ 'p*2CT<x>_Target-specific code generation options'#010+ - 'P*2CT<x>_Target-specific code generation options'#010+ + 'P*2CT<x>_Target-specific code g','eneration options'#010+ 'J*2CT<x>_Target-specific code generation options'#010+ 'p*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+ - ' (A','IX)'#010+ + ' (AIX)'#010+ 'P*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+ ' (AIX)'#010+ - 'J*3CTcompactintarrayinit_ Generate smaller (but potentially slower) co'+ - 'de for initializing integer array constants'#010+ - 'K*3CTenumfieldinit_ Initialize enumeration fi','elds in constructors to'+ - ' enumtype(0), after calling inherited constructors'#010+ - 'J*2Cv_Var/out parameter copy-out checking'#010+ + 'J*3CTcompactintarra','yinit_ Generate smaller (but potentially slower) '+ + 'code for initializing integer array constants'#010+ + 'K*3CTenumfieldinit_ Initialize enumeration fields in constructors to e'+ + 'numtype(0), after calling inherited constructors'#010+ + 'J*2Cv_Var/out parameter co','py-out checking'#010+ '**2CX_Create also smartlinked library'#010+ '**1d<x>_Defines the symbol <x>'#010+ '**1D_Generate a DEF file'#010+ - '**2Dd<x>_Set description to <x','>'#010+ + '**2Dd<x>_Set description to <x>'#010+ '**2Dv<x>_Set DLL version to <x>'#010+ '*O2Dw_PM application'#010+ '**1e<x>_Set path to executable'#010+ - '**1E_Same as -Cn'#010+ + '**1E_Same as -','Cn'#010+ '**1fPIC_Same as -Cg'#010+ '**1F<x>_Set file names and paths:'#010+ '**2Fa<x>[,y]_(for a program) load units <x> and [y] before uses is par'+ 'sed'#010+ - '**2Fc<x>_','Set input codepage to <x>'#010+ + '**2Fc<x>_Set input codepage to <x>'#010+ '**2FC<x>_Set RC compiler binary name to <x>'#010+ - '**2Fd_Disable the compiler'#039's internal directory cache'#010+ + '**2Fd_Disable the compiler'#039's i','nternal directory cache'#010+ '**2FD<x>_Set the directory where to search for compiler utilities'#010+ '**2Fe<x>_Redirect error output to <x>'#010+ - '**2Ff<x>_Add',' <x> to framework path (Darwin only)'#010+ + '**2Ff<x>_Add <x> to framework path (Darwin only)'#010+ '**2FE<x>_Set exe/unit output path to <x>'#010+ - '**2Fi<x>_Add <x> to include path'#010+ + '**2Fi<x>_Add <x> to in','clude path'#010+ '**2Fl<x>_Add <x> to library path'#010+ '**2FL<x>_Use <x> as dynamic linker'#010+ - '**2Fm<x>_Load unicode conversion table from <x>.txt in the co','mpiler '+ - 'dir'#010+ + '**2Fm<x>_Load unicode conversion table from <x>.txt in the compiler di'+ + 'r'#010+ '**2Fo<x>_Add <x> to object path'#010+ '**2Fr<x>_Load error message file <x>'#010+ - '**2FR<x>_Set resource (.res) linker to <x>'#010+ + '**2FR<x>_Set resourc','e (.res) linker to <x>'#010+ '**2Fu<x>_Add <x> to unit path'#010+ '**2FU<x>_Set unit output path to <x>, overrides -FE'#010+ - '**2FW<x>_Store generated whole-prog','ram optimization feedback in <x>'#010+ - '**2Fw<x>_Load previously stored whole-program optimization feedback fr'+ - 'om <x>'#010+ + '**2FW<x>_Store generated whole-program optimization feedback in <x>'#010+ + '**2Fw<x>_Load previously stored whole-program optimization feedback',' '+ + 'from <x>'#010+ '*g1g_Generate debug information (default format for target)'#010+ '*g2gc_Generate checks for pointers'#010+ - '*g2gh_Use heaptrace unit (for memor','y leak/corruption debugging)'#010+ + '*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+ '*g2gl_Use line info unit (show more info with backtraces)'#010+ - '*g2go<x>_Set debug information options'#010+ + '*g2go<x>_Set ','debug information options'#010+ '*g3godwarfsets_ Enable DWARF '#039'set'#039' type debug information (bre'+ 'aks gdb < 6.5)'#010+ - '*g3gostabsabsincludes_ Store absolute','/full include file paths in Sta'+ - 'bs'#010+ - '*g3godwarfmethodclassprefix_ Prefix method names in DWARF with class n'+ - 'ame'#010+ + '*g3gostabsabsincludes_ Store absolute/full include file paths in Stabs'+ + #010+ + '*g3godwarfmethodclassprefix_ Prefix method names in DWARF with cla','ss'+ + ' name'#010+ '*g2gp_Preserve case in stabs symbol names'#010+ '*g2gs_Generate Stabs debug information'#010+ - '*g2gt_Trash local variables (to detect uninitialize','d uses)'#010+ + '*g2gt_Trash local variables (to detect uninitialized uses)'#010+ '*g2gv_Generates programs traceable with Valgrind'#010+ - '*g2gw_Generate DWARFv2 debug information (same as -gw2)'#010+ + '*g2gw_Generate DWARFv2 debug information (s','ame as -gw2)'#010+ '*g2gw2_Generate DWARFv2 debug information'#010+ '*g2gw3_Generate DWARFv3 debug information'#010+ - '*g2gw4_Generate DWARFv4 debug information (','experimental)'#010+ + '*g2gw4_Generate DWARFv4 debug information (experimental)'#010+ '**1i_Information'#010+ '**2iD_Return compiler date'#010+ '**2iV_Return short compiler version'#010+ - '**2iW_Return full compiler version'#010+ + '**2iW_','Return full compiler version'#010+ '**2iSO_Return compiler OS'#010+ '**2iSP_Return compiler host processor'#010+ '**2iTO_Return target OS'#010+ - '**2iTP_Return target pr','ocessor'#010+ + '**2iTP_Return target processor'#010+ '**1I<x>_Add <x> to include path'#010+ '**1k<x>_Pass <x> to the linker'#010+ '**1l_Write logo'#010+ - '**1M<x>_Set language mode to <x>'#010+ + '**1M<x>_Set l','anguage mode to <x>'#010+ '**2Mfpc_Free Pascal dialect (default)'#010+ '**2Mobjfpc_FPC mode with Object Pascal support'#010+ - '**2Mdelphi_Delphi 7 compatibility m','ode'#010+ + '**2Mdelphi_Delphi 7 compatibility mode'#010+ '**2Mtp_TP/BP 7.0 compatibility mode'#010+ '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+ - '**1n_Do not read the default config files'#010+ + '**1n','_Do not read the default config files'#010+ '**1o<x>_Change the name of the executable produced to <x>'#010+ '**1O<x>_Optimizations:'#010+ - '**2O-_Disable optimiz','ations'#010+ + '**2O-_Disable optimizations'#010+ '**2O1_Level 1 optimizations (quick and debugger friendly)'#010+ - '**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+ + '**2O2_Level 2 optimizations (-O1 + ','quick optimizations)'#010+ '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+ - '**2O4_Level 4 optimizations (-O3 + optimizations which might hav','e un'+ - 'expected side effects)'#010+ + '**2O4_Level 4 optimizations (-O3 + optimizations which might have unex'+ + 'pected side effects)'#010+ '**2Oa<x>=<y>_Set alignment'#010+ - '**2Oo[NO]<x>_Enable or disable optimizations, see fpc -i for possible '+ - 'values'#010+ + '**2Oo[NO]<x>_Enable or disable optimizations, ','see fpc -i for possibl'+ + 'e values'#010+ '**2Op<x>_Set target cpu for optimizing, see fpc -i for possible values'+ #010+ - '**2OW<x>_Generate whole-program optimi','zation feedback for optimizati'+ - 'on <x>, see fpc -i for possible values'#010+ - '**2Ow<x>_Perform whole-program optimization <x>, see fpc -i for possib'+ - 'le values'#010+ + '**2OW<x>_Generate whole-program optimization feedback for optimization'+ + ' <x>, see fpc -i for possible values'#010+ + '**2Ow<x>_Perform whole-program ','optimization <x>, see fpc -i for poss'+ + 'ible values'#010+ '**2Os_Optimize for size rather than speed'#010+ - '**1pg_Generate profile code for gprof (defines FP','C_PROFILE)'#010+ + '**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+ 'F*1P<x>_Target CPU / compiler related options:'#010+ 'F*2PB_Show default compiler binary'#010+ - 'F*2PP_Show default target cpu'#010+ + 'F*2PP_S','how default target cpu'#010+ 'F*2P<x>_Set target CPU (arm,i386,m68k,mips,mipsel,powerpc,powerpc64,sp'+ 'arc,x86_64'#010+ '**1R<x>_Assembler reading style:'#010+ - '**2','Rdefault_Use default assembler for target'#010+ + '**2Rdefault_Use default assembler for target'#010+ '3*2Ratt_Read AT&T style assembler'#010+ - '3*2Rintel_Read Intel style assembler'#010+ + '3*2Rintel_Read Intel sty','le assembler'#010+ '6*2RMOT_Read motorola style assembler'#010+ '**1S<x>_Syntax options:'#010+ '**2S2_Same as -Mobjfpc'#010+ - '**2Sc_Support operators like C (*=,+=,/= a','nd -=)'#010+ + '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+ '**2Sa_Turn on assertions'#010+ '**2Sd_Same as -Mdelphi'#010+ - '**2Se<x>_Error options. <x> is a combination of the following:'#010+ + '**2Se<x>_Error options. <x> is a combination ','of the following:'#010+ '**3*_<n> : Compiler halts after the <n> errors (default is 1)'#010+ '**3*_w : Compiler also halts after warnings'#010+ - '**3*_n : Compile','r also halts after notes'#010+ + '**3*_n : Compiler also halts after notes'#010+ '**3*_h : Compiler also halts after hints'#010+ - '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+ + '**2Sg_Enable LABEL and GOTO (defau','lt in -Mtp and -Mdelphi)'#010+ '**2Sh_Use reference counted strings (ansistring by default) instead of'+ ' shortstrings'#010+ - '**2Si_Turn on inlining of proce','dures/functions declared as "inline"'#010+ + '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+ '**2Sk_Load fpcylix unit'#010+ '**2SI<x>_Set interface style to <x>'#010+ - '**3SIcom_COM compatible interface (default)'#010+ + '**3','SIcom_COM compatible interface (default)'#010+ '**3SIcorba_CORBA compatible interface'#010+ '**2Sm_Support macros like C (global)'#010+ '**2So_Same as -Mtp'#010+ - '**2Ss','_Constructor name must be init (destructor must be done)'#010+ - '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+ + '**2Ss_Constructor name must be init (destructor must be done)'#010+ + '**2Sx_Enable exception keywords (default in',' Delphi/ObjFPC modes)'#010+ '**2Sy_@<pointer> returns a typed pointer, same as $T+'#010+ '**1s_Do not call assembler and linker'#010+ - '**2sh_Generate script to l','ink on host'#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+ + '**2sr_Skip register allocation phase (use with -','alr)'#010+ '**1T<x>_Target operating system:'#010+ '3*2Tdarwin_Darwin/Mac OS X'#010+ '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+ '3*2Tfreebsd_FreeBSD'#010+ - '3*2Tg','o32v2_Version 2 of DJ Delorie DOS extender'#010+ - '3*2Tiphonesim_ iPhoneSimulator from iOS SDK 3.2+ (older versions: -Tda'+ - 'rwin)'#010+ + '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+ + '3*2Tiphonesim_ iPhoneSimulator from iOS SDK 3.2+ (older v','ersions: -T'+ + 'darwin)'#010+ '3*2Tlinux_Linux'#010+ '3*2Tnetbsd_NetBSD'#010+ '3*2Tnetware_Novell Netware Module (clib)'#010+ '3*2Tnetwlibc_Novell Netware Module (libc)'#010+ - '3*2T','openbsd_OpenBSD'#010+ + '3*2Topenbsd_OpenBSD'#010+ '3*2Tos2_OS/2 / eComStation'#010+ '3*2Tsunos_SunOS/Solaris'#010+ '3*2Tsymbian_Symbian OS'#010+ - '3*2Tsolaris_Solaris'#010+ + '3*2Tsolari','s_Solaris'#010+ '3*2Twatcom_Watcom compatible DOS extender'#010+ '3*2Twdosx_WDOSX DOS extender'#010+ '3*2Twin32_Windows 32 Bit'#010+ '3*2Twince_Windows CE'#010+ - '4*2Tdarwin_Da','rwin/Mac OS X'#010+ + '4*2Tdarwin_Darwin/Mac OS X'#010+ '4*2Tlinux_Linux'#010+ '4*2Twin64_Win64 (64 bit Windows systems)'#010+ '6*2Tamiga_Commodore Amiga'#010+ - '6*2Tatari_Atari ST/STe/TT'#010+ + '6*2','Tatari_Atari ST/STe/TT'#010+ '6*2Tlinux_Linux'#010+ '6*2Tpalmos_PalmOS'#010+ 'A*2Tdarwin_Darwin/iPhoneOS/iOS'#010+ 'A*2Tlinux_Linux'#010+ 'A*2Twince_Windows CE'#010+ - 'P*2Tamiga_Amiga','OS'#010+ + 'P*2Tamiga_AmigaOS'#010+ 'P*2Tdarwin_Darwin/Mac OS X'#010+ 'P*2Tlinux_Linux'#010+ 'P*2Tmacos_Mac OS (classic)'#010+ 'P*2Tmorphos_MorphOS'#010+ - 'S*2Tsolaris_Solaris'#010+ + 'S*2Tsol','aris_Solaris'#010+ 'S*2Tlinux_Linux'#010+ '**1u<x>_Undefines the symbol <x>'#010+ '**1U_Unit options:'#010+ - '**2Un_Do not check where the unit name matches the file nam','e'#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<x>_Be verbose. <x> is a combination of the following letters:'#010+ + '**1','v<x>_Be verbose. <x> 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*_w : Show warnings u : Show unit info'#010+ + '**2*_n : Show notes t : Show trie','d/used files'#010+ '**2*_h : Show hints c : Show conditionals'#010+ '**2*_i : Show general info d : Show debug info'#010+ - '**2*_l : Sh','ow linenumbers r : Rhide/GCC compatibility mod'+ - 'e'#010+ - '**2*_s : Show time stamps q : Show message numbers'#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 : Executable info (Win32 only)'#010+ - '**2*_b : Write file names messages p : Write tr','ee.log with parse t'+ - 'ree'#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*_ lots of debugging info'#010+ + '**2*_ ',' lots of debugging info'#010+ '**2*_m<x>,<y> : Don'#039't show messages numbered <x> and <y>'#010+ - 'F*1V<x>_Append '#039'-<x>'#039' to the us','ed compiler binary name (e.g.'+ - ' for version)'#010+ + 'F*1V<x>_Append '#039'-<x>'#039' to the used compiler binary name (e.g. f'+ + 'or version)'#010+ '**1W<x>_Target-specific options (targets)'#010+ - '3*2WA_Specify native type application (Windows)'#010+ + '3*2WA_Specify n','ative type application (Windows)'#010+ '4*2WA_Specify native type application (Windows)'#010+ 'A*2WA_Specify native type application (Windows)'#010+ - '3*2Wb_Creat','e a bundle instead of a library (Darwin)'#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+ + 'p*2Wb_C','reate 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+ + '4*2Wb_Create a bundle instead of a library (Darwin)'#010+ '3*2WB_Create a relocatable image (Windows, Symbian)'#010+ - '3*2WBxxxx_Set image base to xxxx (Windows, Symbian)'#010+ + '3*2WBxxxx_Set image base to xxxx (Windo','ws, Symbian)'#010+ '4*2WB_Create a relocatable image (Windows)'#010+ '4*2WBxxxx_Set image base to xxxx (Windows)'#010+ - 'A*2WB_Create a relocatable image (Windows',', Symbian)'#010+ + 'A*2WB_Create a relocatable image (Windows, Symbian)'#010+ 'A*2WBxxxx_Set image base to xxxx (Windows, Symbian)'#010+ - '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+ + '3*2WC_Specify console type applicatio','n (EMX, OS/2, Windows)'#010+ '4*2WC_Specify console type application (EMX, OS/2, Windows)'#010+ 'A*2WC_Specify console type application (Windows)'#010+ - 'P*2WC_Sp','ecify console type application (Classic Mac OS)'#010+ - '3*2WD_Use DEFFILE to export functions of DLL or EXE (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+ 'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+ - '3*2We_','Use external resources (Darwin)'#010+ + '3*2We_Use external resources (Darwin)'#010+ '4*2We_Use external resources (Darwin)'#010+ - 'A*2We_Use external resources (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 application (EMX, OS/2, Windows)'#010+ + '3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+ + '4*2WG_Specify graphic type application (E','MX, OS/2, Windows)'#010+ 'A*2WG_Specify graphic type application (Windows)'#010+ 'P*2WG_Specify graphic type application (Classic Mac OS)'#010+ - '3*2Wi_Use intern','al resources (Darwin)'#010+ + '3*2Wi_Use internal resources (Darwin)'#010+ '4*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+ 'p*2Wi_Use internal resources (Darwin)'#010+ '3*2WI_Turn on/off the usage of import sections (Windows)'#010+ - '4*2WI_Tur','n 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 (Wind','ows)'#010+ '3*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+ 'n)'#010+ - '4*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ..','. (Dar'+ - 'win)'#010+ + '4*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+ + 'n)'#010+ 'p*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+ 'n)'#010+ - 'P*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+ - 'n)'#010+ + 'P*2WM<x>_Minimum',' Mac OS X deployment version: 10.4, 10.5.1, ... (Dar'+ + 'win)'#010+ '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ - '4*2WN_Do not ','generate relocation code, needed for debugging (Windows'+ + '4*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ + 'A*2WN_Do not generate relocation code, need','ed for debugging (Windows'+ ')'#010+ - 'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ 'A*2Wpxxxx_Specify the controller type, see fpc -i for possible values'#010+ - 'V*2Wpxxxx_Specify the controller type, see ','fpc -i for possible value'+ - 's'#010+ + 'V*2Wpxxxx_Specify the controller type, see fpc -i for possible values'#010+ '3*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (iphonesim)'#010+ - 'A*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (Darwin)'#010+ + 'A*2W','P<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (Darwin)'#010+ '3*2WR_Generate relocation code (Windows)'#010+ - '4*2WR_Generate relocation code (Windo','ws)'#010+ + '4*2WR_Generate relocation code (Windows)'#010+ 'A*2WR_Generate relocation code (Windows)'#010+ - 'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+ + 'P*2WT_Specify MPW tool type application (Classic Mac OS',')'#010+ '**2WX_Enable executable stack (Linux)'#010+ '**1X_Executable options:'#010+ '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+ 'ux)'#010+ - '*','*2Xd_Do not search default library path (sometimes required for cro'+ - 'ss-compiling when not using -XR)'#010+ + '**2Xd_Do not search default library path (sometimes required for cross'+ + '-compiling when not using -XR)'#010, '**2Xe_Use external linker'#010+ '**2Xg_Create debuginfo in a separate file and add a debuglink section '+ 'to executable'#010+ - '**2XD_Try to link units dynami','cally (defines FPC_LINK_DYNAMIC)'#010+ + '**2XD_Try to link units dynamically (defines FPC_LINK_DYNAMIC)'#010+ '**2Xi_Use internal linker'#010+ '**2Xm_Generate link map'#010+ - '**2XM<x>_Set the name of the '#039'main'#039' program routine (default i'+ - 's '#039'main'#039')'#010+ + '**2XM<x>_Set',' the name of the '#039'main'#039' program routine (default'+ + ' is '#039'main'#039')'#010+ 'F*2Xp<x>_First search for the compiler binary in the directory <x>'#010+ - '**2XP<x>_Prep','end the binutils names with the prefix <x>'#010+ - '**2Xr<x>_Set the linker'#039's rlink-path to <x> (needed for cross comp'+ - 'ile, see the ld manual for more information) (BeOS, Linux)'#010+ + '**2XP<x>_Prepend the binutils names with the prefix <x>'#010+ + '**2Xr<x>_Set the linker'#039's rlink-path to <x> (needed for c','ross co'+ + 'mpile, see the ld manual for more information) (BeOS, Linux)'#010+ '**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD'+ - ', ','Linux, Mac OS, Solaris)'#010+ + ', Linux, Mac OS, Solaris)'#010+ '**2Xs_Strip all symbols from executable'#010+ - '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+ + '**2XS_Try to link units statically (','default, defines FPC_LINK_STATIC'+ + ')'#010+ '**2Xt_Link with static libraries (-static is passed to linker)'#010+ - '**2XX_Try to smartlink units (d','efines FPC_LINK_SMART)'#010+ + '**2XX_Try to smartlink units (defines FPC_LINK_SMART)'#010+ '**1*_'#010+ '**1?_Show this help'#010+ '**1h_Shows this help without waiting' diff --git a/compiler/x86/aasmcpu.pas b/compiler/x86/aasmcpu.pas index e577d44244..c63538de0b 100644 --- a/compiler/x86/aasmcpu.pas +++ b/compiler/x86/aasmcpu.pas @@ -222,7 +222,9 @@ interface Ch : Array[1..MaxInsChanges] of TInsChange; end; - TMemRefSizeInfo = (msiUnkown, msiUnsupported, msiNoSize, msiMultiple, + TMemRefSizeInfo = (msiUnkown, msiUnsupported, msiNoSize, + msiMultiple, msiMultiple8, msiMultiple16, msiMultiple32, + msiMultiple64, msiMultiple128, msiMultiple256, msiMemRegSize, msiMemRegx64y128, msiMemRegx64y256, msiMem8, msiMem16, msiMem32, msiMem64, msiMem128, msiMem256); @@ -233,7 +235,14 @@ interface ExistsSSEAVX: boolean; ConstSize : TConstSizeInfo; end; + const + MemRefMultiples: set of TMemRefSizeInfo = [msiMultiple, msiMultiple8, + msiMultiple16, msiMultiple32, + msiMultiple64, msiMultiple128, + msiMultiple256]; + + InsProp : array[tasmop] of TInsProp = {$ifdef x86_64} {$i x8664pro.inc} @@ -1278,7 +1287,7 @@ implementation end; end; - if (InsTabMemRefSizeInfoCache^[opcode].MemRefSize = msiMultiple) and + if (InsTabMemRefSizeInfoCache^[opcode].MemRefSize in MemRefMultiples) and (InsTabMemRefSizeInfoCache^[opcode].ExistsSSEAVX) then begin for i:=0 to p^.ops-1 do @@ -3150,7 +3159,19 @@ implementation end else if InsTabMemRefSizeInfoCache^[AsmOp].MemRefSize <> MRefInfo then begin - InsTabMemRefSizeInfoCache^[AsmOp].MemRefSize := msiMultiple; + 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 MemRefSize := msiMultiple; + end; end; if actRegCount > 0 then @@ -3173,7 +3194,7 @@ implementation inc(insentry); end; - if (InsTabMemRefSizeInfoCache^[AsmOp].MemRefSize = msiMultiple) and + if (InsTabMemRefSizeInfoCache^[AsmOp].MemRefSize in MemRefMultiples) and (InsTabMemRefSizeInfoCache^[AsmOp].ExistsSSEAVX)then begin case RegXMMSizeMask of diff --git a/compiler/x86/rax86.pas b/compiler/x86/rax86.pas index aa1c3ba7b0..ec7bd5e1dd 100644 --- a/compiler/x86/rax86.pas +++ b/compiler/x86/rax86.pas @@ -52,7 +52,7 @@ type opsize : topsize; constructor Create(optype : tcoperand);override; { Operand sizes } - procedure AddReferenceSizes; + procedure AddReferenceSizes; virtual; procedure SetInstructionOpsize; procedure CheckOperandSizes; procedure CheckNonCommutativeOpcodes; @@ -352,6 +352,7 @@ begin ExistsConstNoSize := false; ExistsLocalSymSize := false; + // EXIST A MEMORY- OR CONSTANT-OPERAND WITHOUT SIZE ? for i := 1 to ops do begin if operands[i].Opr.Typ in [OPR_REFERENCE, OPR_LOCAL] then @@ -375,17 +376,23 @@ begin end; end; + // ONLY SUPPORTED OPCODES WITH SSE- OR AVX-REGISTERS if (ExistsMemRef) and (MemRefInfo(opcode).ExistsSSEAVX) then begin + // 1. WE HAVE AN SSE- OR AVX-OPCODE WITH MEMORY OPERAND if (not(ExistsMemRefNoSize)) or (ExistsLocalSymSize) then begin + // 2. WE KNOWN THE MEMORYSIZE OF THE MEMORY-OPERAND OR WE CAN + // CALC THE MEMORYSIZE + + // 3. CALC THE SIZE OF THE MEMORYOPERAND BY OPCODE-DEFINITION + // 4. COMPARE THE SIZE FROM OPCODE-DEFINITION AND THE REAL MEMORY-OPERAND-SIZE + // - validate memory-reference-size for i := 1 to ops do begin - //if (operands[i].Opr.Typ in [OPR_REFERENCE, OPR_LOCAL]) and - // (tx86operand(operands[i]).opsize <> S_NO) then if (operands[i].Opr.Typ in [OPR_REFERENCE, OPR_LOCAL]) then begin memrefsize := -1; @@ -422,6 +429,12 @@ begin if memrefsize > -1 then begin + // CALC REAL-MEMORY-OPERAND-SIZE AND A POSSIBLE OFFSET + + // OFFSET: + // e.g. PAND XMM0, [RAX + 16] =>> OFFSET = 16 BYTES + // PAND XMM0, [RAX + a.b + 10] =>> OFFSET = 10 BYTES (a = record-variable) + memopsize := 0; case operands[i].opr.typ of OPR_LOCAL: memopsize := operands[i].opr.localvarsize * 8; @@ -487,31 +500,80 @@ 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; - msiMem16: begin + 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], '"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; + + Message2(asmr_w_check_mem_operand_automap_multiple_size, std_op2str[opcode], '"16 bit memory operand"'); end; - msiMem32: begin + msiMem32: + begin tx86operand(operands[i]).opsize := S_L; tx86operand(operands[i]).size := OS_32; end; - msiMem64: begin + 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; - msiMem128: begin + 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; - msiMem256: begin + 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; msiMemRegSize: begin // mem-ref-size = register size diff --git a/compiler/x86/rax86att.pas b/compiler/x86/rax86att.pas index 5427b3afb0..74bf229911 100644 --- a/compiler/x86/rax86att.pas +++ b/compiler/x86/rax86att.pas @@ -27,9 +27,12 @@ Interface uses cpubase, - raatt,rax86; + raatt,rax86, rautils; type + + { tx86attreader } + tx86attreader = class(tattreader) ActOpsize : topsize; function is_asmopcode(const s: string):boolean;override; @@ -42,7 +45,10 @@ Interface procedure MaybeGetPICModifier(var oper: tx86operand); end; + { Tx86attInstruction } + Tx86attInstruction = class(Tx86Instruction) + procedure AddReferenceSizes; override; procedure FixupOpcode;override; end; @@ -62,12 +68,34 @@ Implementation scanner, procinfo, itcpugas, - rabase,rautils, + rabase, cgbase ; { Tx86attInstruction } + + procedure Tx86attInstruction.AddReferenceSizes; + var + i: integer; + begin + if (Opsize <> S_NO) and + (MemRefInfo(opcode).ExistsSSEAVX) and + (MemRefInfo(opcode).MemRefSize in MemRefMultiples) then + begin + for i := 1 to ops do + begin + if operands[i].Opr.Typ in [OPR_REFERENCE, OPR_LOCAL] then + begin + if (tx86operand(operands[i]).opsize = S_NO) then + tx86operand(operands[i]).opsize := Opsize; + end; + end; + end; + + inherited AddReferenceSizes; + end; + procedure Tx86attInstruction.FixupOpcode; begin if (OpOrder=op_intel) then @@ -929,4 +957,5 @@ Implementation end; + end. diff --git a/tests/test/tasm10.pp b/tests/test/tasm10.pp deleted file mode 100644 index 7e0f5ffc9d..0000000000 --- a/tests/test/tasm10.pp +++ /dev/null @@ -1,12 +0,0 @@ -{ %CPU=x86_64 } -{ %fail } - -// in 64-bit mode is needed exact size of memory operand (32- or 64 bit) -{$asmmode intel} -procedure test; assembler; nostackframe; -asm - vcvtsi2sd xmm0, xmm0, [RAX] -end; - -begin -end. diff --git a/tests/test/tasm11.pp b/tests/test/tasm11.pp deleted file mode 100644 index 08a826da9f..0000000000 --- a/tests/test/tasm11.pp +++ /dev/null @@ -1,12 +0,0 @@ -{ %CPU=i386,x86_64 } -{ %fail } - -// need exact size of memory operand (128- or 256 bit) -{$asmmode intel} -procedure test; assembler; nostackframe; -asm - vcvtpd2dq xmm0, [RAX] -end; - -begin -end. diff --git a/tests/test/tasm12.pp b/tests/test/tasm12.pp deleted file mode 100644 index c4ae165e26..0000000000 --- a/tests/test/tasm12.pp +++ /dev/null @@ -1,12 +0,0 @@ -{ %CPU=i386,x86_64 } -{ %fail } - -// need exact size of memory operand (128- or 256 bit) -{$asmmode intel} -procedure test; assembler; nostackframe; -asm - vcvtpd2ps xmm0, [RAX] -end; - -begin -end. diff --git a/tests/test/tasm13.pp b/tests/test/tasm13.pp deleted file mode 100644 index 13c69f290c..0000000000 --- a/tests/test/tasm13.pp +++ /dev/null @@ -1,12 +0,0 @@ -{ %CPU=i386,x86_64 } -{ %fail } - -// need exact size of memory operand (128- or 256 bit) -{$asmmode intel} -procedure test; assembler; nostackframe; -asm - vcvttpd2dq xmm0, [RAX] -end; - -begin -end. diff --git a/tests/test/tasm14.pp b/tests/test/tasm14.pp deleted file mode 100644 index 86cbd82646..0000000000 --- a/tests/test/tasm14.pp +++ /dev/null @@ -1,57 +0,0 @@ -{ %CPU=x86_64 } - -// (Almost) every of these instructions use a high register and thus generate REX. -{$asmmode intel} -procedure avxtest; assembler; nostackframe; -asm - VADDPD XMM0, XMM1, [RAX] + $100 - VADDPD YMM2, YMM3, [RAX] + $100 - - VBLENDPD XMM2, XMM5, XMM7, $02 - VBLENDPD YMM2, YMM5, YMM7, $0F - - VBLENDVPS XMM2, XMM5, XMM7, XMM4 - VBLENDVPS YMM0, YMM1, YMM2, YMM5 - - VBROADCASTSD YMM0, [RAX] - - VPEXTRB EAX, XMM0, $00 - - VPINSRD XMM7, XMM1, EAX, $03 - - VZEROALL - -end; - - -const - avxtest_expected : array[0..59] of byte = ( - $C5,$F1,$58,$80,$00,$01,$00,$00, - $C5,$E5,$58,$90,$00,$01,$00,$00, - $C4,$E3,$51,$0D,$D7,$02, - $C4,$E3,$55,$0D,$D7,$0F, - $C4,$E3,$51,$4A,$D7,$40, - $C4,$E3,$75,$4A,$C2,$50, - $C4,$E2,$7D,$19,$00, - $C4,$E3,$79,$14,$C0,$00, - $C4,$E3,$71,$22,$F8,$03, - $C5,$FC,$77); - - - -procedure check(const id: string; const expected: array of byte; p: pointer); -var - i : longint; -begin - for i:=0 to high(expected) do - if expected[i]<>pbyte(p)[i] then - begin - writeln(id, ' mismatch at offset $',hexstr(i,4), ', expected=$',hexstr(expected[i],2),' actual=$',hexstr(pbyte(p)[i],2)); - halt(1); - end; -end; - -begin - check('generic', avxtest_expected, @avxtest); - writeln('ok'); -end. diff --git a/tests/test/tasm15.pp b/tests/test/tasm15.pp deleted file mode 100644 index d1499c010a..0000000000 --- a/tests/test/tasm15.pp +++ /dev/null @@ -1,12 +0,0 @@ -{ %CPU=x86_64 } -{ %fail } - -// in 64-bit mode is needed exact size of memory operand (32- or 64 bit) -{$asmmode intel} -procedure test; assembler; nostackframe; -asm - cvtsi2ss xmm0, [RAX] -end; - -begin -end. diff --git a/tests/test/tasm2.pp b/tests/test/tasm2.pp index acae74d498..8ffd18c6ce 100644 --- a/tests/test/tasm2.pp +++ b/tests/test/tasm2.pp @@ -209,14 +209,22 @@ end; const test_expected : array[0..745] of byte = ( - $66,$44,$0F,$D0,$05,$78,$56,$34, - $12,$F2,$44,$0F,$D0,$05,$78,$56,$34,$12,$66,$44,$0F,$2F,$05, - $78,$56,$34,$12,$44,$0F,$2F,$05,$78,$56,$34,$12,$F3,$44,$0F, - $E6,$05,$78,$56,$34,$12,$F2,$44,$0F,$E6,$05,$78,$56,$34,$12, - $44,$0F,$5A,$05,$78,$56,$34,$12,$F3,$44,$0F,$5B,$05,$78,$56, - $34,$12,$F3,$44,$0F,$2A,$C0,$F3,$44,$0F,$2A,$C0,$F3,$4C,$0F, - $2A,$C0,$F3,$4C,$0F,$2A,$C0,$F3,$44,$0F,$2A,$00,$F3,$44,$0F, - $2A,$00,$F3,$44,$0F,$2A,$00,$F2,$44,$0F,$2A,$C0,$F2,$44,$0F, + $66,$44,$0F,$D0,$05,$78,$56,$34,$12, // addsubpd + $F2,$44,$0F,$D0,$05,$78,$56,$34,$12, // addsubps + $66,$44,$0F,$2F,$05,$78,$56,$34,$12, // comisd + $44,$0F,$2F,$05,$78,$56,$34,$12, // comiss + $F3,$44,$0F,$E6,$05,$78,$56,$34,$12, // cvtdq2pd + $F2,$44,$0F,$E6,$05,$78,$56,$34,$12, // cvtpd2dq + $44,$0F,$5A,$05,$78,$56,$34,$12, // cvtps2pd + $F3,$44,$0F,$5B,$05,$78,$56,$34,$12, // cvttps2dq + $F3,$44,$0F,$2A,$C0, // cvtsi2ss + $F3,$44,$0F,$2A,$C0, // cvtsi2ss + $F3,$4C,$0F,$2A,$C0, // cvtsi2ss + $F3,$4C,$0F,$2A,$C0, // cvtsi2ss + $F3,$44,$0F,$2A,$00, // cvtsi2ss (%rax),%xmm8 + $F3,$44,$0F,$2A,$00, // cvtsi2ssl (%rax),%xmm8 + $F3,$4C,$0F,$2A,$00, // cvtsi2ssq (%rax),%xmm8 + $F2,$44,$0F,$2A,$C0,$F2,$44,$0F, $2A,$C0,$F2,$4C,$0F,$2A,$C0,$F2,$4C,$0F,$2A,$C0,$F2,$44,$0F, $2A,$00,$F2,$44,$0F,$2A,$00,$F2,$4C,$0F,$2A,$00,$F3,$44,$0F, $7F,$05,$78,$56,$34,$12,$F3,$44,$0F,$6F,$05,$78,$56,$34,$12, diff --git a/tests/test/tasm7.pp b/tests/test/tasm7.pp index 8e1b18a375..9d46c36eaf 100644 --- a/tests/test/tasm7.pp +++ b/tests/test/tasm7.pp @@ -1,24 +1,57 @@ -{ %CPU=i386 } +{ %CPU=i386,x86_64 } -{$asmmode att} -var - test: array[0..2] of longint; - -function proc: longint; assembler; +// (Almost) every of these instructions use a high register and thus generate REX. +{$asmmode intel} +procedure avxtest; assembler; nostackframe; asm - call .L1 -.L1: - pop %eax - movl test-.L1(%eax),%eax -// This should also work (but it doesn't due to bugs in asmreader): -// movl test-.L1+8(%eax),%eax + VADDPD XMM0, XMM1, [RAX] + $100 + VADDPD YMM2, YMM3, [RAX] + $100 + + VBLENDPD XMM2, XMM5, XMM7, $02 + VBLENDPD YMM2, YMM5, YMM7, $0F + + VBLENDVPS XMM2, XMM5, XMM7, XMM4 + VBLENDVPS YMM0, YMM1, YMM2, YMM5 + + VBROADCASTSD YMM0, [RAX] + + VPEXTRB EAX, XMM0, $00 + + VPINSRD XMM7, XMM1, EAX, $03 + + VZEROALL + +end; + + +const + avxtest_expected : array[0..59] of byte = ( + $C5,$F1,$58,$80,$00,$01,$00,$00, + $C5,$E5,$58,$90,$00,$01,$00,$00, + $C4,$E3,$51,$0D,$D7,$02, + $C4,$E3,$55,$0D,$D7,$0F, + $C4,$E3,$51,$4A,$D7,$40, + $C4,$E3,$75,$4A,$C2,$50, + $C4,$E2,$7D,$19,$00, + $C4,$E3,$79,$14,$C0,$00, + $C4,$E3,$71,$22,$F8,$03, + $C5,$FC,$77); + + + +procedure check(const id: string; const expected: array of byte; p: pointer); +var + i : longint; +begin + for i:=0 to high(expected) do + if expected[i]<>pbyte(p)[i] then + begin + writeln(id, ' mismatch at offset $',hexstr(i,4), ', expected=$',hexstr(expected[i],2),' actual=$',hexstr(pbyte(p)[i],2)); + halt(1); + end; end; begin - test[0]:=5555; - test[1]:=6666; - test[2]:=7777; - if proc<>5555 then - Halt(1); - Halt(0); -end. \ No newline at end of file + check('generic', avxtest_expected, @avxtest); + writeln('ok'); +end. diff --git a/tests/test/tasm8.pp b/tests/test/tasm8.pp deleted file mode 100644 index 29a3ed338a..0000000000 --- a/tests/test/tasm8.pp +++ /dev/null @@ -1,12 +0,0 @@ -{ %CPU=x86_64 } -{ %fail } - -// in 64-bit mode is needed exact size of memory operand (32- or 64 bit) -{$asmmode intel} -procedure test; assembler; nostackframe; -asm - cvtsi2sd xmm0, [RAX] -end; - -begin -end. diff --git a/tests/test/tasm9.pp b/tests/test/tasm9.pp deleted file mode 100644 index 8a897a0c7b..0000000000 --- a/tests/test/tasm9.pp +++ /dev/null @@ -1,12 +0,0 @@ -{ %CPU=x86_64 } -{ %fail } - -// in 64-bit mode is needed exact size of memory operand (32- or 64 bit) -{$asmmode intel} -procedure test; assembler; nostackframe; -asm - vcvtsi2ss xmm0, xmm0, [RAX] -end; - -begin -end.