* fixed compilation of arm compiler

compiler/arm/cgcpu.pas

@@ -29,7 +29,7 @@ unit cgcpu;
   interface
 
     uses
-       globtype,symtype,
+       globtype,symtype,symdef,
        cgbase,cgutils,cgobj,
        aasmbase,aasmcpu,aasmtai,
        parabase,
@@ -95,6 +95,8 @@ unit cgcpu;
         procedure a_jmp_cond(list : taasmoutput;cond : TOpCmp;l: tasmlabel);
         procedure fixref(list : taasmoutput;var ref : treference);
         procedure handle_load_store(list:taasmoutput;op: tasmop;oppostfix : toppostfix;reg:tregister;ref: treference);
+
+        procedure g_intf_wrapper(list: taasmoutput; procdef: tprocdef; const labelname: string; ioffset: longint);override;
       end;
 
       tcg64farm = class(tcg64f32)
@@ -117,7 +119,8 @@ unit cgcpu;
 
     uses
        globals,verbose,systems,cutils,
-       symconst,symdef,symsym,
+       fmodule,
+       symconst,symsym,
        tgobj,
        procinfo,cpupi,
        paramgr;
@@ -1202,6 +1205,71 @@ unit cgcpu;
       end;
 
 
+    procedure tcgarm.g_intf_wrapper(list: taasmoutput; procdef: tprocdef; const labelname: string; ioffset: longint);
+
+      procedure loadvmttor12;
+        var
+          href : treference;
+        begin
+          reference_reset_base(href,NR_R0,0);
+          cg.a_load_ref_reg(list,OS_ADDR,OS_ADDR,href,NR_R12);
+        end;
+
+
+      procedure op_onr12methodaddr;
+        var
+          href : treference;
+        begin
+          if (procdef.extnumber=$ffff) then
+            Internalerror(200006139);
+          { call/jmp  vmtoffs(%eax) ; method offs }
+          reference_reset_base(href,NR_R12,procdef._class.vmtmethodoffset(procdef.extnumber));
+          cg.a_load_ref_reg(list,OS_ADDR,OS_ADDR,href,NR_R12);
+          list.concat(taicpu.op_reg_reg(A_MOV,NR_PC,NR_R12));
+        end;
+
+      var
+        lab : tasmsymbol;
+        make_global : boolean;
+        href : treference;
+      begin
+        if procdef.proctypeoption<>potype_none then
+          Internalerror(200006137);
+        if not assigned(procdef._class) or
+           (procdef.procoptions*[po_classmethod, po_staticmethod,
+             po_methodpointer, po_interrupt, po_iocheck]<>[]) then
+          Internalerror(200006138);
+        if procdef.owner.symtabletype<>objectsymtable then
+          Internalerror(200109191);
+
+        make_global:=false;
+        if (not current_module.is_unit) or
+           (cs_create_smart in aktmoduleswitches) or
+           (procdef.owner.defowner.owner.symtabletype=globalsymtable) then
+          make_global:=true;
+
+        if make_global then
+          list.concat(Tai_symbol.Createname_global(labelname,AT_FUNCTION,0))
+        else
+          list.concat(Tai_symbol.Createname(labelname,AT_FUNCTION,0));
+
+        { set param1 interface to self  }
+        g_adjust_self_value(list,procdef,ioffset);
+
+        { case 4 }
+        if po_virtualmethod in procdef.procoptions then
+          begin
+            loadvmttor12;
+            op_onr12methodaddr;
+          end
+        { case 0 }
+        else
+          list.concat(taicpu.op_sym(A_B,objectlibrary.newasmsymbol(procdef.mangledname,AB_EXTERNAL,AT_FUNCTION)));
+
+        list.concat(Tai_symbol_end.Createname(labelname));
+      end;
+
+
     procedure tcg64farm.a_op64_reg_reg(list : taasmoutput;op:TOpCG;regsrc,regdst : tregister64);
       var
         tmpreg : tregister;
@@ -1316,7 +1384,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.66  2005-01-04 21:00:48  florian
+  Revision 1.67  2005-01-30 14:43:40  florian
+    * fixed compilation of arm compiler
+
+  Revision 1.66  2005/01/04 21:00:48  florian
     * not operator for byte/word fixed
 
   Revision 1.65  2005/01/04 20:15:05  florian

compiler/arm/cpunode.pas

@@ -35,7 +35,6 @@ unit cpunode;
          the processor specific nodes must be included
          after the generic one (FK)
        }
-       narmobj,
        narmadd,
        narmcal,
        narmmat,
