--- a/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/CompilationPrinter.java	Sat Jun 09 18:01:23 2012 +0200
+++ b/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/CompilationPrinter.java	Sat Jun 09 20:10:05 2012 +0200
@@ -22,7 +22,7 @@
  */
 package com.oracle.max.criutils;
 
-import static com.oracle.graal.api.code.CiValueUtil.*;
+import static com.oracle.graal.api.code.ValueUtil.*;
 
 import java.io.*;
 import java.util.*;
@@ -97,8 +97,8 @@
      */
     public void printCompilation(JavaMethod method) {
         begin("compilation");
-        out.print("name \" ").print(CiUtil.format("%H::%n", method)).println('"');
-        out.print("method \"").print(CiUtil.format("%f %r %H.%n(%p)", method)).println('"');
+        out.print("name \" ").print(CodeUtil.format("%H::%n", method)).println('"');
+        out.print("method \"").print(CodeUtil.format("%f %r %H.%n(%p)", method)).println('"');
         out.print("date ").println(System.currentTimeMillis());
         end("compilation");
     }
@@ -106,7 +106,7 @@
     /**
      * Formats a given {@linkplain FrameState JVM frame state} as a multi line string.
      */
-    protected String debugInfoToString(CiCodePos codePos, BitSet registerRefMap, BitSet frameRefMap, CiArchitecture arch) {
+    protected String debugInfoToString(BytecodePosition codePos, BitSet registerRefMap, BitSet frameRefMap, Architecture arch) {
         StringBuilder sb = new StringBuilder();
 
         if (registerRefMap != null) {
@@ -126,13 +126,13 @@
         }
 
         if (codePos != null) {
-            CiCodePos curCodePos = codePos;
-            List<CiVirtualObject> virtualObjects = new ArrayList<>();
+            BytecodePosition curCodePos = codePos;
+            List<VirtualObject> virtualObjects = new ArrayList<>();
             do {
-                sb.append(CiUtil.toLocation(curCodePos.method, curCodePos.bci));
+                sb.append(CodeUtil.toLocation(curCodePos.method, curCodePos.bci));
                 sb.append('\n');
-                if (curCodePos instanceof CiFrame) {
-                    CiFrame frame = (CiFrame) curCodePos;
+                if (curCodePos instanceof BytecodeFrame) {
+                    BytecodeFrame frame = (BytecodeFrame) curCodePos;
                     if (frame.numStack > 0) {
                         sb.append("stack: ");
                         for (int i = 0; i < frame.numStack; i++) {
@@ -158,7 +158,7 @@
             } while (curCodePos != null);
 
             for (int i = 0; i < virtualObjects.size(); i++) {
-                CiVirtualObject obj = virtualObjects.get(i);
+                VirtualObject obj = virtualObjects.get(i);
                 sb.append(obj).append(" ").append(obj.type().name()).append(" ");
                 for (int j = 0; j < obj.values().length; j++) {
                     sb.append(valueToString(obj.values()[j], virtualObjects)).append(' ');
@@ -170,7 +170,7 @@
         return sb.toString();
     }
 
-    protected String valueToString(Value value, List<CiVirtualObject> virtualObjects) {
+    protected String valueToString(Value value, List<VirtualObject> virtualObjects) {
         if (value == null) {
             return "-";
         }