Browse Source

* removed a bunch of cg. and hlcg. prefixes (left-overs from migrations
of ncgutil routines)

git-svn-id: branches/jvmbackend@18451 -

Jonas Maebe 14 years ago
parent
commit
53e6853667
1 changed files with 11 additions and 11 deletions
  1. 11 11
      compiler/hlcgobj.pas

+ 11 - 11
compiler/hlcgobj.pas

@@ -1661,7 +1661,7 @@ implementation
       case l.loc of
       case l.loc of
 {$ifdef cpuflags}
 {$ifdef cpuflags}
         LOC_FLAGS :
         LOC_FLAGS :
-          cg.g_flags2reg(list,def_cgsize(dst_size),l.resflags,hregister);
+          g_flags2reg(list,dst_size,l.resflags,hregister);
 {$endif cpuflags}
 {$endif cpuflags}
         LOC_JUMP :
         LOC_JUMP :
           begin
           begin
@@ -1730,7 +1730,7 @@ implementation
         LOC_CFPUREGISTER :
         LOC_CFPUREGISTER :
           begin
           begin
             tg.gethltemp(list,size,size.size,tt_normal,r);
             tg.gethltemp(list,size,size.size,tt_normal,r);
-            hlcg.a_loadfpu_reg_ref(list,size,size,l.register,r);
+            a_loadfpu_reg_ref(list,size,size,l.register,r);
             location_reset_ref(l,LOC_REFERENCE,l.size,0);
             location_reset_ref(l,LOC_REFERENCE,l.size,0);
             l.reference:=r;
             l.reference:=r;
           end;
           end;
@@ -1749,7 +1749,7 @@ implementation
         LOC_CREGISTER :
         LOC_CREGISTER :
           begin
           begin
             tg.gethltemp(list,size,size.size,tt_normal,r);
             tg.gethltemp(list,size,size.size,tt_normal,r);
-            hlcg.a_load_loc_ref(list,size,size,l,r);
+            a_load_loc_ref(list,size,size,l,r);
             location_reset_ref(l,LOC_REFERENCE,l.size,0);
             location_reset_ref(l,LOC_REFERENCE,l.size,0);
             l.reference:=r;
             l.reference:=r;
           end;
           end;
@@ -1787,9 +1787,9 @@ implementation
             begin
             begin
               if loadref then
               if loadref then
                 begin
                 begin
-                  reference_reset_base(ref,cg.getaddressregister(list),0,alignment);
+                  reference_reset_base(ref,getaddressregister(list,voidpointertype),0,alignment);
                   { it's a pointer to def }
                   { it's a pointer to def }
-                  hlcg.a_load_ref_reg(list,voidpointertype,voidpointertype,l.reference,ref.base);
+                  a_load_ref_reg(list,voidpointertype,voidpointertype,l.reference,ref.base);
                 end
                 end
               else
               else
                 ref:=l.reference;
                 ref:=l.reference;
@@ -2120,7 +2120,7 @@ implementation
                     end
                     end
                   else
                   else
                     highloc.loc:=LOC_INVALID;
                     highloc.loc:=LOC_INVALID;
-                  hreg:=cg.getaddressregister(list);
+                  hreg:=getaddressregister(list,voidpointertype);
                   if not is_packed_array(tparavarsym(p).vardef) then
                   if not is_packed_array(tparavarsym(p).vardef) then
                     g_copyvaluepara_openarray(list,href,highloc,tarraydef(tparavarsym(p).vardef),hreg)
                     g_copyvaluepara_openarray(list,href,highloc,tarraydef(tparavarsym(p).vardef),hreg)
                   else
                   else
@@ -2211,7 +2211,7 @@ implementation
             LOC_CREFERENCE,
             LOC_CREFERENCE,
             LOC_FPUREGISTER,
             LOC_FPUREGISTER,
             LOC_CFPUREGISTER:
             LOC_CFPUREGISTER:
-              hlcg.a_loadfpu_reg_cgpara(list,size,l.register,cgpara);
+              a_loadfpu_reg_cgpara(list,size,l.register,cgpara);
             else
             else
               internalerror(2011010210);
               internalerror(2011010210);
           end;
           end;
@@ -2230,13 +2230,13 @@ implementation
             LOC_CREFERENCE,
             LOC_CREFERENCE,
             LOC_FPUREGISTER,
             LOC_FPUREGISTER,
             LOC_CFPUREGISTER:
             LOC_CFPUREGISTER:
-              hlcg.a_loadfpu_ref_cgpara(list,size,l.reference,cgpara);
+              a_loadfpu_ref_cgpara(list,size,l.reference,cgpara);
             else
             else
               internalerror(2011010211);
               internalerror(2011010211);
           end;
           end;
         LOC_REGISTER,
         LOC_REGISTER,
         LOC_CREGISTER :
         LOC_CREGISTER :
-          hlcg.a_load_loc_cgpara(list,size,l,cgpara);
+          a_load_loc_cgpara(list,size,l,cgpara);
          else
          else
            internalerror(2011010212);
            internalerror(2011010212);
       end;
       end;
@@ -2270,7 +2270,7 @@ implementation
         LOC_REFERENCE,
         LOC_REFERENCE,
         LOC_CREFERENCE :
         LOC_CREFERENCE :
           begin
           begin
-            hlcg.a_load_loc_cgpara(list,vardef,l,cgpara);
+            a_load_loc_cgpara(list,vardef,l,cgpara);
           end;
           end;
 (*
 (*
         LOC_MMREGISTER,
         LOC_MMREGISTER,
@@ -2341,7 +2341,7 @@ implementation
         begin
         begin
           { was: don't do anything if funcretloc.loc in [LOC_INVALID,LOC_REFERENCE] }
           { was: don't do anything if funcretloc.loc in [LOC_INVALID,LOC_REFERENCE] }
           if not paramanager.ret_in_param(current_procinfo.procdef.returndef,current_procinfo.procdef.proccalloption) then
           if not paramanager.ret_in_param(current_procinfo.procdef.returndef,current_procinfo.procdef.proccalloption) then
-            hlcg.gen_load_loc_cgpara(list,ressym.vardef,ressym.localloc,funcretloc);
+            gen_load_loc_cgpara(list,ressym.vardef,ressym.localloc,funcretloc);
         end
         end
       else
       else
         gen_load_uninitialized_function_result(list,current_procinfo.procdef,ressym.vardef,funcretloc)
         gen_load_uninitialized_function_result(list,current_procinfo.procdef,ressym.vardef,funcretloc)