@@ -46,7 +45,10 @@ unit cpunode;
 end.
 {
   $Log$
-  Revision 1.9  2004-06-20 08:55:31  florian
+  Revision 1.10  2005-01-30 14:43:40  florian
+    * fixed compilation of arm compiler
+
+  Revision 1.9  2004/06/20 08:55:31  florian
     * logs truncated
 
   Revision 1.8  2004/03/21 22:40:15  florian

compiler/arm/narmobj.pas

@@ -1,171 +0,0 @@
-{
-    $Id$
-    Copyright (c) 1998-2002 by Kovacs Attila Zoltan
-
-    Generate arm assembly wrapper code interface implementor objects
-
-    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 narmobj;
-
-{$i fpcdefs.inc}
-
-interface
-
-
-implementation
-
-uses
-  systems,
-  verbose,globals,globtype,
-  aasmbase,aasmtai,aasmcpu,
-  symconst,symdef,
-  fmodule,
-  nobj,
-  cpuinfo,cpubase,
-  cgutils,cgobj;
-
-   type
-     tarmclassheader=class(tclassheader)
-     protected
-       procedure cgintfwrapper(asmlist: TAAsmoutput; procdef: tprocdef; const labelname: string; ioffset: longint);override;
-     end;
-
-{
-possible calling conventions:
-              default stdcall cdecl pascal register saveregisters
-default(0):      OK     OK    OK(1)  OK       OK          OK
-virtual(2):      OK     OK    OK(3)  OK       OK          OK(4)
-
-(0):
-    set self parameter to correct value
-    jmp mangledname
-
-(1): The code is the following
-     set self parameter to correct value
-     call mangledname
-     set self parameter to interface value
-
-(2): The wrapper code use %eax to reach the virtual method address
-     set self to correct value
-     move self,%eax
-     mov  0(%eax),%eax ; load vmt
-     jmp  vmtoffs(%eax) ; method offs
-
-(3): The wrapper code use %eax to reach the virtual method address
-     set self to correct value
-     move self,%eax
-     mov  0(%eax),%eax ; load vmt
-     jmp  vmtoffs(%eax) ; method offs
-     set self parameter to interface value
-
-
-(4): Virtual use eax to reach the method address so the following code be generated:
-     set self to correct value
-     push %ebx ; allocate space for function address
-     push %eax
-     mov  self,%eax
-     mov  0(%eax),%eax ; load vmt
-     mov  vmtoffs(%eax),eax ; method offs
-     mov  %eax,4(%esp)
-     pop  %eax
-     ret  0; jmp the address
-
-}
-
-procedure tarmclassheader.cgintfwrapper(asmlist: TAAsmoutput; procdef: tprocdef; const labelname: string; ioffset: longint);
-
-  procedure loadvmttor12;
-  var
-    href : treference;
-  begin
-    reference_reset_base(href,NR_R0,0);
-    cg.a_load_ref_reg(exprasmlist,OS_ADDR,OS_ADDR,href,NR_R12);
-  end;
-
-  procedure op_onr12methodaddr;
-  var
-    href : treference;
-  begin
-    if (procdef.extnumber=$ffff) then
-      Internalerror(200006139);
-    { call/jmp  vmtoffs(%eax) ; method offs }
-    reference_reset_base(href,NR_R12,procdef._class.vmtmethodoffset(procdef.extnumber));
-    cg.a_load_ref_reg(exprasmlist,OS_ADDR,OS_ADDR,href,NR_R12);
-    exprasmlist.concat(taicpu.op_reg_reg(A_MOV,NR_PC,NR_R12));
-  end;
-
-var
-  oldexprasmlist: TAAsmoutput;
-  lab : tasmsymbol;
-  make_global : boolean;
-  href : treference;
-begin
-  if procdef.proctypeoption<>potype_none then
-    Internalerror(200006137);
-  if not assigned(procdef._class) or
-     (procdef.procoptions*[po_classmethod, po_staticmethod,
-       po_methodpointer, po_interrupt, po_iocheck]<>[]) then
-    Internalerror(200006138);
-  if procdef.owner.symtabletype<>objectsymtable then
-    Internalerror(200109191);
-
-  oldexprasmlist:=exprasmlist;
-  exprasmlist:=asmlist;
-
-  make_global:=false;
-  if (not current_module.is_unit) or
-     (cs_create_smart in aktmoduleswitches) or
-     (procdef.owner.defowner.owner.symtabletype=globalsymtable) then
-    make_global:=true;
-
-  if make_global then
-   exprasmList.concat(Tai_symbol.Createname_global(labelname,AT_FUNCTION,0))
-  else
-   exprasmList.concat(Tai_symbol.Createname(labelname,AT_FUNCTION,0));
-
-  { set param1 interface to self  }
-  adjustselfvalue(procdef,ioffset);
-
-  { case 4 }
-  if po_virtualmethod in procdef.procoptions then
-    begin
-      loadvmttor12;
-      op_onr12methodaddr;
-    end
-  { case 0 }
-  else
-    asmlist.concat(taicpu.op_sym(A_B,objectlibrary.newasmsymbol(procdef.mangledname,AB_EXTERNAL,AT_FUNCTION)));
-
-  exprasmList.concat(Tai_symbol_end.Createname(labelname));
-
-  exprasmlist:=oldexprasmlist;
-end;
-
-
-initialization
-  cclassheader:=tarmclassheader;
-end.
-{
-  $Log$
-  Revision 1.2  2004-03-22 22:19:02  florian
-    * interface trampolines (hopyfully) fixed
-
-  Revision 1.1  2004/03/21 22:40:15  florian
-    + added interface support for the arm
-    * added  FPC_REQUIRES_PROPER_ALIGNMENT define for targets which require proper alignment
-}