diff options
-rw-r--r-- | compiler/arm/cpuinfo.pas | 3 | ||||
-rw-r--r-- | compiler/globals.pas | 40 | ||||
-rw-r--r-- | compiler/globtype.pas | 56 | ||||
-rw-r--r-- | compiler/i386/cpuinfo.pas | 4 | ||||
-rw-r--r-- | compiler/m68k/cpuinfo.pas | 3 | ||||
-rw-r--r-- | compiler/mips/cpuinfo.pas | 3 | ||||
-rw-r--r-- | compiler/msg/errore.msg | 31 | ||||
-rw-r--r-- | compiler/msgidx.inc | 5 | ||||
-rw-r--r-- | compiler/msgtxt.inc | 577 | ||||
-rw-r--r-- | compiler/options.pas | 17 | ||||
-rw-r--r-- | compiler/powerpc/cpuinfo.pas | 3 | ||||
-rw-r--r-- | compiler/powerpc64/cpuinfo.pas | 3 | ||||
-rw-r--r-- | compiler/scandir.pas | 23 | ||||
-rw-r--r-- | compiler/sparc/cpuinfo.pas | 3 | ||||
-rw-r--r-- | compiler/switches.pas | 15 | ||||
-rw-r--r-- | compiler/x86_64/cpuinfo.pas | 3 |
16 files changed, 432 insertions, 357 deletions
diff --git a/compiler/arm/cpuinfo.pas b/compiler/arm/cpuinfo.pas index d91f7dcadc..4526abf89f 100644 --- a/compiler/arm/cpuinfo.pas +++ b/compiler/arm/cpuinfo.pas @@ -82,6 +82,9 @@ Const 'VFP' ); + { Supported optimizations, only used for information } + supported_optimizerswitches = [cs_opt_regvar,cs_opt_loopunroll]; + level1optimizerswitches = [cs_opt_level1]; level2optimizerswitches = level1optimizerswitches + [cs_opt_level2,cs_opt_regvar,cs_opt_stackframe]; level3optimizerswitches = level2optimizerswitches + [cs_opt_level3,cs_opt_loopunroll]; diff --git a/compiler/globals.pas b/compiler/globals.pas index e979397ca0..ff028b8c66 100644 --- a/compiler/globals.pas +++ b/compiler/globals.pas @@ -2067,9 +2067,10 @@ end; function UpdateOptimizerStr(s:string;var a:toptimizerswitches):boolean; var - tok : string; - doset : boolean; - doswitch : toptimizerswitch; + tok : string; + doset, + found : boolean; + opt : toptimizerswitch; begin result:=true; uppervar(s); @@ -2084,27 +2085,24 @@ end; end else doset:=true; - if tok='LOOPUNROLL' then - doswitch:=cs_opt_loopunroll - else if tok='UNCERTAIN' then - doswitch:=cs_opt_uncertain - else if tok='REGVAR' then - doswitch:=cs_opt_regvar - else if tok='PEEPHOLE' then - doswitch:=cs_opt_peephole - else if tok='STACKFRAME' then - doswitch:=cs_opt_stackframe - else if tok='ASMCSE' then - doswitch:=cs_opt_asmcse - else { Error } - result:=false; - if doswitch<>cs_opt_none then + found:=false; + for opt:=low(toptimizerswitch) to high(toptimizerswitch) do + begin + if OptimizerSwitchStr[opt]=tok then + begin + found:=true; + break; + end; + end; + if found then begin if doset then - include(a,doswitch) + include(a,opt) else - exclude(a,doswitch); - end; + exclude(a,opt); + end + else + result:=false; until false; end; diff --git a/compiler/globtype.pas b/compiler/globtype.pas index 667eb37219..639fa2d1f8 100644 --- a/compiler/globtype.pas +++ b/compiler/globtype.pas @@ -129,6 +129,7 @@ than 255 characters. That's why using Ansi Strings} ); tglobalswitches = set of tglobalswitch; + type { optimizer } toptimizerswitch = (cs_opt_none, cs_opt_level1,cs_opt_level2,cs_opt_level3, @@ -137,6 +138,14 @@ than 255 characters. That's why using Ansi Strings} ); toptimizerswitches = set of toptimizerswitch; + const + OptimizerSwitchStr : array[toptimizerswitch] of string[10] = ('', + 'LEVEL1','LEVEL2','LEVEL3', + 'REGVAR','UNCERTAIN','SIZE','STACKFRAME', + 'PEEPHOLE','ASMCSE','LOOPUNROLL' + ); + + type { Switches which can be changed by a mode (fpc,tp7,delphi) } tmodeswitch = (m_none,m_all, { needed for keyword } { generic } @@ -227,6 +236,30 @@ than 255 characters. That's why using Ansi Strings} ); tproccalloptions = set of tproccalloption; + const + proccalloptionStr : array[tproccalloption] of string[14]=('', + 'CDecl', + 'CPPDecl', + 'Far16', + 'OldFPCCall', + 'InternProc', + 'SysCall', + 'Pascal', + 'Register', + 'SafeCall', + 'StdCall', + 'SoftFloat', + 'MWPascal' + ); + + { Default calling convention } +{$ifdef x86} + pocall_default = pocall_register; +{$else} + pocall_default = pocall_stdcall; +{$endif} + + type tprocinfoflag=( { procedure has at least one assembler block } pi_has_assembler_block, @@ -254,29 +287,6 @@ than 255 characters. That's why using Ansi Strings} ); tprocinfoflags=set of tprocinfoflag; - const - proccalloptionStr : array[tproccalloption] of string[14]=('', - 'CDecl', - 'CPPDecl', - 'Far16', - 'OldFPCCall', - 'InternProc', - 'SysCall', - 'Pascal', - 'Register', - 'SafeCall', - 'StdCall', - 'SoftFloat', - 'MWPascal' - ); - - { Default calling convention } -{$ifdef x86} - pocall_default = pocall_register; -{$else} - pocall_default = pocall_stdcall; -{$endif} - type stringid = string[maxidlen]; diff --git a/compiler/i386/cpuinfo.pas b/compiler/i386/cpuinfo.pas index 40decb30b9..126d277563 100644 --- a/compiler/i386/cpuinfo.pas +++ b/compiler/i386/cpuinfo.pas @@ -93,6 +93,10 @@ Const sse_singlescalar : set of tfputype = [fpu_sse,fpu_sse2,fpu_sse3]; sse_doublescalar : set of tfputype = [fpu_sse2,fpu_sse3]; + { Supported optimizations, only used for information } + supported_optimizerswitches = [cs_opt_peephole,cs_opt_regvar,cs_opt_stackframe, + cs_opt_asmcse,cs_opt_loopunroll,cs_opt_uncertain]; + level1optimizerswitches = [cs_opt_level1,cs_opt_peephole]; level2optimizerswitches = level1optimizerswitches + [cs_opt_level2,cs_opt_regvar,cs_opt_stackframe,cs_opt_asmcse]; level3optimizerswitches = level2optimizerswitches + [cs_opt_level3,cs_opt_loopunroll]; diff --git a/compiler/m68k/cpuinfo.pas b/compiler/m68k/cpuinfo.pas index edc81d6237..195f9c99bf 100644 --- a/compiler/m68k/cpuinfo.pas +++ b/compiler/m68k/cpuinfo.pas @@ -69,6 +69,9 @@ Const '68881' ); + { Supported optimizations, only used for information } + supported_optimizerswitches = [cs_opt_regvar,cs_opt_loopunroll]; + level1optimizerswitches = [cs_opt_level1]; level2optimizerswitches = level1optimizerswitches + [cs_opt_level2,cs_opt_regvar,cs_opt_stackframe]; level3optimizerswitches = level2optimizerswitches + [cs_opt_level3,cs_opt_loopunroll]; diff --git a/compiler/mips/cpuinfo.pas b/compiler/mips/cpuinfo.pas index cc8b310105..fd753666db 100644 --- a/compiler/mips/cpuinfo.pas +++ b/compiler/mips/cpuinfo.pas @@ -66,6 +66,9 @@ Const 'FPU' ); + { Supported optimizations, only used for information } + supported_optimizerswitches = [cs_opt_regvar,cs_opt_loopunroll]; + level1optimizerswitches = []; level2optimizerswitches = level1optimizerswitches + [cs_opt_regvar,cs_opt_stackframe]; level3optimizerswitches = level2optimizerswitches + [cs_opt_loopunroll]; diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg index 54ecc39ef4..c2ba357537 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -322,6 +322,9 @@ scan_e_compile_time_typeerror=02072_E_Compile time expression: Wanted $1 but got % Type check of a compile time expression failed. scan_n_app_type_not_support=02073_N_APPTYPE is not supported by the target OS % The \var{\{\$APPTYPE\}} directive is supported by certain operating systems only. +scan_e_illegal_optimization_specifier=02074_E_Illegal optimization specified "$1" +% When you specify an optimization with the \var{\{\$OPTIMIZATION xxx\}} +% the compiler didn't recognize the optimization you specified. % \end{description} # # Parser @@ -2180,6 +2183,9 @@ Supported CPU instruction sets: Supported FPU instruction sets: $FPUINSTRUCTIONSETS +Supported Optimizations: + $OPTIMIZATIONS + This program comes under the GNU General Public Licence For more information read COPYING.FPC @@ -2306,23 +2312,14 @@ S*2Aas_assemble using GNU AS **2Nu_unroll loops **1o<x>_change the name of the executable produced to <x> **1O<x>_optimizations: -3*2Oa_<type>=<values> set alignment -3*2Og_generate smaller code -3*2OG_generate faster code (default) -**2Or_keep certain variables in registers -3*2Ou_enable uncertain optimizations (see docs) -3*2O1_level 1 optimizations (quick optimizations) -3*2O2_level 2 optimizations (-O1 + slower optimizations) -3*2O3_level 3 optimizations (-O2 repeatedly, max 5 times) -3*2Op<x>_target processor: -3*3Op1_set target processor to 386/486 -3*3Op2_set target processor to Pentium/PentiumMMX (tm) -3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm) -6*2Og_generate smaller code -6*2OG_generate faster code (default) -6*2Ox_optimize maximum (still BUGGY!!!) -6*2O0_set target processor to a MC68000 -6*2O2_set target processor to a MC68020+ (default) +**2O-_disable optimizations +**2O1_level 1 optimizations (quick and debugger friendly) +**2O2_level 2 optimizations (-O1 + quick optimizations) +**2O3_level 3 optimizations (-O2 + slow optimizations) +**2Oa<x>=<y>_set alignment +**2Oo[NO]<x>_enable or disable optimizations, see fpc -i for possible values +**2Op<x>_set target cpu for optimizing, see fpc -i for possible values +**2Os_generate smaller code **1pg_generate profile code for gprof (defines FPC_PROFILE) **1R<x>_assembler reading style: **2Rdefault_use default assembler diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index 146e7ce90e..f41e852240 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -89,6 +89,7 @@ const scan_c_switching_to_utf8=02071; scan_e_compile_time_typeerror=02072; scan_n_app_type_not_support=02073; + scan_e_illegal_optimization_specifier=02074; parser_e_syntax_error=03000; parser_e_dont_nest_interrupt=03004; parser_w_proc_directive_ignored=03005; @@ -670,9 +671,9 @@ const option_info=11024; option_help_pages=11025; - MsgTxtSize = 39804; + MsgTxtSize = 39564; MsgIdxMax : array[1..20] of longint=( - 19,74,219,59,62,47,100,21,135,60, + 19,75,219,59,62,47,100,21,135,60, 41,1,1,1,1,1,1,1,1,1 ); diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index f05e82ea5a..e9d1349faf 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -1,7 +1,7 @@ {$ifdef Delphi} -const msgtxt : array[0..000165] of string[240]=( +const msgtxt : array[0..000164] of string[240]=( {$else Delphi} -const msgtxt : array[0..000165,1..240] of char=( +const msgtxt : array[0..000164,1..240] of char=( {$endif Delphi} '01000_T_Compiler: $1'#000+ '01001_D_Compiler OS: $1'#000+ @@ -96,638 +96,641 @@ const msgtxt : array[0..000165,1..240] of char=( '02071_C_UTF-8 signature found, using UTF-8 encoding'#000+ '02072_E_Compile time expression: Wanted $1 but got $2 at $3'#000+ '02073_N_APPTYPE is not supported by the target OS'#000+ - '03000_E_Parser - Synta','x Error'#000+ + '02074_E_Illegal optimi','zation specified "$1"'#000+ + '03000_E_Parser - Syntax Error'#000+ '03004_E_INTERRUPT procedure can'#039't be nested'#000+ '03005_W_Procedure type "$1" ignored'#000+ '03006_E_Not all declarations of "$1" are declared with OVERLOAD'#000+ - '03008_E_Duplicate exported function name "$1"'#000+ - '03009_E_Duplicate exported function index ','$1'#000+ + '03008_E_Duplicate exported function name "$1','"'#000+ + '03009_E_Duplicate exported function index $1'#000+ '03010_E_Invalid index for exported function'#000+ '03011_W_Relocatable DLL or executable $1 debug info does not work, dis'+ 'abled.'#000+ '03012_W_To allow debugging for win32 code you need to disable relocati'+ - 'on with -WN option'#000+ - '03013_E_Constructor name mu','st be INIT'#000+ + 'on',' with -WN option'#000+ + '03013_E_Constructor name must be INIT'#000+ '03014_E_Destructor name must be DONE'#000+ '03016_E_Procedure type INLINE not supported'#000+ '03018_W_Constructor should be public'#000+ '03019_W_Destructor should be public'#000+ - '03020_N_Class should have one destructor only'#000+ - '03021_E_Local class definitio','ns are not allowed'#000+ + '03020_N_Class should have one d','estructor only'#000+ + '03021_E_Local class definitions are not allowed'#000+ '03022_F_Anonym class definitions are not allowed'#000+ '03023_N_The object "$1" has no VMT'#000+ '03024_E_Illegal parameter list'#000+ '03026_E_Wrong number of parameters specified'#000+ - '03027_E_overloaded identifier "$1" isn'#039't a function'#000+ - '03028_E_o','verloaded functions have the same parameter list'#000+ + '03027_E_overloade','d identifier "$1" isn'#039't a function'#000+ + '03028_E_overloaded functions have the same parameter list'#000+ '03029_E_function header doesn'#039't match the forward declaration "$1"'+ #000+ '03030_E_function header "$1" doesn'#039't match forward : var name chan'+ 'ges $2 => $3'#000+ - '03031_N_Values in enumeration types have to b','e ascending'#000+ + '0','3031_N_Values in enumeration types have to be ascending'#000+ '03033_E_With can not be used for variables in a different segment'#000+ '03034_E_function nesting > 31'#000+ '03035_E_range check error while evaluating constants'#000+ - '03036_W_range check error while evaluating constants'#000+ - '03037_E_duplicate case lab','el'#000+ + '03036_W_range check error while eva','luating constants'#000+ + '03037_E_duplicate case label'#000+ '03038_E_Upper bound of case range is less than lower bound'#000+ '03039_E_typed constants of classes are not allowed'#000+ '03040_E_functions variables of overloaded functions are not allowed'#000+ - '03041_E_string length must be a value from 1 to 255'#000+ - '03042_W','_use extended syntax of NEW and DISPOSE for instances of obje'+ - 'cts'#000+ + '03041_E_string ','length must be a value from 1 to 255'#000+ + '03042_W_use extended syntax of NEW and DISPOSE for instances of object'+ + 's'#000+ '03043_W_use of NEW or DISPOSE for untyped pointers is meaningless'#000+ - '03044_E_use of NEW or DISPOSE is not possible for untyped pointers'#000+ + '03044_E_use of NEW or DISPOSE is not possible for untyped pointer','s'#000+ '03045_E_class identifier expected'#000+ - '03046_E_','type identifier not allowed here'#000+ + '03046_E_type identifier not allowed here'#000+ '03047_E_method identifier expected'#000+ '03048_E_function header doesn'#039't match any method of this class "$1'+ '"'#000+ '03049_DL_procedure/function $1'#000+ - '03050_E_Illegal floating point constant'#000+ - '03051_E_FAIL can be used in const','ructors only'#000+ + '03050_E_Illegal floating poin','t constant'#000+ + '03051_E_FAIL can be used in constructors only'#000+ '03052_E_Destructors can'#039't have parameters'#000+ '03053_E_Only class methods can be referred with class references'#000+ '03054_E_Only class methods can be accessed in class methods'#000+ - '03055_E_Constant and CASE types do not match'#000+ - '03056_E_The sym','bol can'#039't be exported from a library'#000+ + '03055_E_Constant',' and CASE types do not match'#000+ + '03056_E_The symbol can'#039't be exported from a library'#000+ '03057_W_An inherited method is hidden by "$1"'#000+ '03058_E_There is no method in an ancestor class to be overridden: "$1"'+ #000+ - '03059_E_No member is provided to access property'#000+ - '03060_W_Stored property directive is ','not yet implemented'#000+ + '03059_E_No member is provided to access pr','operty'#000+ + '03060_W_Stored property directive is not yet implemented'#000+ '03061_E_Illegal symbol for property access'#000+ '03062_E_Cannot access a protected field of an object here'#000+ '03063_E_Cannot access a private field of an object here'#000+ - '03066_E_Overridden methods must have the same return type: "$2"',' is o'+ + '03066_E_Overridden ','methods must have the same return type: "$2" is o'+ 'verriden by "$1" which has another return type'#000+ '03067_E_EXPORT declared functions can'#039't be nested'#000+ '03068_E_Methods can'#039't be EXPORTed'#000+ - '03069_E_Call by var parameters have to match exactly: Got "$1" expecte'+ - 'd "$2"'#000+ - '03070_E_Class isn'#039't a paren','t class of the current class'#000+ + '03069_E_Call by var parameters have to match exactly: Got "$','1" expec'+ + 'ted "$2"'#000+ + '03070_E_Class isn'#039't a parent class of the current class'#000+ '03071_E_SELF is only allowed in methods'#000+ '03072_E_Methods can be only in other methods called direct with type i'+ 'dentifier of the class'#000+ '03073_E_Illegal use of '#039':'#039#000+ - '03074_E_range check error in set constructor or dup','licate set elemen'+ + '03074_E','_range check error in set constructor or duplicate set elemen'+ 't'#000+ '03075_E_Pointer to object expected'#000+ '03076_E_Expression must be constructor call'#000+ '03077_E_Expression must be destructor call'#000+ '03078_E_Illegal order of record elements'#000+ - '03079_E_Expression type must be class or record type'#000+ - '03080','_E_Procedures can'#039't return a value'#000+ + '03079_E_Expres','sion type must be class or record type'#000+ + '03080_E_Procedures can'#039't return a value'#000+ '03081_E_constructors and destructors must be methods'#000+ '03082_E_Operator is not overloaded'#000+ '03083_E_Impossible to overload assignment for equal types'#000+ - '03084_E_Impossible operator overload'#000+ - '03085_E_Re-raise isn'#039't',' possible there'#000+ + '03084_E_Impossi','ble operator overload'#000+ + '03085_E_Re-raise isn'#039't possible there'#000+ '03086_E_The extended syntax of new or dispose isn'#039't allowed for a '+ 'class'#000+ '03088_E_Procedure overloading is switched off'#000+ - '03089_E_It is not possible to overload this operator (overload = inste'+ - 'ad)'#000+ - '03090_E_Comparative operator mus','t return a boolean value'#000+ + '03089_E_It is not possible to overload this operator (overload',' = ins'+ + 'tead)'#000+ + '03090_E_Comparative operator must return a boolean value'#000+ '03091_E_Only virtual methods can be abstract'#000+ '03092_F_Use of unsupported feature!'#000+ '03093_E_The mix of different kind of objects (class, object, interface'+ - ', etc) isn'#039't allowed'#000+ - '03094_W_Unknown procedure directive had to ','be ignored: "$1"'#000+ + ', etc) isn'#039't allowed',#000+ + '03094_W_Unknown procedure directive had to be ignored: "$1"'#000+ '03095_E_absolute can only be associated to one variable'#000+ '03096_E_absolute can only be associated with a var or const'#000+ '03097_E_Only one variable can be initialized'#000+ - '03098_E_Abstract methods shouldn'#039't have any definition (with f','un'+ + '03098_E_Abstract m','ethods shouldn'#039't have any definition (with fun'+ 'ction body)'#000+ '03099_E_This overloaded function can'#039't be local (must be exported)'+ #000+ '03100_W_Virtual methods are used without a constructor in "$1"'#000+ '03101_CL_Macro defined: $1'#000+ - '03102_CL_Macro undefined: $1'#000+ + '03102_CL_Macro undefined:',' $1'#000+ '03103_CL_Macro $1 set to $2'#000+ - '03104_I_Comp','iling $1'#000+ + '03104_I_Compiling $1'#000+ '03105_UL_Parsing interface of unit $1'#000+ '03106_UL_Parsing implementation of $1'#000+ '03107_DL_Compiling $1 for the second time'#000+ '03109_E_No property found to override'#000+ - '03110_E_Only one default property is allowed'#000+ - '03111_E_The default property m','ust be an array property'#000+ + '03110_E_Only one default proper','ty is allowed'#000+ + '03111_E_The default property must be an array property'#000+ '03112_E_Virtual constructors are only supported in class object model'#000+ '03113_E_No default property available'#000+ - '03114_E_The class can'#039't have a published section, use the {$M+} sw'+ - 'itch'#000+ - '03115_E_Forward declaration of class',' "$1" must be resolved here to u'+ - 'se the class as ancestor'#000+ + '03114_E_The class can'#039't have a published section, use the {$M+}',' '+ + 'switch'#000+ + '03115_E_Forward declaration of class "$1" must be resolved here to use'+ + ' the class as ancestor'#000+ '03116_E_Local operators not supported'#000+ '03117_E_Procedure directive "$1" not allowed in interface section'#000+ - '03118_E_Procedure directive "$1" not allowed in implementation section'+ - #000+ - '03119_E_','Procedure directive "$1" not allowed in procvar declaration'#000+ + '03118_E_Procedure directive "$1" no','t allowed in implementation secti'+ + 'on'#000+ + '03119_E_Procedure directive "$1" not allowed in procvar declaration'#000+ '03120_E_Function is already declared Public/Forward "$1"'#000+ '03121_E_Can'#039't use both EXPORT and EXTERNAL'#000+ - '03123_W_"$1" not yet supported inside inline procedure/function'#000+ - '03124_W_Inlining',' disabled'#000+ + '03123_W_"$1" not yet supported insid','e inline procedure/function'#000+ + '03124_W_Inlining disabled'#000+ '03125_I_Writing Browser log $1'#000+ '03126_H_may be pointer dereference is missing'#000+ '03127_F_Selected assembler reader not supported'#000+ - '03128_E_Procedure directive "$1" has conflicts with other directives'#000+ - '03129_E_Calling convention doesn'#039't m','atch forward'#000+ + '03128_E_Procedure directive "$1" has conflicts with other dir','ectives'+ + #000+ + '03129_E_Calling convention doesn'#039't match forward'#000+ '03131_E_Property can'#039't have a default value'#000+ '03132_E_The default value of a property must be constant'#000+ '03133_E_Symbol can'#039't be published, can be only a class'#000+ - '03134_E_That kind of property can'#039't be published'#000+ - '03136_E_An import name',' is required'#000+ + '03134_E_That kind of proper','ty can'#039't be published'#000+ + '03136_E_An import name is required'#000+ '03138_E_Division by zero'#000+ '03139_E_Invalid floating point operation'#000+ '03140_E_Upper bound of range is less than lower bound'#000+ '03141_W_string "$1" is longer than "$2"'#000+ - '03142_E_string length is larger than array of char length'#000+ - '03143_E_I','llegal expression after message directive'#000+ + '03142_E_string length i','s larger than array of char length'#000+ + '03143_E_Illegal expression after message directive'#000+ '03144_E_Message handlers can take only one call by ref. parameter'#000+ '03145_E_Duplicate message label: "$1"'#000+ - '03146_E_Self can only be an explicit parameter in methods which are me'+ - 'ssage handlers'#000+ - '03147_E_T','hreadvars can be only static or global'#000+ + '03146_E_Self can only be an explicit parameter in ','methods which are '+ + 'message handlers'#000+ + '03147_E_Threadvars can be only static or global'#000+ '03148_F_Direct assembler not supported for binary output format'#000+ '03149_W_Don'#039't load OBJPAS unit manually, use \{\$mode objfpc\} or '+ '\{\$mode delphi\} instead'#000+ - '03150_E_OVERRIDE can'#039't be used in objects'#000+ - '031','51_E_Data types which require initialization/finalization can'#039+ - 't be used in variant records'#000+ + '0','3150_E_OVERRIDE can'#039't be used in objects'#000+ + '03151_E_Data types which require initialization/finalization can'#039't'+ + ' be used in variant records'#000+ '03152_E_Resourcestrings can be only static or global'#000+ '03153_E_Exit with argument can'#039't be used here'#000+ - '03154_E_The type of the storage symbol must be boo','lean'#000+ + '03154_','E_The type of the storage symbol must be boolean'#000+ '03155_E_This symbol isn'#039't allowed as storage symbol'#000+ '03156_E_Only class which are compiled in $M+ mode can be published'#000+ '03157_E_Procedure directive expected'#000+ - '03158_E_The value for a property index must be of an ordinal type'#000+ - '03159_E_Proce','dure name to short to be exported'#000+ + '03158_E_The value for a property in','dex must be of an ordinal type'#000+ + '03159_E_Procedure name to short to be exported'#000+ '03160_E_No DEFFILE entry can be generated for unit global vars'#000+ '03161_E_Compile without -WD option'#000+ - '03162_F_You need ObjFpc (-S2) or Delphi (-Sd) mode to compile this mod'+ - 'ule'#000+ - '03163_E_Can'#039't export with index un','der $1'#000+ + '03162_F_You need ObjFpc (-S2) or Delphi (-Sd) mode to compile th','is m'+ + 'odule'#000+ + '03163_E_Can'#039't export with index under $1'#000+ '03164_E_Exporting of variables is not supported under $1'#000+ '03165_E_Improper GUID syntax'#000+ '03168_W_Procedure named "$1" not found that is suitable for implementi'+ 'ng the $2.$3'#000+ - '03169_E_interface identifier expected'#000+ - '03170_E_Type "$1" can'#039't be',' used as array index type'#000+ + '03169_E_interface id','entifier expected'#000+ + '03170_E_Type "$1" can'#039't be used as array index type'#000+ '03171_E_Con- and destructors aren'#039't allowed in interfaces'#000+ '03172_E_Access specifiers can'#039't be used in INTERFACES'#000+ '03173_E_An interface can'#039't contain fields'#000+ - '03174_E_Can'#039't declare local procedure as EXTERNAL'#000+ - '03175_W_So','me fields coming before "$1" weren'#039't initialized'#000+ + '03174_E_Can'#039't de','clare local procedure as EXTERNAL'#000+ + '03175_W_Some fields coming before "$1" weren'#039't initialized'#000+ '03176_E_Some fields coming before "$1" weren'#039't initialized'#000+ '03177_W_Some fields coming after "$1" weren'#039't initialized'#000+ - '03178_E_VarArgs directive without CDecl and External'#000+ - '03179_E_Self must be ','a normal (call-by-value) parameter'#000+ + '03178_E_VarArgs directive with','out CDecl and External'#000+ + '03179_E_Self must be a normal (call-by-value) parameter'#000+ '03180_E_Interface "$1" has no interface identification'#000+ '03181_E_Unknown class field or method identifier "$1"'#000+ - '03182_W_Overriding calling convention "$1" with "$2"'#000+ - '03183_E_Typed constants of the type "proced','ure of object" can only b'+ - 'e initialized with NIL'#000+ + '03182_W_Overriding calling convention "$1" with "$2"',#000+ + '03183_E_Typed constants of the type "procedure of object" can only be '+ + 'initialized with NIL'#000+ '03184_E_Default value can only be assigned to one parameter'#000+ '03185_E_Default parameter required for "$1"'#000+ '03186_W_Use of unsupported feature!'#000+ - '03187_H_C arrays are passed by reference'#000+ - '03188_E_C a','rray of const must be the last argument'#000+ + '03187_H_','C arrays are passed by reference'#000+ + '03188_E_C array of const must be the last argument'#000+ '03189_H_Type "$1" redefinition'#000+ '03190_W_cdecl'#039'ared functions have no high parameter'#000+ '03191_W_cdecl'#039'ared functions do not support open strings'#000+ - '03192_E_Cannot initialize variables declared as threadvar'#000+ - '03','193_E_Message directive is only allowed in Classes'#000+ + '03192_E_Cannot i','nitialize variables declared as threadvar'#000+ + '03193_E_Message directive is only allowed in Classes'#000+ '03194_E_Procedure or Function expected'#000+ '03195_W_Calling convention directive ignored: "$1"'#000+ '03196_E_REINTRODUCE can'#039't be used in objects'#000+ - '03197_E_Each argument must have its own location'#000+ - '03198','_E_Each argument must have an explicit location'#000+ + '03197_E_Ea','ch argument must have its own location'#000+ + '03198_E_Each argument must have an explicit location'#000+ '03199_E_Unknown argument location'#000+ '03200_E_32 Bit-Integer or pointer variable expected'#000+ - '03201_E_Goto statements aren'#039't allowed between different procedure'+ - 's'#000+ - '03202_F_Procedure too complex, it requ','ires too much registers'#000+ + '03201_E_Goto statements aren'#039't allowed between different proce','du'+ + 'res'#000+ + '03202_F_Procedure too complex, it requires too much registers'#000+ '03203_E_Illegal expression'#000+ '03204_E_Invalid integer expression'#000+ '03205_E_Illegal qualifier'#000+ '03206_E_High range limit < low range limit'#000+ - '03207_E_Exit'#039's parameter must be the name of the procedure it is u'+ - 'sed in'#000+ - '03208_E_Ille','gal assignment to for-loop variable "$1"'#000+ + '03207_E_Exit'#039's parameter must be the name',' of the procedure it is'+ + ' used in'#000+ + '03208_E_Illegal assignment to for-loop variable "$1"'#000+ '03209_E_Can'#039't declare local variable as EXTERNAL'#000+ '03210_E_Procedure is already declared EXTERNAL'#000+ '03211_W_Implicit uses of Variants unit'#000+ - '03212_E_Class and static methods can'#039't be used in INTERFACES'#000+ - '032','13_E_Overflow in arithmetic operation'#000+ + '03212_E_Class and st','atic methods can'#039't be used in INTERFACES'#000+ + '03213_E_Overflow in arithmetic operation'#000+ '03214_E_Protected or private expected'#000+ '03215_E_SLICE can'#039't be used outside of parameter list'#000+ '03216_E_A DISPINTERFACE can'#039't have a parent class'#000+ - '03217_E_A DISPINTERFACE needs a guid'#000+ - '03218_W_Overridden meth','ods must have a related return type. This cod'+ - 'e may crash, it depends on a Delphi parser bug ("$2" is overriden by "'+ - '$1" which has another return type)'#000+ + '03217_E_A DISPIN','TERFACE needs a guid'#000+ + '03218_W_Overridden methods must have a related return type. This code '+ + 'may crash, it depends on a Delphi parser bug ("$2" is overriden by "$1'+ + '" which has another return type)'#000+ '04000_E_Type mismatch'#000+ - '04001_E_Incompatible types: got "$1" expected "$2"'#000+ - '04002_E_Type mism','atch between "$1" and "$2"'#000+ + '04001_E_Incompatible typ','es: got "$1" expected "$2"'#000+ + '04002_E_Type mismatch between "$1" and "$2"'#000+ '04003_E_Type identifier expected'#000+ '04004_E_Variable identifier expected'#000+ '04005_E_Integer expression expected, but got "$1"'#000+ - '04006_E_Boolean expression expected, but got "$1"'#000+ + '04006_E_Boolean expression expected, but got "$1"',#000+ '04007_E_Ordinal expression expected'#000+ - '04008_E','_pointer type expected, but got "$1"'#000+ + '04008_E_pointer type expected, but got "$1"'#000+ '04009_E_class type expected, but got "$1"'#000+ '04011_E_Can'#039't evaluate constant expression'#000+ '04012_E_Set elements are not compatible'#000+ - '04013_E_Operation not implemented for sets'#000+ - '04014_W_Automatic type conversion f','rom floating type to COMP which i'+ - 's an integer type'#000+ + '04013_E_Operation not implemented ','for sets'#000+ + '04014_W_Automatic type conversion from floating type to COMP which is '+ + 'an integer type'#000+ '04015_H_use DIV instead to get an integer result'#000+ '04016_E_string types doesn'#039't match, because of $V+ mode'#000+ - '04017_E_succ or pred on enums with assignments not possible'#000+ - '04018_E_Can'#039't read or wr','ite variables of this type'#000+ + '04017_E_succ or pred on enums with assig','nments not possible'#000+ + '04018_E_Can'#039't read or write variables of this type'#000+ '04019_E_Can'#039't use readln or writeln on typed file'#000+ '04020_E_Can'#039't use read or write on untyped file.'#000+ '04021_E_Type conflict between set elements'#000+ - '04022_W_lo/hi(dword/qword) returns the upper/lower word/dword'#000+ - '04023_E_I','nteger or real expression expected'#000+ + '04022_W_lo/hi(dword/qword) ','returns the upper/lower word/dword'#000+ + '04023_E_Integer or real expression expected'#000+ '04024_E_Wrong type "$1" in array constructor'#000+ '04025_E_Incompatible type for arg no. $1: Got "$2", expected "$3"'#000+ - '04026_E_Method (variable) and Procedure (variable) are not compatible'#000+ - '04027_E_Illegal constant',' passed to internal math function'#000+ + '04026_E_Method (variable) and Procedure (variable)',' are not compatibl'+ + 'e'#000+ + '04027_E_Illegal constant passed to internal math function'#000+ '04028_E_Can'#039't get the address of constants'#000+ '04029_E_Argument can'#039't be assigned to'#000+ '04030_E_Can'#039't assign local procedure/function to procedure variabl'+ 'e'#000+ - '04031_E_Can'#039't assign values to an address'#000+ - '04032_E_Can'#039't a','ssign values to const variable'#000+ + '04031_E_Can'#039't',' assign values to an address'#000+ + '04032_E_Can'#039't assign values to const variable'#000+ '04033_E_Array type required'#000+ '04034_E_interface type expected, but got "$1"'#000+ '04035_W_Mixing signed expressions and longwords gives a 64bit result'#000+ - '04036_W_Mixing signed expressions and cardinals here may cause a r','an'+ + '04036_W_Mixing signed ','expressions and cardinals here may cause a ran'+ 'ge check error'#000+ '04037_E_Typecast has different size ($1 -> $2) in assignment'#000+ '04038_E_enums with assignments can'#039't be used as array index'#000+ - '04039_E_Class or Object types "$1" and "$2" are not related'#000+ - '04040_W_Class types "$1" and "$2" are not ','related'#000+ + '04039_E_Class or Object types "$1" and "$2" are not relate','d'#000+ + '04040_W_Class types "$1" and "$2" are not related'#000+ '04041_E_Class or interface type expected, but got "$1"'#000+ '04042_E_Type "$1" is not completely defined'#000+ '04043_W_String literal has more characters than short string length'#000+ - '04044_W_Comparison is always false due to range of values'#000+ - '04045_W','_Comparison is always true due to range of values'#000+ + '04044_W_Comparison is',' always false due to range of values'#000+ + '04045_W_Comparison is always true due to range of values'#000+ '04046_W_Constructing a class "$1" with abstract methods'#000+ '04047_H_The left operand of the IN operator should be byte sized'#000+ - '04048_W_Type size mismatch, possible loss of data / range check error', - #000+ + '04048_W_Type size mismatc','h, possible loss of data / range check erro'+ + 'r'#000+ '04049_H_Type size mismatch, possible loss of data / range check error'#000+ '04050_E_The address of an abstract method can'#039't be taken'#000+ '04051_E_The operator is not applicable for the operand type'#000+ - '04052_E_Constant Expression expected'#000+ - '04053_E_Operati','on "$1" not supported for types "$2" and "$3"'#000+ + '04052_E_','Constant Expression expected'#000+ + '04053_E_Operation "$1" not supported for types "$2" and "$3"'#000+ '04054_E_Illegal type conversion: "$1" to "$2"'#000+ '04055_H_Conversion between ordinals and pointers is not portable'#000+ - '04056_W_Conversion between ordinals and pointers is not portable'#000+ - '04057_E_Can'#039't dete','rmine which overloaded function to call'#000+ + '04056_W_Conversion between ordinals and',' pointers is not portable'#000+ + '04057_E_Can'#039't determine which overloaded function to call'#000+ '04058_E_Illegal counter variable'#000+ '05000_E_Identifier not found "$1"'#000+ '05001_F_Internal Error in SymTableStack()'#000+ '05002_E_Duplicate identifier "$1"'#000+ - '05003_H_Identifier already defined in $1 at line $2'#000+ - '05004','_E_Unknown identifier "$1"'#000+ + '05003_H_Ident','ifier already defined in $1 at line $2'#000+ + '05004_E_Unknown identifier "$1"'#000+ '05005_E_Forward declaration not solved "$1"'#000+ '05007_E_Error in type definition'#000+ '05009_E_Forward type not resolved "$1"'#000+ - '05010_E_Only static variables can be used in static methods or outside'+ - ' methods'#000+ - '05012_F_record or ','class type expected'#000+ + '05010_E_Only static variables can be used in static m','ethods or outsi'+ + 'de methods'#000+ + '05012_F_record or class type expected'#000+ '05013_E_Instances of classes or objects with an abstract method are no'+ 't allowed'#000+ '05014_W_Label not defined "$1"'#000+ '05015_E_Label used but not defined "$1"'#000+ - '05016_E_Illegal label declaration'#000+ - '05017_E_GOTO and LABEL are not supp','orted (use switch -Sg)'#000+ + '05016_E_Illegal label dec','laration'#000+ + '05017_E_GOTO and LABEL are not supported (use switch -Sg)'#000+ '05018_E_Label not found'#000+ '05019_E_identifier isn'#039't a label'#000+ '05020_E_label already defined'#000+ '05021_E_illegal type declaration of set elements'#000+ - '05022_E_Forward class definition not resolved "$1"'#000+ - '05023_H_Unit "$1" not used in ','$2'#000+ + '05022_E_Forward class definition not ','resolved "$1"'#000+ + '05023_H_Unit "$1" not used in $2'#000+ '05024_H_Parameter "$1" not used'#000+ '05025_N_Local variable "$1" not used'#000+ '05026_H_Value parameter "$1" is assigned but never used'#000+ '05027_N_Local variable "$1" is assigned but never used'#000+ - '05028_H_Local $1 "$2" is not used'#000+ - '05029_N_Private field "','$1.$2" is never used'#000+ + '05028_H_Local',' $1 "$2" is not used'#000+ + '05029_N_Private field "$1.$2" is never used'#000+ '05030_N_Private field "$1.$2" is assigned but never used'#000+ '05031_N_Private method "$1.$2" never used'#000+ '05032_E_Set type expected'#000+ '05033_W_Function result does not seem to be set'#000+ - '05034_W_Type "$1" is not aligned correctly in ','current record for C'#000+ + '05','034_W_Type "$1" is not aligned correctly in current record for C'#000+ '05035_E_Unknown record field identifier "$1"'#000+ '05036_W_Local variable "$1" does not seem to be initialized'#000+ '05037_W_Variable "$1" does not seem to be initialized'#000+ - '05038_E_identifier idents no member "$1"'#000+ - '05039_H_Found decla','ration: $1'#000+ + '05038_E_identifi','er idents no member "$1"'#000+ + '05039_H_Found declaration: $1'#000+ '05040_E_Data element too large'#000+ '05042_E_No matching implementation for interface method "$1" found'#000+ '05043_W_Symbol "$1" is deprecated'#000+ '05044_W_Symbol "$1" is not portable'#000+ - '05055_W_Symbol "$1" is not implemented'#000+ - '05056_E_Can'#039't create u','nique type from this type'#000+ + '05055_W_Symbol "$','1" is not implemented'#000+ + '05056_E_Can'#039't create unique type from this type'#000+ '05057_H_Local variable "$1" does not seem to be initialized'#000+ '05058_H_Variable "$1" does not seem to be initialized'#000+ - '05059_W_Function result variable does not seem to initialized'#000+ - '05060_H_Function result variable does ','not seem to be initialized'#000+ + '05059_W_Function result variable does not seem to initia','lized'#000+ + '05060_H_Function result variable does not seem to be initialized'#000+ '05061_W_Variable "$1" read but nowhere assigned'#000+ '06009_E_Parameter list size exceeds 65535 bytes'#000+ '06012_E_File types must be var parameters'#000+ - '06013_E_The use of a far pointer isn'#039't allowed there'#000+ - '06015_E_EXPORT declare','d functions can'#039't be called'#000+ + '06013_E_The use of a far pointe','r isn'#039't allowed there'#000+ + '06015_E_EXPORT declared functions can'#039't be called'#000+ '06016_W_Possible illegal call of constructor or destructor'#000+ '06017_N_Inefficient code'#000+ '06018_W_unreachable code'#000+ '06020_E_Abstract methods can'#039't be called directly'#000+ - '06027_DL_Register $1 weight $2 $3'#000+ - '06029_DL_Stack fram','e is omitted'#000+ + '06027_DL_','Register $1 weight $2 $3'#000+ + '06029_DL_Stack frame is omitted'#000+ '06031_E_Object or class methods can'#039't be inline.'#000+ '06032_E_Procvar calls cannot be inline.'#000+ '06033_E_No code for inline procedure stored'#000+ - '06035_E_Element zero of an ansi/wide- or longstring can'#039't be acces'+ - 'sed, use (set)length instead',#000+ + '06035_E_Element zero of an ansi/wide- or longstrin','g can'#039't be acc'+ + 'essed, use (set)length instead'#000+ '06037_E_Constructors or destructors can not be called inside a '#039'wi'+ 'th'#039' clause'#000+ '06038_E_Cannot call message handler methods directly'#000+ '06039_E_Jump in or outside of an exception block'#000+ - '06040_E_Control flow statements aren'#039't allowed in a finally ','bloc'+ + '06040_E_Control ','flow statements aren'#039't allowed in a finally bloc'+ 'k'#000+ '06041_W_Parameters size exceeds limit for certain cpu'#039's'#000+ '06042_W_Local variable size exceed limit for certain cpu'#039's'#000+ '06043_E_Local variables size exceeds supported limit'#000+ - '06044_E_BREAK not allowed'#000+ + '06044_E_BREAK not allo','wed'#000+ '06045_E_CONTINUE not allowed'#000+ - '06046_F_Unk','nown compilerproc "$1". Check if you use the correct run '+ - 'time library.'#000+ + '06046_F_Unknown compilerproc "$1". Check if you use the correct run ti'+ + 'me library.'#000+ '07000_DL_Starting $1 styled assembler parsing'#000+ '07001_DL_Finished $1 styled assembler parsing'#000+ - '07002_E_Non-label pattern contains @'#000+ + '07002_E_Non-label pattern contain','s @'#000+ '07004_E_Error building record offset'#000+ - '070','05_E_OFFSET used without identifier'#000+ + '07005_E_OFFSET used without identifier'#000+ '07006_E_TYPE used without identifier'#000+ '07007_E_Cannot use local variable or parameters here'#000+ '07008_E_need to use OFFSET here'#000+ '07009_E_need to use $ here'#000+ - '07010_E_Cannot use multiple relocatable symbols'#000+ - '07011_E','_Relocatable symbol can only be added'#000+ + '07010_E_Can','not use multiple relocatable symbols'#000+ + '07011_E_Relocatable symbol can only be added'#000+ '07012_E_Invalid constant expression'#000+ '07013_E_Relocatable symbol is not allowed'#000+ '07014_E_Invalid reference syntax'#000+ '07015_E_You can not reach $1 from that code'#000+ - '07016_E_Local symbols/labels aren'#039't allowed as ','references'#000+ + '070','16_E_Local symbols/labels aren'#039't allowed as references'#000+ '07017_E_Invalid base and index register usage'#000+ '07018_W_Possible error in object field handling'#000+ '07019_E_Wrong scale factor specified'#000+ '07020_E_Multiple index register usage'#000+ - '07021_E_Invalid operand type'#000+ - '07022_E_Invalid string as opcod','e operand: $1'#000+ + '07021_E_Invalid ','operand type'#000+ + '07022_E_Invalid string as opcode operand: $1'#000+ '07023_W_@CODE and @DATA not supported'#000+ '07024_E_Null label references are not allowed'#000+ '07025_E_Divide by zero in asm evaluator'#000+ '07026_E_Illegal expression'#000+ - '07027_E_escape sequence ignored: $1'#000+ + '07027_E_escape sequence ignored',': $1'#000+ '07028_E_Invalid symbol reference'#000+ - '07029_','W_Fwait can cause emulation problems with emu387'#000+ + '07029_W_Fwait can cause emulation problems with emu387'#000+ '07030_W_$1 without operand translated into $1P'#000+ '07031_W_ENTER instruction is not supported by Linux kernel'#000+ - '07032_W_Calling an overload function in assembler'#000+ - '07033_E_Unsupported symbol type for',' operand'#000+ + '07032_W_Calling an overload function in a','ssembler'#000+ + '07033_E_Unsupported symbol type for operand'#000+ '07034_E_Constant value out of bounds'#000+ '07035_E_Error converting decimal $1'#000+ '07036_E_Error converting octal $1'#000+ '07037_E_Error converting binary $1'#000+ '07038_E_Error converting hexadecimal $1'#000+ - '07039_H_$1 translated to $2'#000+ - '07040_W_$1 is associa','ted to an overloaded function'#000+ + '07039','_H_$1 translated to $2'#000+ + '07040_W_$1 is associated to an overloaded function'#000+ '07041_E_Cannot use SELF outside a method'#000+ '07042_E_Cannot use OLDEBP outside a nested procedure'#000+ '07043_W_Procedures can'#039't return any value in asm code'#000+ - '07044_E_SEG not supported'#000+ - '07045_E_Size suffix and destination ','or source size do not match'#000+ + '07044_E_SEG not su','pported'#000+ + '07045_E_Size suffix and destination or source size do not match'#000+ '07046_W_Size suffix and destination or source size do not match'#000+ '07047_E_Assembler syntax error'#000+ '07048_E_Invalid combination of opcode and operands'#000+ - '07049_E_Assembler syntax error in operand'#000+ - '07050_E_Assembler syntax',' error in constant'#000+ + '07049_E_Assembler synt','ax error in operand'#000+ + '07050_E_Assembler syntax error in constant'#000+ '07051_E_Invalid String expression'#000+ '07052_W_constant with symbol $1 for address which is not on a pointer'#000+ '07053_E_Unrecognized opcode $1'#000+ '07054_E_Invalid or missing opcode'#000+ - '07055_E_Invalid combination of prefix and opcode: $1',#000+ + '07055_E_','Invalid combination of prefix and opcode: $1'#000+ '07056_E_Invalid combination of override and opcode: $1'#000+ '07057_E_Too many operands on line'#000+ '07058_W_NEAR ignored'#000+ '07059_W_FAR ignored'#000+ '07060_E_Duplicate local symbol $1'#000+ - '07061_E_Undefined local symbol $1'#000+ + '07061_E_Undefined local symbol ','$1'#000+ '07062_E_Unknown label identifier $1'#000+ - '07063','_E_Invalid register name'#000+ + '07063_E_Invalid register name'#000+ '07064_E_Invalid floating point register name'#000+ '07066_W_Modulo not supported'#000+ '07067_E_Invalid floating point constant $1'#000+ '07068_E_Invalid floating point expression'#000+ - '07069_E_Wrong symbol type'#000+ - '07070_E_Cannot index a local v','ar or parameter with a register'#000+ + '07069_E_Wron','g symbol type'#000+ + '07070_E_Cannot index a local var or parameter with a register'#000+ '07071_E_Invalid segment override expression'#000+ '07072_W_Identifier $1 supposed external'#000+ '07073_E_Strings not allowed as constants'#000+ '07074_No type of variable specified'#000+ - '07075_E_assembler code not returned to text sec','tion'#000+ + '070','75_E_assembler code not returned to text section'#000+ '07076_E_Not a directive or local symbol $1'#000+ '07077_E_Using a defined name as a local label'#000+ '07078_E_Dollar token is used without an identifier'#000+ '07079_W_32bit constant created for address'#000+ - '07080_N_.align is target specific, use .balign or .p','2align'#000+ + '07080_N_','.align is target specific, use .balign or .p2align'#000+ '07081_E_Can'#039't access fields directly for parameters'#000+ '07082_E_Can'#039't access fields of objects/classes directly'#000+ '07083_E_No size specified and unable to determine the size of the oper'+ 'ands'#000+ - '07084_E_Cannot use RESULT in this function'#000+ - '07086_W','_"$1" without operand translated into "$1 %st,%st(1)"'#000+ + '07084_','E_Cannot use RESULT in this function'#000+ + '07086_W_"$1" without operand translated into "$1 %st,%st(1)"'#000+ '07087_W_"$1 %st(n)" translated into "$1 %st,%st(n)"'#000+ '07088_W_"$1 %st(n)" translated into "$1 %st(n),%st"'#000+ '07089_E_Char < not allowed here'#000+ - '07090_E_Char > not allowed here'#000+ - '07093_W_ALIGN not ','supported'#000+ + '07090_','E_Char > not allowed here'#000+ + '07093_W_ALIGN not supported'#000+ '07094_E_Inc and Dec cannot be together'#000+ '07095_E_Invalid reglist for movem'#000+ '07096_E_Reglist invalid for opcode'#000+ '07097_E_Higher cpu mode required ($1)'#000+ - '07098_W_No size specified and unable to determine the size of the oper'+ - 'ands, using DW','ORD as default'#000+ + '07098_W_No size specified and unable to ','determine the size of the op'+ + 'erands, using DWORD as default'#000+ '07099_E_Syntax error while trying to parse a shifter operand'#000+ '08000_F_Too many assembler files'#000+ '08001_F_Selected assembler output not supported'#000+ '08002_F_Comp not supported'#000+ - '08003_F_Direct not support for binary writers'#000+ - '08004_E_Al','locating of data is only allowed in bss section'#000+ + '08003_F_Dire','ct 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 references not supported'#000+ - '08009_E_Asm: Inval','id effective address'#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+ - '08015_','E_Asm: Extended type not supported for this target'#000+ + '08014_E_Asm: Co','mp 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 Bit references not supported'#000+ - '09000_W_S','ource operating system redefined'#000+ + '08020_E_Asm: 16 ','or 32 Bit references 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 archive file: $1'#000+ - '09005_E_Assembler $1 not found, switching to external assemblin','g'#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_Assembling $1'#000+ - '09010_I_Assembling with smartlinking $1'#000+ - '09011_W_Object $1 not found, ','Linking may fail !'#000+ + '09010_I_Assembling with s','martlinking $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+ '09015_I_Linking $1'#000+ - '09016_E_Util $1 not found, switching to external linking'#000+ - '09017_T','_Using util $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+ '09020_I_Closing script $1'#000+ - '09021_E_resource compiler not found, switching to external mode'#000+ - '09022_I_Compiling resource $1'#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 be shared linked, switching to static linkin'+ - 'g'#000+ - '09026_E_unit $1 can'#039't be smart or ','static linked'#000+ + '09025_T_unit $1 can'#039't be shared linked, switching to stati','c 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 static linked'#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+ + '09129_F_Can'#039't open executab','le $1'#000+ '09130_X_Size of Code: $1 bytes'#000+ - '09131_X','_Size of initialized data: $1 bytes'#000+ + '09131_X_Size of initialized data: $1 bytes'#000+ '09132_X_Size of uninitialized data: $1 bytes'#000+ '09133_X_Stack space reserved: $1 bytes'#000+ '09134_X_Stack space committed: $1 bytes'#000+ '10000_T_Unitsearch: $1'#000+ - '10001_T_PPU Loading $1'#000+ + '10001_T_PPU L','oading $1'#000+ '10002_U_PPU Name: $1'#000+ - '10003_U_PPU F','lags: $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+ '10008_U_PPU Invalid Version $1'#000+ - '10009_U_PPU is compiled for another processor'#000+ - '10010_U_PPU is compiled for an other ','target'#000+ + '10009_U_PPU is compiled for another pro','cessor'#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+ '10015_F_unexpected end of PPU-File'#000+ '10016_F_Invalid PPU-File entry: $1'#000+ - '10017_F_PPU Dbx count problem'#000+ + '10017_F_PPU Dbx c','ount problem'#000+ '10018_E_Illegal unit name: $1'#000+ - '1','0019_F_Too much units'#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'#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+ + '1','0024_F_Unit $1 searched but $2 found'#000+ + '10025_W_Compiling the system unit requires the -Us switch'#000+ '10026_F_There were $1 errors compiling module, stopping'#000+ '10027_U_Load from $1 ($2) unit $3'#000+ '10028_U_Recompiling $1, checksum changed for $2'#000+ - '10029_U_Recompiling $1, source found only'#000+ - '10030_U_R','ecompiling unit, static lib is older than ppufile'#000+ + '10029_U','_Recompiling $1, source found only'#000+ + '10030_U_Recompiling unit, static lib is older than ppufile'#000+ '10031_U_Recompiling unit, shared lib is older than ppufile'#000+ '10032_U_Recompiling unit, obj and asm are older than ppufile'#000+ - '10033_U_Recompiling unit, obj is older than asm'#000+ - '10034_U_Parsing interf','ace of $1'#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+ - '10041_H_File $1 is newer than Release PPU file $2'#000+ - '10042_U_Usin','g a unit which was not compiled with correct FPU mode'#000+ + '10041_H_File $1 is',' newer than Release PPU file $2'#000+ + '10042_U_Using a unit which was not compiled with correct FPU mode'#000+ '10043_U_Loading interface units from $1'#000+ '10044_U_Loading implementation units from $1'#000+ '10045_U_Interface CRC changed for unit $1'#000+ - '10046_U_Implementation CRC changed for unit $1'#000+ - '10047_U_Fini','shed compiling unit $1'#000+ + '10046_U_Impleme','ntation 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_Flag for reload: $1'#000+ '10052_U_Forced reloading'#000+ - '10053_U_Previous state of $1: $2'#000+ - '10054_U_Alread','y compiling $1, setting second compile'#000+ + '100','53_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+ '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+ - '11000_O_$1 [options','] <inputfile> [options]'#000+ + '10059_U_Skipping re-resolving unit $1, ','still loading used units'#000+ + '11000_O_$1 [options] <inputfile> [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 supported'#000+ - '11004_F_No source file name in command line'#000+ - '11005_N_No option inside $1 config file',#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+ '11009_F_Unable to open file $1'#000+ '11010_D_Reading further options from $1'#000+ - '11011_W_Target is already set to: $1'#000+ - '11012_W_Shared libs not supported o','n DOS platform, reverting to stat'+ - 'ic'#000+ + '11011_W_Target is already se','t 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 information generation is not supported by this executab'+ - 'le'#000+ - '11017_H_Try recompiling with -dG','DB'#000+ + '11016_W_Debug information generation is not supported by this',' execut'+ + 'able'#000+ + '11017_H_Try recompiling with -dGDB'#000+ '11018_W_You are using the obsolete switch $1'#000+ '11019_W_You are using the obsolete switch $1, please use $2'#000+ '11020_N_Switching assembler to default source writing assembler'#000+ - '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+ - '1','1022_W_"$1" assembler use forced'#000+ + '11021_W_Assembler output',' selected "$1" is not compatible with "$2"'#000+ + '11022_W_"$1" assembler use forced'#000+ '11026_T_Reading options from file $1'#000+ '11027_T_Reading options from environment $1'#000+ '11028_D_Handling option "$1"'#000+ '11029__*** press enter ***'#000+ - '11030_H_Start of reading config file $1'#000+ - '11031_H_End of reading config ','file $1'#000+ + '11030_H_Start of reading c','onfig 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+ '11035_D_found source file name "$1"'#000+ - '11039_E_Unknown code page'#000+ - '11040_F_Config file $1 ','is a directory'#000+ + '11039','_E_Unknown code page'#000+ + '11040_F_Config file $1 is a directory'#000+ '11023_Free Pascal Compiler version $FPCVERSION [$FPCDATE] for $FPCCPU'#010+ 'Copyright (c) 1993-2005 by Florian Klaempfl'#000+ '11024_Free Pascal Compiler version $FPCVERSION'#010+ #010+ - 'Compiler Date : $FPCDATE'#010+ + 'Compiler Date ',': $FPCDATE'#010+ 'Compiler CPU Target: $FPCCPU'#010+ #010+ - 'Sup','ported targets:'#010+ + 'Supported targets:'#010+ ' $OSTARGETS'#010+ #010+ 'Supported CPU instruction sets:'#010+ @@ -736,129 +739,125 @@ const msgtxt : array[0..000165,1..240] of char=( 'Supported FPU instruction sets:'#010+ ' $FPUINSTRUCTIONSETS'#010+ #010+ - 'This program comes under the GNU General Public Licence'#010+ + 'Supported Optimizations:'#010+ + ' $OPTIMIZATIONS'#010+ + #010+ + 'This program com','es under the GNU General Public Licence'#010+ 'For more information read COPYING.FPC'#010+ #010+ - 'Report b','ugs,suggestions etc to:'#010+ + 'Report bugs,suggestions etc to:'#010+ ' bugrep@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 assembl','er file'#010+ + '**1a_the comp','iler 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+ '*L2ap_use pipes instead of creating temporary assembler files'#010+ - '**2ar_list register allocation/release info in assembler file'#010+ + '**2ar_list register allocation/release info ','in assembler file'#010+ '**2at_list temp allocation/release info in assembler file'#010+ - '**1A<x>_out','put format:'#010+ + '**1A<x>_output format:'#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*2Anasmelf_elf32 (Linux) file usin','g Nasm'#010+ '3*2Anasmwin32_Win32 object file using Nasm'#010+ - '3*2Anasmwdosx_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*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_elf32 (Linux) using internal writer'#010+ - '3*2Acoff_coff (Go32v2) using inter','nal writer'#010+ + '3*2Acoff_coff (Go32v2) using internal writer'#010+ '3*2Apecoff_pecoff (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 using GN','U 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<x>_code generation options:'#010+ + '**1C<x>','_code generation options:'#010+ '**2Cc<x>_set default calling convention to <x>'#010+ - '**2CD_create a','lso dynamic library (not supported)'#010+ + '**2CD_create also dynamic library (not supported)'#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>_Select fpu instruction set to use, see fpc -i for pos','sible '+ + 'values'#010+ '**2Cg_Generate PIC code'#010+ - '**2Ch<n>_<n> bytes heap (between 1023 and 67107840',')'#010+ + '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+ '**2Ci_IO-checking'#010+ '**2Cn_omit linking stage'#010+ '**2Co_check overflow of integer operations'#010+ '**2Cp<x>_select instruction set, see fpc -i for possible values'#010+ - '**2Cr_range checking'#010+ + '*','*2Cr_range checking'#010+ '**2CR_verify object method call validity'#010+ - '**2Cs<n>_set stack size to',' <n>'#010+ + '**2Cs<n>_set stack size to <n>'#010+ '**2Ct_stack 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+ - '**2Dv<x>_set DLL version 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+ '**1F<x>_set file names and paths:'#010+ '**2Fa<x>[,y]_for a program load first units <x> and [y] before uses is'+ ' parsed'#010+ - '**2Fc<x>_sets input codepage to <x>'#010+ + '**2Fc<x>_sets input codepage',' to <x>'#010+ '**2FD<x>_sets the directory where to search for compiler utilities'#010+ - '**2Fe<x>_red','irect error output to <x>'#010+ + '**2Fe<x>_redirect error output to <x>'#010+ '**2FE<x>_set exe/unit output path to <x>'#010+ '**2Fi<x>_adds <x> to include path'#010+ '**2Fl<x>_adds <x> to library path'#010+ - '**2FL<x>_uses <x> as dynamic linker'#010+ + '**2FL<x>_uses <x> ','as dynamic linker'#010+ '**2Fo<x>_adds <x> to object path'#010+ - '**2Fr<x>_load error message file <x>',#010+ + '**2Fr<x>_load error message file <x>'#010+ '**2Fu<x>_adds <x> to unit path'#010+ '**2FU<x>_set unit output path to <x>, overrides -FE'#010+ '*g1g_generate debugger information:'#010+ - '*g2gc_generate checks for pointers'#010+ + '*g2gc_generate checks for pointer','s'#010+ '*g2gd_use dbx'#010+ '*g2gg_use gsym'#010+ '*g2gh_use heap trace unit (for memory leak debugging)'#010+ - '*g','2gl_use line info unit to show more info for backtraces'#010+ + '*g2gl_use line info unit to show more info for backtraces'#010+ '*g2gv_generates programs traceable with valgrind'#010+ '*g2gw_generate dwarf debugging info'#010+ - '**1i_information'#010+ + '**1i_informa','tion'#010+ '**2iD_return compiler date'#010+ '**2iV_return compiler version'#010+ - '**2iSO_return compiler OS',#010+ + '**2iSO_return compiler OS'#010+ '**2iSP_return compiler processor'#010+ '**2iTO_return target OS'#010+ '**2iTP_return target processor'#010+ '**1I<x>_adds <x> to include path'#010+ - '**1k<x>_Pass <x> to the linker'#010+ + '**1k<x>_Pass <x> to the linker'#010, '**1l_write logo'#010+ '**1M<x>_set language mode to <x>'#010+ - '**2Mfpc_free pascal dialect (default)'#010, + '**2Mfpc_free pascal dialect (default)'#010+ '**2Mobjfpc_switch some Delphi 2 extensions on'#010+ '**2Mdelphi_tries to be Delphi compatible'#010+ '**2Mtp_tries to be TP/BP 7.0 compatible'#010+ - '**2Mgpc_tries to be gpc compatible'#010+ + '**2Mgpc_tries to be gpc co','mpatible'#010+ '**2Mmacpas_tries to be compatible to the macintosh pascal dialects'#010+ - '**1n_don'#039't ','read the default config file'#010+ + '**1n_don'#039't read the default config file'#010+ '**1N<x>_node tree optimizations'#010+ '**2Nu_unroll loops'#010+ '**1o<x>_change the name of the executable produced to <x>'#010+ - '**1O<x>_optimizations:'#010+ - '3*2Oa_<type>=<values> set alignment'#010+ - '3*2Og_generate smaller code'#010+ - '3*2OG_generate ','faster code (default)'#010+ - '**2Or_keep certain variables in registers'#010+ - '3*2Ou_enable uncertain optimizations (see docs)'#010+ - '3*2O1_level 1 optimizations (quick optimizations)'#010+ - '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#010+ - '3*2O3_level 3 optimiz','ations (-O2 repeatedly, max 5 times)'#010+ - '3*2Op<x>_target processor:'#010+ - '3*3Op1_set target processor to 386/486'#010+ - '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#010+ - '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#010+ - '6*2Og_generate smaller code'#010, - '6*2OG_generate faster code (default)'#010+ - '6*2Ox_optimize maximum (still BUGGY!!!)'#010+ - '6*2O0_set target processor to a MC68000'#010+ - '6*2O2_set target processor to a MC68020+ (default)'#010+ + '**1O<x>_optimiz','ations:'#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<x>=<y>_set alignment'#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+ + '**2Os_generate smaller code'#010+ '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+ '**1R<x>_asse','mbler reading style:'#010+ '**2Rdefault_use default assembler'#010+ diff --git a/compiler/options.pas b/compiler/options.pas index 5b1aa91e84..986567fe68 100644 --- a/compiler/options.pas +++ b/compiler/options.pas @@ -160,6 +160,7 @@ var target : tsystem; cpu : tcputype; fpu : tfputype; + opt : toptimizerswitch; begin p:=MessagePchar(option_info); while assigned(p) do @@ -205,6 +206,22 @@ begin end; end; end + else if pos('$OPTIMIZATIONS',s)>0 then + begin + for opt:=low(toptimizerswitch) to high(toptimizerswitch) do + begin + if opt in supported_optimizerswitches then + begin + hs:=s; + hs1:=OptimizerSwitchStr[opt]; + if hs1<>'' then + begin + Replace(hs,'$OPTIMIZATIONS',hs1); + Comment(V_Normal,hs); + end; + end; + end; + end else Comment(V_Normal,s); end; diff --git a/compiler/powerpc/cpuinfo.pas b/compiler/powerpc/cpuinfo.pas index 3b69b16376..e5c0fdf4f8 100644 --- a/compiler/powerpc/cpuinfo.pas +++ b/compiler/powerpc/cpuinfo.pas @@ -66,6 +66,9 @@ Const 'STANDARD' ); + { Supported optimizations, only used for information } + supported_optimizerswitches = [cs_opt_regvar,cs_opt_loopunroll]; + level1optimizerswitches = [cs_opt_level1]; level2optimizerswitches = level1optimizerswitches + [cs_opt_level2,cs_opt_regvar]; level3optimizerswitches = level2optimizerswitches + [cs_opt_level3,cs_opt_loopunroll]; diff --git a/compiler/powerpc64/cpuinfo.pas b/compiler/powerpc64/cpuinfo.pas index 6606e3bae7..186e6b74da 100644 --- a/compiler/powerpc64/cpuinfo.pas +++ b/compiler/powerpc64/cpuinfo.pas @@ -60,6 +60,9 @@ const 'STANDARD' ); + { Supported optimizations, only used for information } + supported_optimizerswitches = [cs_opt_regvar,cs_opt_loopunroll]; + level1optimizerswitches = [cs_opt_level1]; level2optimizerswitches = level1optimizerswitches + [cs_opt_level2,cs_opt_regvar,cs_opt_stackframe]; level3optimizerswitches = level2optimizerswitches + [cs_opt_level3,cs_opt_loopunroll]; diff --git a/compiler/scandir.pas b/compiler/scandir.pas index 6f8289ccf4..7838bda355 100644 --- a/compiler/scandir.pas +++ b/compiler/scandir.pas @@ -32,7 +32,7 @@ implementation uses cutils, - globtype,globals,systems,widestr, + globtype,globals,systems,widestr,cpuinfo, verbose,comphook,ppu, scanner,switches, fmodule, @@ -697,6 +697,26 @@ implementation do_delphiswitch('P'); end; + procedure dir_optimization; + var + hs : string; + begin + current_scanner.skipspace; + { Support also the ON and OFF as switch } + hs:=current_scanner.readid; + if (hs='ON') then + aktoptimizerswitches:=level2optimizerswitches + else if (hs='OFF') then + aktoptimizerswitches:=[] + else if (hs='DEFAULT') then + aktoptimizerswitches:=initoptimizerswitches + else + begin + if not UpdateOptimizerStr(hs,aktoptimizerswitches) then + Message1(scan_e_illegal_optimization_specifier,hs); + end; + end; + procedure dir_overflowchecks; begin do_delphiswitch('Q'); @@ -1197,6 +1217,7 @@ implementation AddDirective('OBJECTCHECKS',directive_all, @dir_objectchecks); AddDirective('OBJECTPATH',directive_all, @dir_objectpath); AddDirective('OPENSTRINGS',directive_all, @dir_openstrings); + AddDirective('OPTIMIZATION',directive_all, @dir_optimization); AddDirective('OVERFLOWCHECKS',directive_all, @dir_overflowchecks); AddDirective('PACKENUM',directive_all, @dir_packenum); AddDirective('PACKRECORDS',directive_all, @dir_packrecords); diff --git a/compiler/sparc/cpuinfo.pas b/compiler/sparc/cpuinfo.pas index 68406d4dc0..b078e009de 100644 --- a/compiler/sparc/cpuinfo.pas +++ b/compiler/sparc/cpuinfo.pas @@ -70,6 +70,9 @@ const 'HARD' ); + { Supported optimizations, only used for information } + supported_optimizerswitches = [cs_opt_regvar,cs_opt_loopunroll]; + level1optimizerswitches = [cs_opt_level1]; level2optimizerswitches = level1optimizerswitches + [cs_opt_level2,cs_opt_regvar]; level3optimizerswitches = level2optimizerswitches + [cs_opt_level3,cs_opt_loopunroll]; diff --git a/compiler/switches.pas b/compiler/switches.pas index 9f7549c7af..63435c40e3 100644 --- a/compiler/switches.pas +++ b/compiler/switches.pas @@ -31,7 +31,7 @@ function CheckSwitch(switch,state:char):boolean; implementation uses - globtype,systems, + globtype,systems,cpuinfo, globals,verbose,fmodule; {**************************************************************************** @@ -39,7 +39,7 @@ uses ****************************************************************************} type - TSwitchType=(ignoredsw,localsw,modulesw,globalsw,illegalsw,unsupportedsw,alignsw); + TSwitchType=(ignoredsw,localsw,modulesw,globalsw,illegalsw,unsupportedsw,alignsw,optimizersw); SwitchRec=record typesw : TSwitchType; setsw : byte; @@ -62,7 +62,7 @@ const {L} (typesw:modulesw; setsw:ord(cs_local_browser)), {M} (typesw:localsw; setsw:ord(cs_generate_rtti)), {N} (typesw:unsupportedsw; setsw:ord(cs_localnone)), - {O} (typesw:unsupportedsw; setsw:ord(cs_localnone)), + {O} (typesw:optimizersw; setsw:ord(cs_opt_none)), {P} (typesw:modulesw; setsw:ord(cs_openstring)), {Q} (typesw:localsw; setsw:ord(cs_check_overflow)), {R} (typesw:localsw; setsw:ord(cs_check_range)), @@ -92,7 +92,7 @@ const {L} (typesw:modulesw; setsw:ord(cs_local_browser)), {M} (typesw:localsw; setsw:ord(cs_generate_rtti)), {N} (typesw:unsupportedsw; setsw:ord(cs_localnone)), - {O} (typesw:unsupportedsw; setsw:ord(cs_localnone)), + {O} (typesw:optimizersw; setsw:ord(cs_opt_none)), {P} (typesw:modulesw; setsw:ord(cs_openstring)), {Q} (typesw:localsw; setsw:ord(cs_check_overflow)), {R} (typesw:localsw; setsw:ord(cs_check_range)), @@ -135,6 +135,13 @@ begin aktpackrecords:=4 else aktpackrecords:=1; + optimizersw : + begin + if state='+' then + aktoptimizerswitches:=level2optimizerswitches + else + aktoptimizerswitches:=[]; + end; ignoredsw : Message1(scan_n_ignored_switch,'$'+switch); illegalsw : diff --git a/compiler/x86_64/cpuinfo.pas b/compiler/x86_64/cpuinfo.pas index 5312b91ab8..28d339d9a1 100644 --- a/compiler/x86_64/cpuinfo.pas +++ b/compiler/x86_64/cpuinfo.pas @@ -79,6 +79,9 @@ Const sse_singlescalar : set of tfputype = [fpu_sse64]; sse_doublescalar : set of tfputype = [fpu_sse64]; + { Supported optimizations, only used for information } + supported_optimizerswitches = [cs_opt_regvar,cs_opt_loopunroll,cs_opt_stackframe]; + level1optimizerswitches = [cs_opt_level1]; level2optimizerswitches = level1optimizerswitches + [cs_opt_level2,cs_opt_regvar,cs_opt_stackframe]; level3optimizerswitches = level2optimizerswitches + [cs_opt_level3,cs_opt_loopunroll]; |