Prechádzať zdrojové kódy

* small m68k updates to bring it up2date
* give better error for external local variable

peter 21 rokov pred
rodič
commit
6c9c4c686c

+ 8 - 1
compiler/assemble.pas

@@ -193,6 +193,9 @@ Implementation
       finput,
       gdb,
 {$endif GDB}
+{$ifdef m68k}
+      cpuinfo,
+{$endif m68k}
       cpubase,aasmcpu
       ;
 
@@ -1680,7 +1683,11 @@ Implementation
 end.
 {
   $Log$
-  Revision 1.81  2004-10-31 21:45:02  peter
+  Revision 1.82  2004-11-09 22:32:59  peter
+    * small m68k updates to bring it up2date
+    * give better error for external local variable
+
+  Revision 1.81  2004/10/31 21:45:02  peter
     * generic tlocation
     * move tlocation to cgutils
 

+ 5 - 2
compiler/cgbase.pas

@@ -29,7 +29,6 @@ interface
 
     uses
       globtype,
-      aasmbase,
       symconst;
 
     type
@@ -598,7 +597,11 @@ finalization
 end.
 {
   $Log$
-  Revision 1.97  2004-11-09 16:18:12  peter
+  Revision 1.98  2004-11-09 22:32:59  peter
+    * small m68k updates to bring it up2date
+    * give better error for external local variable
+
+  Revision 1.97  2004/11/09 16:18:12  peter
     * indexword can't be used for 1.9.4
 
   Revision 1.96  2004/10/31 21:45:02  peter

+ 10 - 1
compiler/cgutils.pas

@@ -52,6 +52,11 @@ unit cgutils;
          addressmode : taddressmode;
          shiftmode   : tshiftmode;
 {$endif arm}
+{$ifdef m68k}
+         { indexed increment and decrement mode }
+         { (An)+ and -(An)                      }
+         direction : tdirection;
+{$endif m68k}
       end;
 
       tlocation = record
@@ -178,7 +183,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.3  2004-11-01 17:41:28  florian
+  Revision 1.4  2004-11-09 22:32:59  peter
+    * small m68k updates to bring it up2date
+    * give better error for external local variable
+
+  Revision 1.3  2004/11/01 17:41:28  florian
     * fixed arm compilation with cgutils
     * ...
 

+ 10 - 4
compiler/i386/ra386int.pas

@@ -82,7 +82,7 @@ Unit Ra386int;
        globals,verbose,
        systems,
        { aasm }
-       cpuinfo,aasmbase,aasmtai,aasmcpu,
+       aasmbase,aasmtai,aasmcpu,
        { symtable }
        symconst,symbase,symtype,symsym,symdef,symtable,
        { parser }
@@ -846,8 +846,10 @@ Unit Ra386int;
                       if assigned(sym) then
                        begin
                          case sym.typ of
-                           fieldvarsym :
-                             l:=tfieldvarsym(sym).getsize;
+                           globalvarsym,
+                           localvarsym,
+                           paravarsym :
+                             l:=tabstractvarsym(sym).getsize;
                            typedconstsym :
                              l:=ttypedconstsym(sym).getsize;
                            typesym :
@@ -2017,7 +2019,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.79  2004-11-08 22:09:59  peter
+  Revision 1.80  2004-11-09 22:32:59  peter
+    * small m68k updates to bring it up2date
+    * give better error for external local variable
+
+  Revision 1.79  2004/11/08 22:09:59  peter
     * tvarsym splitted
 
   Revision 1.78  2004/10/31 21:45:03  peter

+ 51 - 2
compiler/m68k/aasmcpu.pas

@@ -29,7 +29,7 @@ interface
 uses
   cclasses,aasmtai,
   aasmbase,globals,verbose,
-  cpubase,cpuinfo,cgbase;
+  cpubase,cpuinfo,cgbase,cgutils;
 
 
 const
@@ -95,6 +95,8 @@ type
   procedure InitAsm;
   procedure DoneAsm;
 
+    function spilling_create_load(const ref:treference;r:tregister): tai;
+    function spilling_create_store(r:tregister; const ref:treference): tai;
 
   implementation
 
@@ -416,6 +418,49 @@ type
       end;
 
 
+    function spilling_create_load(const ref:treference;r:tregister): tai;
+      begin
+        {
+        case getregtype(r) of
+          R_INTREGISTER :
+            result:=taicpu.op_ref_reg(A_LD,ref,r);
+          R_FPUREGISTER :
+            begin
+              case getsubreg(r) of
+                R_SUBFS :
+                  result:=taicpu.op_ref_reg(A_LDF,ref,r);
+                R_SUBFD :
+                  result:=taicpu.op_ref_reg(A_LDD,ref,r);
+                else
+                  internalerror(200401042);
+              end;
+            end
+          else
+            internalerror(200401041);
+        end;}
+      end;
+
+
+    function spilling_create_store(r:tregister; const ref:treference): tai;
+      begin
+        {case getregtype(r) of
+          R_INTREGISTER :
+            result:=taicpu.op_reg_ref(A_ST,r,ref);
+          R_FPUREGISTER :
+            begin
+              case getsubreg(r) of
+                R_SUBFS :
+                  result:=taicpu.op_reg_ref(A_STF,r,ref);
+                R_SUBFD :
+                  result:=taicpu.op_reg_ref(A_STD,r,ref);
+                else
+                  internalerror(200401042);
+              end;
+            end
+          else
+            internalerror(200401041);
+        end;}
+      end;
 
     procedure InitAsm;
       begin
@@ -429,7 +474,11 @@ type
 end.
 {
   $Log$
-  Revision 1.13  2004-06-20 08:55:31  florian
+  Revision 1.14  2004-11-09 22:32:59  peter
+    * small m68k updates to bring it up2date
+    * give better error for external local variable
+
+  Revision 1.13  2004/06/20 08:55:31  florian
     * logs truncated
 
   Revision 1.12  2004/06/20 08:47:33  florian

+ 18 - 5
compiler/m68k/aoptcpub.pas

@@ -1,10 +1,10 @@
  {
     $Id$
-    Copyright (c) 1998-2002 by Jonas Maebe, member of the Free Pascal
+    Copyright (c) 1998-2004 by Jonas Maebe, member of the Free Pascal
     Development Team
 
     This unit contains several types and constants necessary for the
-    optimizer to work on the 80x86 architecture
+    optimizer to work on the sparc architecture
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -24,6 +24,8 @@
 }
 Unit aoptcpub; { Assembler OPTimizer CPU specific Base }
 
+{$i fpcdefs.inc}
+
 { enable the following define if memory references can have both a base and }
 { index register in 1 operand                                               }
 
@@ -41,7 +43,7 @@ Unit aoptcpub; { Assembler OPTimizer CPU specific Base }
 Interface
 
 Uses
-  aasmcpu,AOptBase;
+  cpubase,aasmcpu,AOptBase;
 
 Type
 
@@ -62,7 +64,7 @@ Type
 { **************************** TAoptBaseCpu ******************************* }
 { ************************************************************************* }
 
-  TAoptBaseCpu = Object(TAoptBase)
+  TAoptBaseCpu = class(TAoptBase)
   End;
 
 
@@ -100,6 +102,9 @@ Const
 
   StoreDst = 1;
 
+  aopt_uncondjmp = A_JMP;
+  aopt_condjmp = A_Bxx;
+
 Implementation
 
 { ************************************************************************* }
@@ -117,7 +122,15 @@ End.
 
 {
  $Log$
- Revision 1.3  2004-06-20 08:55:31  florian
+ Revision 1.4  2004-11-09 22:32:59  peter
+   * small m68k updates to bring it up2date
+   * give better error for external local variable
+
+ Revision 1.1  2004/10/30 15:21:38  florian
+   * fixed generic optimizer
+   * enabled generic optimizer for sparc
+
+ Revision 1.6  2004/06/20 08:55:31  florian
    * logs truncated
 
 }

+ 47 - 0
compiler/m68k/aoptcpud.pas

@@ -0,0 +1,47 @@
+{
+    $Id$
+    Copyright (c) 1998-2004 by Jonas Maebe, member of the Free Pascal
+    Development Team
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+ ****************************************************************************
+}
+Unit aoptcpud;
+
+{$i fpcdefs.inc}
+
+  interface
+
+    uses
+      aoptda;
+
+    type
+      TAOptDFACpu = class(TAOptDFA)
+      end;
+
+  implementation
+
+end.
+{
+  $Log$
+  Revision 1.1  2004-11-09 22:32:59  peter
+    * small m68k updates to bring it up2date
+    * give better error for external local variable
+
+  Revision 1.1  2004/10/30 15:21:38  florian
+    * fixed generic optimizer
+    * enabled generic optimizer for sparc
+}

+ 19 - 15
compiler/m68k/cgcpu.pas

@@ -27,11 +27,11 @@ unit cgcpu;
   interface
 
     uses
-       cgbase,cgobj,
+       cgbase,cgobj,globtype,
        aasmbase,aasmtai,aasmcpu,
        cpubase,cpuinfo,cpupara,
        node,symconst,symtype,
-       cg64f32;
+       cgutils,cg64f32;
 
     type
       tcg68k = class(tcg)
@@ -39,7 +39,7 @@ unit cgcpu;
           procedure done_register_allocators;override;
           procedure a_call_name(list : taasmoutput;const s : string);override;
           procedure a_call_reg(list : taasmoutput;reg : tregister);override;
-          procedure a_load_const_reg(list : taasmoutput;size : tcgsize;a : aword;register : tregister);override;
+          procedure a_load_const_reg(list : taasmoutput;size : tcgsize;a : aint;register : tregister);override;
           procedure a_load_reg_ref(list : taasmoutput;fromsize,tosize : tcgsize;register : tregister;const ref : treference);override;
           procedure a_load_reg_reg(list : taasmoutput;fromsize,tosize : tcgsize;reg1,reg2 : tregister);override;
           procedure a_load_ref_reg(list : taasmoutput;fromsize,tosize : tcgsize;const ref : treference;register : tregister);override;
@@ -51,22 +51,22 @@ unit cgcpu;
           procedure a_loadmm_ref_reg(list: taasmoutput;fromsize,tosize : tcgsize; const ref: treference; reg: tregister;shuffle : pmmshuffle); override;
           procedure a_loadmm_reg_ref(list: taasmoutput;fromsize,tosize : tcgsize; reg: tregister; const ref: treference;shuffle : pmmshuffle); override;
           procedure a_parammm_reg(list: taasmoutput; size: tcgsize; reg: tregister;const locpara : tparalocation;shuffle : pmmshuffle); override;
-          procedure a_op_const_reg(list : taasmoutput; Op: TOpCG; size: tcgsize; a: AWord; reg: TRegister); override;
+          procedure a_op_const_reg(list : taasmoutput; Op: TOpCG; size: tcgsize; a: aint; reg: TRegister); override;
           procedure a_op_reg_reg(list : taasmoutput; Op: TOpCG; size: TCGSize; reg1, reg2: TRegister); override;
-          procedure a_cmp_const_reg_label(list : taasmoutput;size : tcgsize;cmp_op : topcmp;a : aword;reg : tregister;
+          procedure a_cmp_const_reg_label(list : taasmoutput;size : tcgsize;cmp_op : topcmp;a : aint;reg : tregister;
             l : tasmlabel);override;
           procedure a_cmp_reg_reg_label(list : taasmoutput;size : tcgsize;cmp_op : topcmp;reg1,reg2 : tregister;l : tasmlabel); override;
           procedure a_jmp_always(list : taasmoutput;l: tasmlabel); override;
           procedure a_jmp_flags(list : taasmoutput;const f : TResFlags;l: tasmlabel); override;
           procedure g_flags2reg(list: taasmoutput; size: TCgSize; const f: tresflags; reg: TRegister); override;
 
-          procedure g_concatcopy(list : taasmoutput;const source,dest : treference;len : aword;delsource,loadref : boolean);override;
+          procedure g_concatcopy(list : taasmoutput;const source,dest : treference;len : aint;delsource,loadref : boolean);override;
           { generates overflow checking code for a node }
           procedure g_overflowcheck(list: taasmoutput; const l:tlocation; def:tdef); override;
-          procedure g_copyvaluepara_openarray(list : taasmoutput;const ref:treference;const lenloc:tlocation;elesize:aword); override;
+          procedure g_copyvaluepara_openarray(list : taasmoutput;const ref:treference;const lenloc:tlocation;elesize:aint); override;
           procedure g_stackframe_entry(list : taasmoutput;localsize : longint);override;
           procedure g_restore_frame_pointer(list : taasmoutput);override;
-          procedure g_return_from_proc(list : taasmoutput;parasize : aword);override;
+          procedure g_return_from_proc(list : taasmoutput;parasize : aint);override;
           procedure g_restore_standard_registers(list:Taasmoutput);override;
           procedure g_save_standard_registers(list:Taasmoutput);override;
           procedure g_save_all_registers(list : taasmoutput);override;
@@ -253,7 +253,7 @@ unit cgcpu;
 
 
 
-    procedure tcg68k.a_load_const_reg(list : taasmoutput;size : tcgsize;a : aword;register : tregister);
+    procedure tcg68k.a_load_const_reg(list : taasmoutput;size : tcgsize;a : aint;register : tregister);
       begin
         if getregtype(register)=R_ADDRESSREGISTER then
          begin
@@ -386,7 +386,7 @@ unit cgcpu;
       end;
 
 
-    procedure tcg68k.a_op_const_reg(list : taasmoutput; Op: TOpCG; size: tcgsize; a: AWord; reg: TRegister);
+    procedure tcg68k.a_op_const_reg(list : taasmoutput; Op: TOpCG; size: tcgsize; a: aint; reg: TRegister);
       var
        scratch_reg : tregister;
        scratch_reg2: tregister;
@@ -746,7 +746,7 @@ unit cgcpu;
 
 
 
-    procedure tcg68k.a_cmp_const_reg_label(list : taasmoutput;size : tcgsize;cmp_op : topcmp;a : aword;reg : tregister;
+    procedure tcg68k.a_cmp_const_reg_label(list : taasmoutput;size : tcgsize;cmp_op : topcmp;a : aint;reg : tregister;
             l : tasmlabel);
       var
        hregister : tregister;
@@ -861,7 +861,7 @@ unit cgcpu;
 
 
 
-    procedure tcg68k.g_concatcopy(list : taasmoutput;const source,dest : treference;len : aword;delsource,loadref : boolean);
+    procedure tcg68k.g_concatcopy(list : taasmoutput;const source,dest : treference;len : aint;delsource,loadref : boolean);
      var
          helpsize : longint;
          i : byte;
@@ -998,7 +998,7 @@ unit cgcpu;
       begin
       end;
 
-    procedure tcg68k.g_copyvaluepara_openarray(list : taasmoutput;const ref:treference;const lenloc:tlocation;elesize:aword);
+    procedure tcg68k.g_copyvaluepara_openarray(list : taasmoutput;const ref:treference;const lenloc:tlocation;elesize:aint);
       begin
       end;
 
@@ -1038,7 +1038,7 @@ unit cgcpu;
       end;
 
 
-    procedure tcg68k.g_return_from_proc(list : taasmoutput;parasize : aword);
+    procedure tcg68k.g_return_from_proc(list : taasmoutput;parasize : aint);
       var
         r,hregister : tregister;
         ref : treference;
@@ -1313,7 +1313,11 @@ end.
 
 {
   $Log$
-  Revision 1.30  2004-10-11 15:48:15  peter
+  Revision 1.31  2004-11-09 22:32:59  peter
+    * small m68k updates to bring it up2date
+    * give better error for external local variable
+
+  Revision 1.30  2004/10/11 15:48:15  peter
     * small regvar for para fixes
     * function tvarsym.is_regvar added
     * tvarsym.getvaluesize removed, use getsize instead

+ 42 - 87
compiler/m68k/cpubase.pas

@@ -138,6 +138,11 @@ unit cpubase;
         {$i r68ksta.inc}
       );
 
+      regdwarf_table : array[tregisterindex] of shortint = (
+{$warning TODO reused stabs values!}
+        {$i r68ksta.inc}
+      );
+
       { registers which may be destroyed by calls }
       VOLATILE_INTREGISTERS = [];
       VOLATILE_FPUREGISTERS = [];
@@ -163,6 +168,11 @@ unit cpubase;
         'ge','pl','gt','t','hi','vc','le','vs'
       );
 
+      inverse_cond:array[TAsmCond] of TAsmCond=(C_None,
+{$warning TODO, this is just a copy!}
+         C_CC,C_LS,C_CS,C_LT,C_EQ,C_MI,C_F,C_NE,
+         C_GE,C_PL,C_GT,C_T,C_HI,C_VC,C_LE,C_VS
+      );
 
 {*****************************************************************************
                                    Flags
@@ -178,94 +188,10 @@ unit cpubase;
 *****************************************************************************}
 
     type
-      trefoptions=(ref_none,ref_parafixup,ref_localfixup,ref_selffixup);
-
       { direction of address register :      }
       {              (An)     (An)+   -(An)  }
       tdirection = (dir_none,dir_inc,dir_dec);
 
-      { reference record }
-      preference = ^treference;
-      treference = packed record
-         base,
-         index       : tregister;
-         scalefactor : byte;
-         offset      : longint;
-         symbol      : tasmsymbol;
-         { symbol the symbol of this reference is relative to, nil if none }
-         relsymbol      : tasmsymbol;
-         { reference type addr or symbol itself }
-         refaddr : trefaddr;
-         options     : trefoptions;
-         { indexed increment and decrement mode }
-         { (An)+ and -(An)                      }
-         direction : tdirection;
-      end;
-
-      { reference record }
-      pparareference = ^tparareference;
-      tparareference = record
-         offset      : longint;
-         index       : tregister;
-      end;
-
-
-{*****************************************************************************
-                               Generic Location
-*****************************************************************************}
-
-    type
-      { tparamlocation describes where a parameter for a procedure is stored.
-        References are given from the caller's point of view. The usual
-        TLocation isn't used, because contains a lot of unnessary fields.
-      }
-      tparalocation = record
-         size : TCGSize;
-         loc  : TCGLoc;
-         lochigh : TCGLoc;
-         alignment : byte;
-         case TCGLoc of
-            LOC_REFERENCE : (reference : tparareference);
-            { segment in reference at the same place as in loc_register }
-            LOC_REGISTER,LOC_CREGISTER : (
-              case longint of
-                1 : (register,register64.reghi : tregister);
-                { overlay a register64.reglo }
-                2 : (register64.reglo : tregister);
-                { overlay a 64 Bit register type }
-                3 : (reg64 : tregister64);
-                4 : (register64 : tregister64);
-              );
-      end;
-
-      tlocation = record
-         loc  : TCGLoc;
-         size : TCGSize;
-         case TCGLoc of
-            LOC_FLAGS : (resflags : tresflags);
-            LOC_CONSTANT : (
-              case longint of
-                1 : (value : aint);
-                { can't do this, this layout depends on the host cpu. Use }
-                { lo(valueqword)/hi(valueqword) instead (JM)              }
-                { 2 : (valuelow, valuehigh:AWord);                        }
-                { overlay a complete 64 Bit value }
-                3 : (value64 : qword);
-              );
-            LOC_CREFERENCE,
-            LOC_REFERENCE : (reference : treference);
-            { segment in reference at the same place as in loc_register }
-            LOC_REGISTER,LOC_CREGISTER : (
-              case longint of
-                1 : (register,register64.reghi,segment : tregister);
-                { overlay a register64.reglo }
-                2 : (register64.reglo : tregister);
-                { overlay a 64 Bit register type }
-                3 : (reg64 : tregister64);
-                4 : (register64 : tregister64);
-              );
-      end;
-
 
 {*****************************************************************************
                                 Operand Sizes
@@ -336,6 +262,9 @@ unit cpubase;
          further information look at GCC source : PIC_OFFSET_TABLE_REGNUM
       }
       NR_PIC_OFFSET_REG = NR_A5;
+      { Return address for DWARF }
+{$warning TODO just a guess!}
+      NR_RETURN_ADDRESS_REG = NR_A0;
       { Results are returned in this register (32-bit values) }
       NR_FUNCTION_RETURN_REG = NR_D0;
       RS_FUNCTION_RETURN_REG = NR_D0;
@@ -369,8 +298,9 @@ unit cpubase;
          This value can be deduced from CALLED_USED_REGISTERS array in the
          GCC source.
       }
-      std_saved_intregisters = [RS_D2..RS_D7];
-      std_saved_addrregisters = [RS_A2..RS_A5];
+      saved_standard_registers : array[0..5] of tsuperregister = (RS_D2,RS_D3,RS_D4,RS_D5,RS_D6,RS_D7);
+      saved_standard_address_registers : array[0..3] of tsuperregister = (RS_A2,RS_A3,RS_A4,RS_A5);
+
       {# Required parameter alignment when calling a routine declared as
          stdcall and cdecl. The alignment value should be the one defined
          by GCC or the target ABI.
@@ -380,6 +310,12 @@ unit cpubase;
       }
       std_param_align = 4;  { for 32-bit version only }
 
+      { size of the buffer used for setjump/longjmp
+      the size of this buffer is deduced from the
+      jmp_buf structure in setjumph.inc file
+      }
+      jmp_buf_size = 28;
+
 {*****************************************************************************
                             CPU Dependent Constants
 *****************************************************************************}
@@ -394,6 +330,7 @@ unit cpubase;
     procedure inverse_flags(var r : TResFlags);
     function  flags_to_cond(const f: TResFlags) : TAsmCond;
     function cgsize2subreg(s:Tcgsize):Tsubregister;
+    function reg_cgsize(const reg: tregister): tcgsize;
 
     function findreg_by_number(r:Tregister):tregisterindex;
     function std_regnum_search(const s:string):Tregister;
@@ -482,6 +419,20 @@ implementation
       end;
 
 
+    function reg_cgsize(const reg: tregister): tcgsize;
+      begin
+        case getregtype(reg) of
+          R_ADDRESSREGISTER,
+          R_INTREGISTER :
+            result:=OS_32;
+          R_FPUREGISTER :
+            result:=OS_F32;
+          else
+            internalerror(200303181);
+        end;
+      end;
+
+
     function findreg_by_number(r:Tregister):tregisterindex;
       begin
         result:=findreg_by_number_table(r,regnumber_index);
@@ -515,7 +466,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.32  2004-10-31 21:45:03  peter
+  Revision 1.33  2004-11-09 22:32:59  peter
+    * small m68k updates to bring it up2date
+    * give better error for external local variable
+
+  Revision 1.32  2004/10/31 21:45:03  peter
     * generic tlocation
     * move tlocation to cgutils
 

+ 5 - 13
compiler/m68k/cpuinfo.pas

@@ -46,18 +46,6 @@ Type
      );
 
 Const
-   {# Size of native extended floating point type }
-   extended_size = 8;
-   {# Size of a multimedia register               }
-   mmreg_size = 16;
-   { size of the buffer used for setjump/longjmp
-     the size of this buffer is deduced from the
-     jmp_buf structure in setjumph.inc file
-   }
-   jmp_buf_size = 28;
-   { target cpu string (used by compiler options) }
-   target_cpu_string = 'm68k';
-
    { calling conventions supported by the code generator }
    supported_calling_conventions : tproccalloptions = [
      pocall_internproc,
@@ -89,7 +77,11 @@ Implementation
 end.
 {
   $Log$
-  Revision 1.13  2004-06-20 08:55:31  florian
+  Revision 1.14  2004-11-09 22:32:59  peter
+    * small m68k updates to bring it up2date
+    * give better error for external local variable
+
+  Revision 1.13  2004/06/20 08:55:31  florian
     * logs truncated
 
   Revision 1.12  2004/06/16 20:07:10  florian

+ 73 - 52
compiler/m68k/cpupara.pas

@@ -32,7 +32,7 @@ unit cpupara;
       globtype,
       cpubase,
       symconst,symdef,
-      paramgr;
+      parabase,paramgr;
 
     type
        { Returns the location for the nr-st 32 Bit int parameter
@@ -41,7 +41,7 @@ unit cpupara;
          rtl are used.
        }
        tm68kparamanager = class(tparamanager)
-          function getintparaloc(calloption : tproccalloption;nr : longint) : tparalocation;override;
+          procedure getintparaloc(calloption : tproccalloption; nr : longint;var cgpara : TCGPara);override;
           function create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;override;
          private
            function parseparaloc(p : tparaitem;const s : string) : boolean;override;
@@ -56,99 +56,116 @@ unit cpupara;
        cpuinfo,cgbase,
        defutil;
 
-    function tm68kparamanager.getintparaloc(calloption : tproccalloption;nr : longint) : tparalocation;
+    procedure tm68kparamanager.getintparaloc(calloption : tproccalloption; nr : longint;var cgpara : TCGPara);
+      var
+        paraloc : pcgparalocation;
       begin
-         fillchar(result,sizeof(tparalocation),0);
          if nr<1 then
-           internalerror(2002070801)
-         else
+           internalerror(2002070801);
+         cgpara.reset;
+         cgpara.size:=OS_INT;
+         cgpara.alignment:=std_param_align;
+         paraloc:=cgpara.add_location;
+         with paraloc^ do
            begin
               { warning : THIS ONLY WORKS WITH INTERNAL ROUTINES,
                 WHICH MUST ALWAYS PASS 4-BYTE PARAMETERS!!
               }
-              result.loc:=LOC_REFERENCE;
-              result.reference.index:=NR_STACK_POINTER_REG;
-              result.reference.offset:=target_info.first_parm_offset+nr*4;
+              loc:=LOC_REFERENCE;
+              reference.index:=NR_STACK_POINTER_REG;
+              reference.offset:=target_info.first_parm_offset+nr*4;
            end;
       end;
 
 
     function tm68kparamanager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
       var
-        param_offset : integer;
-        hp : tparaitem;
-        paraloc: tparalocation;
-        l : longint;
-        parasize : longint;
+        paraloc      : pcgparalocation;
+        hp           : tparaitem;
+        paracgsize   : tcgsize;
+        paralen      : longint;
+        parasize     : longint;
       begin
-         { frame pointer for nested procedures? }
-         { inc(nextintreg);                     }
-         { constructor? }
-         { destructor? }
-         param_offset := target_info.first_parm_offset;
-         hp:=tparaitem(p.para.last);
-         while assigned(hp) do
-           begin
-             paraloc.size:=def_cgsize(hp.paratype.def);
-             paraloc.loc:=LOC_REFERENCE;
-             paraloc.alignment:=4;
-             paraloc.reference.index:=NR_FRAME_POINTER_REG;
-             l:=push_size(hp.paratyp,hp.paratype.def,p.proccalloption);
-             paraloc.reference.offset:=parasize;
-             parasize:=parasize+l;
-             hp.paraloc[callerside]:=paraloc;
-             hp:=tparaitem(hp.next);
-           end;
+        parasize:=0;
+        hp:=tparaitem(p.para.first);
+        while assigned(hp) do
+          begin
+            if push_addr_param(hp.paratyp,hp.paratype.def,p.proccalloption) then
+              paracgsize:=OS_ADDR
+            else
+              begin
+                paracgsize:=def_cgSize(hp.paratype.def);
+                if paracgsize=OS_NO then
+                  paracgsize:=OS_ADDR;
+              end;
+            hp.paraloc[side].reset;
+            hp.paraloc[side].size:=paracgsize;
+            hp.paraloc[side].Alignment:=std_param_align;
+            paraloc:=hp.paraloc[side].add_location;
+            paraloc^.size:=paracgsize;
+            paraloc^.loc:=LOC_REFERENCE;
+            if side=callerside then
+              paraloc^.reference.index:=NR_STACK_POINTER_REG
+            else
+              paraloc^.reference.index:=NR_FRAME_POINTER_REG;
+            paraloc^.reference.offset:=target_info.first_parm_offset+parasize;
+            hp:=TParaItem(hp.Next);
+          end;
+        result:=parasize;
       end;
 
 
     function tm68kparamanager.parseparaloc(p : tparaitem;const s : string) : boolean;
+      var
+        paraloc : pcgparalocation;
       begin
         result:=false;
         case target_info.system of
           system_m68k_amiga:
             begin
-              p.paraloc[callerside].loc:=LOC_REGISTER;
-              p.paraloc[callerside].lochigh:=LOC_INVALID;
-              p.paraloc[callerside].size:=def_cgsize(p.paratype.def);
               p.paraloc[callerside].alignment:=4;
+              paraloc:=p.paraloc[callerside].add_location;
+              paraloc^.loc:=LOC_REGISTER;
+              paraloc^.size:=def_cgsize(p.paratype.def);
               { pattern is always uppercase'd }
               if s='D0' then
-                p.paraloc[callerside].register:=NR_D0
+                paraloc^.register:=NR_D0
               else if s='D1' then
-                p.paraloc[callerside].register:=NR_D1
+                paraloc^.register:=NR_D1
               else if s='D2' then
-                p.paraloc[callerside].register:=NR_D2
+                paraloc^.register:=NR_D2
               else if s='D3' then
-                p.paraloc[callerside].register:=NR_D3
+                paraloc^.register:=NR_D3
               else if s='D4' then
-                p.paraloc[callerside].register:=NR_D4
+                paraloc^.register:=NR_D4
               else if s='D5' then
-                p.paraloc[callerside].register:=NR_D5
+                paraloc^.register:=NR_D5
               else if s='D6' then
-                p.paraloc[callerside].register:=NR_D6
+                paraloc^.register:=NR_D6
               else if s='D7' then
-                p.paraloc[callerside].register:=NR_D7
+                paraloc^.register:=NR_D7
               else if s='A0' then
-                p.paraloc[callerside].register:=NR_A0
+                paraloc^.register:=NR_A0
               else if s='A1' then
-                p.paraloc[callerside].register:=NR_A1
+                paraloc^.register:=NR_A1
               else if s='A2' then
-                p.paraloc[callerside].register:=NR_A2
+                paraloc^.register:=NR_A2
               else if s='A3' then
-                p.paraloc[callerside].register:=NR_A3
+                paraloc^.register:=NR_A3
               else if s='A4' then
-                p.paraloc[callerside].register:=NR_A4
+                paraloc^.register:=NR_A4
               else if s='A5' then
-                p.paraloc[callerside].register:=NR_A5
+                paraloc^.register:=NR_A5
               { 'A6' is problematic, since it's the frame pointer in fpc,
                 so it should be saved before a call! }
               else if s='A6' then
-                p.paraloc[callerside].register:=NR_A6
+                paraloc^.register:=NR_A6
               { 'A7' is the stack pointer on 68k, can't be overwritten by API calls }
               else
                 exit;
-              p.paraloc[calleeside]:=p.paraloc[callerside];
+
+              { copy to callee side }
+              p.paraloc[calleeside].add_location^:=paraloc^;
             end;
           else
             internalerror(200405092);
@@ -162,7 +179,11 @@ end.
 
 {
   $Log$
-  Revision 1.7  2004-06-20 08:55:31  florian
+  Revision 1.8  2004-11-09 22:32:59  peter
+    * small m68k updates to bring it up2date
+    * give better error for external local variable
+
+  Revision 1.7  2004/06/20 08:55:31  florian
     * logs truncated
 
   Revision 1.6  2004/05/12 13:28:01  karoly

+ 70 - 65
compiler/m68k/ra68kmot.pas

@@ -1755,7 +1755,6 @@ type
     type
       TM68kInstruction=class(TInstruction)
         procedure InitOperands;override;
-        procedure BuildOpcode;override;
         procedure ConcatInstruction(p : taasmoutput);override;
         Procedure ConcatLabeledInstr(p : taasmoutput);
       end;
@@ -1769,67 +1768,6 @@ type
       end;
 
 
-  Procedure TM68kInstruction.BuildOpCode;
-  {*********************************************************************}
-  { PROCEDURE BuildOpcode;                                              }
-  {  Description: Parses the intel opcode and operands, and writes it   }
-  {  in the TInstruction object.                                        }
-  {*********************************************************************}
-  { EXIT CONDITION:  On exit the routine should point to AS_SEPARATOR.  }
-  { On ENTRY: Token should point to AS_OPCODE                           }
-  {*********************************************************************}
-  var asmtok: tasmop;
-      expr: string;
-      operandnum : longint;
-  begin
-    expr := '';
-    asmtok := A_NONE; { assmume no prefix          }
-
-    { //  opcode                          // }
-    { allow for newline as in gas styled syntax }
-    { under DOS you get two AS_SEPARATOR !! }
-    while actasmtoken=AS_SEPARATOR do
-      Consume(AS_SEPARATOR);
-    if (actasmtoken <> AS_OPCODE) then
-    begin
-      Message(asmr_e_invalid_or_missing_opcode);
-      { error recovery }
-      While not (actasmtoken in [AS_SEPARATOR,AS_COMMA]) do
-         Consume(actasmtoken);
-      exit;
-    end
-    else
-    begin
-      opcode := findopcode(actasmpattern,opsize);
-      Consume(AS_OPCODE);
-      { // Zero operand opcode ? // }
-      if actasmtoken = AS_SEPARATOR then
-        exit
-      else
-       operandnum := 1;
-    end;
-
-    While actasmtoken <> AS_SEPARATOR do
-    begin
-       case actasmtoken of
-         { //  Operand delimiter // }
-         AS_COMMA: begin
-                  if operandnum > Max_Operands then
-                    Message(asmr_e_too_many_operands)
-                  else
-                    Inc(operandnum);
-                  Consume(AS_COMMA);
-                end;
-         { // End of asm operands for this opcode // }
-         AS_SEPARATOR: ;
-       else
-         Operands[operandnum].BuildOperand;
-     end; { end case }
-    end; { end while }
-  end;
-
-
-
  procedure TM68kInstruction.ConcatInstruction(p : taasmoutput);
   var
     fits : boolean;
@@ -2135,7 +2073,70 @@ type
       end;
 
 
-    function ti386intreader.Assemble: tlinkedlist;
+
+  Procedure TM68kReader.BuildOpCode(instr:Tm68kinstruction);
+  {*********************************************************************}
+  { PROCEDURE BuildOpcode;                                              }
+  {  Description: Parses the intel opcode and operands, and writes it   }
+  {  in the TInstruction object.                                        }
+  {*********************************************************************}
+  { EXIT CONDITION:  On exit the routine should point to AS_SEPARATOR.  }
+  { On ENTRY: Token should point to AS_OPCODE                           }
+  {*********************************************************************}
+  var asmtok: tasmop;
+      expr: string;
+      operandnum : longint;
+  begin
+    expr := '';
+    asmtok := A_NONE; { assmume no prefix          }
+
+    { //  opcode                          // }
+    { allow for newline as in gas styled syntax }
+    { under DOS you get two AS_SEPARATOR !! }
+    while actasmtoken=AS_SEPARATOR do
+      Consume(AS_SEPARATOR);
+    if (actasmtoken <> AS_OPCODE) then
+    begin
+      Message(asmr_e_invalid_or_missing_opcode);
+      { error recovery }
+      While not (actasmtoken in [AS_SEPARATOR,AS_COMMA]) do
+         Consume(actasmtoken);
+      exit;
+    end
+    else
+    begin
+      Instr.opcode := findopcode(actasmpattern,opsize);
+      Consume(AS_OPCODE);
+      { // Zero operand opcode ? // }
+      if actasmtoken = AS_SEPARATOR then
+        exit
+      else
+       operandnum := 1;
+    end;
+
+    While actasmtoken <> AS_SEPARATOR do
+    begin
+       case actasmtoken of
+         { //  Operand delimiter // }
+         AS_COMMA: begin
+                  if operandnum > Max_Operands then
+                    Message(asmr_e_too_many_operands)
+                  else
+                    Inc(operandnum);
+                  Consume(AS_COMMA);
+                end;
+         { // End of asm operands for this opcode // }
+         AS_SEPARATOR: ;
+       else
+         Instr.Operands[operandnum].BuildOperand;
+     end; { end case }
+    end; { end while }
+  end;
+
+
+
+
+    function tm68kreader.Assemble: tlinkedlist;
       var
         hl: tasmlabel;
         labelptr,nextlabel : tasmlabel;
@@ -2208,7 +2209,7 @@ type
               AS_OPCODE:
                 begin
                   instr:=TM68kInstruction.Create;
-                  instr.BuildOpcode;
+                  BuildOpcode(instr);
 {                    instr.AddReferenceSizes;}
 {                    instr.SetInstructionOpsize;}
 {                    instr.CheckOperandSizes;}
@@ -2271,7 +2272,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.5  2004-06-20 08:55:31  florian
+  Revision 1.6  2004-11-09 22:32:59  peter
+    * small m68k updates to bring it up2date
+    * give better error for external local variable
+
+  Revision 1.5  2004/06/20 08:55:31  florian
     * logs truncated
 
   Revision 1.4  2004/05/20 21:54:33  florian

+ 4 - 1
compiler/msg/errore.msg

@@ -860,7 +860,7 @@ parser_e_no_access_specifier_in_interfaces=03172_E_Access specifiers can't be us
 parser_e_no_vars_in_interfaces=03173_E_An interface can't contain fields
 % Declarations of fields aren't allowed in interfaces. An interface
 % can contain only methods
-parser_e_no_local_external=03174_E_Can't declare local procedure as EXTERNAL
+parser_e_no_local_proc_external=03174_E_Can't declare local procedure as EXTERNAL
 % Declaring local procedures as external is not possible. Local procedures
 % get hidden parameters that will make the chance of errors very high
 parser_w_skipped_fields_before=03175_W_Some fields coming before "$1" weren't initialized
@@ -980,6 +980,9 @@ parser_e_macpas_exit_wrong_param=03207_E_Exit's parameter must be the name of th
 parser_e_illegal_assignment_to_count_var=03208_E_Illegal assignment to for-loop variable "$1"
 % The type of a \var{for} loop variable must be an ordinal type.
 % Loop variables cannot be reals or strings.
+parser_e_no_local_var_external=03209_E_Can't declare local variable as EXTERNAL
+% Declaring local variables as external is not allowed. Only global variables can reference
+% to external variables.
 % \end{description}
 #
 # Type Checking

+ 4 - 3
compiler/msgidx.inc

@@ -237,7 +237,7 @@ const
   parser_e_no_con_des_in_interfaces=03171;
   parser_e_no_access_specifier_in_interfaces=03172;
   parser_e_no_vars_in_interfaces=03173;
-  parser_e_no_local_external=03174;
+  parser_e_no_local_proc_external=03174;
   parser_w_skipped_fields_before=03175;
   parser_e_skipped_fields_before=03176;
   parser_w_skipped_fields_after=03177;
@@ -272,6 +272,7 @@ const
   parser_e_upper_lower_than_lower=03206;
   parser_e_macpas_exit_wrong_param=03207;
   parser_e_illegal_assignment_to_count_var=03208;
+  parser_e_no_local_var_external=03209;
   type_e_mismatch=04000;
   type_e_incompatible_types=04001;
   type_e_not_equal_types=04002;
@@ -646,9 +647,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 37604;
+  MsgTxtSize = 37653;
 
   MsgIdxMax : array[1..20] of longint=(
-    18,67,209,59,57,46,99,20,35,60,
+    18,67,210,59,57,46,99,20,35,60,
     40,1,1,1,1,1,1,1,1,1
   );

+ 208 - 205
compiler/msgtxt.inc

@@ -306,397 +306,400 @@ const msgtxt : array[0..000156,1..240] of char=(
   '03207_E_Exit'#039's parameter must be the name of the procedure it is u'+
   'sed in'#000+
   '03208_E_Illegal assignment to for-loop variable "$1"'#000+
+  '03209_E_Can'#039't declare local variable as EXTERNAL'#000+
   '04000_E_Type mismatch'#000+
-  '04001_E_Incompatible types: got "$1" expected "$2"'#000+
-  '04002_E_Type mismatch b','etween "$1" and "$2"'#000+
+  '04001_E_Incompatible type','s: 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_point','er 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 from fl','oating type to COMP which i'+
-  's an integer type'#000+
+  '04013_E_Operation not implemented f','or 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 write va','riables of this type'#000+
+  '04017_E_succ or pred on enums with assign','ments 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_Integer',' or real expression expected'#000+
+  '04022_W_lo/hi(dword/qword) r','eturns 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 passe','d 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 assign ','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 range'+
-  ' c','heck error'#000+
+  '04036_W_Mixing signed e','xpressions 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 relate','d'#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+
   '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_Compa','rison 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+
-  '04049','_H_Type size mismatch, possible loss of data / range check erro'+
+  '04048_W_Type size mismatch',', 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_Operation "$1','" not supported for types "$2" and "$3"'#000+
+  '04052_E_C','onstant 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 determine ','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_Unk','nown identifier "$1"'#000+
+  '05003_H_Identi','fier 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 me','thods 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 supported ','(use switch -Sg)'#000+
+  '05016_E_Illegal label decl','aration'#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+
+  '05022_E_Forward class definition not r','esolved "$1"'#000+
   '05023_H_Unit "$1" not used in $2'#000+
-  '050','24_H_Parameter "$1" not used'#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 curren','t record for C'#000+
+  '050','34_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 declaration',': $1'#000+
+  '05038_E_identifie','r 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 unique ','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+
   '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 declared functions can'#039't be called'#000+
-  '06016_W_Possible illegal ca','ll of constructor or destructor'#000+
+  '06015_E_EXPORT declared func','tions 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 frame is omitted'#000+
-  '06031_E_Object or class methods can'#039't be i','nline.'#000+
+  '06029_DL_Stack frame is o','mitted'#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+
-  '06037_E_Constructors or destructors can not be called ','inside a '#039'w'+
+  '06037','_E_Constructors or destructors can not be called inside a '#039'w'+
   'ith'#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 block'#000+
-  '06041_W_Parameters size exceeds limit for certain',' cpu'#039's'#000+
+  '06040_E_Control flow statements aren'#039't allowed in a finally block'#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+
   '06045_E_CONTINUE not allowed'#000+
-  '07000_DL_Starting $1 styled assembler parsing'#000+
-  '07001_DL_Finished $1',' styled assembler parsing'#000+
+  '07000_DL_Starting',' $1 styled assembler parsing'#000+
+  '07001_DL_Finished $1 styled assembler parsing'#000+
   '07002_E_Non-label pattern contains @'#000+
   '07004_E_Error building record offset'#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_nee','d to use OFFSET here'#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+
   '07012_E_Invalid constant expression'#000+
-  '07013_E_Relocatable symbol is not allowed'#000+
-  '07014_E_Invalid refer','ence syntax'#000+
+  '07013_E_Reloca','table 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+
   '07017_E_Invalid base and index register usage'#000+
-  '07018_W_Possible error in object field handling'#000+
-  '07019_E_Wrong scale factor speci','fied'#000+
+  '07018_W_Possible error in objec','t 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 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+
+  '07024_E_Null label references are no','t allowed'#000+
+  '07025_E_Divide by zero in asm evaluator'#000+
   '07026_E_Illegal expression'#000+
   '07027_E_escape sequence ignored: $1'#000+
   '07028_E_Invalid symbol reference'#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 supporte','d by Linux kernel'#000+
+  '07030_W_$1 without operand translated i','nto $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+
   '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 convert','ing binary $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 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_Proce','dures can'#039't return any value in asm code'#000+
+  '07042_E_Cannot us','e 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+
-  '07046_W_Size suffix and destination or source size do not match'#000+
+  '07046_W_Size suffix and destination or source size do not ma','tch'#000+
   '07047_E_Assembler syntax error'#000+
-  '07048_E_Invali','d combination of opcode and operands'#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+
   '07051_E_Invalid String expression'#000+
-  '07052_W_constant with symbol $1 for address which is not on a pointer'#000+
-  '07053_E_Unreco','gnized opcode $1'#000+
+  '07052_W_constant with symbol $1 for',' address which is not on a pointe'+
+  'r'#000+
+  '07053_E_Unrecognized opcode $1'#000+
   '07054_E_Invalid or missing opcode'#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+
+  '07057_E_Too many operands on lin','e'#000+
   '07058_W_NEAR ignored'#000+
   '07059_W_FAR ignored'#000+
-  '07060_','E_Duplicate local symbol $1'#000+
+  '07060_E_Duplicate local symbol $1'#000+
   '07061_E_Undefined local symbol $1'#000+
   '07062_E_Unknown label identifier $1'#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 constan','t $1'#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 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 a','llowed as constants'#000+
+  '07072_W_Iden','tifier $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 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 ide','ntifier'#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 .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 specif','ied and unable to determine the size of the op'+
-  'erands'#000+
+  '07082_E_Can'#039't access fields o','f 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+
-  '07087_W_"$1 %st(n)" translated into "$1 %st,%st(n)"'#000+
-  '07088_W_"$1 %st(n)" translated ','into "$1 %st(n),%st"'#000+
+  '07087_W_"$1 %st(n)" translated int','o "$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+
   '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+
+  '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 DWORD as default'#000+
   '08000_F_Too many assembler files'#000+
-  '08001_F_Selected assembler output not supported'#000+
+  '08001_F_Selected assembler output not su','pported'#000+
   '08002_F_Comp not supported'#000+
-  '08003_F_Direct',' not support for binary writers'#000+
+  '08003_F_Direct not support for binary writers'#000+
   '08004_E_Allocating of data is only allowed in bss section'#000+
   '08005_F_No binary writer selected'#000+
   '08006_E_Asm: Opcode $1 not in table'#000+
-  '08007_E_Asm: $1 invalid combination of opcode and operands'#000+
-  '08008_E_Asm: 16 Bit r','eferences not supported'#000+
+  '08007_E_Asm: $1 invalid combina','tion of opcode and operands'#000+
+  '08008_E_Asm: 16 Bit references not supported'#000+
   '08009_E_Asm: Invalid effective address'#000+
   '08010_E_Asm: Immediate or reference expected'#000+
   '08011_E_Asm: $1 value exceeds bounds $2'#000+
-  '08012_E_Asm: Short jump is out of range $1'#000+
+  '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+
+  '08014_E_Asm: Comp type not supported for this target'#000+
   '08015_E_Asm: Extended type not supported for this target'#000+
   '08016_E_Asm: Duplicate label $1'#000+
   '08017_E_Asm: Redefined label $1'#000+
   '08018_E_Asm: First defined here'#000+
-  '08019_E_Asm: Invalid register $1'#000+
-  '09000_W_Source ope','rating system redefined'#000+
+  '08','019_E_Asm: Invalid register $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+
   '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+
+  '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 ma','y fail !'#000+
+  '09010_I_Assembling with smartl','inking $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 uti','l $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+
+  '09021_E_resource compiler not found, switching to exter','nal mode'#000+
   '09022_I_Compiling resource $1'#000+
-  '09023_T_un','it $1 can'#039't be statically linked, switching to smart l'+
-  'inking'#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 lin','ked'#000+
+  '09025_T_unit $1 can'#039't be shared linked, switching to static lin','k'+
+  '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_F_Can'#039't post process 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+
+  '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+
   '10000_T_Unitsearch: $1'#000+
   '10001_T_PPU Loading $1'#000+
   '10002_U_PPU Name: $1'#000+
   '10003_U_PPU Flags: $1'#000+
-  '10004_U_PPU Crc: $1'#000+
+  '10004_U_PPU Crc: $','1'#000+
   '10005_U_PPU Time: $1'#000+
-  '10006_U_PPU File too short',#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+
-  '10011_U_PPU Source: $1'#000+
+  '10011_U_PPU Source: ','$1'#000+
   '10012_U_Writing $1'#000+
-  '10013_F_Can'#039't Write PPU-Fil','e'#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+
   '10018_E_Illegal unit name: $1'#000+
   '10019_F_Too much units'#000+
-  '10020_F_Circular unit reference between $1 and $2'#000+
-  '1002','1_F_Can'#039't compile unit $1, no sources available'#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+
-  '10026_F_There were $1 err','ors compiling module, stopping'#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_Recompiling unit, static lib is older than ppufile'#000+
-  '10031_U_Recompiling unit, ','shared lib is older than ppufile'#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 interface of $1'#000+
-  '10035_U_Parsing implementation of $1'#000+
-  '10036_U_Second load for unit ','$1'#000+
+  '10035_U_Parsing i','mplementation 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+
   '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 file','s'+
+  '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_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 uni','t $1'#000+
+  '10044_U_Loading implementation un','its from $1'#000+
+  '10045_U_Interface CRC changed for unit $1'#000+
   '10046_U_Implementation CRC changed for unit $1'#000+
   '10047_U_Finished compiling unit $1'#000+
   '10048_U_Add dependency of $1 to $2'#000+
   '10049_U_No reload, is caller: $1'#000+
-  '10050_U_No reload, already in second compile: $1'#000+
+  '10050_U_No reload, already in second',' compile: $1'#000+
   '10051_U_Flag for reload: $1'#000+
-  '10052_U_','Forced reloading'#000+
+  '10052_U_Forced reloading'#000+
   '10053_U_Previous state of $1: $2'#000+
   '10054_U_Already compiling $1, setting second compile'#000+
   '10055_U_Loading unit $1'#000+
   '10056_U_Finished loading unit $1'#000+
-  '10057_U_Registering new 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+
+  '10059_U_Skipping re-resolving unit $1, still loading used units'#000+
   '11000_$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 fil','e name in command line'#000+
+  '11003_E_nested respo','nse files are not supported'#000+
+  '11004_F_No source file name in command line'#000+
   '11005_N_No option inside $1 config file'#000+
   '11006_E_Illegal parameter: $1'#000+
   '11007_H_-? writes help pages'#000+
   '11008_F_Too many config files nested'#000+
   '11009_F_Unable to open file $1'#000+
-  '11010_D_Reading further options from $1'#000+
-  '11011_W_Ta','rget is already set to: $1'#000+
+  '1','1010_D_Reading further options from $1'#000+
+  '11011_W_Target is already set to: $1'#000+
   '11012_W_Shared libs not supported on DOS platform, reverting to static'+
   #000+
   '11013_F_too many IF(N)DEFs'#000+
   '11014_F_too many ENDIFs'#000+
-  '11015_F_open conditional at the end of the file'#000+
-  '11016_W_Debug information generation is not',' supported by this execut'+
-  'able'#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+
   '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+
+  '11020_N_Switching ass','embler to default source writing assembler'#000+
+  '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
   '11022_W_"$1" assembler use forced'#000+
   '11026_T_Reading options from file $1'#000+
   '11027_T_Reading options from environment $1'#000+
-  '11028_D_Handling option "$1"'#000+
+  '11028_D_Handlin','g option "$1"'#000+
   '11029__*** press enter ***'#000+
-  '11030_H_','Start of reading config file $1'#000+
+  '11030_H_Start of reading config file $1'#000+
   '11031_H_End of reading config file $1'#000+
   '11032_D_interpreting option "$1"'#000+
   '11036_D_interpreting firstpass option "$1"'#000+
   '11033_D_interpreting file option "$1"'#000+
-  '11034_D_Reading config file "$1"'#000+
-  '11035_D_found source fi','le name "$1"'#000+
+  '11034_D','_Reading config file "$1"'#000+
+  '11035_D_found source file name "$1"'#000+
   '11037_D_Defining symbol $1'#000+
   '11038_D_Undefining symbol $1'#000+
   '11039_E_Unknown code page'#000+
   '11023_Free Pascal Compiler version $FPCVERSION [$FPCDATE] for $FPCCPU'#010+
-  'Copyright (c) 1993-2004 by Florian Klaempfl'#000+
-  '11024_Free Pascal Compiler vers','ion $FPCVERSION'#010+
+  'Copyright (c) 1993-2004 by',' Florian Klaempfl'#000+
+  '11024_Free Pascal Compiler version $FPCVERSION'#010+
   #010+
   'Compiler Date      : $FPCDATE'#010+
   'Compiler CPU Target: $FPCCPU'#010+
@@ -705,160 +708,160 @@ const msgtxt : array[0..000156,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 information read',' COPYING.FPC'#010+
   #010+
   'Report bugs,suggestions etc to:'#010+
-  '   ','              [email protected]'#000+
+  '                 [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 assembler file'#010+
-  '**2an_list node inf','o in assembler file'#010+
+  '**2al_list sourc','ecode lines in assembler file'#010+
+  '**2an_list node info in assembler file'#010+
   '*L2ap_use pipes instead of creating temporary assembler files'#010+
   '**2ar_list register allocation/release info in assembler file'#010+
-  '**2at_list temp allocation/release info in assembler file'#010+
+  '**2at_list temp allocation/release info in asse','mbler file'#010+
   '**1A<x>_output format:'#010+
-  '**2Adefault_use',' default assembler'#010+
+  '**2Adefault_use default assembler'#010+
   '3*2Aas_assemble using GNU AS'#010+
   '3*2Anasmcoff_coff (Go32v2) file using Nasm'#010+
   '3*2Anasmelf_elf32 (Linux) file using Nasm'#010+
   '3*2Awasm_obj file using Wasm (Watcom)'#010+
-  '3*2Anasmobj_obj file using Nasm'#010+
-  '3*2Amasm_obj file using Masm (Microso','ft)'#010+
+  '3*2Anasmobj_obj file',' using Nasm'#010+
+  '3*2Amasm_obj file using Masm (Microsoft)'#010+
   '3*2Atasm_obj file using Tasm (Borland)'#010+
   '3*2Aelf_elf32 (Linux) using internal 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+
+  '4*2Aas_asse','mble using GNU AS'#010+
+  '6*2Aas_Unix o-file using GNU AS'#010+
   '6*2Agas_GNU Motorola assembler'#010+
   '6*2Amit_MIT Syntax (old GAS)'#010+
   '6*2Amot_Standard Motorola assembler'#010+
   '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 i','nfo'#010+
+  '**1b_ge','nerate browser info'#010+
+  '**2bl_generate local symbol info'#010+
   '**1B_build all modules'#010+
   '**1C<x>_code generation options:'#010+
   '**2Cc<x>_set default calling convention to <x>'#010+
   '**2CD_create also dynamic library (not supported)'#010+
-  '**2Ce_Compilation with emulated floating point opcodes'#010+
-  '**2Cf<x>_Select fpu instruct','ion set to use to <x>'#010+
+  '**2Ce_Compilation with emulated fl','oating point opcodes'#010+
+  '**2Cf<x>_Select fpu instruction set to use to <x>'#010+
   '**2Cg_Generate PIC code'#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+
-  '**2CR_verify object method call val','idity'#010+
+  '**2Cr_r','ange checking'#010+
+  '**2CR_verify object method call validity'#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+
-  '**1','e<x>_set path to executable'#010+
+  '**1e<x>_set path to executable'#010+
   '**1E_same as -Cn'#010+
   '**1F<x>_set file names and paths:'#010+
   '**2Fc<x>_sets input codepage to <x>'#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/uni','t output path 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+
   '**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 u','nit output path to <x>, overrides -FE'#010+
+  '**2FU<x>_set unit output path to <x>, overrides -FE'#010+
   '*g1g_generate debugger information:'#010+
   '*g2gc_generate checks for pointers'#010+
   '*g2gd_use dbx'#010+
   '*g2gg_use gsym'#010+
-  '*g2gh_use heap trace unit (for memory leak debugging)'#010+
-  '*g2gl_use line info unit to show more info for b','acktraces'#010+
+  '*g2gh_use heap trace unit (for memory leak debugging)',#010+
+  '*g2gl_use line info unit to show more info for backtraces'#010+
   '*g2gv_generates programs tracable with valgrind'#010+
   '*g2gw_generate dwarf debugging info'#010+
   '**1i_information'#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+
+  '**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+
   '**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+
+  '**2Mdelphi_tries to be Delphi compatible'#010+
   '**2Mtp_tries to be TP/BP 7.0 compatible'#010+
   '**2Mgpc_tries to be gpc compatible'#010+
   '**2Mmacpas_tries to be compatible to the macintosh pascal dialects'#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 config file'#010+
+  '**1o<x>_change the name of the executable produced to <x>'#010+
   '**1O<x>_optimizations:'#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 optimiza','tions (quick optimizations)'#010+
+  '3*2Ou_enable uncertai','n 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 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*3Op1_set target pro','cessor 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+
+  '6*2O0_se','t target processor to a MC68000'#010+
+  '6*2O2_set target processor to a MC68020+ (default)'#010+
   '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+
   '**1R<x>_assembler reading style:'#010+
   '**2Rdefault_use default assembler'#010+
-  '3*2Ratt_read AT&T style assembler'#010+
+  '3*2Ratt_read AT&T style assemb','ler'#010+
   '3*2Rintel_read Intel style assembler'#010+
-  '6*2RMOT_','read motorola style assembler'#010+
+  '6*2RMOT_read motorola style assembler'#010+
   '**1S<x>_syntax options:'#010+
   '**2S2_same as -Mobjfpc'#010+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+
   '**2Sa_include assertion code.'#010+
   '**2Sd_same as -Mdelphi'#010+
-  '**2Se<x>_compiler stops after the <x> errors (default is 1)'#010,
+  '**2Se<x>_co','mpiler 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+
   '**2SI<x>_set interface style to <x>'#010+
   '**3SIcom COM compatible interface (default)'#010+
-  '**3SIcorba CORBA compatible interface'#010+
+  '**3SIcorba CORBA compatible in','terface'#010+
   '**2Sm_support macros like C (global)'#010+
-  '**2S','o_same as -Mtp'#010+
+  '**2So_same as -Mtp'#010+
   '**2Sp_same as -Mgpc'#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 linker'#010+
-  '**2sh_Generate script to link on host'#010+
-  '**2st_Generate script to link ','on target'#010+
+  '**2sh_Generate scri','pt to link on host'#010+
+  '**2st_Generate script to link on target'#010+
   '**2sr_Skip register allocation phase (use with -alr)'#010+
   '**1T<x>_Target operating system:'#010+
   '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+
   '3*2Tfreebsd_FreeBSD'#010+
-  '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+
+  '3*2Tgo32v2_Version 2 of D','J Delorie DOS extender'#010+
   '3*2Tlinux_Linux'#010+
-  '3*2Tnetbsd','_NetBSD'#010+
+  '3*2Tnetbsd_NetBSD'#010+
   '3*2Tnetware_Novell Netware Module (clib)'#010+
   '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
   '3*2Topenbsd_OpenBSD'#010+
   '3*2Tos2_OS/2 / eComStation'#010+
   '3*2Tsunos_SunOS/Solaris'#010+
-  '3*2Twatcom_Watcom compatible DOS extender'#010+
+  '3*2Twatcom_Watcom compatible ','DOS extender'#010+
   '3*2Twdosx_WDOSX DOS extender'#010+
-  '3*2Twin','32_Windows 32 Bit'#010+
+  '3*2Twin32_Windows 32 Bit'#010+
   '4*2Tlinux_Linux'#010+
   '6*2Tamiga_Commodore Amiga'#010+
   '6*2Tatari_Atari ST/STe/TT'#010+
@@ -866,50 +869,50 @@ const msgtxt : array[0..000156,1..240] of char=(
   '6*2Tmacos_Macintosh m68k (not supported)'#010+
   '6*2Tpalmos_PalmOS'#010+
   'A*2Tlinux_Linux'#010+
-  'P*2Tdarwin_Darwin and MacOS X on PowerPC'#010+
-  'P*2Tlinux_Linux on',' PowerPC'#010+
+  'P*2Tdarwin','_Darwin and MacOS X on PowerPC'#010+
+  'P*2Tlinux_Linux on PowerPC'#010+
   'P*2Tmacos_MacOS (classic) on PowerPC'#010+
   'P*2Tmorphos_MorphOS'#010+
   'S*2Tlinux_Linux'#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+
+  '**2Ur_generate release un','it files'#010+
   '**2Us_compile a system unit'#010+
-  '**1v<x>_Be v','erbose. <x> is a combination of the following letters:'#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*_n : Show notes    ','              t : Show tried/used files'#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 e','rrors'+
+  '**2*_a : Show ','everything             0 : Show nothing (except errors'+
   ')'#010+
   '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#010+
   '**2*_    declarations if an error    x : Executable info (Win32 only)'#010+
   '**2*_    occurs'#010+
-  '**1V_write fpcdebug.txt file with lots of debugging info'#010+
-  '3*1W<x>_Win32-like t','arget options'#010+
+  '**1V_write fpcdebug.txt file',' with lots of debugging info'#010+
+  '3*1W<x>_Win32-like 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_Specify full-screen type application (OS/2 only)'#010+
-  '3*2WG_Specify graphic type appl','ication'#010+
+  '3*2WF_Specify full-screen type applic','ation (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+
   'P*2WC_Specify console type application (MacOS only)'#010+
-  'P*2WG_Specify graphic type application (MacOS only)'#010+
-  'P*2WT_Specify tool type applicati','on (MPW tool, MacOS only)'#010+
+  'P*2WG_Specify graphic type applicati','on (MacOS only)'#010+
+  'P*2WT_Specify tool type application (MPW tool, MacOS only)'#010+
   '**1X_executable options:'#010+
   '**2Xc_link with the c library'#010+
   '**2Xd_don'#039't use standard library search path (needed for cross com'+
   'pile)'#010+
-  '**2XD_try to link units dynamic          (defines FPC_LINK_DYNAMIC)'#010+
-  '**2XP<x>_prepend th','e binutils names with the prefix <x>'#010+
+  '**2XD_try to link units dynamic       ','   (defines FPC_LINK_DYNAMIC)'#010+
+  '**2XP<x>_prepend the binutils names with the prefix <x>'#010+
   '**2Xr<x>_set library search path to <x> (needed for cross compile)'#010+
   '**2Xs_strip all symbols from executable'#010+
-  '**2XS_try to link units static (default) (defines FPC_LINK_STATIC)'#010+
-  '**2Xt_link with static librar','ies (-static is passed to linker)'#010+
+  '**2XS_try to link units static (default) (defin','es FPC_LINK_STATIC)'#010+
+  '**2Xt_link with static libraries (-static is passed to linker)'#010+
   '**2XX_try to link units smart            (defines FPC_LINK_SMART)'#010+
   '**1*_'#010+
   '**1?_shows this help'#010+

+ 6 - 2
compiler/pdecsub.pas

@@ -1215,7 +1215,7 @@ begin
   tprocdef(pd).forwarddef:=false;
   { forbid local external procedures }
   if pd.parast.symtablelevel>normal_function_level then
-    Message(parser_e_no_local_external);
+    Message(parser_e_no_local_proc_external);
   { If the procedure should be imported from a DLL, a constant string follows.
     This isn't really correct, an contant string expression follows
     so we check if an semicolon follows, else a string constant have to
@@ -2266,7 +2266,11 @@ const
 end.
 {
   $Log$
-  Revision 1.201  2004-11-09 17:26:47  peter
+  Revision 1.202  2004-11-09 22:32:59  peter
+    * small m68k updates to bring it up2date
+    * give better error for external local variable
+
+  Revision 1.201  2004/11/09 17:26:47  peter
     * fixed wrong typecasts
 
   Revision 1.200  2004/11/08 22:09:59  peter

+ 7 - 3
compiler/pdecvar.pas

@@ -829,7 +829,7 @@ implementation
                       include(vs.varoptions,vo_is_external);
                     end
                   else
-                    Message(parser_e_not_external_and_export);
+                    Message(parser_e_no_local_var_external);
                   symdone:=true;
                end;
 
@@ -1131,7 +1131,7 @@ implementation
                         end;
                      end
                    else
-                     Message(parser_e_not_external_and_export);
+                     Message(parser_e_no_local_var_external);
                    symdone:=true;
                  end;
               end;
@@ -1309,7 +1309,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.82  2004-11-08 22:09:59  peter
+  Revision 1.83  2004-11-09 22:32:59  peter
+    * small m68k updates to bring it up2date
+    * give better error for external local variable
+
+  Revision 1.82  2004/11/08 22:09:59  peter
     * tvarsym splitted
 
   Revision 1.81  2004/10/15 09:14:17  mazen

+ 5 - 2
compiler/rautils.pas

@@ -113,7 +113,6 @@ type
     operands  : array[1..max_operands] of toperand;
     constructor create(optype : tcoperand);virtual;
     destructor  destroy;override;
-    Procedure BuildOpcode;virtual;abstract;
     { converts the instruction to an instruction how it's used by the assembler writer
       and concats it to the passed list, the newly created item is returned }
     function ConcatInstruction(p:TAAsmoutput) : tai;virtual;
@@ -1636,7 +1635,11 @@ end;
 end.
 {
   $Log$
-  Revision 1.94  2004-11-08 22:09:59  peter
+  Revision 1.95  2004-11-09 22:32:59  peter
+    * small m68k updates to bring it up2date
+    * give better error for external local variable
+
+  Revision 1.94  2004/11/08 22:09:59  peter
     * tvarsym splitted
 
   Revision 1.93  2004/10/31 21:45:03  peter