2
0
Эх сурвалжийг харах

* detect duplicate labels

peter 24 жил өмнө
parent
commit
ce43e79517

+ 16 - 3
compiler/aasm.pas

@@ -118,10 +118,12 @@ interface
          proclocal : boolean;
          { is the symbol in the used list }
          inusedlist : boolean;
+         { assembler pass label is set, used for detecting multiple labels }
+         pass : byte;
          constructor create(const s:string;_bind:TAsmsymbind;_typ:Tasmsymtype);
          procedure reset;
          function  is_used:boolean;
-         procedure setaddress(sec:tsection;offset,len:longint);
+         procedure setaddress(_pass:byte;sec:tsection;offset,len:longint);
          procedure GenerateAltSymbol;
        end;
 
@@ -890,6 +892,7 @@ uses
         defbind:=_bind;
         typ:=_typ;
         inusedlist:=false;
+        pass:=255;
         { mainly used to remove unused labels from the codesegment }
         refs:=0;
       end;
@@ -912,6 +915,7 @@ uses
         address:=0;
         size:=0;
         idx:=-1;
+        pass:=255;
         bind:=AB_EXTERNAL;
         proclocal:=false;
       end;
@@ -921,8 +925,14 @@ uses
         is_used:=(refs>0);
       end;
 
-    procedure tasmsymbol.setaddress(sec:tsection;offset,len:longint);
+    procedure tasmsymbol.setaddress(_pass:byte;sec:tsection;offset,len:longint);
       begin
+        if (_pass=pass) then
+         begin
+           Message1(asmw_e_duplicate_label,name);
+           exit;
+         end;
+        pass:=_pass;
         section:=sec;
         address:=offset;
         size:=len;
