Mercurial > hg > truffle
changeset 18856:e86659e1f813
added missing JNICALL to JNI functions
Contributed-by: Igor Ignatyev <igor.ignatyev@oracle.com>
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Tue, 13 Jan 2015 13:06:21 +0100 |
| parents | 82e5b5ccdb0c |
| children | 5214669b01f2 |
| files | src/gpu/hsail/vm/gpu_hsail.hpp src/gpu/ptx/vm/gpu_ptx.hpp |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gpu/hsail/vm/gpu_hsail.hpp Tue Jan 13 13:04:37 2015 +0100 +++ b/src/gpu/hsail/vm/gpu_hsail.hpp Tue Jan 13 13:06:21 2015 +0100 @@ -179,13 +179,13 @@ static JNINativeMethod HSAIL_methods[]; // static native boolean initialize(); - JNIEXPORT static jboolean initialize(JNIEnv* env, jclass); + JNIEXPORT static jboolean JNICALL initialize(JNIEnv* env, jclass); // static native long generateKernel(byte[] targetCode, String name); - JNIEXPORT static jlong generate_kernel(JNIEnv* env, jclass, jbyteArray code_handle, jstring name_handle); + JNIEXPORT static jlong JNICALL generate_kernel(JNIEnv* env, jclass, jbyteArray code_handle, jstring name_handle); // static native boolean executeKernel0(HotSpotInstalledCode kernel, int jobSize, Object[] args); - JNIEXPORT static jboolean execute_kernel_void_1d(JNIEnv* env, jclass, jobject hotspotInstalledCode, jint dimX, jobject args, + JNIEXPORT static jboolean JNICALL execute_kernel_void_1d(JNIEnv* env, jclass, jobject hotspotInstalledCode, jint dimX, jobject args, jint num_tlabs, int allocBytesPerWorkitem, jobject oop_map_array); static jboolean execute_kernel_void_1d_internal(address kernel, int dimX, jobject args, methodHandle& mh, nmethod* nm,
--- a/src/gpu/ptx/vm/gpu_ptx.hpp Tue Jan 13 13:04:37 2015 +0100 +++ b/src/gpu/ptx/vm/gpu_ptx.hpp Tue Jan 13 13:06:21 2015 +0100 @@ -101,18 +101,18 @@ static JNINativeMethod PTX_methods[]; // static native boolean initialize(); - JNIEXPORT static jboolean initialize(JNIEnv* env, jclass); + JNIEXPORT static jboolean JNICALL initialize(JNIEnv* env, jclass); // static native long generateKernel(byte[] targetCode, String name); - JNIEXPORT static jlong generate_kernel(JNIEnv *env, jclass, jbyteArray code_handle, jstring name_handle); + JNIEXPORT static jlong JNICALL generate_kernel(JNIEnv *env, jclass, jbyteArray code_handle, jstring name_handle); // static native long getLaunchKernelAddress(); - JNIEXPORT static jlong get_execute_kernel_from_vm_address(JNIEnv *env, jclass); + JNIEXPORT static jlong JNICALL get_execute_kernel_from_vm_address(JNIEnv *env, jclass); // static native int getAvailableProcessors0(); - JNIEXPORT static jint get_total_cores(JNIEnv *env, jobject); + JNIEXPORT static jint JNICALL get_total_cores(JNIEnv *env, jobject); - JNIEXPORT static void destroy_ptx_context(); + JNIEXPORT static void JNICALL destroy_ptx_context(); // Links the CUDA driver library functions static bool link();