harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r600868 - in /harmony/enhanced/drlvm/trunk: build/make/components/vm/ vm/jitrino/src/codegenerator/ia32/ vm/jitrino/src/optimizer/abcd/ vm/jitrino/src/translator/java/ vm/port/src/thread/win/ vm/vmcore/src/init/ vm/vmcore/src/kernel_classes...
Date Tue, 04 Dec 2007 10:18:16 GMT
Author: varlax
Date: Tue Dec  4 02:18:14 2007
New Revision: 600868

URL: http://svn.apache.org/viewvc?rev=600868&view=rev
Log:
HARMONY-5097 [drlvm][build] Repair ICL build bugs for DRLVM

Modified:
    harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/classic_abcd_solver.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaLabelPrepass.cpp
    harmony/enhanced/drlvm/trunk/vm/port/src/thread/win/apr_thread_ext.c
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMThreadManager.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/win/atomics.cpp

Modified: harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml?rev=600868&r1=600867&r2=600868&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml Tue Dec  4 02:18:14 2007
@@ -175,6 +175,8 @@
                 </dirset>
             </includepath>
 
+            <compilerarg value="/Qwd94" if="is.icl"/>
+
             <defineset define="BUILDING_VM,GC_V4,USE_DLL_JIT,APR_DECLARE_STATIC" />
         </compiler>
 

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp?rev=600868&r1=600867&r2=600868&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp
(original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp
Tue Dec  4 02:18:14 2007
@@ -2648,8 +2648,10 @@
         Opnd* stride = (Opnd*) args[2];
 
     	assert (distance->isPlacedIn(OpndKind_Imm) && stride->isPlacedIn(OpndKind_Imm));
-	int dist = distance->getImmValue();
-        int strd = stride->getImmValue();
+		assert(fits32(distance->getImmValue()));
+		assert(fits32(stride->getImmValue()));
+		int dist = (int)distance->getImmValue();
+        int strd = (int)stride->getImmValue();
     
     	for (int i=0; i< dist; i+=strd)
     	{

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/classic_abcd_solver.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/classic_abcd_solver.cpp?rev=600868&r1=600867&r2=600868&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/classic_abcd_solver.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/classic_abcd_solver.cpp Tue
Dec  4 02:18:14 2007
@@ -1204,6 +1204,7 @@
             }
         }
         assert(found);
+        if (!found) {} // to cheat icl warning
     }
     assert(found_count == id_count);
 }

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaLabelPrepass.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaLabelPrepass.cpp?rev=600868&r1=600867&r2=600868&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaLabelPrepass.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaLabelPrepass.cpp Tue Dec
 4 02:18:14 2007
@@ -1723,9 +1723,9 @@
 }
 
 void JavaLabelPrepass::genTypeArrayStore() {
-    UNUSED Type *type = popType().type;
+    popType();
     popAndCheck(int32Type);
-    type = popType().type;
+    UNUSED Type *type = popType().type;
     assert(type->isArrayType() || type->isNullObject() || type->isUnresolvedObject());
 }
 

Modified: harmony/enhanced/drlvm/trunk/vm/port/src/thread/win/apr_thread_ext.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/src/thread/win/apr_thread_ext.c?rev=600868&r1=600867&r2=600868&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/src/thread/win/apr_thread_ext.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/src/thread/win/apr_thread_ext.c Tue Dec  4 02:18:14
2007
@@ -33,8 +33,9 @@
     // VC++ 2005
     #include <intrin.h>
     #include <emmintrin.h>
+    #pragma intrinsic (_ReadWriteBarrier)
 #endif
-#pragma intrinsic (_ReadWriteBarrier)
+
 
 APR_DECLARE(apr_status_t) apr_thread_set_priority(apr_thread_t *thread, 
                 apr_int32_t priority) 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm.cpp?rev=600868&r1=600867&r2=600868&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm.cpp Tue Dec  4 02:18:14 2007
@@ -21,10 +21,10 @@
 #include "object_layout.h"
 
 
-Global_Env *VM_Global_State::loader_env = 0;
+VMEXPORT Global_Env *VM_Global_State::loader_env = 0;
 
 // tag pointer is not allocated by default, enabled by TI
-bool ManagedObject::_tag_pointer = false;
+VMEXPORT bool ManagedObject::_tag_pointer = false;
 
 
 /////////////////////////////////////////////////////////////////

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?rev=600868&r1=600867&r2=600868&view=diff
==============================================================================
--- 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
Tue Dec  4 02:18:14 2007
@@ -149,7 +149,7 @@
 JNIEXPORT jlong JNICALL Java_java_lang_VMThreadManager_init
   (JNIEnv *jenv, jclass clazz, jobject thread, jobject ref, jlong oldThread)
 {
-    return jthread_thread_init(jenv, thread, ref, (hythread_t)oldThread);
+    return jthread_thread_init(jenv, thread, ref, (hythread_t)(POINTER_SIZE_INT)oldThread);
 }
 
 /*

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/win/atomics.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/win/atomics.cpp?rev=600868&r1=600867&r2=600868&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/win/atomics.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/win/atomics.cpp Tue Dec  4 02:18:14
2007
@@ -27,9 +27,9 @@
     // VC++ 2005
     #include <intrin.h>
     #include <emmintrin.h>
+    #pragma intrinsic (_ReadWriteBarrier)
+    #pragma intrinsic (_WriteBarrier)
 #endif
-#pragma intrinsic (_ReadWriteBarrier)
-#pragma intrinsic (_WriteBarrier)
 
 void MemoryReadWriteBarrier() {
 #ifdef _EM64T_



Mime
View raw message