--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/VMEntriesNative.java	Fri Jul 23 15:53:02 2010 -0700
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/VMEntriesNative.java	Mon Aug 02 15:44:38 2010 -0700
@@ -1,75 +1,61 @@
 package com.sun.hotspot.c1x;
 
-import com.sun.cri.ri.RiConstantPool;
-import com.sun.cri.ri.RiField;
-import com.sun.cri.ri.RiMethod;
-import com.sun.cri.ri.RiSignature;
-import com.sun.cri.ri.RiType;
+import java.lang.reflect.*;
+
+import com.sun.cri.ri.*;
 
 public class VMEntriesNative implements VMEntries {
 
     @Override
-    public native byte[] RiMethod_code(Object methodOop);
+    public native byte[] RiMethod_code(Method methodOop);
 
     @Override
-    public native int RiMethod_maxStackSize(Object methodOop);
+    public native int RiMethod_maxStackSize(Method methodOop);
 
     @Override
-    public native int RiMethod_maxLocals(Object methodOop);
-
-    @Override
-    public native RiType RiMethod_holder(Object methodOop);
+    public native int RiMethod_maxLocals(Method methodOop);
 
     @Override
-    public native String RiMethod_signature(Object methodOop);
+    public native RiType RiMethod_holder(Method methodOop);
 
     @Override
-    public native String RiMethod_name(Object methodOop);
+    public native String RiMethod_signature(Method methodOop);
 
     @Override
-    public native RiType RiSignature_lookupType(String returnType, Object accessingClass);
+    public native String RiMethod_name(Method methodOop);
 
     @Override
-    public native String RiSignature_symbolToString(Object symbolOop);
+    public native int RiMethod_accessFlags(Method methodOop);
 
     @Override
-    public native Class< ? > RiType_javaClass(Object klassOop);
-
-    @Override
-    public native String RiType_name(Object klassOop);
+    public native RiType RiSignature_lookupType(String returnType, Class<?> accessingClass);
 
     @Override
-    public native Object RiConstantPool_lookupConstant(Object constantPoolOop, int cpi);
-
-    @Override
-    public native RiMethod RiConstantPool_lookupMethod(Object constantPoolOop, int cpi, byte byteCode);
+    public native Object RiConstantPool_lookupConstant(Class<?> constantPoolOop, int cpi);
 
     @Override
-    public native RiSignature RiConstantPool_lookupSignature(Object constantPoolOop, int cpi);
+    public native RiMethod RiConstantPool_lookupMethod(Class<?> constantPoolOop, int cpi, byte byteCode);
 
     @Override
-    public native RiType RiConstantPool_lookupType(Object constantPoolOop, int cpi);
+    public native RiSignature RiConstantPool_lookupSignature(Class<?> constantPoolOop, int cpi);
 
     @Override
-    public native RiField RiConstantPool_lookupField(Object constantPoolOop, int cpi);
+    public native RiType RiConstantPool_lookupType(Class<?> constantPoolOop, int cpi);
 
     @Override
-    public native RiType findRiType(Object holderKlassOop);
+    public native RiField RiConstantPool_lookupField(Class<?> constantPoolOop, int cpi);
 
     @Override
-    public native RiConstantPool RiRuntime_getConstantPool(Object klassOop);
+    public native String RiType_name(Class<?> klassOop);
 
     @Override
-    public native boolean RiType_isArrayClass(Object klassOop);
+    public native boolean RiType_isArrayClass(Class<?> klassOop);
 
     @Override
-    public native boolean RiType_isInstanceClass(Object klassOop);
+    public native boolean RiType_isInstanceClass(Class<?> klassOop);
 
     @Override
-    public native boolean RiType_isInterface(Object klassOop);
-
-    @Override
-    public native int RiMethod_accessFlags(Object methodOop);
+    public native boolean RiType_isInterface(Class<?> klassOop);
 
     @Override
     public native void installCode(HotSpotTargetMethod targetMethod);