From d908fb42f79f2c418160679757fe0a8d4ff13026 Mon Sep 17 00:00:00 2001 From: sergei Date: Mon, 16 May 2011 20:18:03 +0000 Subject: [PATCH] x86 assembler fixes: * Factored repeating REX operations into a separate function. * Fixed instruction matching bug which was preventing compilation of 3-operand SIMD instructions with RIP-relative operand + test. * Do not adjust offset of RIP-relative reference if it is a literal number, this was causing 0x123(%rip) to assemble as 0x122(%rip) in 3-operand instructions. Now tasm2.pp is the same with and without -Aas. Also fixed the expected result, improved verbosity of diagnostic and removed %norun, so it is actually executed. + Disallow high-byte registers in instructions requiring REX + test. git-svn-id: trunk@17478 - --- .gitattributes | 2 + compiler/msg/errore.msg | 7 +- compiler/msgidx.inc | 5 +- compiler/msgtxt.inc | 431 +++++++++++++++++++-------------------- compiler/x86/aasmcpu.pas | 144 ++++++------- tests/test/tasm2.pp | 10 +- tests/test/tasm3.pp | 26 +++ tests/test/tasm4.pp | 12 ++ 8 files changed, 327 insertions(+), 310 deletions(-) create mode 100644 tests/test/tasm3.pp create mode 100644 tests/test/tasm4.pp diff --git a/.gitattributes b/.gitattributes index 5edcd4c503..be9039e1c2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9565,6 +9565,8 @@ tests/test/tarray8.pp svneol=native#text/plain tests/test/tarray9.pp svneol=native#text/plain tests/test/tasm1.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/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 ede501a95a..e135b2a05a 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -2405,7 +2405,7 @@ asmr_w_useless_got_for_local=07110_W_@GOTPCREL is useless and potentially danger # # Assembler/binary writers # -# 08020 is the last used one +# 08022 is the last used one # asmw_f_too_many_asm_files=08000_F_Too many assembler files % With smartlinking enabled, there are too many assembler @@ -2432,6 +2432,11 @@ asmw_e_first_defined_label=08018_E_Asm: First defined here asmw_e_invalid_register=08019_E_Asm: Invalid register $1 asmw_e_16bit_32bit_not_supported=08020_E_Asm: 16 or 32 Bit references not supported asmw_e_64bit_not_supported=08021_E_Asm: 64 Bit operands not supported +asmw_e_bad_reg_with_rex=08022_E_Asm: AH,BH,CH or DH cannot be used in an instruction requiring REX prefix +% x86_64 only: instruction encoding of this platform does not allow using +% 8086 high byte registers (AH,BH,CH or DH) together with REX prefix in a single instruction. +% The REX prefix is required whenever the instruction operand size is 64 bits, or +% when it uses one of extended x86_64 registers (R8-R15 or XMM8-XMM15). # # Executing linker/assembler diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index 82aba1f4de..d493e087c1 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -721,6 +721,7 @@ const asmw_e_invalid_register=08019; asmw_e_16bit_32bit_not_supported=08020; asmw_e_64bit_not_supported=08021; + asmw_e_bad_reg_with_rex=08022; exec_w_source_os_redefined=09000; exec_i_assembling_pipe=09001; exec_d_cant_create_asmfile=09002; @@ -892,9 +893,9 @@ const option_info=11024; option_help_pages=11025; - MsgTxtSize = 59383; + MsgTxtSize = 59465; MsgIdxMax : array[1..20] of longint=( - 24,88,311,103,84,54,111,22,202,63, + 24,88,311,103,84,54,111,23,202,63, 49,20,1,1,1,1,1,1,1,1 ); diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index 6a8d507ff3..229391ba45 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -849,227 +849,227 @@ const msgtxt : array[0..000247,1..240] of char=( '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+ '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 fil','e: $1'#000+ '09003_E_Can'#039't create object file: $1'#000+ '09004_E_Can'#039't create archive file: $1'#000+ - '0','9005_E_Assembler $1 not found, switching to external assembling'#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 external a'+ - 'ssembling'#000+ + '09008_E_Can'#039't call the ','assembler, error $1 switching to external'+ + ' assembling'#000+ '09009_I_Assembling $1'#000+ - '09010_I','_Assembling with smartlinking $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+ - '09013_E_Error while linking'#000+ + '09013_E_Error while linking'#000, '09014_E_Can'#039't call the linker, switching to external linking'#000+ '09015_I_Linking $1'#000+ - '09','016_E_Util $1 not found, switching to external linking'#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+ + '09019_E_Creation of Dynamic/Shared ','Libraries not supported'#000+ '09020_I_Closing script $1'#000+ - '09021_E_resource compiler "$1" n','ot found, switching to external mode'+ - #000+ + '09021_E_resource 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, 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 lin','ked, switching to static link'+ - 'ing'#000+ + '09024_T_unit $1 can'#039,'t be smart linked, switching to static linkin'+ + 'g'#000+ + '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+ + 'g'#000+ '09026_E_unit $1 can'#039't be smart or static 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+ + '09028_D_Calling resource com','piler "$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 exte'+ - 'rnal mode'#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+ - '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+ + '09130_X_Size of Code: $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+ + '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+ + '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+ + '10003_U_PPU Flags: $','1'#000+ '10004_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+ + '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+ - '10011_U_PPU Source: $1'#000+ + '1','0011_U_PPU Source: $1'#000+ '10012_U_Writing $1'#000+ '10013_F_Can'#039't Write PPU-File'#000+ - '10014_F_Erro','r reading 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'#000+ - '10019_F_Too much units'#000+ + '10019_F_T','oo much units'#000+ '10020_F_Circular unit reference between $1 and $2'#000+ - '10021_F_Can'#039't comp','ile unit $1, no sources available'#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+ - '10026_F_There were $1 errors',' compiling module, stopping'#000+ + '1002','5_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 than ppufile'#000+ - '10031_U_Recompiling unit, sha','red lib is older than ppufile'#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+ - '10034_U_Parsing interface of $1'#000+ + '10034_U_Parsing int','erface of $1'#000+ '10035_U_Parsing implementation of $1'#000+ - '10036_U_Second load for unit $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+ + '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+ + '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+ + '10046_U_Implementation CRC cha','nged for unit $1'#000+ '10047_U_Finished compiling unit $1'#000+ - '10048_U_Adding dependency: $1 ','depends on $2'#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+ - '10053_U_Previous state of $1: $2'#000+ + '10053_U_P','revious state of $1: $2'#000+ '10054_U_Already compiling $1, setting second compile'#000+ - '10055','_U_Loading unit $1'#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+ + '10059_U_Skipping re-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 optimiz'+ - 'ation feedback input ($2, $3); recompile it without wpo or use the sam'+ - 'e wpo feedback input file for this compilation invocation'#000+ - '10062_U_Indirect interface (objects/classes) CRC changed fo','r unit $1'+ - #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 interface (objects/classes) CRC changed for unit $1'#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_DEF file can be created only for OS/2'#000+ + '11002_W_DEF f','ile can be created only for OS/2'#000+ '11003_E_nested response files are not supported'#000+ - '1','1004_F_No source file name in command line'#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+ '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 option','s from $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 \var{\#IF(N)DEFs} encou'+ - 'ntered'#000+ - '11014_F_In options file $1 at line $2 unexpec','ted \var{\#ENDIFs} enco'+ - 'untered'#000+ + '11013_F_In options file $1 at line $2 to','o 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 end of the options file'#000+ '11016_W_Debug information generation is not supported by this executab'+ - 'le'#000+ + 'l','e'#000+ '11017_H_Try recompiling with -dGDB'#000+ - '11018_W_You are using the obsolete switch $1'#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 not compatible with "$2"'#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+ + '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+ - '11030_H_Start of reading config file $1'#000+ + '11030_H_Start of reading config fil','e $1'#000+ '11031_H_End of reading config file $1'#000+ '11032_D_interpreting option "$1"'#000+ - '11036_','D_interpreting firstpass option "$1"'#000+ + '11036_D_interpreting firstpass option "$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 code page'#000+ + '11039_E_Unknow','n code page'#000+ '11040_F_Config file $1 is a directory'#000+ - '11041_W_Assembler output selecte','d "$1" cannot generate debug info, d'+ - 'ebugging disabled'#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+ - '11044_F_Option "$1" is not',', or not yet, supported on the current tar'+ - 'get platform'#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 selected'+ ' target platform'#000+ - '11046_N_DWARF debug information cannot be used with smart linking on t'+ - 'his target, switching to sta','tic linking'#000+ + '11046_N_DWARF de','bug 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+ - '12000_F_Cannot open whole program optimizat','ion feedback file "$1"'#000+ + ' for the sel','ected target/debug format combination.'#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 feed'+ - 'back file'#000+ + '12002_D_Finished processing the whole program optim','ization 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+ '12004_W_No handler registered for whole program optimization section "'+ - '$2" at line $1 of wpo feedback file, ignoring'#000+ + '$2" at line $1 of wpo feedback file, ignoring'#000, '12005_D_Found whole program optimization section "$1" with information'+ - ' about "$2"'#000, + ' 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 o','ptimization feedback file to store '+ - 'the generated info in (using -FW)'#000+ + '12007_E_No collected information necessary ','to perform "$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+ '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, ye','t an input'+ - ' feedback file was specified (using -Fw)'#000+ + ' a feedback file wa','s specified (using -FW)'#000+ + '12010_E_Not performing any whole program optimizations, yet an input f'+ + 'eedback file was specified (using -Fw)'#000+ '12011_D_Skipping whole program optimization section "$1", because not '+ - 'needed by the requested optimizations'#000+ + 'needed by the requested optimizations',#000+ '12012_W_Overriding previously read information for "$1" from feedback '+ - 'input file ','using information in section "$2"'#000+ + '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'+ - 'ion from linked program'#000+ + '12014_E_Cannot extract symb','ol liveness 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+ '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+ - '120','18_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] f','or $F'+ - 'PCCPU'#010+ + '12017_F_Error e','xecuting "$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+ + '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+ + 'CPU'#010+ 'Copyright (c) 1993-2011 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 T','arget: $FPCCPU'#010+ #010+ 'Supported targets:'#010+ ' $OSTARGETS'#010+ #010+ 'Supported CPU instruction sets:'#010+ - ' ',' $INSTRUCTIONSETS'#010+ + ' $INSTRUCTIONSETS'#010+ #010+ 'Supported FPU instruction sets:'#010+ ' $FPUINSTRUCTIONSETS'#010+ @@ -1080,225 +1080,225 @@ const msgtxt : array[0..000247,1..240] of char=( 'Supported Optimizations:'#010+ ' $OPTIMIZATIONS'#010+ #010+ - 'Supported Whole Program Optimizations:'#010+ + 'Sup','ported Whole Program Optimizations:'#010+ ' All'#010+ ' $WPOPTIMIZATIONS'#010+ #010+ - 'Supported Microcontr','oller types:'#010+ + 'Supported Microcontroller types:'#010+ ' $CONTROLLERTYPES'#010+ #010+ 'This program comes under the GNU General Public Licence'#010+ 'For more information read COPYING.FPC'#010+ #010+ - 'Report bugs, suggestions, etc. to:'#010+ + 'Report bugs, suggestions, etc.',' to:'#010+ ' http://bugs.freepascal.org'#010+ 'or'#010+ - ' bugs@freepasc','al.org'#000+ + ' bugs@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+ - '**2al_List sourcecode lines in assembler file'#010+ + '**2al_List s','ourcecode lines in assembler file'#010+ '**2an_List node info in assembler file'#010+ - '*L2ap_Use',' pipes instead of creating temporary assembler files'#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+ + '**2at_List temp allocation/release info in ','assembler file'#010+ '**1A_Output format:'#010+ '**2Adefault_Use default assembler'#010+ - '3*2Aas_Ass','emble using GNU AS'#010+ + '3*2Aas_Assemble using GNU AS'#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*2Anasmelf_ELF32 (Linux) file usi','ng Nasm'#010+ '3*2Anasmwin32_Win32 object file using Nasm'#010+ - '3*2Anasmwdosx_Win32/WDOSX objec','t 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*2Amasm_Obj file using Masm (Microsoft)'#010+ - '3*2Atasm_Obj file using Tasm (Borland)'#010+ + '3*2Atasm_Obj file using Tasm ','(Borland)'#010+ '3*2Aelf_ELF (Linux) using internal writer'#010+ - '3*2Acoff_COFF (Go32v2) using i','nternal 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+ '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 usi','ng 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+ '**2bl_Generate local symbol info'#010+ '**1B_Build all modules'#010+ - '**1C_Code generation options:'#010+ + '**1C','_Code generation options:'#010+ '**2C3_Turn on ieee error checking for constants'#010+ - '**2Ca','_Select ABI, see fpc -i for possible values'#010+ + '**2Ca_Select ABI, see fpc -i for possible values'#010+ '**2Cb_Generate big-endian code'#010+ '**2Cc_Set default calling convention to '#010+ - '**2CD_Create also dynamic library (not supported)'#010+ + '**2CD_Create also dynamic library',' (not supported)'#010+ '**2Ce_Compilation with emulated floating point opcodes'#010+ - '**2Cf_S','elect fpu instruction set to use, see fpc -i for possible '+ - 'values'#010+ + '**2Cf_Select fpu instruction set to use, see fpc -i for possible va'+ + 'lues'#010+ '**2CF_Minimal floating point constant precision (default, 32, 64)'#010+ - '**2Cg_Generate PIC code'#010+ + '**2Cg_Generate PIC code'#010, '**2Ch_ bytes heap (between 1023 and 67107840)'#010+ '**2Ci_IO-checking'#010+ - '**2Cn_Omit l','inking stage'#010+ + '**2Cn_Omit linking stage'#010+ '**2Co_Check overflow of integer operations'#010+ '**2CO_Check for possible overflow of integer operations'#010+ - '**2Cp_Select instruction set, see fpc -i for possible values'#010+ + '**2Cp_Select instruction set, see fpc -i fo','r possible values'#010+ '**2CP=_ packing settings'#010+ - '**3CPPACKSET=_ set allocat','ion: 0, 1 or DEFAULT or NORMAL, 2, '+ - '4 and 8'#010+ + '**3CPPACKSET=_ 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_Set stack checking size to '#010+ - '**2Ct_Stack checking (for testing only, see manual)'#010+ + '**2Ct_Stack c','hecking (for testing only, see manual)'#010+ '**2CX_Create also smartlinked library'#010+ - '**1d<','x>_Defines the symbol '#010+ + '**1d_Defines the symbol '#010+ '**1D_Generate a DEF file'#010+ '**2Dd_Set description to '#010+ '**2Dv_Set DLL version to '#010+ '*O2Dw_PM application'#010+ - '**1e_Set path to executable'#010+ + '**1e_Set path to ex','ecutable'#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 p'+ - 'arsed'#010+ + '**2Fa[,y]_(for a program) load units and [y] before uses is par'+ + 'sed'#010+ '**2Fc_Set input codepage 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+ + '**2Fd_D','isable 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+ '**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+ + '**2FL_Use as dynamic linker'#010+ '**2Fm_Load unicode conversion table from .txt in the compiler di'+ 'r'#010+ '**2Fo_Add to object path'#010+ - '**2Fr_Load error message file '#010+ + '**2Fr_Load error message file <','x>'#010+ '**2FR_Set resource (.res) linker to '#010+ '**2Fu_Add to unit path'#010+ - '**2FU<','x>_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 f','or target)'#010+ + '**2Fw_Load previously stored whole-progra','m optimization feedback '+ + 'from '#010+ + '*g1g_Generate debug information (default format for target)'#010+ '*g2gc_Generate checks for pointers'#010+ '*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+ - '*g2gl_Use line info unit (show more info with backtraces)'#010+ + '*g2gl_Use line info unit (show more info with ba','cktraces)'#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 file paths in Stabs'+ #010+ - '*g3godwarfmethodclassprefix_ Prefix method names in DWARF with class n'+ - 'ame'#010+ + '*g3godwarfmethodclassprefix_ Prefix method ','names in DWARF with class'+ + ' name'#010+ '*g2gp_Preserve case in stabs symbol names'#010+ - '*g2gs_Gen','erate Stabs debug information'#010+ + '*g2gs_Generate Stabs debug information'#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 DWARF','v2 debug information (same as -gw2)'#010+ '*g2gw2_Generate DWARFv2 debug information'#010+ - '*g2g','w3_Generate DWARFv3 debug information'#010+ + '*g2gw3_Generate DWARFv3 debug information'#010+ '*g2gw4_Generate DWARFv4 debug information (experimental)'#010+ '**1i_Information'#010+ '**2iD_Return compiler date'#010+ - '**2iV_Return short compiler version'#010+ + '**2iV_Return short ','compiler version'#010+ '**2iW_Return full compiler version'#010+ '**2iSO_Return compiler OS'#010+ - '**2i','SP_Return compiler host processor'#010+ + '**2iSP_Return compiler host processor'#010+ '**2iTO_Return target OS'#010+ '**2iTP_Return target processor'#010+ '**1I_Add to include path'#010+ '**1k_Pass to the linker'#010+ - '**1l_Write logo'#010+ + '**1l_W','rite logo'#010+ '**1M_Set language mode to '#010+ '**2Mfpc_Free Pascal dialect (default)'#010+ - '*','*2Mobjfpc_FPC mode with Object Pascal support'#010+ + '**2Mobjfpc_FPC mode 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+ + '**2Mmacpas_Macintosh Pascal dialects ','compatibility mode'#010+ '**1n_Do not read the default config files'#010+ - '**1N_Node tree opt','imizations'#010+ + '**1N_Node tree optimizations'#010+ '**2Nu_Unroll loops'#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+ - '**2O2_Level 2 optimizations (-O1 + quick op','timizations)'#010+ + '**2O1_Level 1 optim','izations (quick and debugger friendly)'#010+ + '**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+ '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+ '**2Oa=_Set alignment'#010+ - '**2Oo[NO]_Enable or disable optimizations, see fpc -i for possible '+ - 'values'#010+ - '**2Op_Set target cpu for optimizing, see fpc -i for possible valu','e'+ - 's'#010+ + '**2Oo[NO]_Enable or disable optimizations, see fpc -i for po','ssibl'+ + 'e values'#010+ + '**2Op_Set target cpu for optimizing, see fpc -i for possible values'+ + #010+ '**2OW_Generate whole-program optimization feedback for optimization'+ ' , see fpc -i for possible values'#010+ - '**2Ow_Perform whole-program optimization , see fpc -i for possib'+ - 'le values'#010+ + '**2Ow_Perform whole-program optimization ,',' see fpc -i for poss'+ + 'ible values'#010+ '**2Os_Optimize for size rather than speed'#010+ - '**1pg_Ge','nerate profile code for gprof (defines FPC_PROFILE)'#010+ + '**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+ '**1R_Assembler reading style:'#010+ '**2Rdefault_Use default assembler for target'#010+ - '3*2Ratt_Read AT&T style assembler'#010+ + '3*2Ratt_Read AT&T style asse','mbler'#010+ '3*2Rintel_Read Intel style assembler'#010+ '6*2RMOT_Read motorola style assembler'#010+ - '*','*1S_Syntax 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 th','e errors (default is 1)'#010+ + '**2Se_Error ','options. is a combination 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+ - '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+ - '**2Sh_Use ansistrings by de','fault instead of shortstrings'#010+ + '**2S','g_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+ + '**2Sh_Use ansistrings by default instead of shortstrings'#010+ '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+ '**2Sk_Load fpcylix unit'#010+ - '**2SI_Set interface style to '#010+ + '**2SI_Set interface style to '#010, '**3SIcom_COM compatible interface (default)'#010+ - '**3SIcorba_CORBA compatible interface'#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+ + '**2Sx_Enable exception keywords (default',' in Delphi/ObjFPC modes)'#010+ '**2Sy_@ returns a typed pointer, same as $T+'#010+ - '**1','s_Do not call assembler and linker'#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+ + '**2sr_Skip register allocation phase (use wit','h -alr)'#010+ '**1T_Target operating system:'#010+ '3*2Tdarwin_Darwin/Mac OS X'#010+ - '3*2Temx_OS/2 v','ia EMX (including EMX/RSX extender)'#010+ + '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+ '3*2Tfreebsd_FreeBSD'#010+ '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+ - '3*2Tiphonesim_ iPhoneSimulator from iOS SDK 3.2+ (older versions: -Tda'+ - 'rwin)'#010+ + '3*2Tiphonesim_ iPhoneSimulator from iOS SDK 3.2+ (olde','r versions: -T'+ + 'darwin)'#010+ '3*2Tlinux_Linux'#010+ '3*2Tnetbsd_NetBSD'#010+ - '3*2Tnetware_Novell Netware',' Module (clib)'#010+ + '3*2Tnetware_Novell Netware Module (clib)'#010+ '3*2Tnetwlibc_Novell Netware Module (libc)'#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*2Tsol','aris_Solaris'#010+ '3*2Twatcom_Watcom compatible DOS extender'#010+ - '3*2Twdosx_WDOSX DOS extende','r'#010+ + '3*2Twdosx_WDOSX DOS extender'#010+ '3*2Twin32_Windows 32 Bit'#010+ '3*2Twince_Windows CE'#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*2Tamiga_Commodore Amiga'#010, '6*2Tatari_Atari ST/STe/TT'#010+ '6*2Tlinux_Linux'#010+ '6*2Tpalmos_PalmOS'#010+ - 'A*2Tdarwin_Darwin/iPho','neOS/iOS'#010+ + 'A*2Tdarwin_Darwin/iPhoneOS/iOS'#010+ 'A*2Tlinux_Linux'#010+ 'A*2Twince_Windows CE'#010+ 'P*2Tamiga_AmigaOS'#010+ @@ -1306,86 +1306,85 @@ const msgtxt : array[0..000247,1..240] of char=( 'P*2Tlinux_Linux'#010+ 'P*2Tmacos_Mac OS (classic)'#010+ 'P*2Tmorphos_MorphOS'#010+ - 'S*2Tsolaris_Solaris'#010+ + 'S*2T','solaris_Solaris'#010+ 'S*2Tlinux_Linux'#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+ + '**2Us_Compile a system unit'#010, '**1v_Be verbose. is a combination of the following letters:'#010+ - '**2*_e : Show e','rrors (default) 0 : Show nothing (except errors'+ - ')'#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*_n : Show notes t : Show t','ried/used files'#010+ '**2*_h : Show hints c : Show conditionals'#010+ - '**2*_i ',': Show general info d : Show debug info'#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 : Executable info (','Win32 only'+ - ')'#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 tree.log with parse tre'+ 'e'#010+ '**2*_ with full path v : Write fpcdebug.txt with'#010+ - '**2*_ lots of debugging info'#010+ - '**2*_m, : Don'#039't show ','messages numbered and '#010+ + '**2*_ ',' lots of debugging info'#010+ + '**2*_m, : Don'#039't show messages numbered and '#010+ '3*1W_Target-specific options (targets)'#010+ 'A*1W_Target-specific options (targets)'#010+ 'P*1W_Target-specific options (targets)'#010+ - 'p*1W_Target-specific options (targets)'#010+ - '3*2Wb_Create a bundle instead of a library',' (Darwin)'#010+ + 'p*','1W_Target-specific options (targets)'#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+ '3*2WB_Create a relocatable image (Windows)'#010+ - 'A*2WB_Create a relocatable image (Windows, Symbian)'#010+ - '3*2WC_Specify console type appl','ication (EMX, OS/2, Windows)'#010+ + 'A','*2WB_Create a relocatable image (Windows, Symbian)'#010+ + '3*2WC_Specify console type application (EMX, OS/2, 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+ - 'A*2WD_Use DEFFILE to export functions of DLL',' or EXE (Windows)'#010+ + '3*2WD_Use DEFFILE to exp','ort 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+ 'A*2We_Use external resources (Darwin)'#010+ - 'P*2We_Use external resources (Darwin)'#010+ + 'P*2We_Use external resourc','es (Darwin)'#010+ 'p*2We_Use external resources (Darwin)'#010+ - '3*2WF_Specify full-screen type a','pplication (EMX, OS/2)'#010+ + '3*2WF_Specify full-screen type application (EMX, OS/2)'#010+ '3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+ 'A*2WG_Specify graphic type application (Windows)'#010+ - 'P*2WG_Specify graphic type application (Classic Mac OS)'#010+ + 'P*2WG_Specify graphic type',' application (Classic Mac OS)'#010+ '3*2Wi_Use internal resources (Darwin)'#010+ - 'P*2Wi_Use inte','rnal resources (Darwin)'#010+ + 'P*2Wi_Use internal resources (Darwin)'#010+ 'p*2Wi_Use internal resources (Darwin)'#010+ '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ - 'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ - '3*2WR_Generate relocation code (Window','s)'#010+ + 'A*2WN_Do not generate relo','cation code, needed for debugging (Windows'+ + ')'#010+ + '3*2WR_Generate relocation code (Windows)'#010+ 'A*2WR_Generate relocation code (Windows)'#010+ 'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+ '3*2WX_Enable executable stack (Linux)'#010+ - 'A*2WX_Enable executable stack (Linux)'#010+ + 'A*2WX_Enable execut','able stack (Linux)'#010+ 'p*2WX_Enable executable stack (Linux)'#010+ - 'P*2WX_Enable executable s','tack (Linux)'#010+ + 'P*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 use standard library search path (needed for cross compil'+ - 'e)'#010+ + '**2Xd_Do not use standard library search path ','(needed for cross comp'+ + 'ile)'#010+ '**2Xe_Use external linker'#010+ - '**2Xg_Create debuginfo in a s','eparate file and add a debuglink sectio'+ - 'n to executable'#010+ + '**2Xg_Create debuginfo in a separate file and add a debuglink section '+ + 'to executable'#010+ '**2XD_Try to link units dynamically (defines FPC_LINK_DYNAMIC)'#010+ '**2Xi_Use internal linker'#010+ - '**2Xm_Generate link map'#010+ + '**2Xm_Gen','erate link map'#010+ '**2XM_Set the name of the '#039'main'#039' program routine (default i'+ - 's '#039'ma','in'#039')'#010+ + 's '#039'main'#039')'#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, FreeB'+ - 'SD, Linux, Mac OS, Solaris)'#010+ + '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+ '**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+ - '**2XX_Try to smartlink un','its (defines FPC_LINK_SMART)'#010+ + '**2Xt_','Link with static libraries (-static is passed to linker)'#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 7f06c1ae37..e16e778133 100644 --- a/compiler/x86/aasmcpu.pas +++ b/compiler/x86/aasmcpu.pas @@ -162,7 +162,6 @@ interface OT_IMM16 = OT_IMMEDIATE or OT_BITS16; OT_IMM32 = OT_IMMEDIATE or OT_BITS32; OT_IMM64 = OT_IMMEDIATE or OT_BITS64; - OT_IMM80 = OT_IMMEDIATE or OT_BITS80; OT_ONENESS = otf_sub0; { special type of immediate operand } OT_UNITY = OT_IMMEDIATE or OT_ONENESS; { for shift/rotate instructions } @@ -341,6 +340,7 @@ implementation IF_AR1 = $00000040; { SB, SW, SD applies to argument 1 } IF_AR2 = $00000060; { SB, SW, SD applies to argument 2 } IF_ARMASK = $00000060; { mask for unsized argument spec } + IF_ARSHIFT = 5; { LSB of IF_ARMASK } IF_PRIV = $00000100; { it's a privileged instruction } IF_SMM = $00000200; { it's only valid in SMM } IF_PROT = $00000400; { it's protected mode only } @@ -1150,15 +1150,10 @@ implementation asize:=OT_BITS32; if (insflags and IF_ARMASK)<>0 then begin - siz[0]:=0; - siz[1]:=0; - siz[2]:=0; - if (insflags and IF_AR0)<>0 then - siz[0]:=asize - else if (insflags and IF_AR1)<>0 then - siz[1]:=asize - else if (insflags and IF_AR2)<>0 then - siz[2]:=asize; + siz[0]:=-1; + siz[1]:=-1; + siz[2]:=-1; + siz[((insflags and IF_ARMASK) shr IF_ARSHIFT)-1]:=asize; end else begin @@ -1397,6 +1392,28 @@ implementation {$ifdef x86_64} + function rexbits(r: tregister): byte; + begin + result:=0; + case getregtype(r) of + R_INTREGISTER: + if (getsupreg(r)>=RS_R8) then + { Either B,X or R bits can be set, depending on register role in instruction. + Set all three bits here, caller will discard unnecessary ones. } + result:=result or $47 + else if (getsubreg(r)=R_SUBL) and + (getsupreg(r) in [RS_RDI,RS_RSI,RS_RBP,RS_RSP]) then + result:=result or $40 + else if (getsubreg(r)=R_SUBH) then + { Not an actual REX bit, used to detect incompatible usage of + AH/BH/CH/DH } + result:=result or $80; + R_MMREGISTER: + if getsupreg(r)>=RS_XMM8 then + result:=result or $47; + end; + end; + function process_ea(const input:toper;out output:ea;rfield:longint):boolean; var sym : tasmsymbol; @@ -1414,21 +1431,7 @@ implementation rv:=regval(input.reg); output.modrm:=$c0 or (rfield shl 3) or rv; output.size:=1; - - if ((getregtype(input.reg)=R_INTREGISTER) and - (getsupreg(input.reg)>=RS_R8)) or - ((getregtype(input.reg)=R_MMREGISTER) and - (getsupreg(input.reg)>=RS_XMM8)) then - begin - output.rex:=output.rex or $41; - end - else if (getregtype(input.reg)=R_INTREGISTER) and - (getsubreg(input.reg)=R_SUBL) and - (getsupreg(input.reg) in [RS_RDI,RS_RSI,RS_RBP,RS_RSP]) then - begin - output.rex:=output.rex or $40; - end; - + output.rex:=output.rex or (rexbits(input.reg) and $F1); process_ea:=true; exit; @@ -1472,22 +1475,7 @@ implementation if (ir=NR_ESP) or ((s<>1) and (s<>2) and (s<>4) and (s<>8) and (ir<>NR_NO)) then exit; - if ((getregtype(br)=R_INTREGISTER) and - (getsupreg(br)>=RS_R8)) or - ((getregtype(br)=R_MMREGISTER) and - (getsupreg(br)>=RS_XMM8)) then - begin - output.rex:=output.rex or $41; - end; - - if ((getregtype(ir)=R_INTREGISTER) and - (getsupreg(ir)>=RS_R8)) or - ((getregtype(ir)=R_MMREGISTER) and - (getsupreg(ir)>=RS_XMM8)) then - begin - output.rex:=output.rex or $42; - end; - + output.rex:=output.rex or (rexbits(br) and $F1) or (rexbits(ir) and $F2); process_ea:=true; @@ -1746,19 +1734,7 @@ implementation 8,9,10 : begin {$ifdef x86_64} - if ((getregtype(oper[c-8]^.reg)=R_INTREGISTER) and - (getsupreg(oper[c-8]^.reg)>=RS_R8)) or - ((getregtype(oper[c-8]^.reg)=R_MMREGISTER) and - (getsupreg(oper[c-8]^.reg)>=RS_XMM8)) then - begin - rex:=rex or $41; - end - else if (getregtype(oper[c-8]^.reg)=R_INTREGISTER) and - (getsubreg(oper[c-8]^.reg)=R_SUBL) and - (getsupreg(oper[c-8]^.reg) in [RS_RDI,RS_RSI,RS_RBP,RS_RSP]) then - begin - rex:=rex or $40; - end; + rex:=rex or (rexbits(oper[c-8]^.reg) and $F1); {$endif x86_64} inc(codes); inc(len); @@ -1850,19 +1826,7 @@ implementation begin if (oper[c and 7]^.typ=top_reg) then begin - if ((getregtype(oper[c and 7]^.reg)=R_INTREGISTER) and - (getsupreg(oper[c and 7]^.reg)>=RS_R8)) or - ((getregtype(oper[c and 7]^.reg)=R_MMREGISTER) and - (getsupreg(oper[c and 7]^.reg)>=RS_XMM8)) then - begin - rex:=rex or $44; - end - else if (getregtype(oper[c and 7]^.reg)=R_INTREGISTER) and - (getsubreg(oper[c and 7]^.reg)=R_SUBL) and - (getsupreg(oper[c and 7]^.reg) in [RS_RDI,RS_RSI,RS_RBP,RS_RSP]) then - begin - rex:=rex or $40; - end; + rex:=rex or (rexbits(oper[c and 7]^.reg) and $F4); end; end; @@ -1881,6 +1845,9 @@ implementation end; until false; {$ifdef x86_64} + if ((rex and $80)<>0) and ((rex and $4F)<>0) then + Message(asmw_e_bad_reg_with_rex); + rex:=rex and $4F; { reset extra bits in upper nibble } if omit_rexw then begin if rex=$48 then { remove rex entirely? } @@ -1932,7 +1899,6 @@ implementation * \312 - (disassembler only) invalid with non-default address size. * \320,\321,\322 - might be an 0x66 or 0x48 byte, depending on the operand * size of operand x. - * \323 - insert x86_64 REX at this position. * \324 - indicates fixed 16-bit operand size, i.e. optional 0x66. * \325 - indicates fixed 32-bit operand size, i.e. optional 0x66. * \326 - indicates fixed 64-bit operand size, i.e. optional 0x48. @@ -1942,10 +1908,10 @@ implementation * \331 - instruction not valid with REP prefix. Hint for * disassembler only; for SSE instructions. * \332 - disassemble a rep (0xF3 byte) prefix as repe not rep. - * \333 - 0xF3 prefix optionally followed by REX; for SSE instructions - * \334 - 0xF2 prefix optionally followed by REX; for SSE instructions - * \335 - removes rex size prefix, i.e. rex.w must be the last opcode - * \361 - 0x66 prefix optionally followed by REX; for SSE instructions + * \333 - 0xF3 prefix for SSE instructions + * \334 - 0xF2 prefix for SSE instructions + * \335 - Indicates 64-bit operand size with REX.W not necessary + * \361 - 0x66 prefix for SSE instructions } var @@ -2164,7 +2130,7 @@ implementation else objdata.writebytes(currval,1); end; - 24,25,26 : + 24,25,26 : // 030..032 begin getvalsym(c-24); if (currval<-65536) or (currval>65535) then @@ -2174,7 +2140,9 @@ implementation else objdata.writebytes(currval,2); end; - 28,29,30 : + 28,29,30 : // 034..036 + { !!! These are intended (and used in opcode table) to select depending + on address size, *not* operand size. Works by coincidence only. } begin getvalsym(c-28); if opsize=S_Q then @@ -2192,7 +2160,7 @@ implementation objdata.writebytes(currval,4); end end; - 32,33,34 : + 32,33,34 : // 040..042 begin getvalsym(c-32); if assigned(currsym) then @@ -2200,7 +2168,7 @@ implementation else objdata.writebytes(currval,4); end; - 40,41,42 : + 40,41,42 : // 050..052 - byte relative operand begin getvalsym(c-40); data:=currval-insend; @@ -2210,7 +2178,7 @@ implementation Message1(asmw_e_short_jmp_out_of_range,tostr(data)); objdata.writebytes(data,1); end; - 52,53,54 : + 52,53,54 : // 064..066 - select between 16/32 address mode, but we support only 32 begin getvalsym(c-52); if assigned(currsym) then @@ -2218,7 +2186,7 @@ implementation else objdata_writereloc(currval-insend,4,nil,currabsreloc32) end; - 56,57,58 : + 56,57,58 : // 070..072 - long relative operand begin getvalsym(c-56); if assigned(currsym) then @@ -2377,15 +2345,17 @@ implementation if oper[opidx]^.ref^.base=NR_RIP then begin currabsreloc:=RELOC_RELATIVE; - { Adjust reloc value depending of immediate operand size } - case Ord(codes^) of - 12,13,14,16,17,18,20,21,22: - Dec(currval, 1); - 24,25,26: - Dec(currval, 2); - 32,33,34: - Dec(currval, 4); - end; + { Adjust reloc value depending of immediate operand size, + but not if offset is specified by literal constant } + if Assigned(currsym) then + case Ord(codes^) of + 12,13,14,16,17,18,20,21,22: + Dec(currval, 1); + 24,25,26: + Dec(currval, 2); + 32,33,34: + Dec(currval, 4); + end; end else {$endif x86_64} diff --git a/tests/test/tasm2.pp b/tests/test/tasm2.pp index 32941129a5..b571041e42 100644 --- a/tests/test/tasm2.pp +++ b/tests/test/tasm2.pp @@ -1,5 +1,4 @@ { %CPU=x86_64 } -{ %norun } // (Almost) every of these instructions use a high register and thus generate REX. {$asmmode att} @@ -189,8 +188,8 @@ const $05,$78,$56,$34,$12,$44,$0F,$16,$05,$78,$56,$34,$12,$66,$44, $0F,$13,$05,$78,$56,$34,$12,$66,$44,$0F,$12,$05,$78,$56,$34, $12,$44,$0F,$13,$05,$78,$56,$34,$12,$44,$0F,$12,$05,$78,$56, - $34,$12,$F3,$0F,$70,$0D,$77,$56,$34,$12,$90,$F2,$0F,$70,$0D, - $77,$56,$34,$12,$90,$0F,$60,$0D,$78,$56,$34,$12,$0F,$62,$0D, + $34,$12,$F3,$0F,$70,$0D,$78,$56,$34,$12,$90,$F2,$0F,$70,$0D, + $78,$56,$34,$12,$90,$0F,$60,$0D,$78,$56,$34,$12,$0F,$62,$0D, $78,$56,$34,$12,$0F,$61,$0D,$78,$56,$34,$12,$66,$44,$0F,$60, $05,$78,$56,$34,$12,$66,$44,$0F,$62,$05,$78,$56,$34,$12,$66, $44,$0F,$61,$05,$78,$56,$34,$12,$66,$44,$0F,$6C,$05,$78,$56, @@ -229,6 +228,9 @@ var begin for i:=0 to high(test_expected) do if test_expected[i]<>pbyte(@test)[i] then - halt(1); + begin + writeln('mismatch at offset $',hexstr(i,4), ', expected=$',hexstr(test_expected[i],2),' actual=$',hexstr(pbyte(@test)[i],2)); + halt(1); + end; writeln('ok'); end. diff --git a/tests/test/tasm3.pp b/tests/test/tasm3.pp new file mode 100644 index 0000000000..740880ad65 --- /dev/null +++ b/tests/test/tasm3.pp @@ -0,0 +1,26 @@ +{ %CPU=x86_64 } + +// Basic test for 3-operand SIMD instructions with rip-relative operand + +{$codealign varmin=16} +{$codealign constmin=16} +type + tvec=array[0..3] of longword; + +var + t: tvec = ($00010203, $04050607, $08090a0b, $0c0d0e0f); + +{$asmmode att} +function test: word; assembler; nostackframe; +asm + pshufd $0b11100100,t(%rip),%xmm0 // direct copy + pcmpeqd t(%rip),%xmm0 + pmovmskb %xmm0,%eax +end; + +begin + if test<>65535 then + Halt(1) + else + writeln('ok'); +end. diff --git a/tests/test/tasm4.pp b/tests/test/tasm4.pp new file mode 100644 index 0000000000..de01d4bf9d --- /dev/null +++ b/tests/test/tasm4.pp @@ -0,0 +1,12 @@ +{ %CPU=x86_64 } +{ %fail } + +// AH/BH/CH/DH and x86_64 specific registers cannot be used in a single instruction +{$asmmode att} +procedure test; assembler; nostackframe; +asm + adcb %ah, (%r8) +end; + +begin +end.