harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r523191 - in /harmony/enhanced/drlvm/trunk/vm: jitrino/src/jet/cg_instr.cpp jitrino/src/jet/val.h vmcore/src/init/finalizer_thread.cpp vmcore/src/kernel_classes/native/org_apache_harmony_drlvm_VMHelper.cpp
Date Wed, 28 Mar 2007 06:22:05 GMT
Author: varlax
Date: Tue Mar 27 23:22:04 2007
New Revision: 523191

URL: http://svn.apache.org/viewvc?view=rev&rev=523191
Log:
Few compilation warning fixed.

Modified:
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_instr.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/val.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_drlvm_VMHelper.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_instr.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_instr.cpp?view=diff&rev=523191&r1=523190&r2=523191
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_instr.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_instr.cpp Tue Mar 27 23:22:04 2007
@@ -443,7 +443,7 @@
         baseObject = Val(jobj, NULL_REF);
         rlock(baseObject);
         void* fieldAddress = field_get_address(fieldHandle);
-        slotAddress = Opnd(jobj, (jlong)(int_ptr)fieldAddress);
+        slotAddress = Opnd(jobj, (int_ptr)fieldAddress);
         rlock(slotAddress);
     }
     else if (opcode == OPCODE_AASTORE) {

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/val.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/val.h?view=diff&rev=523191&r1=523190&r2=523191
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/val.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/val.h Tue Mar 27 23:22:04 2007
@@ -239,7 +239,7 @@
         if (is_reg()) {
             return Opnd(jt, reg());
         }
-        return Opnd(jt, lval());
+        return Opnd(jt, (int_ptr)lval());
     }
     //
     AR      reg(void) const { return m_kind == opnd_reg ? m_reg : ar_x; }
@@ -423,4 +423,5 @@
 }}; // ~namespace Jitrino::Jet
 
 #endif      // ~__VAL_H_INCLUDED__
+
 

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=523191&r1=523190&r2=523191
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp Tue Mar 27 23:22:04
2007
@@ -92,7 +92,7 @@
     for(unsigned int i = 0; i < fin_thread_info->thread_num; i++){
         void **args = (void **)STD_MALLOC(sizeof(void *) * 2);
         args[0] = (void *)java_vm;
-        args[1] = (void *)(i + 1);
+        args[1] = (void *)(UDATA)(i + 1);
         fin_thread_info->thread_ids[i] = NULL;
         status = hythread_create(&fin_thread_info->thread_ids[i], 0, FINALIZER_THREAD_PRIORITY,
0, (hythread_entrypoint_t)finalizer_thread_func, args);
         assert(status == TM_ERROR_NONE);

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_drlvm_VMHelper.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_drlvm_VMHelper.cpp?view=diff&rev=523191&r1=523190&r2=523191
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_drlvm_VMHelper.cpp
(original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_drlvm_VMHelper.cpp
Tue Mar 27 23:22:04 2007
@@ -53,7 +53,7 @@
 JNIEXPORT jlong JNICALL Java_org_apache_harmony_drlvm_VMHelper_getCompressedModeObjectBaseOffset(JNIEnv
*, jclass) {
     bool cm = (jboolean)VM_Global_State::loader_env->compress_references;
     if (cm) {
-        return (jlong)VM_Global_State::loader_env->heap_base;;
+        return (jlong)(POINTER_SIZE_INT)VM_Global_State::loader_env->heap_base;;
     }
     return -1;
 }



Mime
View raw message