+ check for access to index 0 of long/wide/ansi strings added,

    gives now an error
  * problem with access to contant index of ansistrings fixed

compiler/cg386mem.pas

@@ -395,26 +395,25 @@ implementation
                 end;
               del_reference(p^.left^.location.reference);
               p^.location.reference.base:=getregister32;
+
               exprasmlist^.concat(new(pai386,op_ref_reg(A_MOV,S_L,
                 newreference(p^.left^.location.reference),
                 p^.location.reference.base)));
 
               if is_ansistring(p^.left^.resulttype) then
-                begin
-                   { in ansistrings S[1] is pchar(S)[0] !! }
-                   dec(p^.location.reference.offset);
-                   { this is necessary for ansistrings with constant index }
-                   dec(p^.left^.location.reference.offset);
-                end
+                { in ansistrings S[1] is pchar(S)[0] !! }
+                dec(p^.location.reference.offset)
               else
                 begin
                    { in widestrings S[1] is pwchar(S)[0] !! }
                    dec(p^.location.reference.offset,2);
-                   { this is necessary for ansistrings with constant index }
-                   dec(p^.left^.location.reference.offset,2);
                    exprasmlist^.concat(new(pai386,op_const_reg(A_SHL,S_L,
-                     2,p^.location.reference.base)));
+                     1,p^.location.reference.base)));
                 end;