@@ -1150,7 +1160,10 @@ uses
 end.
 {
   $Log$
-  Revision 1.17  2001-04-13 01:22:06  peter
+  Revision 1.18  2001-08-30 19:43:50  peter
+    * detect duplicate labels
+
+  Revision 1.17  2001/04/13 01:22:06  peter
     * symtable change to classes
     * range check generation and errors fixed, make cycle DEBUG=1 works
     * memory leaks fixed

+ 13 - 10
compiler/assemble.pas

@@ -758,7 +758,7 @@ Implementation
            hp:=newasmsymboltype('Ltext'+ToStr(IncludeCount),AB_LOCAL,AT_FUNCTION);
            if currpass=1 then
              begin
-                hp.setaddress(objectalloc.currsec,objectalloc.sectionsize,0);
+                hp.setaddress(currpass,objectalloc.currsec,objectalloc.sectionsize,0);
                 UsedAsmSymbolListInsert(hp);
              end
            else
@@ -806,7 +806,7 @@ Implementation
         hp:=newasmsymboltype('Letext',AB_LOCAL,AT_FUNCTION);
         if currpass=1 then
           begin
-            hp.setaddress(objectalloc.currsec,objectalloc.sectionsize,0);
+            hp.setaddress(currpass,objectalloc.currsec,objectalloc.sectionsize,0);
             UsedAsmSymbolListInsert(hp);
           end
         else
@@ -896,9 +896,9 @@ Implementation
              ait_section:
                objectalloc.setsection(Tai_section(hp).sec);
              ait_symbol :
-               Tai_symbol(hp).sym.setaddress(objectalloc.currsec,objectalloc.sectionsize,0);
+               Tai_symbol(hp).sym.setaddress(currpass,objectalloc.currsec,objectalloc.sectionsize,0);
              ait_label :
-               Tai_label(hp).l.setaddress(objectalloc.currsec,objectalloc.sectionsize,0);
+               Tai_label(hp).l.setaddress(currpass,objectalloc.currsec,objectalloc.sectionsize,0);
              ait_string :
                objectalloc.sectionalloc(Tai_string(hp).len);
              ait_instruction :
@@ -957,7 +957,7 @@ Implementation
                   begin
                     if Tai_datablock(hp).is_global then
                      begin
-                       Tai_datablock(hp).sym.setaddress(sec_none,Tai_datablock(hp).size,Tai_datablock(hp).size);
+                       Tai_datablock(hp).sym.setaddress(currpass,sec_none,Tai_datablock(hp).size,Tai_datablock(hp).size);
                        { force to be common/external, must be after setaddress as that would
                          set it to AS_GLOBAL }
                        Tai_datablock(hp).sym.bind:=AB_COMMON;
@@ -969,7 +969,7 @@ Implementation
                          objectalloc.sectionalign(4)
                        else if l>1 then
                          objectalloc.sectionalign(2);
-                       Tai_datablock(hp).sym.setaddress(objectalloc.currsec,objectalloc.sectionsize,
+                       Tai_datablock(hp).sym.setaddress(currpass,objectalloc.currsec,objectalloc.sectionsize,
                          Tai_datablock(hp).size);
                        objectalloc.sectionalloc(Tai_datablock(hp).size);
                      end;
@@ -981,7 +981,7 @@ Implementation
                        objectalloc.sectionalign(4)
                      else if l>1 then
                        objectalloc.sectionalign(2);
-                     Tai_datablock(hp).sym.setaddress(objectalloc.currsec,objectalloc.sectionsize,Tai_datablock(hp).size);
+                     Tai_datablock(hp).sym.setaddress(currpass,objectalloc.currsec,objectalloc.sectionsize,Tai_datablock(hp).size);
                      objectalloc.sectionalloc(Tai_datablock(hp).size);
                    end;
                  UsedAsmSymbolListInsert(Tai_datablock(hp).sym);
@@ -1040,7 +1040,7 @@ Implementation
 {$endif}
              ait_symbol :
                begin
-                 Tai_symbol(hp).sym.setaddress(objectalloc.currsec,objectalloc.sectionsize,0);
+                 Tai_symbol(hp).sym.setaddress(currpass,objectalloc.currsec,objectalloc.sectionsize,0);
                  UsedAsmSymbolListInsert(Tai_symbol(hp).sym);
                end;
              ait_symbol_end :
@@ -1053,7 +1053,7 @@ Implementation
                 end;
              ait_label :
                begin
-                 Tai_label(hp).l.setaddress(objectalloc.currsec,objectalloc.sectionsize,0);
+                 Tai_label(hp).l.setaddress(currpass,objectalloc.currsec,objectalloc.sectionsize,0);
                  UsedAsmSymbolListInsert(Tai_label(hp).l);
                end;
              ait_string :
@@ -1534,7 +1534,10 @@ Implementation
 end.
 {
   $Log$
-  Revision 1.24  2001-08-26 13:36:35  florian
+  Revision 1.25  2001-08-30 19:43:50  peter
+    * detect duplicate labels
+
+  Revision 1.24  2001/08/26 13:36:35  florian
     * some cg reorganisation
     * some PPC updates
 

+ 1 - 1
compiler/msg/errore.msg

@@ -1543,7 +1543,7 @@ asmw_e_immediate_or_reference_expected=08010_E_Asm: Immediate or reference expec
 asmw_e_value_exceeds_bounds=08011_E_Asm: $1 value exceeds bounds $2
 asmw_e_short_jmp_out_of_range=08012_E_Asm: Short jump is out of range $1
 asmw_e_undefined_label=08013_E_Asm: Undefined label $1
-
+asmw_e_duplicate_label=08014_E_Asm: Duplicate label $1
 
 #
 # Executing linker/assembler

+ 3 - 2
compiler/msgidx.inc

@@ -486,6 +486,7 @@ const
   asmw_e_value_exceeds_bounds=08011;
   asmw_e_short_jmp_out_of_range=08012;
   asmw_e_undefined_label=08013;
+  asmw_e_duplicate_label=08014;
   exec_w_source_os_redefined=09000;
   exec_i_assembling_pipe=09001;
   exec_d_cant_create_asmfile=09002;
@@ -594,9 +595,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 33191;
+  MsgTxtSize = 33223;
 
   MsgIdxMax : array[1..20] of longint=(
-    17,61,179,37,41,41,98,14,35,42,
+    17,61,179,37,41,41,98,15,35,42,
     30,1,1,1,1,1,1,1,1,1
   );

+ 80 - 79
compiler/msgtxt.inc

@@ -529,119 +529,120 @@ const msgtxt : array[0..000138,1..240] of char=(
   '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: Duplicate label $1'#000+
   '09000_W_Source operating system redefined'#000+
   '09001_I_Assembling (pipe) $1'#000+
-  '09002_E_Can'#039't create assember file: $1'#000+
-  '0900','3_E_Can'#039't create object file: $1'#000+
+  '09002_E_Can',#039't create assember file: $1'#000+
+  '09003_E_Can'#039't create object file: $1'#000+
   '09004_E_Can'#039't create archive file: $1'#000+
   '09005_E_Assembler $1 not found, switching to external assembling'#000+
   '09006_T_Using assembler: $1'#000+
   '09007_E_Error while assembling exitcode $1'#000+
-  '09008_E_Can'#039't call the assembler,',' error $1 switching to external'+
+  '0','9008_E_Can'#039't call the assembler, error $1 switching to external'+
   ' assembling'#000+
   '09009_I_Assembling $1'#000+
   '09010_I_Assembling smartlink $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+
+  '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+
   '09018_E_Creation of Executables not supported'#000+
-  '09019_E_Creation of Dynamic/Shared Libraries not supp','orted'#000+
+  '09019_E_Creation of D','ynamic/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+
   '09023_T_unit $1 can'#039't be static linked, switching to smart linking'+
   #000+
-  '09024_T_unit $1 can'#039't be smart linked, switchin','g to static linki'+
+  '09024_T_unit $1',' can'#039't be smart linked, switching to static linki'+
   'ng'#000+
   '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+
   'g'#000+
   '09026_E_unit $1 can'#039't be smart or static linked'#000+
   '09027_E_unit $1 can'#039't be shared or static linked'#000+
-  '09028_F_Can'#039't post process executable $1'#000+
-  '09029_F_Can'#039't ','open executable $1'#000+
+  '09028_F_Can'#039't post proc','ess executable $1'#000+
+  '09029_F_Can'#039't open executable $1'#000+
   '09030_X_Size of Code: $1 bytes'#000+
   '09031_X_Size of initialized data: $1 bytes'#000+
   '09032_X_Size of uninitialized data: $1 bytes'#000+
   '09033_X_Stack space reserved: $1 bytes'#000+
-  '09034_X_Stack space commited: $1 bytes'#000+
+  '09034_X_Stack space commited: $','1 bytes'#000+
   '10000_T_Unitsearch: $1'#000+
-  '1','0001_T_PPU Loading $1'#000+
+  '10001_T_PPU Loading $1'#000+
   '10002_U_PPU Name: $1'#000+
   '10003_U_PPU Flags: $1'#000+
   '10004_U_PPU Crc: $1'#000+
   '10005_U_PPU Time: $1'#000+
   '10006_U_PPU File too short'#000+
   '10007_U_PPU Invalid Header (no PPU at the begin)'#000+
-  '10008_U_PPU Invalid Version $1'#000+
-  '10009_U_PPU is compiled for',' an other processor'#000+
+  '10008_U_PPU Invalid Versio','n $1'#000+
+  '10009_U_PPU is compiled for an other processor'#000+
   '10010_U_PPU is compiled for an other target'#000+
   '10011_U_PPU Source: $1'#000+
   '10012_U_Writing $1'#000+
   '10013_F_Can'#039't Write PPU-File'#000+
   '10014_F_Error reading PPU-File'#000+
   '10015_F_unexpected end of PPU-File'#000+
-  '10016_F_Invalid PPU-File entry: $1'#000+
-  '1001','7_F_PPU Dbx count problem'#000+
+  '10016_F','_Invalid PPU-File entry: $1'#000+
+  '10017_F_PPU Dbx count problem'#000+
   '10018_E_Illegal unit name: $1'#000+
   '10019_F_Too much units'#000+
   '10020_F_Circular unit reference between $1 and $2'#000+
   '10021_F_Can'#039't compile unit $1, no sources available'#000+
-  '10022_F_Can'#039't find unit $1'#000+
-  '10023_W_Unit $1 was not found bu','t $2 exists'#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+
   '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 f','or $2'#000+
+  '10028_U_Re','compiling $1, checksum changed for $2'#000+
   '10029_U_Recompiling $1, source found only'#000+
   '10030_U_Recompiling unit, static lib is older than ppufile'#000+
   '10031_U_Recompiling unit, shared lib is older than ppufile'#000+
-  '10032_U_Recompiling unit, obj and asm are older than ppufile'#000+
-  '10033_U_Recom','piling unit, obj is older than asm'#000+
+  '10032_U_Recompiling unit, obj and asm are ','older than ppufile'#000+
+  '10033_U_Recompiling unit, obj is older than asm'#000+
   '10034_U_Parsing interface of $1'#000+
   '10035_U_Parsing implementation of $1'#000+
   '10036_U_Second load for unit $1'#000+
   '10037_U_PPU Check file $1 time $2'#000+
-  '10038_H_Conditional $1 was not set at startup in last compilation of $',
-  '2'#000+
+  '10038_H_Conditional $1 was not set at ','startup in last compilation of'+
+  ' $2'#000+
   '10039_H_Conditional $1 was set at startup in last compilation of $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+
-  '11000_$1 [options] <inputfile> [options]'#000+
-  '11001_W_Only o','ne source file supported'#000+
+  '11000_$1 [options] <inp','utfile> [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+
-  '11006_E_Illegal parameter: $1'#000+
-  '11007_H','_-? writes help pages'#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 on DOS platform, reverting to static'+
-  #000+
-  '11','013_F_too many IF(N)DEFs'#000+
+  '11012_W_Shared libs not supported on DOS ','platform, reverting to stat'+
+  'ic'#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 -dGDB'#000+
-  '11018_E_You are using the obsolete ','switch $1'#000+
+  '110','18_E_You are using the obsolete switch $1'#000+
   '11019_E_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+
-  '11022_W_"$1" assembler use forced'#000+
-  '11026','_T_Reading options from file $1'#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+
   '11023_Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#010+
-  'Copyright (c) 1993-2000 by Florian Klae','mpfl'#000+
+  'Copyrig','ht (c) 1993-2000 by Florian Klaempfl'#000+
   '11024_Free Pascal Compiler version $FPCVER'#010+
   #010+
   'Compiler Date  : $FPCDATE'#010+
@@ -651,27 +652,27 @@ const msgtxt : array[0..000138,1..240] of char=(
   '  $OSTARGETS'#010+
   #010+
   'This program comes under the GNU General Public Licence'#010+
-  'For more information read COPYING.FPC'#010+
+  'For more inform','ation read COPYING.FPC'#010+
   #010+
-  'Report b','ugs,suggestions etc to:'#010+
+  'Report bugs,suggestions etc to:'#010+
   '                 [email protected]'#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+
+  '**2al_','list sourcecode lines in assembler file'#010+
   '**2ar_list register allocation/release info in assembler file'#010+
   '**2at_list temp allocation/release info in assembler file'#010+
   '**1b_generate browser info'#010+
   '**2bl_generate local symbol info'#010+
-  '**1B_build all modules'#010+
-  '**1C<x>_code generation optio','ns:'#010+
+  '**1B_build all modul','es'#010+
+  '**1C<x>_code generation options:'#010+
   '**2CD_create also dynamic library (not supported)'#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+
-  '**2Cr_range checking'#010+
-  '**2Cs<n>_set stack size to ','<n>'#010+
+  '**2Cr_range chec','king'#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+
@@ -679,137 +680,137 @@ const msgtxt : array[0..000138,1..240] of char=(
   '*O2Dd<x>_set description to <x>'#010+
   '*O2Dw_PM application'#010+
   '**1e<x>_set path to executable'#010+
-  '**1E_same as -Cn'#010+
-  '**1F<x>_set file nam','es and paths:'#010+
+  '**1E_','same as -Cn'#010+
+  '**1F<x>_set file names and paths:'#010+
   '**2FD<x>_sets the directory where to search for compiler utilities'#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+
-  '*L2FL<x>_use','s <x> as dynamic linker'#010+
+  '**2Fl<x>_adds ','<x> to library path'#010+
+  '*L2FL<x>_uses <x> as dynamic linker'#010+
   '**2Fo<x>_adds <x> to object path'#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+
+  '*g1g_generate debugger informat','ion:'#010+
   '*g2gg_use gsym'#010+
-  '*g2gd_use db','x'#010+
+  '*g2gd_use dbx'#010+
   '*g2gh_use heap trace unit (for memory leak debugging)'#010+
   '*g2gl_use line info unit to show more info for backtraces'#010+
   '*g2gc_generate checks for pointers'#010+
   '**1i_information'#010+
   '**2iD_return compiler date'#010+
-  '**2iV_return compiler version'#010+
-  '**2iSO_return com','piler OS'#010+
+  '**2iV_return co','mpiler version'#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+
   '**1l_write logo'#010+
-  '**1n_don'#039't read the default config file'#010+
-  '**1o<x>_change the name',' of the executable produced to <x>'#010+
+  '**1n_don'#039't read the default con','fig file'#010+
+  '**1o<x>_change the name of the executable produced to <x>'#010+
   '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+
   '*L1P_use pipes instead of creating temporary assembler files'#010+
   '**1S<x>_syntax options:'#010+
-  '**2S2_switch some Delphi 2 extensions on'#010+
-  '**2Sc_supports oper','ators like C (*=,+=,/= and -=)'#010+
+  '**2S2_switch some Delphi 2 e','xtensions on'#010+
+  '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+
   '**2Sa_include assertion code.'#010+
   '**2Sd_tries to be Delphi compatible'#010+
   '**2Se<x>_compiler stops after the <x> errors (default is 1)'#010+
   '**2Sg_allow LABEL and GOTO'#010+
   '**2Sh_Use ansistrings'#010+
-  '**2Si_support C++ styled INLINE'#010+
-  '**','2Sm_support macros like C (global)'#010+
+  '**','2Si_support C++ styled INLINE'#010+
+  '**2Sm_support macros like C (global)'#010+
   '**2So_tries to be TP/BP 7.0 compatible'#010+
   '**2Sp_tries to be gpc compatible'#010+
   '**2Ss_constructor name must be init (destructor must be done)'#010+
   '**2St_allow static keyword in objects'#010+
-  '**1s_don'#039't call assembler and lin','ker (only with -a)'#010+
+  '*','*1s_don'#039't call assembler and linker (only with -a)'#010+
   '**1u<x>_undefines the symbol <x>'#010+
   '**1U_unit options:'#010+
   '**2Un_don'#039't check the unit name'#010+
   '**2Ur_generate release unit files'#010+
   '**2Us_compile a system unit'#010+
-  '**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
-  '**2*_e :',' Show errors (default)       d : Show debug info'#010+
+  '**1v<x>_Be verbose. <x> is a combination of',' the following letters:'#010+
+  '**2*_e : Show errors (default)       d : Show debug info'#010+
   '**2*_w : Show warnings               u : Show unit info'#010+
   '**2*_n : Show notes                  t : Show tried/used files'#010+
-  '**2*_h : Show hints                  m : Show defined macros'#010+
-  '**2*_i : Sh','ow general info           p : Show compiled procedures'#010+
+  '**2*_h : Show hints                  m :',' Show defined macros'#010+
+  '**2*_i : Show general info           p : Show compiled procedures'#010+
   '**2*_l : Show linenumbers            c : Show conditionals'#010+
   '**2*_a : Show everything             0 : Show nothing (except errors)'#010+
-  '**2*_b : Show all procedure          r : Rhide/GCC compa','tibility mod'+
+  '**2*_b : Show all proced','ure          r : Rhide/GCC compatibility mod'+
   'e'#010+
   '**2*_    declarations if an error    x : Executable info (Win32 only)'#010+
   '**2*_    occurs'#010+
   '**1X_executable options:'#010+
   '*L2Xc_link with the c library'#010+
   '**2Xs_strip all symbols from executable'#010+
-  '**2XD_try to link dynamic          (defines F','PC_LINK_DYNAMIC)'#010+
+  '**2XD_try to ','link dynamic          (defines FPC_LINK_DYNAMIC)'#010+
   '**2XS_try to link static (default) (defines FPC_LINK_STATIC)'#010+
   '**2XX_try to link smart            (defines FPC_LINK_SMART)'#010+
   '**0*_Processor specific options:'#010+
   '3*1A<x>_output format:'#010+
-  '3*2Aas_assemble using GNU AS'#010+
-  '3*2Aasaout_assemb','le using GNU AS for aout (Go32v1)'#010+
+  '3*2Aas_assembl','e using GNU AS'#010+
+  '3*2Aasaout_assemble using GNU AS for aout (Go32v1)'#010+
   '3*2Anasmcoff_coff (Go32v2) file using Nasm'#010+
   '3*2Anasmelf_elf32 (Linux) file using Nasm'#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*2Acoff_','coff (Go32v2) using internal writer'#010+
+  '3*2Atasm_obj fil','e using Tasm (Borland)'#010+
+  '3*2Acoff_coff (Go32v2) using internal writer'#010+
   '3*2Apecoff_pecoff (Win32) using internal writer'#010+
   '3*1R<x>_assembler reading style:'#010+
   '3*2Ratt_read AT&T style assembler'#010+
   '3*2Rintel_read Intel style assembler'#010+
-  '3*2Rdirect_copy assembler text directly to assembler',' file'#010+
+  '3*2Rdirect_copy asse','mbler text directly to assembler file'#010+
   '3*1O<x>_optimizations:'#010+
   '3*2Og_generate smaller code'#010+
   '3*2OG_generate faster code (default)'#010+
   '3*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*2O1_level 1 optimizati','ons (quick optimizations)'#010+
+  '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#010+
   '3*2O3_level 3 optimizations (-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+
+  '3*3Op2_set target processor to Pe','ntium/PentiumMMX (tm)'#010+
+  '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#010+
   '3*1T<x>_Target operating system:'#010+
   '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#010+
   '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#010+
   '3*2TLINUX_Linux'#010+
-  '3*2Tnetware_Novell Netware Module (experimental)'#010+
-  '3*','2TOS2_OS/2 2.x'#010+
+  '3*2Tnetware_Novell ','Netware Module (experimental)'#010+
+  '3*2TOS2_OS/2 2.x'#010+
   '3*2TSUNOS_SunOS/Solaris'#010+
   '3*2TWin32_Windows 32 Bit'#010+
   '3*1W<x>_Win32 target options'#010+
   '3*2WB<x>_Set Image base to Hexadecimal <x> value'#010+
   '3*2WC_Specify console type application'#010+
-  '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+
-  '3*2WF_S','pecify full-screen type application (OS/2 only)'#010+
+  '3*2WD_Use DEFFILE to export',' functions of DLL or EXE'#010+
+  '3*2WF_Specify full-screen type application (OS/2 only)'#010+
   '3*2WG_Specify graphic type application'#010+
   '3*2WN_Do not generate relocation code (necessary for debugging)'#010+
   '3*2WR_Generate relocation code'#010+
   '6*1A<x>_output format'#010+
-  '6*2Aas_Unix o-file using GNU AS'#010+
-  '6*2A','gas_GNU Motorola assembler'#010+
+  '6*2A','as_Unix o-file using GNU AS'#010+
+  '6*2Agas_GNU Motorola assembler'#010+
   '6*2Amit_MIT Syntax (old GAS)'#010+
   '6*2Amot_Standard Motorola assembler'#010+
   '6*1O_optimizations:'#010+
   '6*2Oa_turn on the optimizer'#010+
   '6*2Og_generate smaller code'#010+
   '6*2OG_generate faster code (default)'#010+
-  '6*2Ox_optimize maximum (still BUGGY','!!!)'#010+
+  '6*2','Ox_optimize maximum (still BUGGY!!!)'#010+
   '6*2O2_set target processor to a MC68020+'#010+
   '6*1R<x>_assembler reading style:'#010+
   '6*2RMOT_read motorola style assembler'#010+
   '6*1T<x>_Target operating system:'#010+
   '6*2TAMIGA_Commodore Amiga'#010+
   '6*2TATARI_Atari ST/STe/TT'#010+
-  '6*2TMACOS_Macintosh m68k'#010+
-  '6*2TLINUX_Lin','ux-68k'#010+
+  '6*2TMA','COS_Macintosh m68k'#010+
+  '6*2TLINUX_Linux-68k'#010+
   '**1*_'#010+
   '**1?_shows this help'#010+
   '**1h_shows this help without waiting'#000