harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r522564 - in /harmony/enhanced/drlvm/trunk/vm: em/src/ include/open/ vmcore/src/init/ vmcore/src/jni/ vmcore/src/jvmti/ vmcore/src/kernel_classes/native/ vmcore/src/thread/
Date Mon, 26 Mar 2007 16:29:02 GMT
Author: gshimansky
Date: Mon Mar 26 09:28:57 2007
New Revision: 522564

URL: http://svn.apache.org/viewvc?view=rev&rev=522564
Log:
Applied HARMONY-3442 [drlvm][winx64] Warnings introduced in VM due to IDATA/UDATA porting
to Windows x64.


Modified:
    harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.cpp
    harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/ref_enqueue_thread.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_shutdown.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_heap.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_object.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_roots.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_thread.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_trace.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMThreadManager.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_generic.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.cpp?view=diff&rev=522564&r1=522563&r2=522564
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.cpp Mon Mar 26 09:28:57 2007
@@ -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;
 }
 

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h?view=diff&rev=522564&r1=522563&r2=522564
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h Mon Mar 26 09:28:57 2007
@@ -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;

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp?view=diff&rev=522564&r1=522563&r2=522564
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp Mon Mar 26 09:28:57
2007
@@ -59,7 +59,7 @@
     return 0;
 }
 
-static int finalizer_thread_func(void **args);
+static IDATA finalizer_thread_func(void **args);
 
 void finalizer_threads_init(JavaVM *java_vm)
 {
@@ -164,7 +164,7 @@
     assert(stat == TM_ERROR_NONE);
 }
 
-static int finalizer_thread_func(void **args)
+static IDATA finalizer_thread_func(void **args)
 {
     JavaVM *java_vm = (JavaVM *)args[0];
     JNIEnv *jni_env;

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/ref_enqueue_thread.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/ref_enqueue_thread.cpp?view=diff&rev=522564&r1=522563&r2=522564
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/ref_enqueue_thread.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/ref_enqueue_thread.cpp Mon Mar 26 09:28:57
2007
@@ -36,7 +36,7 @@
 {  native_ref_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)
 {
@@ -73,7 +73,7 @@
     assert(stat == TM_ERROR_NONE);
 }
 
-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;

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp?view=diff&rev=522564&r1=522563&r2=522564
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp Mon Mar 26 09:28:57 2007
@@ -553,7 +553,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);
@@ -585,7 +585,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;
     }

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_shutdown.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_shutdown.cpp?view=diff&rev=522564&r1=522563&r2=522564
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_shutdown.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_shutdown.cpp Mon Mar 26 09:28:57 2007
@@ -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);
@@ -340,10 +340,11 @@
     status = JNI_GetCreatedJavaVMs(vmBuf, nVMs, &nVMs);
     assert(nVMs <= 1);
 
+    IDATA htstatus;
     if (status != JNI_OK) goto cleanup;
 
-    status = hythread_attach(NULL);
-    if (status != TM_ERROR_NONE) goto cleanup;
+    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++) {

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp?view=diff&rev=522564&r1=522563&r2=522564
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp Mon Mar 26 09:28:57 2007
@@ -505,10 +505,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;
@@ -1450,8 +1452,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);
 
@@ -1508,7 +1510,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;
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp?view=diff&rev=522564&r1=522563&r2=522564
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp Mon Mar 26 09:28:57 2007
@@ -2244,7 +2244,7 @@
     }
 }
 
-static int VMCALL
+static IDATA VMCALL
 jvmti_event_thread_function(void *args)
 {
     DebugUtilsTI *ti = VM_Global_State::loader_env->TI;
@@ -2254,7 +2254,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:");
     }

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_heap.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_heap.h?view=diff&rev=522564&r1=522563&r2=522564
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_heap.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_heap.h Mon Mar 26 09:28:57 2007
@@ -60,7 +60,7 @@
 
     // used to trace the heap
     unsigned char *markbits;
-    unsigned markbits_size;
+    UDATA markbits_size;
     std::stack<ManagedObject*> *markstack;
 
     // some data is set up in enclosing scope and saved here,

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_object.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_object.cpp?view=diff&rev=522564&r1=522563&r2=522564
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_object.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_object.cpp Mon Mar 26 09:28:57
2007
@@ -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;

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_roots.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_roots.cpp?view=diff&rev=522564&r1=522563&r2=522564
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_roots.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_roots.cpp Mon Mar 26 09:28:57 2007
@@ -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, 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_thread.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_thread.cpp?view=diff&rev=522564&r1=522563&r2=522564
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_thread.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_thread.cpp Mon Mar 26 09:28:57
2007
@@ -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){

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_trace.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_trace.cpp?view=diff&rev=522564&r1=522563&r2=522564
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_trace.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_trace.cpp Mon Mar 26 09:28:57 2007
@@ -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);

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMThreadManager.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMThreadManager.cpp?view=diff&rev=522564&r1=522563&r2=522564
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMThreadManager.cpp
(original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMThreadManager.cpp
Mon Mar 26 09:28:57 2007
@@ -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_INTERRUPT)?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);

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_generic.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_generic.cpp?view=diff&rev=522564&r1=522563&r2=522564
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_generic.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_generic.cpp Mon Mar 26 09:28:57
2007
@@ -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";



Mime
View raw message