浏览代码

* m68k compiler compiles again

peter 27 年之前
父节点
当前提交
3d984e5bf1
共有 12 个文件被更改,包括 190 次插入159 次删除
  1. 7 6
      compiler/cg68kcnv.pas
  2. 7 29
      compiler/cg68kinl.pas
  3. 31 1
      compiler/cg68kld.pas
  4. 5 2
      compiler/cg68kmem.pas
  5. 1 0
      compiler/msgidx.inc
  6. 109 109
      compiler/msgtxt.inc
  7. 5 2
      compiler/pass_1.pas
  8. 5 2
      compiler/tccal.pas
  9. 5 2
      compiler/tcflw.pas
  10. 5 2
      compiler/tcinl.pas
  11. 5 2
      compiler/tcld.pas
  12. 5 2
      compiler/tcset.pas

+ 7 - 6
compiler/cg68kcnv.pas

@@ -1227,10 +1227,8 @@ implementation
          emitl(A_LABEL,l2); }
       end;
 
-    procedure second_pchar_to_ansistring(p,hp : ptree;convtyp : tconverttype);
-
+    procedure second_pchar_to_string(p,hp : ptree;convtyp : tconverttype);
       begin
-         p^.location.loc:=LOC_REGISTER;
          internalerror(12121);
       end;
 
@@ -1243,7 +1241,6 @@ implementation
 ****************************************************************************}
 
     procedure secondtypeconv(var p : ptree);
-
       const
          secondconvert : array[tconverttype] of
            tsecondconvproc = (second_nothing,second_nothing,
@@ -1272,7 +1269,8 @@ implementation
            second_nothing,
            second_load_smallset,
            second_ansistring_to_pchar,
-           second_pchar_to_ansistring);
+           second_pchar_to_string,
+           second_nothing);
 
       begin
          { this isn't good coding, I think tc_bool_2_int, shouldn't be }
@@ -1376,7 +1374,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.5  1998-09-17 09:42:23  peter
+  Revision 1.6  1998-10-06 20:48:56  peter
+    * m68k compiler compiles again
+
+  Revision 1.5  1998/09/17 09:42:23  peter
     + pass_2 for cg386
     * Message() -> CGMessage() for pass_1/pass_2
 

+ 7 - 29
compiler/cg68kinl.pas

@@ -502,40 +502,15 @@ implementation
          ispushed : boolean;
          hregister : tregister;
          otlabel,oflabel,filenamestring : plabel;
-
+         oldpushedparasize : longint;
       begin
       { save & reset pushedparasize }
          oldpushedparasize:=pushedparasize;
          pushedparasize:=0;
          case p^.inlinenumber of
-            in_assert_x:
+            in_assert_x_y:
               begin
-{ !!!!!!!!! }
-(*               otlabel:=truelabel;
-                 oflabel:=falselabel;
-                 getlabel(truelabel);
-                 getlabel(falselabel);
-                 getlabel(filenamestring);
-                 secondpass(p^.left);
-                 if codegenerror then
-                   exit;
-                 if cs_do_assertion in aktlocalswitches then
-                   begin
-                      maketojumpbool(p^.left);
-                      emitl(A_LABEL,falselabel);
-                      exprasmlist^.concat(new(pai386,op_const(A_PUSH,S_L,
-                        p^.fileinfo.line)));
-                      { generate string }
-                      { push string
-                      exprasmlist^.concat(new(pai386,op_const(A_PUSH,S_L,
-                        p^.fileinfo.line)));
-                      }
-                      emitcall('FPC_DO_ASSERT',true);
-                      emitl(A_LABEL,truelabel);
-
-                   end;
-                 truelabel:=otlabel;
-                 falselabel:=oflabel; *)
+               { !!!!!!!!! }
               end;
             in_lo_word,
             in_hi_word :
@@ -907,7 +882,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.5  1998-09-20 12:26:39  peter
+  Revision 1.6  1998-10-06 20:48:58  peter
+    * m68k compiler compiles again
+
+  Revision 1.5  1998/09/20 12:26:39  peter
     * merged fixes
 
   Revision 1.4  1998/09/17 09:42:26  peter

