--- a/graal/com.oracle.max.asm/src/com/oracle/max/asm/target/amd64/AMD64Assembler.java	Thu Jun 07 17:25:52 2012 +0200
+++ b/graal/com.oracle.max.asm/src/com/oracle/max/asm/target/amd64/AMD64Assembler.java	Thu Jun 07 18:12:01 2012 +0200
@@ -136,7 +136,7 @@
      *            {@link CiRegister#CallerFrame} to physical registers. This value can be null if this assembler
      *            instance will not be used to assemble instructions using these logical registers.
      */
-    public AMD64Assembler(CiTarget target, RiRegisterConfig registerConfig) {
+    public AMD64Assembler(CiTarget target, CiRegisterConfig registerConfig) {
         super(target);
         this.frameRegister = registerConfig == null ? null : registerConfig.getFrameRegister();
     }
@@ -2217,7 +2217,7 @@
         }
     }
 
-    private static boolean needsRex(CiValue value) {
+    private static boolean needsRex(RiValue value) {
         return isRegister(value) && asRegister(value).encoding >= MinEncodingNeedsRex;
     }