+
+              { we've also to keep left up-to-date, because it is used   }
+              { if a constant array index occurs, subject to change (FK) }
+              set_location(p^.left^.location,p^.location);
            end
          else
            set_location(p^.location,p^.left^.location);
@@ -443,9 +442,33 @@ implementation
                      end
                    else
                      begin
-                        { range checking for open arrays }
+                        { range checking for open arrays !!!! }
                      end;
+                end
+              else if (p^.left^.resulttype^.deftype=stringdef) then
+                begin
+                   if (p^.right^.value=0) and not(is_shortstring(p^.left^.resulttype)) then
+                     CGMessage(cg_e_can_access_element_zero);
+
+                   case pstringdef(p^.left^.resulttype)^.string_typ of
+                      st_ansistring:
+                        begin
+                        end;
+
+                      st_shortstring:
+                        begin
+                        end;
+
+                      st_longstring:
+                        begin
+                        end;
+
+                      st_widestring:
+                        begin
+                        end;
+                   end;
                 end;
+
               inc(p^.left^.location.reference.offset,
                   get_mul_size*p^.right^.value);
               if p^.memseg then
@@ -677,7 +700,12 @@ implementation
 end.
 {
   $Log$
-  Revision 1.15  1998-10-12 09:49:53  florian
+  Revision 1.16  1998-10-21 11:44:42  florian
+    + check for access to index 0 of long/wide/ansi strings added,
+      gives now an error
+    * problem with access to contant index of ansistrings fixed
+
+  Revision 1.15  1998/10/12 09:49:53  florian
     + support of <procedure var type>:=<pointer> in delphi mode added
 
   Revision 1.14  1998/10/02 07:20:37  florian

compiler/msgidx.inc

@@ -253,6 +253,7 @@ type tmsgconst=(
   cg_e_unable_inline_object_methods,
   cg_e_unable_inline_procvar,
   cg_e_no_code_for_inline_stored,
+  cg_e_can_access_element_zero,
   assem_f_ev_zero_divide,
   assem_f_ev_stack_overflow,
   assem_f_ev_stack_underflow,

compiler/msgtxt.inc

@@ -265,168 +265,169 @@ const msgtxt : array[0..00092,1..240] of char=(+
   'E_Unable to inline object methods'#000+
   'E_Unab','le to inline procvar calls'#000+
   'E_No code for inline procedure stored'#000+
+  'E_Element zero of an ansi/wide- or longstring can'#039't be accessed'#000+
   'F_Divide by zero in asm evaluator'#000+
   'F_Evaluator stack overflow'#000+
   'F_Evaluator stack underflow'#000+
-  'F_Invalid numeric format in asm evaluator'#000+
+  'F_Invalid numeric form','at in asm evaluator'#000+
   'F_Invalid Operator in asm evaluator'#000+
-  'F_Unknow','n error in asm evaluator'#000+
+  'F_Unknown error in asm evaluator'#000+
   'W_Invalid numeric value'#000+
   'E_escape sequence ignored: $1'#000+
   'E_Asm syntax error - Prefix not found'#000+
   'E_Asm syntax error - Trying to add more than one prefix'#000+
-  'E_Asm syntax error - Opcode not found'#000+
+  'E_A','sm syntax error - Opcode not found'#000+
   'E_Invalid symbol reference'#000+
-  'W_','Calling an overload function in an asm'#000+
+  'W_Calling an overload function in an asm'#000+
   'E_Constant value out of bounds'#000+
   'E_Non-label pattern contains @'#000+
   'E_Invalid Operand: $1'#000+
   'W_Override operator not supported'#000+
-  'E_Error in binary constant: $1'#000+
+  'E_Error in binary c','onstant: $1'#000+
   'E_Error in octal constant: $1'#000+
-  'E_Error in hexadecimal',' constant: $1'#000+
+  'E_Error in hexadecimal constant: $1'#000+
   'E_Error in integer constant: $1'#000+
   'E_Invalid labeled opcode'#000+
   'F_Internal error in Findtype()'#000+
   'E_Invalid size for MOVSX/MOVZX'#000+
   'E_16-bit base in 32-bit segment'#000+
-  'E_16-bit index in 32-bit segment'#000+
+  'E_16-bit in','dex in 32-bit segment'#000+
   'E_Invalid Opcode'#000+
-  'E_Constant reference not ','allowed'#000+
+  'E_Constant reference not allowed'#000+
   'W_Fwait can cause emulation problems with emu387'#000+
   'E_Invalid combination of opcode and operands'#000+
   'W_Opcode $1 not in table, operands not checked'#000+
-  'F_Internal Error in ConcatOpcode()'#000+
+  'F_Internal Error in ConcatO','pcode()'#000+
   'E_Invalid size in reference'#000+
-  'E_Invalid middle sized opera','nd'#000+
+  'E_Invalid middle sized operand'#000+
   'E_Invalid three operand opcode'#000+
   'E_Assembler syntax error'#000+
   'E_Invalid operand type'#000+
   'E_Segment overrides not supported'#000+
   'E_Invalid constant symbol $1'#000+
-  'F_Internal Errror converting binary'#000+
+  'F_Internal Errror converting bi','nary'#000+
   'F_Internal Errror converting hexadecimal'#000+
-  'F_Internal Errror ','converting octal'#000+
+  'F_Internal Errror converting octal'#000+
   'E_Invalid constant expression'#000+
   'E_Unknown identifier: $1'#000+
   'E_Trying to define an index register more than once'#000+
   'E_Invalid field specifier'#000+
-  'F_Internal Error in BuildScaling()'#000+
+  'F_Internal Error in BuildS','caling()'#000+
   'E_Invalid scaling factor'#000+
   'E_Invalid scaling value'#000+
-  'E_Scal','ing value only allowed with index'#000+
+  'E_Scaling value only allowed with index'#000+
   'E_Invalid assembler syntax. No ref with brackets)'#000+
   'E_Expressions of the form [sreg:reg...] are currently not supported'#000+
-  'E_Trying to define a segment register twice'#000+
+  'E_Trying to define a seg','ment register twice'#000+
   'E_Trying to define a base register twice'#000+
-  'E_T','rying to use a negative index register'#000+
+  'E_Trying to use a negative index register'#000+
   'E_Asm syntax error - error in reference'#000+
   'E_Local symbols not allowed as references'#000+
   'E_Invalid operand in bracket expression'#000+
-  'E_Invalid symbol name: $1'#000+
+  'E_Invalid symbo','l name: $1'#000+
   'E_Invalid Reference syntax'#000+
-  'E_Invalid string as opcode',' operand: $1'#000+
+  'E_Invalid string as opcode operand: $1'#000+
   'W_@CODE and @DATA not supported'#000+
   'E_Null label references are not allowed'#000+
   'W_Calling of an overloaded function in direct assembler'#000+
-  'E_Cannot use SELF outside a method'#000+
+  'E_Cannot use SELF outside a method'#000,+
   'E_Asm syntax error - Should start with bracket'#000+
-  'E_Asm syntax erro','r - register: $1'#000+
+  'E_Asm syntax error - register: $1'#000+
   'E_SEG and OFFSET not supported'#000+
   'E_Asm syntax error - in opcode operand'#000+
   'E_Invalid String expression'#000+
   'E_Constant expression out of bounds'#000+
-  'F_Internal Error in BuildConstant()'#000+
-  'W_A repeat prefix and a segment override on <= i386 m','ay result in er'+
-  'rors if an interrupt occurs'#000+
+  'F_Internal Error in Build','Constant()'#000+
+  'W_A repeat prefix and a segment override on <= i386 may result in erro'+
+  'rs if an interrupt occurs'#000+
   'E_Invalid or missing opcode'#000+
   'E_Invalid combination of prefix and opcode: $1'#000+
   'E_Invalid combination of override and opcode: $1'#000+
-  'E_Too many operands on line'#000+
+  'E_Too man','y operands on line'#000+
   'E_Duplicate local symbol: $1'#000+
-  'E_Unknown label ','identifer: $1'#000+
+  'E_Unknown label identifer: $1'#000+
   'E_Assemble node syntax error'#000+
   'E_Undefined local symbol: $1'#000+
   'D_Starting intel styled assembler parsing...'#000+
   'D_Finished intel styled assembler parsing...'#000+
-  'E_Not a directive or local symbol: $1'#000+
+  'E_Not a direct','ive or local symbol: $1'#000+
   'E_/ at beginning of line not allowed'#000+
-  'E_N','OR not supported'#000+
+  'E_NOR not supported'#000+
   'E_Invalid floating point register name'#000+
   'W_Modulo not supported'#000+
   'E_Invalid floating point constant: $1'#000+
   'E_Size suffix and destination register do not match'#000+
-  'E_Internal error in ConcatLabeledInstr()'#000+
-  'W_Floating point binary repres','entation ignored'#000+
+  'E_Inter','nal error in ConcatLabeledInstr()'#000+
+  'W_Floating point binary representation ignored'#000+
   'W_Floating point hexadecimal representation ignored'#000+
   'W_Floating point octal representation ignored'#000+
   'E_Invalid real constant expression'#000+
-  'E_Parenthesis are not allowed'#000+
+  'E_Parenthesis are not allo','wed'#000+
   'E_Invalid Reference'#000+
   'E_Cannot use __SELF outside a method'#000+
-  'E_C','annot use __OLDEBP outside a nested procedure'#000+
+  'E_Cannot use __OLDEBP outside a nested procedure'#000+
   'W_Identifier $1 supposed external'#000+
   'E_Invalid segment override expression'#000+
   'E_Strings not allowed as constants'#000+
-  'D_Starting AT&T styled assembler parsing...'#000+
-  'D_Finished AT&T styled assembler parsing...',#000+
+  'D_Starting AT&T styled ','assembler parsing...'#000+
+  'D_Finished AT&T styled assembler parsing...'#000+
   'E_Switching sections is not allowed in an assembler block'#000+
   'E_Invalid global definition'#000+
   'E_Line separator expected'#000+
   'W_globl not supported'#000+
   'W_align not supported'#000+
-  'W_lcomm not supported'#000+
+  'W_lcomm not support','ed'#000+
   'W_comm not supported'#000+
   'E_Invalid local common definition'#000+
-  'E_Inva','lid global common definition'#000+
+  'E_Invalid global common definition'#000+
   'E_local symbol: $1 not found inside asm statement'#000+
   'E_assembler code not returned to text'#000+
   'F_internal error in BuildReference()'#000+
-  'E_invalid opcode size'#000+
+  'E_invalid opcode size'#000,+
   'W_NEAR ignored'#000+
   'W_FAR ignored'#000+
-  'D_Creating inline asm lookup tables',#000+
+  'D_Creating inline asm lookup tables'#000+
   'E_Using a defined name as a local label'#000+
   'F_internal error in HandleExtend()'#000+
   'E_Invalid character: <'#000+
   'E_Invalid character: >'#000+
   'E_Unsupported opcode'#000+
-  'E_Increment and Decrement mode not allowed together'#000+
+  'E_Increment and Decrement mode no','t allowed together'#000+
   'E_Invalid Register list in movem/fmovem'#000+
-  'E_Inv','alid Register list for opcode'#000+
+  'E_Invalid Register list for opcode'#000+
   'E_68020+ mode required to assemble'#000+
   'D_Starting Motorola styled assembler parsing...'#000+
   'D_Finished Motorola styled assembler parsing...'#000+
-  'W_XDEF not supported'#000+
-  'W_Functions with void return value can'#039't return any value ','in asm'+
-  ' code'#000+
+  'W_XDEF not supp','orted'#000+
+  'W_Functions with void return value can'#039't return any value in asm c'+
+  'ode'#000+
   'E_Invalid suffix for intel assembler'#000+
   'E_Extended not supported in this mode'#000+
   'E_Comp not supported in this mode'#000+
-  'W_You need GNU as version >= 2.81 to compile this MMX code'#000+
+  'W_You need GNU as version >= 2.81 to compile this MMX c','ode'#000+
   'F_Too many assembler files'#000+
-  'F_Selected assembler output not s','upported'#000+
+  'F_Selected assembler output not supported'#000+
   'E_Unsupported symbol type for operand'#000+
   'W_Source operating system redefined'#000+
   'I_Assembling (pipe) $1'#000+
   'E_Can'#039't create assember file $1'#000+
-  'W_Assembler $1 not found, switching to external assembling'#000+
+  'W_Assembler $1 not found, switching to',' external assembling'#000+
   'T_Using assembler: $1'#000+
-  'W_Error while assembl','ing exitcode $1'#000+
+  'W_Error while assembling exitcode $1'#000+
   'W_Can'#039't call the assembler, error $1 switching to external assembl'+
   'ing'#000+
   'I_Assembling $1'#000+
   'W_Linker $1 not found, switching to external linking'#000+
   'T_Using linker: $1'#000+
-  'W_Object $1 not found, Linking may fail !'#000+
-  'W_Library $1 not found, ','Linking may fail !'#000+
+  'W_','Object $1 not found, Linking may fail !'#000+
+  'W_Library $1 not found, Linking may fail !'#000+
   'W_Error while linking'#000+
   'W_Can'#039't call the linker, switching to external linking'#000+
   'I_Linking $1'#000+
   'W_binder not found, switching to external binding'#000+
-  'W_ar not found, switching to external ar'#000+
+  'W_ar not found, s','witching to external ar'#000+
   'E_Dynamic Libraries not supported'#000+
-  'I_Clos','ing script $1'#000+
+  'I_Closing script $1'#000+
   'T_Unitsearch: $1'#000+
   'T_PPU Loading $1'#000+
   'U_PPU Name: $1'#000+
@@ -435,95 +436,95 @@ const msgtxt : array[0..00092,1..240] of char=(+
   'U_PPU Time: $1'#000+
   'U_PPU File too short'#000+
   'U_PPU Invalid Header (no PPU at the begin)'#000+
-  'U_PPU Invalid Version $1'#000+
+  'U_PP','U Invalid Version $1'#000+
   'U_PPU is compiled for an other processor'#000+
-  'U_','PPU is compiled for an other target'#000+
+  'U_PPU is compiled for an other target'#000+
   'U_PPU Source: $1'#000+
   'U_Writing $1'#000+
   'F_Can'#039't Write PPU-File'#000+
   'F_reading PPU-File'#000+
   'F_unexpected end of PPU-File'#000+
   'F_Invalid PPU-File entry: $1'#000+
-  'F_PPU Dbx count problem'#000+
+  'F_PPU Dbx ','count problem'#000+
   'E_Illegal unit name: $1'#000+
   'F_Too much units'#000+
-  'F_Circula','r unit reference between $1 and $2'#000+
+  'F_Circular unit reference between $1 and $2'#000+
   'F_Can'#039't compile unit $1, no sources available'#000+
   'W_Compiling the system unit requires the -Us switch'#000+
-  'F_There were $1 errors compiling module, stopping'#000+
+  'F_There were $1 errors compiling module, st','opping'#000+
   'U_Load from $1 ($2) unit $3'#000+
-  'U_Recompiling $1, checksum ch','anged for $2'#000+
+  'U_Recompiling $1, checksum changed for $2'#000+
   'U_Recompiling unit, static lib is older than ppufile'#000+
   'U_Recompiling unit, shared lib is older than ppufile'#000+
   'U_Recompiling unit, obj and asm are older than ppufile'#000+
-  'U_Recompiling unit, obj is older than asm'#000+
-  'U_Parsing interface of $','1'#000+
+  'U_','Recompiling unit, obj is older than asm'#000+
+  'U_Parsing interface of $1'#000+
   'U_Parsing implementation of $1'#000+
   'U_Second load for unit $1'#000+
   'U_PPU Check file $1 time $2'#000+
   '$1 [options] <inputfile> [options]'#000+
   'W_Only one source file supported'#000+
-  'W_DEF file can be created only for OS/2'#000+
+  'W_DEF file can be cre','ated only for OS/2'#000+
   'E_nested response files are not supported'#000+
-  'F_N','o source file name in command line'#000+
+  'F_No source file name in command line'#000+
   'E_Illegal parameter: $1'#000+
   'H_-? writes help pages'#000+
   'F_Too many config files nested'#000+
   'F_Unable to open file $1'#000+
   'N_Reading further options from $1'#000+
-  'W_Target is already set to: $1'#000+
-  'W_Shared libs not supported on DOS pl','atform, reverting to static'#000+
+  'W_Ta','rget is already set to: $1'#000+
+  'W_Shared libs not supported on DOS platform, reverting to static'#000+
   'F_too many IF(N)DEFs'#000+
   'F_too many ENDIFs'#000+
   'F_open conditional at the end of the file'#000+
-  'W_Debug information generation is not supported by this executable'#000+
+  'W_Debug information generation is not supported by this executable'#000,+
   'H_Try recompiling with -dGDB'#000+
-  'Free Pascal Compiler version $FPCVE','R [$FPCDATE] for $FPCTARGET'#000+
+  'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
   'Copyright (c) 1993-98 by Florian Klaempfl'#000+
   'Free Pascal Compiler version $FPCVER'#000+
   #000+
   'Compiler Date  : $FPCDATE'#000+
   'Compiler Target: $FPCTARGET'#000+
   #000+
-  'This program comes under the GNU General Public Licence'#000+
-  'For more information ','read COPYING.FPC'#000+
+  'This program ','comes under the GNU General Public Licence'#000+
+  'For more information read COPYING.FPC'#000+
   #000+
   'Report bugs,suggestions etc to:'#000+
   '                [email protected]'#000+
   '**0*_+ switch option on, - off'#000+
-  '**1a_the compiler doesn'#039't delete the generated assembler file'#000+
+  '**1a_the compiler doesn'#039't delete the generated',' assembler file'#000+
   '**2al_list sourcecode lines in assembler file'#000+
-  '*t','1b_use EMS'#000+
+  '*t1b_use EMS'#000+
   '**1B_build all modules'#000+
   '**1C_code generation options'#000+
   '3*2CD_create dynamic library'#000+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#000+
   '**2Ci_IO-checking'#000+
-  '**2Cn_omit linking stage'#000+
+  '**2Cn_omit lin','king stage'#000+
   '**2Co_check overflow of integer operations'#000+
-  '**2Cr_rang','e checking'#000+
+  '**2Cr_range checking'#000+
   '**2Cs<n>_set stack size to <n>'#000+
   '**2Ct_stack checking'#000+
   '3*2CS_create static library'#000+
   '3*2Cx_use smartlinking'#000+
   '**1d<x>_defines the symbol <x>'#000+
   '*O1D_generate a DEF file'#000+
-  '*O2Dd<x>_set description to <x>'#000+
+  '*O2Dd<','x>_set description to <x>'#000+
   '*O2Dw_PM application'#000+
-  '**1e<x>_set path ','to executable'#000+
+  '**1e<x>_set path to executable'#000+
   '**1E_same as -Cn'#000+
   '**1F_set file names and paths'#000+
   '**2FD<x>_sets the directory where to search for compiler utilities'#000+
   '**2Fe<x>_redirect error output to <x>'#000+
-  '**2FE<x>_set exe/unit output path to <x>'#000+
+  '**2FE<x>_s','et exe/unit output path to <x>'#000+
   '*L2Fg<x>_same as -Fl'#000+
-  '**2Fi<x>_add','s <x> to include path'#000+
+  '**2Fi<x>_adds <x> to include path'#000+
   '**2Fl<x>_adds <x> to library path'#000+
   '*L2FL<x>_uses <x> as dynamic linker'#000+
   '**2Fo<x>_adds <x> to object path'#000+
   '**2Fr<x>_load error message file <x>'#000+
-  '**2Fu<x>_adds <x> to unit path'#000+
-  '**2FU<x>_set unit output path to <x>, overrides',' -FE'#000+
+  '**2Fu<x>_adds ','<x> to unit path'#000+
+  '**2FU<x>_set unit output path to <x>, overrides -FE'#000+
   '*g1g_generate debugger information'#000+
   '*g2gg_use gsym'#000+
   '*g2gd_use dbx'#000+
@@ -531,94 +532,95 @@ const msgtxt : array[0..00092,1..240] of char=(+
   '**1I<x>_adds <x> to include path'#000+
   '**1k<x>_Pass <x> to the linker'#000+
   '**1l_write logo'#000+
-  '**1n_don'#039't read the default config file'#000+
-  '**1o<x>_change the name of the exe','cutable produced to <x>'#000+
+  '**1n_don'#039't',' read the default config file'#000+
+  '**1o<x>_change the name of the executable produced to <x>'#000+
   '**1pg_generate profile code for gprof'#000+
   '*L1P_use pipes instead of creating temporary assembler files'#000+
   '**1S_syntax options'#000+
-  '**2S2_switch some Delphi 2 extensions on'#000+
+  '**2S2_switch some Delphi 2 extens','ions on'#000+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+
-  '**2Sd_','tries to be Delphi compatible'#000+
+  '**2Sd_tries to be Delphi compatible'#000+
   '**2Se_compiler stops after the first error'#000+
   '**2Sg_allow LABEL and GOTO'#000+
   '**2Si_support C++ stlyed INLINE'#000+
   '**2Sm_support macros like C (global)'#000+
-  '**2So_tries to be TP/BP 7.0 compatible'#000+
-  '**2Sp_tries to be gpc compatible',#000+
+  '**2So_t','ries to be TP/BP 7.0 compatible'#000+
+  '**2Sp_tries to be gpc compatible'#000+
   '**2Ss_constructor name must be init (destructor must be done)'#000+
   '**2St_allow static keyword in objects'#000+
   '**2Sv_allow variable directives (cvar,external,public,export)'#000+
-  '**1s_don'#039't call assembler and linker (only with -a)'#000+
-  '**1u<x>_undefines the sym','bol <x>'#000+
+  '**1s_don'#039't ca','ll assembler and linker (only with -a)'#000+
+  '**1u<x>_undefines the symbol <x>'#000+
   '**1U_unit options'#000+
   '**2Un_don'#039't check the unit name'#000+
   '**2Up<x>_same as -Fu<x>'#000+
   '**2Us_compile a system unit'#000+
-  '**1v<x>_Be verbose. <x> is a combination of the following letters :'#000+
+  '**1v<x>_Be verbose. <x> is a combination of the following letters ',':'#000+
   '**2*_e : Show errors (default)       d : Show debug info'#000+
-  '**2*_','w : Show warnings               u : Show unit info'#000+
+  '**2*_w : Show warnings               u : Show unit info'#000+
   '**2*_n : Show notes                  t : Show tried/used files'#000+
   '**2*_h : Show hints                  m : Show defined macros'#000+
-  '**2*_i : Show general info           p : Show compiled procedures',#000+
+  '*','*2*_i : Show general info           p : Show compiled procedures'#000+
   '**2*_l : Show linenumbers            c : Show conditionals'#000+
   '**2*_a : Show everything             0 : Show nothing (except errors)'#000+
-  '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#000+
+  '**2*_b : Show all procedure          r : Rhide','/GCC compatibility mod'+
+  'e'#000+
   '**2*_    declarations if an error'#000+
-  '**2*_ ','   occurs'#000+
+  '**2*_    occurs'#000+
   '**1X_executable options'#000+
   '*L2Xc_link with the c library'#000+
   '**2XD_link with dynamic libraries (defines FPC_LINK_DYNAMIC)'#000+
   '**2Xs_strip all symbols from executable'#000+
-  '**2XS_link with static libraries (defines FPC_LINK_STATIC)'#000+
-  '**0*_Processor s','pecific options:'#000+
+  '**2XS_link ','with static libraries (defines FPC_LINK_STATIC)'#000+
+  '**0*_Processor specific options:'#000+
   '3*1A<x>_output format'#000+
   '3*2Ao_coff file using GNU AS'#000+
   '3*2Anasmcoff_coff file using Nasm'#000+
   '3*2Anasmelf_elf32 (linux) file using Nasm'#000+
-  '3*2Anasmobj_obj file using Nasm'#000+
+  '3*2Anasmobj_obj file using Nasm'#000,+
   '3*2Amasm_obj using Masm (Mircosoft)'#000+
-  '3*2Atasm_obj using Tasm (Bor','land)'#000+
+  '3*2Atasm_obj using Tasm (Borland)'#000+
   '3*1R<x>_assembler reading style'#000+
   '3*2Ratt_read AT&T style assembler'#000+
   '3*2Rintel_read Intel style assembler'#000+
   '3*2Rdirect_copy assembler text directly to assembler file'#000+
-  '3*1O<x>_optimizations'#000+
+  '3*1O<x>_o','ptimizations'#000+
   '3*2Og_generate smaller code'#000+
-  '3*2OG_generate faster c','ode (default)'#000+
+  '3*2OG_generate faster code (default)'#000+
   '3*2Or_keep certain variables in registers (still BUGGY!!!)'#000+
   '3*2Ou_enable uncertain optimizations (see docs)'#000+
   '3*2O1_level 1 optimizations (quick optimizations)'#000+
-  '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#000+
-  '3*2O3_level ','3 optimizations (same as -O2u)'#000+
+  '3*2O2','_level 2 optimizations (-O1 + slower optimizations)'#000+
+  '3*2O3_level 3 optimizations (same as -O2u)'#000+
   '3*2Op_target processor'#000+
   '3*3Op1_set target processor to 386/486'#000+
   '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#000+
-  '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#000+
+  '3*3Op3_set target processor ','to PPro/PII/c6x86/K6 (tm)'#000+
   '3*1T<x>_Target operating system'#000+
-  '3*2TGO','32V1_version 1 of DJ Delorie DOS extender'#000+
+  '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#000+
   '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#000+
   '3*2TLINUX_Linux'#000+
   '3*2TOS2_OS/2 2.x'#000+
   '3*2TWin32_Windows 32 Bit'#000+
   '6*1A<x>_output format'#000+
-  '6*2Ao_Unix o-file using GNU AS'#000+
+  '6*2Ao_','Unix o-file using GNU AS'#000+
   '6*2Agas_GNU Motorola assembler'#000+
-  '6*2Amit_','MIT Syntax (old GAS)'#000+
+  '6*2Amit_MIT Syntax (old GAS)'#000+
   '6*2Amot_Standard Motorola assembler'#000+
   '6*1O_optimizations'#000+
   '6*2Oa_turn on the optimizer'#000+
   '6*2Og_generate smaller code'#000+
   '6*2OG_generate faster code (default)'#000+
-  '6*2Ox_optimize maximum (still BUGGY!!!)'#000+
-  '6*2O2_set target processor to a',' MC68020+'#000+
+  '6*2Ox_o','ptimize maximum (still BUGGY!!!)'#000+
+  '6*2O2_set target processor to a MC68020+'#000+
   '6*1R<x>_assembler reading style'#000+
   '6*2RMOT_read motorola style assembler'#000+
   '6*1T<x>_Target operating system'#000+
   '6*2TAMIGA_Commodore Amiga'#000+
   '6*2TATARI_Atari ST/STe/TT'#000+
-  '6*2TMACOS_Macintosh m68k'#000+
+  '6*2TMACOS_Ma','cintosh m68k'#000+
   '6*2TLINUX_Linux-68k'#000+
   '**1*_'#000+
   '**1?_shows this help'#000+
-  '**1h','_shows this help without waiting'#000
+  '**1h_shows this help without waiting'#000
 );