Mercurial > hg > graal-jvmci-8
comparison src/share/vm/prims/nativeLookup.cpp @ 21562:47bebae7454f
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 28 May 2015 21:58:33 +0200 |
parents | be896a1983c0 cecb4e39521c |
children | 4f63449b4422 |
comparison
equal
deleted
inserted
replaced
21561:ce2113326bc8 | 21562:47bebae7454f |
---|---|
132 jobject JNICALL JVM_GetJVMCIRuntime(JNIEnv *env, jclass c); | 132 jobject JNICALL JVM_GetJVMCIRuntime(JNIEnv *env, jclass c); |
133 jobject JNICALL JVM_GetJVMCIRuntime(JNIEnv *env, jclass c); | 133 jobject JNICALL JVM_GetJVMCIRuntime(JNIEnv *env, jclass c); |
134 jobject JNICALL JVM_GetJVMCIServiceImpls(JNIEnv *env, jclass c, jclass serviceClass); | 134 jobject JNICALL JVM_GetJVMCIServiceImpls(JNIEnv *env, jclass c, jclass serviceClass); |
135 jobject JNICALL JVM_CreateTruffleRuntime(JNIEnv *env, jclass c); | 135 jobject JNICALL JVM_CreateTruffleRuntime(JNIEnv *env, jclass c); |
136 jobject JNICALL JVM_CreateNativeFunctionInterface(JNIEnv *env, jclass c); | 136 jobject JNICALL JVM_CreateNativeFunctionInterface(JNIEnv *env, jclass c); |
137 jboolean JNICALL JVM_ParseJVMCIOptions(JNIEnv *env, jclass hotspotOptionsClass); | 137 jboolean JNICALL JVM_IsCITimingEnabled(JNIEnv *env); |
138 #ifdef COMPILERJVMCI | 138 #ifdef COMPILERJVMCI |
139 void JNICALL JVM_PrintAndResetJVMCICompRate(JNIEnv *env, jclass c); | 139 void JNICALL JVM_PrintAndResetJVMCICompRate(JNIEnv *env, jclass c); |
140 #endif | 140 #endif |
141 #endif | 141 #endif |
142 } | 142 } |
154 { CC"Java_com_oracle_jvmci_runtime_JVMCI_initializeRuntime", NULL, FN_PTR(JVM_GetJVMCIRuntime) }, | 154 { CC"Java_com_oracle_jvmci_runtime_JVMCI_initializeRuntime", NULL, FN_PTR(JVM_GetJVMCIRuntime) }, |
155 { CC"Java_com_oracle_jvmci_runtime_Services_getServiceImpls", NULL, FN_PTR(JVM_GetJVMCIServiceImpls) }, | 155 { CC"Java_com_oracle_jvmci_runtime_Services_getServiceImpls", NULL, FN_PTR(JVM_GetJVMCIServiceImpls) }, |
156 { CC"Java_com_oracle_truffle_api_Truffle_createRuntime", NULL, FN_PTR(JVM_CreateTruffleRuntime) }, | 156 { CC"Java_com_oracle_truffle_api_Truffle_createRuntime", NULL, FN_PTR(JVM_CreateTruffleRuntime) }, |
157 { CC"Java_com_oracle_nfi_NativeFunctionInterfaceRuntime_createInterface", NULL, FN_PTR(JVM_CreateNativeFunctionInterface) }, | 157 { CC"Java_com_oracle_nfi_NativeFunctionInterfaceRuntime_createInterface", NULL, FN_PTR(JVM_CreateNativeFunctionInterface) }, |
158 { CC"Java_com_oracle_jvmci_hotspot_CompilerToVMImpl_init", NULL, FN_PTR(JVM_InitializeJVMCINatives) }, | 158 { CC"Java_com_oracle_jvmci_hotspot_CompilerToVMImpl_init", NULL, FN_PTR(JVM_InitializeJVMCINatives) }, |
159 { CC"Java_com_oracle_jvmci_hotspot_HotSpotOptions_parseVMOptions", NULL, FN_PTR(JVM_ParseJVMCIOptions) }, | 159 { CC"Java_com_oracle_jvmci_hotspot_HotSpotOptions_isCITimingEnabled", NULL, FN_PTR(JVM_IsCITimingEnabled) }, |
160 #endif | 160 #endif |
161 }; | 161 }; |
162 | 162 |
163 static address lookup_special_native(char* jni_name) { | 163 static address lookup_special_native(char* jni_name) { |
164 int count = sizeof(lookup_special_native_methods) / sizeof(JNINativeMethod); | 164 int count = sizeof(lookup_special_native_methods) / sizeof(JNINativeMethod); |