# HG changeset patch
# User Christian Wimmer <christian.wimmer@oracle.com>
# Date 1349824599 25200
# Node ID ec196bfc458bac2a2fee6b3a01e47eac68d11e2b
# Parent  592782b4bc00a12d0b51882fa978e310e5c50297
Minor fixes after cleanup

diff -r 592782b4bc00 -r ec196bfc458b graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java	Tue Oct 09 15:39:49 2012 -0700
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java	Tue Oct 09 16:16:39 2012 -0700
@@ -28,7 +28,6 @@
 
 import junit.framework.*;
 
-import com.oracle.graal.api.*;
 import com.oracle.graal.api.code.*;
 import com.oracle.graal.api.meta.*;
 import com.oracle.graal.api.runtime.*;
@@ -41,7 +40,7 @@
 import com.oracle.graal.nodes.cfg.*;
 import com.oracle.graal.nodes.spi.*;
 import com.oracle.graal.phases.*;
-import com.oracle.graal.phases.PhasePlan.*;
+import com.oracle.graal.phases.PhasePlan.PhasePosition;
 import com.oracle.graal.phases.schedule.*;
 
 /**
diff -r 592782b4bc00 -r ec196bfc458b graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java	Tue Oct 09 15:39:49 2012 -0700
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java	Tue Oct 09 16:16:39 2012 -0700
@@ -24,7 +24,6 @@
 
 import java.lang.reflect.*;
 
-import com.oracle.graal.api.*;
 import com.oracle.graal.api.code.*;
 import com.oracle.graal.api.interpreter.*;
 import com.oracle.graal.api.meta.*;
diff -r 592782b4bc00 -r ec196bfc458b graal/com.oracle.graal.interpreter/src/com/oracle/graal/interpreter/BytecodeInterpreter.java
--- a/graal/com.oracle.graal.interpreter/src/com/oracle/graal/interpreter/BytecodeInterpreter.java	Tue Oct 09 15:39:49 2012 -0700
+++ b/graal/com.oracle.graal.interpreter/src/com/oracle/graal/interpreter/BytecodeInterpreter.java	Tue Oct 09 16:16:39 2012 -0700
@@ -25,7 +25,6 @@
 import java.lang.reflect.*;
 import java.util.*;
 
-import com.oracle.graal.api.*;
 import com.oracle.graal.api.interpreter.*;
 import com.oracle.graal.api.meta.*;
 import com.oracle.graal.api.runtime.*;
diff -r 592782b4bc00 -r ec196bfc458b graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/WordTest.java
--- a/graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/WordTest.java	Tue Oct 09 15:39:49 2012 -0700
+++ b/graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/WordTest.java	Tue Oct 09 16:16:39 2012 -0700
@@ -26,7 +26,6 @@
 
 import org.junit.*;
 
-import com.oracle.graal.api.*;
 import com.oracle.graal.api.code.*;
 import com.oracle.graal.api.meta.*;
 import com.oracle.graal.api.runtime.*;
diff -r 592782b4bc00 -r ec196bfc458b src/share/vm/prims/nativeLookup.cpp
--- a/src/share/vm/prims/nativeLookup.cpp	Tue Oct 09 15:39:49 2012 -0700
+++ b/src/share/vm/prims/nativeLookup.cpp	Tue Oct 09 16:16:39 2012 -0700
@@ -140,7 +140,7 @@
   { CC"Java_sun_misc_Perf_registerNatives",                        NULL, FN_PTR(JVM_RegisterPerfMethods)         },
   { CC"Java_sun_hotspot_WhiteBox_registerNatives",                 NULL, FN_PTR(JVM_RegisterWhiteBoxMethods)     },
 #ifdef GRAAL
-  { CC"Java_com_oracle_graal_api_Graal_initializeRuntime",         NULL, FN_PTR(JVM_InitializeGraalRuntime)      }
+  { CC"Java_com_oracle_graal_api_runtime_Graal_initializeRuntime", NULL, FN_PTR(JVM_InitializeGraalRuntime)      }
 #endif
 };
 
diff -r 592782b4bc00 -r ec196bfc458b src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Tue Oct 09 15:39:49 2012 -0700
+++ b/src/share/vm/runtime/arguments.cpp	Tue Oct 09 16:16:39 2012 -0700
@@ -2153,7 +2153,7 @@
         "com.oracle.graal.compiler.amd64",
         "com.oracle.graal.hotspot.amd64",
 #endif
-        "com.oracle.graal.api",
+        "com.oracle.graal.api.runtime",
         "com.oracle.graal.api.meta",
         "com.oracle.graal.api.code",
         "com.oracle.graal.api.interpreter",