--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiAddress.java	Thu Jun 07 17:07:42 2012 +0200
+++ b/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiAddress.java	Thu Jun 07 17:08:33 2012 +0200
@@ -35,7 +35,7 @@
     /**
      * A sentinel value used as a place holder in an instruction stream for an address that will be patched.
      */
-    public static final CiAddress Placeholder = new CiAddress(CiKind.Illegal, CiValue.IllegalValue);
+    public static final CiAddress Placeholder = new CiAddress(RiKind.Illegal, CiValue.IllegalValue);
 
     /**
      * Base register that defines the start of the address computation.
@@ -64,7 +64,7 @@
      * @param kind the kind of the value being addressed
      * @param base the base register
      */
-    public CiAddress(CiKind kind, CiValue base) {
+    public CiAddress(RiKind kind, CiValue base) {
         this(kind, base, IllegalValue, Scale.Times1, 0);
     }
 
@@ -74,7 +74,7 @@
      * @param base the base register
      * @param displacement the displacement
      */
-    public CiAddress(CiKind kind, CiValue base, int displacement) {
+    public CiAddress(RiKind kind, CiValue base, int displacement) {
         this(kind, base, IllegalValue, Scale.Times1, displacement);
     }
 
@@ -87,7 +87,7 @@
      * @param scale the scaling factor
      * @param displacement the displacement
      */
-    public CiAddress(CiKind kind, CiValue base, CiValue index, Scale scale, int displacement) {
+    public CiAddress(RiKind kind, CiValue base, CiValue index, Scale scale, int displacement) {
         super(kind);
         this.base = base;
         this.index = index;