diff src/share/vm/graal/graalCompilerToVM.cpp @ 5541:b4c406861c33

More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sat, 09 Jun 2012 16:52:12 +0200
parents a891c53a295b
children 20e390e09717
line wrap: on
line diff
--- a/src/share/vm/graal/graalCompilerToVM.cpp	Fri Jun 08 23:47:42 2012 +0200
+++ b/src/share/vm/graal/graalCompilerToVM.cpp	Sat Jun 09 16:52:12 2012 +0200
@@ -667,7 +667,7 @@
   return JNIHandles::make_local(THREAD, GraalCompiler::createHotSpotTypeResolved(arr, name, THREAD)());
 }
 
-// public RiResolvedField[] RiType_fields(HotSpotTypeResolved klass);
+// public ResolvedJavaField[] RiType_fields(HotSpotTypeResolved klass);
 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiType_1fields(JNIEnv *, jobject, jobject klass) {
   TRACE_graal_3("CompilerToVM::RiType_fields");
   VM_ENTRY_MARK;
@@ -1121,16 +1121,16 @@
 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &(Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_##f))
 
 #define PROXY           "J"
-#define TYPE            "Lcom/oracle/graal/api/meta/RiType;"
+#define TYPE            "Lcom/oracle/graal/api/meta/JavaType;"
 #define RESOLVED_TYPE   "Lcom/oracle/graal/hotspot/ri/HotSpotTypeResolved;"
-#define METHOD          "Lcom/oracle/graal/api/meta/RiMethod;"
+#define METHOD          "Lcom/oracle/graal/api/meta/JavaMethod;"
 #define RESOLVED_METHOD "Lcom/oracle/graal/hotspot/ri/HotSpotMethodResolved;"
 #define REFLECT_METHOD  "Ljava/lang/reflect/Method;"
-#define SIGNATURE       "Lcom/oracle/graal/api/meta/RiSignature;"
-#define FIELD           "Lcom/oracle/graal/api/meta/RiField;"
-#define RESOLVED_FIELD  "Lcom/oracle/graal/api/meta/RiResolvedField;"
-#define CONSTANT_POOL   "Lcom/oracle/graal/api/meta/RiConstantPool;"
-#define EXCEPTION_HANDLERS "[Lcom/oracle/graal/api/meta/RiExceptionHandler;"
+#define SIGNATURE       "Lcom/oracle/graal/api/meta/Signature;"
+#define FIELD           "Lcom/oracle/graal/api/meta/JavaField;"
+#define RESOLVED_FIELD  "Lcom/oracle/graal/api/meta/ResolvedJavaField;"
+#define CONSTANT_POOL   "Lcom/oracle/graal/api/meta/ConstantPool;"
+#define EXCEPTION_HANDLERS "[Lcom/oracle/graal/api/meta/ExceptionHandler;"
 #define TARGET_METHOD   "Lcom/oracle/graal/hotspot/HotSpotTargetMethod;"
 #define CONFIG          "Lcom/oracle/graal/hotspot/HotSpotVMConfig;"
 #define HS_METHOD       "Lcom/oracle/graal/hotspot/ri/HotSpotMethod;"