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

* fixed missing cgutils usage

florian 21 жил өмнө
parent
commit
054f6bff3a

+ 6 - 2
compiler/aoptbase.pas

@@ -30,7 +30,8 @@ unit aoptbase;
     uses
     uses
       aasmbase,aasmcpu,aasmtai,
       aasmbase,aasmcpu,aasmtai,
       cpubase,
       cpubase,
-      cgbase;
+      cgbase,
+      cgutils;
 
 
     Type
     Type
       { the number of tai objects processed by an optimizer object since the last
       { the number of tai objects processed by an optimizer object since the last
@@ -258,7 +259,10 @@ end.
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.9  2004-10-31 21:45:02  peter
+  Revision 1.10  2004-11-03 17:51:58  florian
+    * fixed missing cgutils usage
+
+  Revision 1.9  2004/10/31 21:45:02  peter
     * generic tlocation
     * generic tlocation
     * move tlocation to cgutils
     * move tlocation to cgutils
 
 

+ 9 - 6
compiler/aoptobj.pas

@@ -35,9 +35,9 @@ Unit AoptObj;
       globtype,
       globtype,
       aasmbase,aasmcpu,aasmtai,
       aasmbase,aasmcpu,aasmtai,
       cclasses,
       cclasses,
-      cgbase,
+      cgbase,cgutils,
       cpubase,
       cpubase,
-      aoptbase, aoptcpub, aoptda;
+      aoptbase,aoptcpub,aoptda;
 
 
     { ************************************************************************* }
     { ************************************************************************* }
     { ********************************* Constants ***************************** }
     { ********************************* Constants ***************************** }
@@ -57,7 +57,7 @@ Unit AoptObj;
     { ************************************************************************* }
     { ************************************************************************* }
     { ************************* Some general type definitions ***************** }
     { ************************* Some general type definitions ***************** }
     { ************************************************************************* }
     { ************************************************************************* }
-      TRefCompare = Function(const r1, r2: TReference): Boolean;
+      TRefCompare = Function(r1, r2: TReference): Boolean;
       //!!! FIXME
       //!!! FIXME
       TRegArray = Array[byte] of tsuperregister;
       TRegArray = Array[byte] of tsuperregister;
       TRegSet = Set of byte;
       TRegSet = Set of byte;
@@ -712,7 +712,7 @@ Unit AoptObj;
               (Counter <= Content.NrOfMods) Do
               (Counter <= Content.NrOfMods) Do
           Begin
           Begin
             If (p.typ = ait_instruction) And
             If (p.typ = ait_instruction) And
-               RefInInstruction(Ref, p, {$ifdef fpc}@{$endif}RefsEqual)
+               RefInInstruction(Ref, p, {$ifdef fpc}@{$endif}references_equal)
               Then TmpResult := True;
               Then TmpResult := True;
             Inc(Counter);
             Inc(Counter);
             GetNextInstruction(p,p)
             GetNextInstruction(p,p)
@@ -806,7 +806,7 @@ Unit AoptObj;
             Top_Reg :
             Top_Reg :
               OpsEqual:=o1.reg=o2.reg;
               OpsEqual:=o1.reg=o2.reg;
             Top_Ref :
             Top_Ref :
-              OpsEqual := RefsEqual(o1.ref^, o2.ref^);
+              OpsEqual := references_equal(o1.ref^, o2.ref^);
             Top_Const :
             Top_Const :
               OpsEqual:=o1.val=o2.val;
               OpsEqual:=o1.val=o2.val;
             Top_None :
             Top_None :
@@ -1085,7 +1085,10 @@ End.
 
 
 {
 {
  $Log$
  $Log$
- Revision 1.13  2004-10-31 21:45:02  peter
+ Revision 1.14  2004-11-03 17:51:58  florian
+   * fixed missing cgutils usage
+
+ Revision 1.13  2004/10/31 21:45:02  peter
    * generic tlocation
    * generic tlocation
    * move tlocation to cgutils
    * move tlocation to cgutils