Index: vm/include/open/hythread.h =================================================================== --- vm/include/open/hythread.h (revision 520371) +++ vm/include/open/hythread.h (working copy) @@ -29,8 +29,8 @@ #define HYTHREAD_PROC VMCALL -typedef int(HYTHREAD_PROC* hythread_entrypoint_t)(void*); -typedef void(HYTHREAD_PROC* hythread_tls_finalizer_t)(void*); +typedef IDATA (HYTHREAD_PROC* hythread_entrypoint_t)(void*); +typedef void (HYTHREAD_PROC* hythread_tls_finalizer_t)(void*); typedef struct HyThread *hythread_t; typedef struct HyThreadMonitor *hythread_monitor_t; typedef struct HySemaphore *hysem_t; Index: vm/vmcore/include/finalizer_thread.h =================================================================== --- vm/vmcore/include/finalizer_thread.h (revision 520371) +++ vm/vmcore/include/finalizer_thread.h (working copy) @@ -32,22 +32,22 @@ #define VmEventHandle hysem_t -inline int vm_wait_event(VmEventHandle event) +inline IDATA vm_wait_event(VmEventHandle event) { IDATA stat = hysem_wait(event); assert(stat == TM_ERROR_NONE); return stat; } -inline int vm_set_event(VmEventHandle event, IDATA count) +inline IDATA vm_set_event(VmEventHandle event, IDATA count) { IDATA stat = hysem_set(event, count); assert(stat == TM_ERROR_NONE); return stat; } -inline int vm_post_event(VmEventHandle event) +inline IDATA vm_post_event(VmEventHandle event) { IDATA stat = hysem_set(event, 1); assert(stat == TM_ERROR_NONE); return stat; } -inline int vm_create_event(VmEventHandle* event, unsigned int initial_count, unsigned int max_count) +inline IDATA vm_create_event(VmEventHandle* event, unsigned int initial_count, unsigned int max_count) { return hysem_create(event, initial_count, max_count); } Index: vm/vmcore/include/ref_enqueue_thread.h =================================================================== --- vm/vmcore/include/ref_enqueue_thread.h (revision 520371) +++ vm/vmcore/include/ref_enqueue_thread.h (working copy) @@ -32,22 +32,22 @@ #define VmEventHandle hysem_t -inline int vm_wait_event(VmEventHandle event) +inline IDATA vm_wait_event(VmEventHandle event) { IDATA stat = hysem_wait(event); assert(stat == TM_ERROR_NONE); return stat; } -inline int vm_set_event(VmEventHandle event, IDATA count) +inline IDATA vm_set_event(VmEventHandle event, IDATA count) { IDATA stat = hysem_set(event, count); assert(stat == TM_ERROR_NONE); return stat; } -inline int vm_post_event(VmEventHandle event) +inline IDATA vm_post_event(VmEventHandle event) { IDATA stat = hysem_set(event, 1); assert(stat == TM_ERROR_NONE); return stat; } -inline int vm_create_event(VmEventHandle* event, unsigned int initial_count, unsigned int max_count) +inline IDATA vm_create_event(VmEventHandle* event, unsigned int initial_count, unsigned int max_count) { return hysem_create(event, initial_count, max_count); } Index: vm/vmcore/src/jni/jni.cpp =================================================================== --- vm/vmcore/src/jni/jni.cpp (revision 520371) +++ vm/vmcore/src/jni/jni.cpp (working copy) @@ -503,10 +503,12 @@ if (status != JNI_OK) goto done; // Attaches main thread to TM. - status = jthread_attach(jni_env, java_thread, daemon); - if (status != TM_ERROR_NONE) { - status = JNI_ERR; - goto done; + { + IDATA jtstatus = jthread_attach(jni_env, java_thread, daemon); + if (jtstatus != TM_ERROR_NONE) { + status = JNI_ERR; + goto done; + } } assert(jthread_self() != NULL); *p_jni_env = jni_env; @@ -1445,8 +1447,8 @@ status = vm_attach_internal(&jni_env, &java_thread, java_vm, NULL, name, daemon); if (status != JNI_OK) return status; - status = jthread_attach(jni_env, java_thread, daemon); - if (status != TM_ERROR_NONE) return JNI_ERR; + IDATA jtstatus = jthread_attach(jni_env, java_thread, daemon); + if (jtstatus != TM_ERROR_NONE) return JNI_ERR; // Now JVMTIThread keeps global reference. Discared temporary global reference. jni_env->DeleteGlobalRef(java_thread); @@ -1502,7 +1504,7 @@ // Attaches current thread to VM. status = vm_attach_internal(&jni_env, &java_thread, java_vm, group, name, daemon); - if (status != JNI_OK) return status; + if (status != JNI_OK) return (jint)status; *p_jni_env = jni_env; Index: vm/vmcore/src/jvmti/jvmti_trace.cpp =================================================================== --- vm/vmcore/src/jvmti/jvmti_trace.cpp (revision 520371) +++ vm/vmcore/src/jvmti/jvmti_trace.cpp (working copy) @@ -131,9 +131,9 @@ { assert((UDATA)obj < (UDATA)VM_Global_State::loader_env->heap_end); assert((UDATA)obj >= (UDATA)VM_Global_State::loader_env->heap_base); - unsigned offset = (UDATA)obj - (UDATA)VM_Global_State::loader_env->heap_base; - unsigned bitnum = offset / GC_OBJECT_ALIGNMENT; - unsigned index = bitnum / 8; + UDATA offset = (UDATA)obj - (UDATA)VM_Global_State::loader_env->heap_base; + UDATA bitnum = offset / GC_OBJECT_ALIGNMENT; + UDATA index = bitnum / 8; unsigned mask = 1 << (bitnum % 8); assert(index < state->markbits_size); bool unmarked = ((state->markbits[index] & mask) == 0); Index: vm/vmcore/src/jvmti/jvmti_thread.cpp =================================================================== --- vm/vmcore/src/jvmti/jvmti_thread.cpp (revision 520371) +++ vm/vmcore/src/jvmti/jvmti_thread.cpp (working copy) @@ -124,7 +124,7 @@ //jthread_get_all_threads(threads_ptr, threads_count_ptr); iterator=jthread_iterator_create(); - java_thread_count = jthread_iterator_size(iterator); + java_thread_count = (jint)jthread_iterator_size(iterator); //allocate memory err=jvmtiAllocate(env,java_thread_count*sizeof(jthread),(unsigned char**)&java_threads); if (err != JVMTI_ERROR_NONE){ Index: vm/vmcore/src/jvmti/jvmti_heap.h =================================================================== --- vm/vmcore/src/jvmti/jvmti_heap.h (revision 520371) +++ vm/vmcore/src/jvmti/jvmti_heap.h (working copy) @@ -60,7 +60,7 @@ // used to trace the heap unsigned char *markbits; - unsigned markbits_size; + UDATA markbits_size; std::stack *markstack; // some data is set up in enclosing scope and saved here, Index: vm/vmcore/src/jvmti/jvmti_roots.cpp =================================================================== --- vm/vmcore/src/jvmti/jvmti_roots.cpp (revision 520371) +++ vm/vmcore/src/jvmti/jvmti_roots.cpp (working copy) @@ -168,9 +168,9 @@ assert(state); if (JVMTI_HEAP_ROOT_STACK_LOCAL == state->root_kind || JVMTI_HEAP_ROOT_JNI_LOCAL == state->root_kind) { - jint depth = state->depth; + jint depth = (jint)state->depth; jmethodID method = state->method; - jint slot = ((UDATA)state->frame_base - (UDATA)root)/sizeof(void*); + jint slot = (jint)(((UDATA)state->frame_base - (UDATA)root)/sizeof(void*)); vm_ti_enumerate_stack_root((jvmtiEnv*)ti_env, root, obj, state->root_kind, Index: vm/vmcore/src/jvmti/jvmti_object.cpp =================================================================== --- vm/vmcore/src/jvmti/jvmti_object.cpp (revision 520371) +++ vm/vmcore/src/jvmti/jvmti_object.cpp (working copy) @@ -250,7 +250,7 @@ owner = oh_copy_to_local_handle(owner); info_ptr->owner = owner; - info_ptr->entry_count = jthread_get_lock_recursion(object, info_ptr->owner); + info_ptr->entry_count = (jint)jthread_get_lock_recursion(object, info_ptr->owner); info_ptr->waiter_count = ii; info_ptr->waiters = enter_wait_array; info_ptr->notify_waiter_count = jj; Index: vm/vmcore/src/jvmti/jvmti_event.cpp =================================================================== --- vm/vmcore/src/jvmti/jvmti_event.cpp (revision 520371) +++ vm/vmcore/src/jvmti/jvmti_event.cpp (working copy) @@ -2247,7 +2247,7 @@ } } -static int VMCALL +static IDATA VMCALL jvmti_event_thread_function(void *args) { DebugUtilsTI *ti = VM_Global_State::loader_env->TI; @@ -2257,7 +2257,7 @@ // attaching native thread to VM JavaVMAttachArgs vm_args = {JNI_VERSION_1_2, "TIEventThread", NULL}; - int status = AttachCurrentThreadAsDaemon(java_vm, (void**)&jni_env, &vm_args); + jint status = AttachCurrentThreadAsDaemon(java_vm, (void**)&jni_env, &vm_args); if(status != JNI_OK) { LDIE(24, "{0} cannot attach current thread" << "jvmti_event_thread_function:"); } Index: vm/vmcore/src/kernel_classes/native/java_lang_VMThreadManager.cpp =================================================================== --- vm/vmcore/src/kernel_classes/native/java_lang_VMThreadManager.cpp (revision 520371) +++ vm/vmcore/src/kernel_classes/native/java_lang_VMThreadManager.cpp (working copy) @@ -60,7 +60,7 @@ JNIEXPORT jint JNICALL Java_java_lang_VMThreadManager_interrupt (JNIEnv * UNREF jenv, jclass clazz, jobject jthread) { - return jthread_interrupt(jthread); + return (jint)jthread_interrupt(jthread); } /* @@ -71,7 +71,7 @@ JNIEXPORT jboolean JNICALL Java_java_lang_VMThreadManager_isInterrupted__ (JNIEnv * UNREF jenv, jclass clazz) { - return jthread_clear_interrupted(jthread_self()); + return (jthread_clear_interrupted(jthread_self()) == TM_ERROR_NONE)?JNI_TRUE:JNI_FALSE; } /* @@ -93,7 +93,7 @@ JNIEXPORT jint JNICALL Java_java_lang_VMThreadManager_notify (JNIEnv * UNREF jenv, jclass clazz, jobject monitor) { - return jthread_monitor_notify(monitor); + return (jint)jthread_monitor_notify(monitor); } /* @@ -104,7 +104,7 @@ JNIEXPORT jint JNICALL Java_java_lang_VMThreadManager_notifyAll (JNIEnv * UNREF jenv, jclass clazz, jobject monitor) { - return jthread_monitor_notify_all(monitor); + return (jint)jthread_monitor_notify_all(monitor); } /* @@ -115,7 +115,7 @@ JNIEXPORT jint JNICALL Java_java_lang_VMThreadManager_resume (JNIEnv * UNREF jenv, jclass clazz, jobject thread) { - return jthread_resume(thread); + return (jint)jthread_resume(thread); } /* @@ -126,7 +126,7 @@ JNIEXPORT jint JNICALL Java_java_lang_VMThreadManager_setPriority (JNIEnv * UNREF jenv, jclass clazz, jobject UNREF thread, jint UNREF priority) { - return jthread_set_priority(thread, priority); + return (jint)jthread_set_priority(thread, priority); } /* @@ -137,7 +137,7 @@ JNIEXPORT jint JNICALL Java_java_lang_VMThreadManager_sleep (JNIEnv * UNREF jenv, jclass clazz, jlong millis, jint nanos) { - return jthread_sleep(millis, nanos); + return (jint)jthread_sleep(millis, nanos); } /* @@ -175,7 +175,7 @@ JNIEXPORT jint JNICALL Java_java_lang_VMThreadManager_stop (JNIEnv *env, jclass clazz, jobject UNREF thread, jthrowable UNREF threadDeathException) { - return jthread_exception_stop(thread, threadDeathException); + return (jint)jthread_exception_stop(thread, threadDeathException); } /* @@ -186,7 +186,7 @@ JNIEXPORT jint JNICALL Java_java_lang_VMThreadManager_suspend (JNIEnv * UNREF jenv, jclass clazz, jobject jthread) { - return jthread_suspend(jthread); + return (jint)jthread_suspend(jthread); } @@ -199,7 +199,7 @@ (JNIEnv *env, jclass clazz, jobject monitor, jlong millis, jint UNREF nanos) { // TODO: need to evaluate return code properly - return jthread_monitor_timed_wait(monitor, millis, nanos); + return (jint)jthread_monitor_timed_wait(monitor, millis, nanos); } /* @@ -210,7 +210,7 @@ JNIEXPORT jint JNICALL Java_java_lang_VMThreadManager_yield (JNIEnv * UNREF jenv, jclass clazz) { - return jthread_yield(); + return (jint)jthread_yield(); } /* @@ -242,7 +242,7 @@ JNIEXPORT jint JNICALL Java_java_lang_VMThreadManager_join (JNIEnv * UNREF jenv, jclass clazz, jobject thread, jlong millis, jint nanos) { - return jthread_timed_join(thread, millis, nanos); + return (jint)jthread_timed_join(thread, millis, nanos); } /* @@ -254,7 +254,7 @@ (JNIEnv * UNREF jenv, jclass clazz, jobject jthread) { jint state; - int stat; + IDATA stat; stat = jthread_get_state(jthread, &state); assert(stat == TM_ERROR_NONE); Index: vm/vmcore/src/init/vm_init.cpp =================================================================== --- vm/vmcore/src/init/vm_init.cpp (revision 520371) +++ vm/vmcore/src/init/vm_init.cpp (working copy) @@ -555,7 +555,7 @@ native_thread = hythread_self(); args[3].j = (POINTER_SIZE_INT) native_thread; args[4].j = 0; - args[5].i = hythread_get_priority(native_thread); + args[5].i = (jint)hythread_get_priority(native_thread); args[6].z = daemon; vm_execute_java_method_array((jmethodID) constructor, 0, args); @@ -587,7 +587,7 @@ native_thread = hythread_self(); if (!native_thread) { - status = hythread_attach_to_group(&native_thread, + status = (jint)hythread_attach_to_group(&native_thread, ((JavaVM_Internal *)java_vm)->vm_env->hythread_lib, NULL); if (status != TM_ERROR_NONE) return JNI_ERR; } Index: vm/vmcore/src/init/finalizer_thread.cpp =================================================================== --- vm/vmcore/src/init/finalizer_thread.cpp (revision 520371) +++ vm/vmcore/src/init/finalizer_thread.cpp (working copy) @@ -50,7 +50,7 @@ return finalizer_thread_info->on_exit; } -static int finalizer_thread_func(void **args); +static IDATA finalizer_thread_func(void **args); void finalizer_threads_init(JavaVM *java_vm, JNIEnv *jni_env) { @@ -64,7 +64,7 @@ finalizer_thread_info->shutdown = FALSE; finalizer_thread_info->on_exit = FALSE; - int status = vm_create_event(&finalizer_thread_info->finalizer_pending_event, 0, finalizer_thread_info->thread_num); + IDATA status = vm_create_event(&finalizer_thread_info->finalizer_pending_event, 0, finalizer_thread_info->thread_num); assert(status == TM_ERROR_NONE); status = vm_create_event(&finalizer_thread_info->finalization_end_event, 0, 1); assert(status == TM_ERROR_NONE); @@ -146,7 +146,7 @@ gc_unlock(finalizer_thread_info->lock); } -static int finalizer_thread_func(void **args) +static IDATA finalizer_thread_func(void **args) { JavaVM *java_vm = (JavaVM *)args[0]; JNIEnv *jni_env = (JNIEnv *)args[1]; Index: vm/vmcore/src/init/ref_enqueue_thread.cpp =================================================================== --- vm/vmcore/src/init/ref_enqueue_thread.cpp (revision 520371) +++ vm/vmcore/src/init/ref_enqueue_thread.cpp (working copy) @@ -37,7 +37,7 @@ native_ref_enqueue_thread_flag = flag; } -static int ref_enqueue_thread_func(void **args); +static IDATA ref_enqueue_thread_func(void **args); void ref_enqueue_thread_init(JavaVM *java_vm, JNIEnv *jni_env) { @@ -48,7 +48,7 @@ ref_enqueue_thread_info->lock = FREE_LOCK; ref_enqueue_thread_info->shutdown = FALSE; - int status = vm_create_event(&ref_enqueue_thread_info->reference_pending_event, 0, 1); + IDATA status = vm_create_event(&ref_enqueue_thread_info->reference_pending_event, 0, 1); assert(status == TM_ERROR_NONE); void **args = (void **)STD_MALLOC(sizeof(void *)*2); @@ -84,7 +84,7 @@ } -static int ref_enqueue_thread_func(void **args) +static IDATA ref_enqueue_thread_func(void **args) { JavaVM *java_vm = (JavaVM *)args[0]; JNIEnv *jni_env = (JNIEnv *)args[1]; Index: vm/vmcore/src/init/vm_shutdown.cpp =================================================================== --- vm/vmcore/src/init/vm_shutdown.cpp (revision 520371) +++ vm/vmcore/src/init/vm_shutdown.cpp (working copy) @@ -155,7 +155,7 @@ */ jint vm_destroy(JavaVM_Internal * java_vm, jthread java_thread) { - jint status; + IDATA status; JNIEnv * jni_env; jobject uncaught_exception; @@ -182,7 +182,7 @@ // Execute pending shutdown hooks & finalizers status = exec_shutdown_sequence(jni_env); - if (status != JNI_OK) return status; + if (status != JNI_OK) return (jint)status; // Raise uncaught exception to current thread. // It will be properly processed in jthread_detach(). @@ -222,7 +222,7 @@ return JNI_OK; } -static int vm_interrupt_process(void * data) { +static IDATA vm_interrupt_process(void * data) { hythread_t * threadBuf; int i; @@ -241,7 +241,7 @@ /** * Initiates VM shutdown sequence. */ -static int vm_interrupt_entry_point(void * data) { +static IDATA vm_interrupt_entry_point(void * data) { JNIEnv * jni_env; JavaVMAttachArgs args; JavaVM * java_vm; @@ -263,7 +263,7 @@ /** * Dumps all java stacks. */ -static int vm_dump_entry_point(void * data) { +static IDATA vm_dump_entry_point(void * data) { JNIEnv * jni_env; JavaVMAttachArgs args; JavaVM * java_vm; @@ -292,7 +292,7 @@ JavaVM ** vmBuf; hythread_t * threadBuf; int nVMs; - jint status; + IDATA status; status = JNI_GetCreatedJavaVMs(NULL, 0, &nVMs); assert(nVMs <= 1); @@ -342,8 +342,8 @@ if (status != JNI_OK) goto cleanup; - status = hythread_attach(NULL); - if (status != TM_ERROR_NONE) goto cleanup; + IDATA htstatus = hythread_attach(NULL); + if (htstatus != TM_ERROR_NONE) goto cleanup; // Create a new thread for each VM to avoid scalability and deadlock problems. for (int i = 0; i < nVMs; i++) { Index: vm/vmcore/src/thread/thread_generic.cpp =================================================================== --- vm/vmcore/src/thread/thread_generic.cpp (revision 520371) +++ vm/vmcore/src/thread/thread_generic.cpp (working copy) @@ -147,7 +147,7 @@ /** * Runs java.lang.Thread.detach() method. */ -static IDATA run_java_detach(jthread java_thread) { +static jint run_java_detach(jthread java_thread) { static Method * detach = NULL; const char * method_name = "detach"; const char * descriptor = "(Ljava/lang/Throwable;)V"; Index: vm/em/src/EdgeProfileCollector.cpp =================================================================== --- vm/em/src/EdgeProfileCollector.cpp (revision 520371) +++ vm/em/src/EdgeProfileCollector.cpp (working copy) @@ -137,7 +137,7 @@ if (val!=key) { return NULL; } - uint32 idx = it - cntMap.begin(); + uint32 idx = (uint32)(it - cntMap.begin()); return (uint32*)&counters.front() + idx; }