From 18eb495d0f8e611e10034f48a35c55857ec41c54 Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Sat, 1 Dec 2007 11:28:15 +0000 Subject: [PATCH] * give a regular error message instead of an internal error on x86 when using non-PIC references in assembler code when the compiler is configured to generate PIC code (on ppc, sparc and arm, no error message is given at all currently) git-svn-id: trunk@9364 - --- compiler/m68k/ra68k.pas | 7 +- compiler/msg/errore.msg | 8 +- compiler/msgidx.inc | 5 +- compiler/msgtxt.inc | 303 ++++++++++++++++++++------------------- compiler/sparc/racpu.pas | 3 +- compiler/x86/rax86.pas | 43 ++++-- 6 files changed, 194 insertions(+), 175 deletions(-) diff --git a/compiler/m68k/ra68k.pas b/compiler/m68k/ra68k.pas index b71d7dc074..611ad4dcd3 100644 --- a/compiler/m68k/ra68k.pas +++ b/compiler/m68k/ra68k.pas @@ -49,11 +49,10 @@ unit ra68k; *****************************************************************************} function TM68kInstruction.ConcatInstruction(p : TAsmList):tai; - var - ai : taicpu; begin - ai:=taicpu(inherited ConcatInstruction(p)); - ai.opsize:=opsize; + result:=inherited ConcatInstruction(p); + if assigned(result) then + taicpu(result).opsize:=opsize; end; { function TM68kInstruction.ConcatInstruction(p : TAsmList):tai; diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg index 62a3e98365..a31892becb 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -1715,7 +1715,7 @@ cg_e_goto_label_not_found=06049_E_Goto label "$1" not defined or optimized away # # Assembler reader # -# 07106 is the last used one +# 07107 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 @@ -1956,7 +1956,11 @@ asmr_w_direct_esp_neg_offset=07105_W_Use of -offset(%esp), access may cause a cr % Using -8(%esp) to access a local stack is not recommended, as % this stack portion can be overwritten by any function calls or interrupts. asmr_e_no_vmtoffset_possible=07106_E_VMTOffset must be used in combination with a virtual method, and "$1" is not virtual -% +% Only virtul methods have a VMT offset +asmr_e_need_pic_ref=07107_E_Generating PIC, but reference is not PIC-safe +% The compiler has been configured to generate position-independent code +% (PIC), but there are position-dependent references in the current +% handwritten assembler instruction. # # Assembler/binary writers # diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index e74ab8b2cd..2c921d11f9 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -575,6 +575,7 @@ const asmr_w_direct_ebp_neg_offset=07104; asmr_w_direct_esp_neg_offset=07105; asmr_e_no_vmtoffset_possible=07106; + asmr_e_need_pic_ref=07107; asmw_f_too_many_asm_files=08000; asmw_f_assembler_output_not_supported=08001; asmw_f_comp_not_supported=08002; @@ -732,9 +733,9 @@ const option_info=11024; option_help_pages=11025; - MsgTxtSize = 45394; + MsgTxtSize = 45448; MsgIdxMax : array[1..20] of longint=( - 24,86,238,83,63,50,107,22,135,60, + 24,86,238,83,63,50,108,22,135,60, 42,1,1,1,1,1,1,1,1,1 ); diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index 4a320d44f5..7f7282238f 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -648,180 +648,180 @@ const msgtxt : array[0..000189,1..240] of char=( 'be lost'#000+ '07106_E_VMTOffset must be used in combination with a virtual method, a'+ 'nd "$1" is not virtual'#000+ + '07107_E_Generating PIC, but reference is not PIC-safe'#000+ '08000_F_Too many assembler files'#000+ - '08001_F_Selected assembler output not supported'#000+ + '08001_F_Selected assembler output not sup','ported'#000+ '08002_F_Comp not supported'#000+ - '08003_F_Direct not s','upport for binary writers'#000+ + '08003_F_Direct not support for binary writers'#000+ '08004_E_Allocating of data is only allowed in bss section'#000+ '08005_F_No binary writer selected'#000+ '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 referen','ces not supported'#000+ + '08007_E_Asm: $1 invalid combinat','ion of opcode and operands'#000+ + '08008_E_Asm: 16 Bit references not supported'#000+ '08009_E_Asm: Invalid effective address'#000+ '08010_E_Asm: Immediate or reference expected'#000+ '08011_E_Asm: $1 value exceeds bounds $2'#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+ + '0','8013_E_Asm: Undefined label $1'#000+ + '08014_E_Asm: Comp type not supported for this target'#000+ '08015_E_Asm: Extended type not supported for this target'#000+ '08016_E_Asm: Duplicate label $1'#000+ '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 Bi','t references not supported'#000+ + '080','19_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+ '09000_W_Source operating system redefined'#000+ '09001_I_Assembling (pipe) $1'#000+ '09002_E_Can'#039't create assembler file: $1'#000+ - '09003_E_Can'#039't create object file: $1'#000+ - '09004_E_Can'#039't create a','rchive file: $1'#000+ + '09003','_E_Can'#039't create object file: $1'#000+ + '09004_E_Can'#039't create archive file: $1'#000+ '09005_E_Assembler $1 not found, switching to external assembling'#000+ '09006_T_Using assembler: $1'#000+ '09007_E_Error while assembling exitcode $1'#000+ - '09008_E_Can'#039't call the assembler, error $1 switching to external a'+ - 'ssembling'#000+ - '09009_I_Asse','mbling $1'#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+ '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+ - '09014_E_Can'#039't call the linker, switching to external linking'#000+ - '0901','5_I_Linking $1'#000+ + '09014_E_Can',#039't call the linker, switching to external linking'#000+ + '09015_I_Linking $1'#000+ '09016_E_Util $1 not found, switching to external linking'#000+ '09017_T_Using util $1'#000+ '09018_E_Creation of Executables not supported'#000+ - '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+ + '09019_E_Creation of Dynamic/Shared Libraries n','ot supported'#000+ '09020_I_Closing script $1'#000+ - '09021_E_resourc','e compiler not found, switching to external mode'#000+ + '09021_E_resource compiler 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 b','e shared linked, switching to static link'+ - 'ing'#000+ + '09024_T_unit $1 can'#039't be smart linke','d, switching to static linki'+ + 'ng'#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+ - '09128_F_Can'#039't post process execut','able $1'#000+ + '09028_D_Calling resource compiler "$1" with ','"$2" as command line'#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_Size of uninitialized data: $1 bytes'#000+ - '09133_X_Stack space reserved: $1 bytes'#000+ + '09133_X_Stack space reserv','ed: $1 bytes'#000+ '09134_X_Stack space committed: $1 bytes'#000+ - '1','0000_T_Unitsearch: $1'#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+ '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+ - '1000','9_U_PPU is compiled for another processor'#000+ + '10009_U_PPU is compiled for another processor'#000+ '10010_U_PPU is compiled for an other target'#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+ + '10014_F_Error reading PPU-Fil','e'#000+ '10015_F_unexpected end of PPU-File'#000+ - '10016_F_Invalid P','PU-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+ '10020_F_Circular unit reference between $1 and $2'#000+ - '10021_F_Can'#039't compile unit $1, no sources available'#000+ - '10022_F_Can'#039't find unit $1 used by $2',#000+ + '10021_F_Can'#039't compile unit $1, no s','ources 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+ + '10026_F_There were $1 errors compiling module',', stopping'#000+ '10027_U_Load from $1 ($2) unit $3'#000+ - '10028_U_R','ecompiling $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+ - '10031_U_Recompiling unit, shared lib is older than ppufile'#000+ - '10032_U_Recompiling unit, obj and asm are',' 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+ '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+ + '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 PPU file $2'#000+ '10042_U_Trying to use a unit which was compiled with a different FPU m'+ 'ode'#000+ '10043_U_Loading interface units from $1'#000+ - '10044_U_Loading implementation units from $1'#000+ - '10045_U_Int','erface CRC changed for unit $1'#000+ + '10','044_U_Loading implementation units from $1'#000+ + '10045_U_Interface CRC changed for unit $1'#000+ '10046_U_Implementation CRC changed for unit $1'#000+ '10047_U_Finished compiling unit $1'#000+ '10048_U_Add dependency of $1 to $2'#000+ '10049_U_No reload, is caller: $1'#000+ - '10050_U_No reload, already in second compile: $1'#000+ - '10051_U_Fl','ag for reload: $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+ '10054_U_Already compiling $1, setting second compile'#000+ '10055_U_Loading unit $1'#000+ - '10056_U_Finished loading unit $1'#000+ + '10056_U_Finished loading unit $1'#000, '10057_U_Registering new unit $1'#000+ - '10058_U_Re-resolving u','nit $1'#000+ + '10058_U_Re-resolving unit $1'#000+ '10059_U_Skipping re-resolving unit $1, still loading used units'#000+ '11000_O_$1 [options] [options]'#000+ '11001_W_Only one source file supported'#000+ - '11002_W_DEF file can be created only for OS/2'#000+ - '11003_E_nested response files are not sup','ported'#000+ + '11002_W_DEF file can be created o','nly for OS/2'#000+ + '11003_E_nested response files are not supported'#000+ '11004_F_No source file name in command line'#000+ '11005_N_No option inside $1 config file'#000+ '11006_E_Illegal parameter: $1'#000+ '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 furthe','r options 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_too many IF(N)DEFs'#000+ '11014_F_too many ENDIFs'#000+ - '11015_F_open conditional at the end of the file'#000+ - '11016_W_Debug i','nformation generation is not supported by this execut'+ - 'able'#000+ + '11015_F_o','pen conditional at the end of the file'#000+ + '11016_W_Debug information generation is not supported by this executab'+ + 'le'#000+ '11017_H_Try recompiling with -dGDB'#000+ '11018_W_You are using the obsolete switch $1'#000+ - '11019_W_You are using the obsolete switch $1, please use $2'#000+ - '11020_N_Switching assembler to default sou','rce writing assembler'#000+ + '11019_W_You are using the obsolete switch $1, pl','ease 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+ '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 fr','om environment $1'#000+ '11028_D_Handling option "$1"'#000+ - '11029__','*** press enter ***'#000+ + '11029__*** press enter ***'#000+ '11030_H_Start of reading config file $1'#000+ '11031_H_End of reading config file $1'#000+ '11032_D_interpreting option "$1"'#000+ '11036_D_interpreting firstpass option "$1"'#000+ - '11033_D_interpreting file option "$1"'#000+ - '11034_D_Reading config file ','"$1"'#000+ + '11033_D_inte','rpreting 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+ '11040_F_Config file $1 is a directory'#000+ '11041_W_Assembler output selected "$1" cannot generate debug info, deb'+ - 'ugging disabled'#000+ - '11023_Free Pascal Compiler version $FPCFULLVERSIO','N [$FPCDATE] for $F'+ - 'PCCPU'#010+ + 'ugging disa','bled'#000+ + '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+ + 'CPU'#010+ 'Copyright (c) 1993-2007 by Florian Klaempfl'#000+ '11024_Free Pascal Compiler version $FPCVERSION'#010+ #010+ 'Compiler Date : $FPCDATE'#010+ 'Compiler CPU Target: $FPCCPU'#010+ #010+ - 'Supported targets:'#010+ + 'Supported',' targets:'#010+ ' $OSTARGETS'#010+ #010+ - 'Supported CPU instruction sets',':'#010+ + 'Supported CPU instruction sets:'#010+ ' $INSTRUCTIONSETS'#010+ #010+ 'Supported FPU instruction sets:'#010+ @@ -831,182 +831,183 @@ const msgtxt : array[0..000189,1..240] of char=( ' $OPTIMIZATIONS'#010+ #010+ 'This program comes under the GNU General Public Licence'#010+ - 'For more information read COPYING.FPC'#010+ + 'For more i','nformation read COPYING.FPC'#010+ #010+ - 'Report bugs,suggestions e','tc to:'#010+ + 'Report bugs,suggestions etc to:'#010+ ' 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+ - '**2an_List ','node info in assembler file'#010+ + '**2','al_List sourcecode lines in assembler file'#010+ + '**2an_List node info in assembler file'#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+ - '**2Adef','ault_Use default assembler'#010+ + '**2Adefault_Use default assembler'#010+ '3*2Aas_Assemble using GNU AS'#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*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+ - '3*2Awas','m_Obj file using Wasm (Watcom)'#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*2Aelf_ELF (Linux) using internal writer'#010+ - '3*2Acoff_COFF (Go32v2) using internal writer'#010+ - '3*2Apecoff','_PE-COFF (Win32) using internal writer'#010+ + '3','*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*2Amot_Standard Motorola assembler'#010+ + '6*2Amot_Standard Motorola ','assembler'#010+ 'A*2Aas_Assemble using GNU AS'#010+ - 'P*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+ - '**2Cc_Set default calling convention to '#010+ - '**2CD_Create also dynamic library ','(not supported)'#010+ + '**2Cc_Set default callin','g convention to '#010+ + '**2CD_Create also dynamic library (not supported)'#010+ '**2Ce_Compilation with emulated floating point opcodes'#010+ '**2Cf_Select fpu instruction set to use, see fpc -i for possible va'+ 'lues'#010+ - '**2CF_Minimal floating point constant precision (default, 32, 64)'#010+ + '**2CF_Minimal floating point constant',' precision (default, 32, 64)'+ + #010+ '**2Cg_Generate PIC code'#010+ - '*','*2Ch_ bytes heap (between 1023 and 67107840)'#010+ + '**2Ch_ bytes heap (between 1023 and 67107840)'#010+ '**2Ci_IO-checking'#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+ + '**2CO_Check for possible overflow of integer oper','ations'#010+ + '**2Cp_Select instruction set, see fpc -i for possible values'#010+ '**2CP=_ packing settings'#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+ + '**2CR_Verify object method call validity'#010, '**2Cs_Set stack size to '#010+ '**2Ct_Stack checking'#010+ - '**','2CX_Create also smartlinked library'#010+ + '**2CX_Create also smartlinked library'#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_S','et path to executable'#010+ '**1E_Same as -Cn'#010+ - '**1fPIC_Same as',' -Cg'#010+ + '**1fPIC_Same as -Cg'#010+ '**1F_Set file names and paths:'#010+ '**2Fa[,y]_(for a program) load units and [y] before uses is par'+ 'sed'#010+ '**2Fc_Set input codepage to '#010+ - '**2FC_Set RC compiler binary name to '#010+ - '**2FD_Set the directory where to search for c','ompiler utilities'#010+ + '**2FC_Set RC compiler binary name t','o '#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+ '**2Fi_Add to include path'#010+ - '**2Fl_Add to library path'#010+ - '**2FL_Use as dynamic ','linker'#010+ + '**2Fl_Add to library path'#010+ + '**2FL_Use as dynamic linker'#010+ '**2Fm_Load unicode conversion table from .txt in the compiler di'+ 'r'#010+ '**2Fo_Add to object path'#010+ '**2Fr_Load error message file '#010+ - '**2FR_Set resource (.res) linker to '#010+ + '**2FR_Set resource (.res) linker to',' '#010+ '**2Fu_Add to unit path'#010+ - '**2FU_Set unit o','utput path to , overrides -FE'#010+ + '**2FU_Set unit output path to , overrides -FE'#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 ba','cktraces)'#010+ + '*g2gh_Use heaptrace unit (for memory leak/corruption debug','ging)'#010+ + '*g2gl_Use line info unit (show more info with backtraces)'#010+ '*g2go_Set debug information options'#010+ '*g3godwarfsets_ Enable Dwarf set debug information (breaks gdb < 6.5)'#010+ '*g2gp_Preserve case in stabs symbol names'#010+ - '*g2gs_Generate stabs debug information'#010+ - '*g2gt_Trash local variables (to detect u','ninitialized uses)'#010+ + '*g2gs_Generate stabs debu','g information'#010+ + '*g2gt_Trash local variables (to detect uninitialized uses)'#010+ '*g2gv_Generates programs traceable with valgrind'#010+ '*g2gw_Generate dwarf-2 debug information (same as -gw2)'#010+ '*g2gw2_Generate dwarf-2 debug information'#010+ - '*g2gw3_Generate dwarf-3 debug information'#010+ + '*g2gw3_Generate dwar','f-3 debug information'#010+ '**1i_Information'#010+ - '**2iD_Return co','mpiler date'#010+ + '**2iD_Return compiler date'#010+ '**2iV_Return short 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 processor'#010+ + '**2iTP_Return t','arget processor'#010+ '**1I_Add to include path'#010+ - '**1k_Pass to the linker'#010+ + '**1k_Pass to the linker'#010+ '**1l_Write logo'#010+ '**1M_Set language mode to '#010+ '**2Mfpc_Free Pascal dialect (default)'#010+ '**2Mobjfpc_FPC mode with Object Pascal support'#010+ - '**2Mdelphi_Delphi 7 compatibility mode'#010+ + '**2Mdelphi_Delphi 7 compati','bility mode'#010+ '**2Mtp_TP/BP 7.0 compatibility mode'#010+ - '**2Mma','cpas_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 optimizations'#010+ '**2Nu_Unroll loops'#010+ - '**1o_Change the name of the executable produced to '#010+ + '**1o_Change the name of the executable p','roduced to '#010+ '**1O_Optimizations:'#010+ - '**2O-_Disable op','timizations'#010+ + '**2O-_Disable optimizations'#010+ '**2O1_Level 1 optimizations (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 o','ptimizations, see fpc -i for possibl'+ - 'e values'#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 values'+ #010+ '**2Os_Optimize for size rather than speed'#010+ - '**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+ - '**1R_Assembler read','ing style:'#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*2Rintel_Read Intel style assembler'#010+ '6*2RMOT_Read motorola style assembler'#010+ - '**1S_Syntax options:'#010+ + '**1S_Syntax option','s:'#010+ '**2S2_Same as -Mobjfpc'#010+ - '**2Sc_Support operators like',' C (*=,+=,/= and -=)'#010+ + '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+ '**2Sa_Turn on assertions'#010+ '**2Sd_Same as -Mdelphi'#010+ '**2Se_Error options. is a combination of the following:'#010+ - '**3*_ : Compiler halts after the errors (default is 1)'#010+ + '**3*_ : Compiler halts after the errors (defaul','t is 1)'#010+ '**3*_w : Compiler also halts after warnings'#010+ - '**','3*_n : Compiler 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+ - '**2Sh_Use ansistrings by default instead of shortstrings'#010+ - '**2Si_Turn on inlining of procedures/functio','ns declared as "inline"'#010+ + '**2Sh_Use ansistrings by default instead of sho','rtstrings'#010+ + '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+ '**2Sk_Load fpcylix unit'#010+ '**2SI_Set interface style to '#010+ '**3SIcom_COM compatible interface (default)'#010+ '**3SIcorba_CORBA compatible interface'#010+ - '**2Sm_Support macros like C (global)'#010+ + '**2Sm_Support macros',' like C (global)'#010+ '**2So_Same as -Mtp'#010+ - '**2Ss_Constructor ','name must be init (destructor must be done)'#010+ + '**2Ss_Constructor name must be init (destructor must be done)'#010+ '**2St_Allow static keyword in objects'#010+ '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+ '**1s_Do not call assembler and linker'#010+ - '**2sh_Generate script to link on host'#010+ - '**2st_Generate sc','ript to link on target'#010+ + '*','*2sh_Generate script to link on host'#010+ + '**2st_Generate script to link on target'#010+ '**2sr_Skip register allocation phase (use with -alr)'#010+ '**1T_Target operating system:'#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*2Tlinux_Lin','ux'#010+ + '3*2Tgo3','2v2_Version 2 of DJ Delorie DOS extender'#010+ + '3*2Tlinux_Linux'#010+ '3*2Tnetbsd_NetBSD'#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*2Twatcom_Watcom compatible DOS extender'#010, + '3*2Tsymbian','_Symbian OS'#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+ @@ -1014,77 +1015,77 @@ const msgtxt : array[0..000189,1..240] of char=( '6*2Tamiga_Commodore Amiga'#010+ '6*2Tatari_Atari ST/STe/TT'#010+ '6*2Tlinux_Linux/m68k'#010+ - '6*2Tmacos_Macintosh m68k (not supported)'#010+ + '6*2Tmacos_Macintosh m6','8k (not supported)'#010+ '6*2Tpalmos_PalmOS'#010+ 'A*2Tlinux_Linux'#010+ - 'A','*2Twince_Windows CE'#010+ + 'A*2Twince_Windows CE'#010+ 'P*2Tamiga_AmigaOS on PowerPC'#010+ 'P*2Tdarwin_Darwin and Mac OS X on PowerPC'#010+ 'P*2Tlinux_Linux on PowerPC'#010+ 'P*2Tmacos_Mac OS (classic) on PowerPC'#010+ 'P*2Tmorphos_MorphOS'#010+ - 'S*2Tlinux_Linux'#010+ + 'S*2Tlinux_','Linux'#010+ '**1u_Undefines the symbol '#010+ - '**1U_Unit optio','ns:'#010+ + '**1U_Unit options:'#010+ '**2Un_Do not check where the unit name matches the file name'#010+ '**2Ur_Generate release unit files (never automatically recompiled)'#010+ '**2Us_Compile a system unit'#010+ - '**1v_Be verbose. is a combination of the following letters:'#010+ - '**2*_e : Show',' errors (default) 0 : Show nothing (except errors'+ - ')'#010+ + '**1v_Be verbose. is',' a combination of the following letters:'#010+ + '**2*_e : Show errors (default) 0 : Show nothing (except errors)'#010+ '**2*_w : Show warnings u : Show unit info'#010+ '**2*_n : Show notes t : Show tried/used files'#010+ - '**2*_h : Show hints c : Show conditionals'#010+ - '**2*_','i : Show general info d : Show debug info'#010+ + '**2*_h : S','how hints c : Show conditionals'#010+ + '**2*_i : Show general info d : Show debug info'#010+ '**2*_l : Show linenumbers r : Rhide/GCC compatibility mode'#010+ - '**2*_a : Show everything x : Executable info (Win32 only)'#010+ - '**2*_b : Write file names messages with full pat','h'#010+ + '**2*_a : Show everything x : Executable info (Win32 ','only'+ + ')'#010+ + '**2*_b : Write file names messages with full path'#010+ '**2*_v : Write fpcdebug.txt with p : Write tree.log with parse tre'+ 'e'#010+ '**2*_ lots of debugging info'#010+ '3*1W_Target-specific options (targets)'#010+ - 'A*1W_Target-specific options (targets)'#010+ + 'A*1W_Target-specific options (targe','ts)'#010+ 'P*1W_Target-specific options (targets)'#010+ - '3*2Wb_Cr','eate 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+ - '3*2WB_Create a relocatable image (Windows)'#010+ - 'A*2WB_Create a relocatable image (Windows, Symbia','n)'#010+ + '3*2WB_Create a relocatable image (Wind','ows)'#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 export functions of DLL or EXE (Windows)'#010+ + 'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#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 ty','pe application (Classic Mac OS)'#010+ + 'A*2WG_Specify graph','ic type application (Windows)'#010+ + 'P*2WG_Specify graphic type application (Classic Mac OS)'#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 (Windows)'#010+ - 'A*2WR_Generate relocation c','ode (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+ '**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+ '**2XD_Try to link units dynamically (defines FPC_LINK_DYNAMIC)'#010+ '**2Xi_Use internal linker'#010+ '**2Xm_Generate link map'#010+ - '**2XM_Set the name of the '#039'main'#039' program routine (default i'+ - 's '#039'main'#039')'#010+ - '**2XP_Prepend the ','binutils names with the prefix '#010+ + '**2XM_Set the name of the '#039'main'#039' pro','gram routine (default'+ + ' is '#039'main'#039')'#010+ + '**2XP_Prepend the binutils names with the prefix '#010+ '**2Xr_Set library search path to (needed for cross compile) (Be'+ 'OS, Linux)'#010+ - '**2XR_Prepend to all linker search paths (BeOS, Darwin, FreeBSD'+ + '**2XR_Prepend to all linker search paths (BeOS, Darwin, FreeBSD', ', Linux, Mac OS, Solaris)'#010+ - '**2Xs_Strip all symbols from',' executable'#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 units (defines FPC_LINK_SMART)'#010+ + '**2XX_Try to smartlink units ','(defines FPC_LINK_SMART)'#010+ '**1*_'#010+ '**1?_Show this help'#010+ - '**1','h_Shows this help without waiting'#000 + '**1h_Shows this help without waiting'#000 ); diff --git a/compiler/sparc/racpu.pas b/compiler/sparc/racpu.pas index 34b2ebd02e..aa56288442 100644 --- a/compiler/sparc/racpu.pas +++ b/compiler/sparc/racpu.pas @@ -45,7 +45,8 @@ implementation begin result:=inherited ConcatInstruction(p); { delay slot annulled support } - if (result.typ=ait_instruction) and + if assigned(result) and + (result.typ=ait_instruction) and delayslot_annulled then taicpu(result).delayslot_annulled:=true; end; diff --git a/compiler/x86/rax86.pas b/compiler/x86/rax86.pas index acc2a2aaa5..3d9595f070 100644 --- a/compiler/x86/rax86.pas +++ b/compiler/x86/rax86.pas @@ -44,7 +44,7 @@ type opsize : topsize; Procedure SetSize(_size:longint;force:boolean);override; Procedure SetCorrectSize(opcode:tasmop);override; - Procedure CheckOperand; override; + Function CheckOperand: boolean; override; end; Tx86Instruction=class(TInstruction) @@ -207,23 +207,34 @@ begin end; end; -Procedure Tx86Operand.CheckOperand; +Function Tx86Operand.CheckOperand: boolean; begin - if (opr.typ=OPR_Reference) and - not hasvar then + result:=true; + if (opr.typ=OPR_Reference) then begin - if (getsupreg(opr.ref.base)=RS_EBP) and (opr.ref.offset>0) then + if not hasvar then begin - if current_procinfo.procdef.proccalloption=pocall_register then - message(asmr_w_no_direct_ebp_for_parameter) - else - message(asmr_w_direct_ebp_for_parameter_regcall); - end - else if (getsupreg(opr.ref.base)=RS_EBP) and (opr.ref.offset<0) then - message(asmr_w_direct_ebp_neg_offset) - else if (getsupreg(opr.ref.base)=RS_ESP) and (opr.ref.offset<0) then - message(asmr_w_direct_esp_neg_offset); + if (getsupreg(opr.ref.base)=RS_EBP) and (opr.ref.offset>0) then + begin + if current_procinfo.procdef.proccalloption=pocall_register then + message(asmr_w_no_direct_ebp_for_parameter) + else + message(asmr_w_direct_ebp_for_parameter_regcall); + end + else if (getsupreg(opr.ref.base)=RS_EBP) and (opr.ref.offset<0) then + message(asmr_w_direct_ebp_neg_offset) + else if (getsupreg(opr.ref.base)=RS_ESP) and (opr.ref.offset<0) then + message(asmr_w_direct_esp_neg_offset); + end; + if (cs_create_pic in current_settings.moduleswitches) and + assigned(opr.ref.symbol) and + not assigned(opr.ref.relsymbol) and + (opr.ref.refaddr<>addr_pic) then + begin + message(asmr_e_need_pic_ref); + result:=false; + end; end; end; @@ -525,8 +536,10 @@ begin if (OpOrder=op_intel) then SwapOperands; + ai:=nil; for i:=1 to Ops do - operands[i].CheckOperand; + if not operands[i].CheckOperand then + exit; { Get Opsize } if (opsize<>S_NO) or (Ops=0) then