+ 31 - 1
compiler/cg68kld.pas

@@ -40,6 +40,7 @@ interface
     procedure secondload(var p : ptree);
     procedure secondassignment(var p : ptree);
     procedure secondfuncret(var p : ptree);
+    procedure secondarrayconstruct(var p : ptree);
 
 
 implementation
@@ -476,11 +477,40 @@ implementation
            end;
       end;
 
+{*****************************************************************************
+                           SecondArrayConstruct
+*****************************************************************************}
+
+      const
+        vtInteger    = 0;
+        vtBoolean    = 1;
+        vtChar       = 2;
+        vtExtended   = 3;
+        vtString     = 4;
+        vtPointer    = 5;
+        vtPChar      = 6;
+        vtObject     = 7;
+        vtClass      = 8;
+        vtWideChar   = 9;
+        vtPWideChar  = 10;
+        vtAnsiString = 11;
+        vtCurrency   = 12;
+        vtVariant    = 13;
+        vtInterface  = 14;
+        vtWideString = 15;
+        vtInt64      = 16;
+
+    procedure secondarrayconstruct(var p : ptree);
+      begin
+      end;
 
 end.
 {
   $Log$
-  Revision 1.2  1998-09-17 09:42:27  peter
+  Revision 1.3  1998-10-06 20:48:59  peter
+    * m68k compiler compiles again
+
+  Revision 1.2  1998/09/17 09:42:27  peter
     + pass_2 for cg386
     * Message() -> CGMessage() for pass_1/pass_2
 

+ 5 - 2
compiler/cg68kmem.pas

@@ -555,7 +555,7 @@ implementation
                         new(hp);
                         reset_reference(hp^);
                         parraydef(p^.left^.resulttype)^.genrangecheck;
-                        hp^.symbol:=stringdup('R_'+tostr(parraydef(p^.left^.resulttype)^.rangenr));
+                        hp^.symbol:=stringdup(parraydef(p^.left^.resulttype)^.getrangecheckstring);
                         emit_bounds_check(hp^,ind);
                      end;
                 end;
@@ -691,7 +691,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.5  1998-09-17 09:42:28  peter
+  Revision 1.6  1998-10-06 20:49:00  peter
+    * m68k compiler compiles again
+
+  Revision 1.5  1998/09/17 09:42:28  peter
     + pass_2 for cg386
     * Message() -> CGMessage() for pass_1/pass_2
 

+ 1 - 0
compiler/msgidx.inc

@@ -192,6 +192,7 @@ type tmsgconst=(
   sym_e_forward_not_resolved,
   sym_f_id_already_typed,
   sym_e_error_in_type_def,
+  sym_e_type_id_not_defined,
   sym_e_forward_type_not_resolved,
   sym_e_only_static_in_static,
   sym_e_invalid_call_tvarsymmangledname,

+ 109 - 109
compiler/msgtxt.inc

@@ -199,28 +199,29 @@ const msgtxt : array[0..00088,1..240] of char=(+
   'E_Forward declaration not solved $1'#000+
   'F_Identifier type already defined as type'#000+
   'E_Error in type definition'#000+
-  'E_Fo','rward type not resolved $1'#000+
+  'E_Ty','pe identifier not defined'#000+
+  'E_Forward type not resolved $1'#000+
   'E_Only static variables can be used in static methods or outside metho'+
   'ds'#000+
   'E_Invalid call to tvarsym.mangledname()'#000+
   'F_record or class type expected'#000+
-  'E_Instances of classes or objects with an abtsract method are not al','l'+
-  'owed'#000+
+  'E_Instances of classes or objects with',' an abtsract method are not al'+
+  'lowed'#000+
   'E_Label not defined $1'#000+
   'E_Illegal label declaration'#000+
   'E_GOTO und LABEL are not supported (use command line switch -Sg)'#000+
   'E_Label not found'#000+
   'E_identifier isn'#039't a label'#000+
   'E_label already defined'#000+
-  'E_illegal type declaration of set elements'#000+
-  'E_Forw','ard class definition not resolved $1'#000+
+  'E_illegal type decl','aration of set elements'#000+
+  'E_Forward class definition not resolved $1'#000+
   'H_Parameter not used $1'#000+
   'N_Local variable not used $1'#000+
   'E_Set type expected'#000+
   'W_Function result does not seem to be set'#000+
   'E_Unknown field identifier'#000+
-  'W_Local variable $1 does not seem to be initialized'#000+
-  'E_identif','ier idents no member $1'#000+
+  'W_Local variable $1 does not se','em to be initialized'#000+
+  'E_identifier idents no member $1'#000+
   'B_Found declaration: $1'#000+
   'E_BREAK not allowed'#000+
   'E_CONTINUE not allowed'#000+
@@ -228,199 +229,199 @@ const msgtxt : array[0..00088,1..240] of char=(+
   'E_Illegal expression'#000+
   'E_Invalid integer'#000+
   'E_Illegal qualifier'#000+
-  'E_High range limit < low range limit'#000+
-  'E_I','llegal counter variable'#000+
+  'E_High ran','ge limit < low range limit'#000+
+  'E_Illegal counter variable'#000+
   'E_Can'#039't determine which overloaded function to call'#000+
   'E_Parameter list size exceeds 65535 bytes'#000+
   'E_Illegal type conversion'#000+
   'E_File types must be var parameters'#000+
-  'E_The use of a far pointer isn'#039't allowed there'#000+
-  'E_illegal cal','l by reference parameters'#000+
+  'E_The use of a far pointer isn',#039't allowed there'#000+
+  'E_illegal call by reference parameters'#000+
   'E_EXPORT declared functions can'#039't be called'#000+
   'W_Possible illegal call of constructor or destructor (doesn'#039't matc'+
   'h to this context)'#000+
   'N_Inefficient code'#000+
   'W_unreachable code'#000+
-  'E_procedure call with stackframe ESP/SP'#000+
-  'E_Abstr','act methods can'#039't be called directly'#000+
+  'E_procedure call ','with stackframe ESP/SP'#000+
+  'E_Abstract methods can'#039't be called directly'#000+
   'F_Internal Error in getfloatreg(), allocation failure'#000+
   'F_Unknown float type'#000+
   'F_SecondVecn() base defined twice'#000+
   'F_Extended cg68k not supported'#000+
-  'F_32-bit unsigned not supported in MC68000 mode'#000+
-  'F_Internal Erro','r in secondinline()'#000+
+  'F_32-bit unsigned not supported i','n MC68000 mode'#000+
+  'F_Internal Error in secondinline()'#000+
   'D_Register $1 weight $2 $3'#000+
   'E_Stack limit excedeed in local routine'#000+
   'D_Stack frame is omited'#000+
   'E_Unable to inline object methods'#000+
   'E_Unable to inline procvar calls'#000+
-  'E_No code for inline procedure stored'#000+
-  'F_Divide by zero in asm ','evaluator'#000+
+  'E_No code for inline procedure s','tored'#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 Operator in asm evaluator'#000+
   'F_Unknown error in asm evaluator'#000+
   'W_Invalid numeric value'#000+
-  'E_escape sequence ignored: $1'#000+
-  'E_Asm synt','ax error - Prefix not found'#000+
+  'E_escape s','equence 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_Invalid symbol reference'#000+
   'W_Calling an overload function in an asm'#000+
-  'E_Constant value out of bounds'#000+
-  'E_Non-label pattern',' contains @'#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 octal 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 i','n Findtype()'#000+
+  'E_Invalid lab','eled 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_Invalid Opcode'#000+
   'E_Constant reference not allowed'#000+
   'W_Fwait can cause emulation problems with emu387'#000+
-  'E_Invalid combination of opcode ','and operands'#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+
   'E_Invalid size in reference'#000+
   'E_Invalid middle sized operand'#000+
   'E_Invalid three operand opcode'#000+
-  'E_Assembler syntax error'#000+
+  'E_Assembler syntax error'#000,+
   'E_Invalid operand type'#000+
-  'E_Segme','nt overrides not supported'#000+
+  'E_Segment overrides not supported'#000+
   'E_Invalid constant symbol $1'#000+
   'F_Internal Errror converting binary'#000+
   'F_Internal Errror converting hexadecimal'#000+
   'F_Internal Errror converting octal'#000+
   'E_Invalid constant expression'#000+
-  'E_Unknown identifier: $1'#000+
-  'E_Trying to defin','e an index register more than once'#000+
+  'E_Unknown id','entifier: $1'#000+
+  'E_Trying to define an index register more than once'#000+
   'E_Invalid field specifier'#000+
   'F_Internal Error in BuildScaling()'#000+
   'E_Invalid scaling factor'#000+
   'E_Invalid scaling value'#000+
   'E_Scaling value only allowed with index'#000+
-  'E_Invalid assembler syntax. No ref with brackets)'#000+
-  'E_Exp','ressions of the form [sreg:reg...] are currently not supported'#000+
+  'E_Invalid assembler synta','x. 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 base register twice'#000+
   'E_Trying to use a negative index register'#000+
-  'E_Asm syntax error - error in reference'#000+
-  'E_Local sy','mbols not allowed as references'#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 Reference syntax'#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_Ca','lling of an overloaded function in direct assembler'#000+
+  'E_Null label r','eferences are not allowed'#000+
+  'W_Calling of an overloaded function in direct assembler'#000+
   'E_Cannot use SELF outside a method'#000+
   'E_Asm syntax error - Should start with bracket'#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_Asm synta','x 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 may result in erro'+
   'rs if an interrupt occurs'#000+
-  'E_Invalid or missing opcode'#000+
-  'E_Invalid combinat','ion of prefix and opcode: $1'#000+
+  'E_Invalid or mis','sing 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_Duplicate local symbol: $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+
+  'E_Undefined loca','l 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_/ at beginning of line not allowed'#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+
+  'W_M','odulo 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 representation ignored'#000+
-  'W_Floating point hexadecimal representation ignored'#000+
-  'W_Floating point oct','al representation ignored'#000+
+  'W_Floating point hexadecimal representatio','n ignored'#000+
+  'W_Floating point octal representation ignored'#000+
   'E_Invalid real constant expression'#000+
   'E_Parenthesis are not allowed'#000+
   'E_Invalid Reference'#000+
   'E_Cannot use __SELF outside a method'#000+
   'E_Cannot use __OLDEBP outside a nested procedure'#000+
-  'W_Identifier $1 supposed external'#000+
-  'E_Invalid',' segment override expression'#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+
-  'E_Switching sections is not allowed in an assembler block'#000+
+  'E_Switching sections is not allowed in an assembler block'#000,+
   'E_Invalid global definition'#000+
-  'E_','Line separator expected'#000+
+  'E_Line separator expected'#000+
   'W_globl not supported'#000+
   'W_align not supported'#000+
   'W_lcomm not supported'#000+
   'W_comm not supported'#000+
   'E_Invalid local common definition'#000+
   'E_Invalid global common definition'#000+
-  'E_local symbol: $1 not found inside asm statement'#000+
-  'E_assemble','r code not returned to text'#000+
+  'E_local symbol: $1 not found i','nside asm statement'#000+
+  'E_assembler code not returned to text'#000+
   'F_internal error in BuildReference()'#000+
   'E_invalid opcode size'#000+
   'W_NEAR ignored'#000+
   'W_FAR ignored'#000+
   'D_Creating inline asm lookup tables'#000+
   'W_Using a defined name as a local label'#000+
-  'F_internal error in HandleExtend()'#000+
-  'E_Invalid cha','racter: <'#000+
+  'F_internal error i','n HandleExtend()'#000+
+  'E_Invalid character: <'#000+
   'E_Invalid character: >'#000+
   'E_Unsupported opcode'#000+
   'E_Increment and Decrement mode not allowed together'#000+
   'E_Invalid Register list in movem/fmovem'#000+
   'E_Invalid Register list for opcode'#000+
-  'E_68020+ mode required to assemble'#000+
-  'D_Starting Motorola styl','ed assembler parsing...'#000+
+  'E_68020+ mode required to ass','emble'#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 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+
+  '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+
   'F_Too many assembler files'#000+
   'F_Selected assembler output not supported'#000+
   'E_Unsupported symbol type for operand'#000+
-  'I_Assembling (pipe) $1'#000+
-  'E_Can'#039't create asse','mber file $1'#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+
   'U_Using assembler: $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+
+  'I_Assembl','ing $1'#000+
+  'W_Linker $1 not found, switching to external linking'#000+
   'U_Using linker: $1'#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+
+  'W_Can'#039't call the linker, switching to external linking',#000+
   'I_Linking $1'#000+
-  'W_binder not fou','nd, switching to external binding'#000+
+  'W_binder not found, switching to external binding'#000+
   'W_ar not found, switching to external ar'#000+
   'E_Dynamic Libraries not supported'#000+
   'I_Closing script $1'#000+
   'U_PPU Loading $1'#000+
   'D_PPU Time: $1'#000+
   'D_PPU File too short'#000+
-  'D_PPU Invalid Header (no PPU at the begin)'#000+
-  'D_PPU Invalid V','ersion $1'#000+
+  'D_PPU Invalid Header (no PPU',' at the begin)'#000+
+  'D_PPU Invalid Version $1'#000+
   'D_PPU Flags: $1'#000+
   'D_PPU Crc: $1'#000+
   'T_PPU Source: $1'#000+
@@ -429,58 +430,58 @@ const msgtxt : array[0..00088,1..240] of char=(+
   'T_Unitsearch: $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_rea','ding PPU-File'#000+
+  'F_unexpected end of PPU-File'#000+
   'F_Invalid PPU-File entry: $1'#000+
   'F_PPU Dbx count problem'#000+
   'E_Illegal unit name: $1'#000+
   'F_Too much units'#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 -U','s switch'#000+
+  'W_Compiling t','he system unit requires the -Us switch'#000+
   'F_There were $1 errors compiling module, stopping'#000+
   'T_From $1 ($2) load unit $3'#000+
   '$1 [options] <inputfile> [options]'#000+
   'W_Only one source file supported'#000+
   'W_DEF file can be created only for OS/2'#000+
-  'E_nested response files are not supported'#000+
-  'F_N','o source file name in command line'#000+
+  'E_nested respon','se files are not supported'#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_Share','d 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+
   '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+
-  '**2al_list sourcecode lines in assembler file'#000+
-  '*t','1b_use EMS'#000+
+  '**2al_list sourcec','ode lines in assembler file'#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+
-  '**2Co_check overflow of integer operations'#000+
-  '**2Cr_rang','e checking'#000+
+  '**2Co_check overflow of',' integer operations'#000+
+  '**2Cr_range checking'#000+
   '**2Cs<n>_set stack size to <n>'#000+
   '**2Ct_stack checking'#000+
   '3*2CS_create static library'#000+
@@ -488,96 +489,95 @@ const msgtxt : array[0..00088,1..240] of char=(+
   '**1d<x>_defines the symbol <x>'#000+
   '*O1D_generate a DEF file'#000+
   '*O2Dd<x>_set description to <x>'#000+
-  '*O2Dw_PM application'#000+
-  '**1e<x>_set path ','to executable'#000+
+  '*O2Dw_PM',' application'#000+
+  '**1e<x>_set path to executable'#000+
   '**1E_same as -Cn'#000+
   '**1F_set file names and paths'#000+
   '**2Fe<x>_redirect error output to <x>'#000+
   '**2FE<x>_set exe/unit output path to <x>'#000+
   '*L2Fg<x>_same as -Fl'#000+
   '**2Fi<x>_adds <x> to include path'#000+
-  '**2Fl<x>_adds <x> to library path'#000+
-  '*L2FL<x>_us','es <x> as dynamic linker'#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+
-  '*g1g_generate debugger information'#000+
+  '*g1g_generate debugger informati','on'#000+
   '*g2gg_use gsym'#000+
-  '*g2gd_use db','x'#000+
+  '*g2gd_use dbx'#000+
   '**1i_information'#000+
   '**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 executable produced to <x>'#000+
-  '**1pg_generate profile code for gprof'#000+
-  '*L1P_','use pipes instead of creating temporary assembler files'#000+
+  '**1pg_generat','e 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+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+
   '**2Sd_tries to be Delphi compatible'#000+
-  '**2Se_compiler stops after the first ','error'#000+
+  '**2Se_c','ompiler 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+
-  '**2Ss_constructor name must be init (destructor must be done)'#000+
-  '**2S','t_allow static keyword in objects'#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 symbol <x>'#000+
   '**1U_unit options'#000+
-  '**2Un_don'#039't check the unit name'#000+
-  '**2Up<x>_','same as -Fu<x>'#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+
   '**2*_e : Show errors (default)       d : Show debug info'#000+
-  '**2*_w : Show warnings               u : Show used files'#000+
-  '**2*_n : Show n','otes                  t : Show tried files'#000+
+  '**2*_w : Show warnings               u : S','how used files'#000+
+  '**2*_n : Show notes                  t : Show tried files'#000+
   '**2*_h : Show hints                  m : Show defined macros'#000+
   '**2*_i : Show general info           p : Show compiled procedures'#000+
-  '**2*_l : Show linenumbers            c : Show conditionals'#000+
-  '**2*_a : Sh','ow everything             0 : Show nothing (except errors'+
-  ')'#000+
+  '**2*_l : Show linenumbers            c :',' Show conditionals'#000+
+  '**2*_a : Show everything             0 : Show nothing (except errors)'#000+
   '**2*_b : Show all procedure'#000+
   '**2*_    declarations if an error'#000+
   '**2*_    occurs'#000+
   '**1X_executable options'#000+
   '*L2Xc_link with the c library'#000+
-  '**2XD_link with dynamic libraries (defines FPC_LI','NK_DYNAMIC)'#000+
+  '**2XD_link with dyn','amic 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 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*2Anasmcoff_co','ff file using Nasm'#000+
+  '3*2Anasmelf_elf32 (linux) file using Nasm'#000+
   '3*2Anasmobj_obj file using Nasm'#000+
   '3*2Amasm_obj using Masm (Mircosoft)'#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*2R','direct_copy assembler text directly to assembler file'#000+
+  '3*2Rintel_r','ead Intel style assembler'#000+
+  '3*2Rdirect_copy assembler text directly to assembler file'#000+
   '3*1O<x>_optimizations'#000+
   '3*2Og_generate smaller code'#000+
   '3*2OG_generate faster code (default)'#000+
   '3*2Or_keep certain variables in registers (still BUGGY!!!)'#000+
-  '3*2Ou_enable uncertain optimizations (se','e docs)'#000+
+  '3*2Ou_enab','le 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*2Op_target processor'#000+
-  '3*3Op1_set target processor to 386/486'#000+
-  '3*3Op2_set target pr','ocessor to Pentium/PentiumMMX (tm)'#000+
+  '3*3Op1_set target processor t','o 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*1T<x>_Target operating system'#000+
   '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#000+
-  '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#000+
+  '3*2TGO32V2_version 2 of DJ Delorie DOS ex','tender'#000+
   '3*2TLINUX_Linux'#000+
-  '3*2TOS2','_OS/2 2.x'#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+
@@ -585,15 +585,15 @@ const msgtxt : array[0..00088,1..240] of char=(+
   '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_gen','erate smaller code'#000+
+  '6*2Oa_t','urn 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*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*1','T<x>_Target operating system'#000+
+  '6*2TAMIGA_Commodore Amiga'#000+
   '6*2TATARI_Atari ST/STe/TT'#000+
   '6*2TMACOS_Macintosh m68k'#000+
   '6*2TLINUX_Linux-68k'#000+

+ 5 - 2
compiler/pass_1.pas

@@ -45,7 +45,7 @@ implementation
       ,i386,tgeni386
 {$endif}
 {$ifdef m68k}
-      ,m68k,tgenm68k
+      ,m68k,tgen68k
 {$endif}
       ;
 
@@ -350,7 +350,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.95  1998-09-24 15:13:44  peter
+  Revision 1.96  1998-10-06 20:49:07  peter
+    * m68k compiler compiles again
+
+  Revision 1.95  1998/09/24 15:13:44  peter
     * fixed type node which was always set to void :(
 
   Revision 1.94  1998/09/23 20:42:22  peter

+ 5 - 2
compiler/tccal.pas

@@ -42,7 +42,7 @@ implementation
       ,i386,tgeni386
 {$endif}
 {$ifdef m68k}
-      ,m68k,tgeni386
+      ,m68k,tgen68k
 {$endif}
 {$ifdef UseBrowser}
       ,browser
@@ -921,7 +921,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.6  1998-10-02 09:24:22  peter
+  Revision 1.7  1998-10-06 20:49:09  peter
+    * m68k compiler compiles again
+
+  Revision 1.6  1998/10/02 09:24:22  peter
     * more constant expression evaluators
 
   Revision 1.5  1998/09/28 11:22:17  pierre

+ 5 - 2
compiler/tcflw.pas

@@ -49,7 +49,7 @@ implementation
       ,i386,tgeni386
 {$endif}
 {$ifdef m68k}
-      ,m68k,tgeni386
+      ,m68k,tgen68k
 {$endif}
       ;
 
@@ -482,7 +482,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.1  1998-09-23 20:42:24  peter
+  Revision 1.2  1998-10-06 20:49:10  peter
+    * m68k compiler compiles again
+
+  Revision 1.1  1998/09/23 20:42:24  peter
     * splitted pass_1
 
 }

+ 5 - 2
compiler/tcinl.pas

@@ -40,7 +40,7 @@ implementation
       ,i386,tgeni386
 {$endif}
 {$ifdef m68k}
-      ,m68k,tgenm68k
+      ,m68k,tgen68k
 {$endif}
       ;
 
@@ -848,7 +848,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.3  1998-10-05 12:32:49  peter
+  Revision 1.4  1998-10-06 20:49:11  peter
+    * m68k compiler compiles again
+
+  Revision 1.3  1998/10/05 12:32:49  peter
     + assert() support
 
   Revision 1.2  1998/10/02 09:24:23  peter

+ 5 - 2
compiler/tcld.pas

@@ -44,7 +44,7 @@ implementation
       ,i386,tgeni386
 {$endif}
 {$ifdef m68k}
-      ,m68k,tgenm68k
+      ,m68k,tgen68k
 {$endif}
       ;
 
@@ -399,7 +399,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.4  1998-09-28 11:07:40  peter
+  Revision 1.5  1998-10-06 20:49:12  peter
+    * m68k compiler compiles again
+
+  Revision 1.4  1998/09/28 11:07:40  peter
     + floatdef support for array of const
 
   Revision 1.3  1998/09/27 10:16:27  florian

+ 5 - 2
compiler/tcset.pas

@@ -42,7 +42,7 @@ implementation
       ,i386,tgeni386
 {$endif}
 {$ifdef m68k}
-      ,m68k,tgenm68k
+      ,m68k,tgen68k
 {$endif}
       ;
 
@@ -219,7 +219,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.1  1998-09-23 20:42:24  peter
+  Revision 1.2  1998-10-06 20:49:13  peter
+    * m68k compiler compiles again
+
+  Revision 1.1  1998/09/23 20:42:24  peter
     * splitted pass_1
 
 }