harmony-commits mailing list archives

Author: mfursov
Date: Fri Mar  7 07:50:58 2008
New Revision: 634718

URL: http://svn.apache.org/viewvc?rev=634718&view=rev
Log:
Fix for HARMONY-5550 [drlvm][jit] Sunflow fails on multicore PCs


Modified:
    harmony/enhanced/drlvm/trunk/src/test/regression/H2092/run.test.xml
    harmony/enhanced/drlvm/trunk/vm/include/open/vm_interface.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_br.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/compiler.cpp

Modified: harmony/enhanced/drlvm/trunk/src/test/regression/H2092/run.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/src/test/regression/H2092/run.test.xml?rev=634718&r1=634717&r2=634718&view=diff
==============================================================================
    (empty)

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/vm_interface.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/vm_interface.h?rev=634718&r1=634717&r2=634718&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/vm_interface.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/vm_interface.h Fri Mar  7 07:50:58 2008
@@ -102,7 +102,7 @@
 PROTOTYPE_WITH_NAME(bool        , field_is_magic, (Field_Handle fh)); //Boolean field_is_magic(Field_Handle
fh);
 PROTOTYPE_WITH_NAME(bool        , field_is_private, (Field_Handle fh));
 PROTOTYPE_WITH_NAME(bool        , field_is_static, (Field_Handle fh));
-PROTOTYPE_WITH_NAME(bool        , field_is_volatile, (Field_Handle fh));
+PROTOTYPE_WITH_NAME(Boolean     , field_is_volatile, (Field_Handle fh));
 
 //Method
 

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_br.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_br.cpp?rev=634718&r1=634717&r2=634718&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_br.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_br.cpp Fri Mar  7 07:50:58 2008
@@ -94,12 +94,12 @@
 
 void Compiler::gen_goto(unsigned target)
 {
-    gen_bb_leave(target);
     if (target <= m_pc) {
         // Back branch
         gen_prof_be();
         gen_gc_safe_point();
     }
+    gen_bb_leave(target);
     br(cond_none, target, m_bbinfo->start);
 }
 

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/compiler.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/compiler.cpp?rev=634718&r1=634717&r2=634718&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/compiler.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/compiler.cpp Fri Mar  7 07:50:58 2008
@@ -155,7 +155,7 @@
     // Process args, update flags if necessary
     //
     if (!get_bool_arg("bbp", true)) {
-        compile_flags &= JMF_BBPOLLING;
+        compile_flags &= ~JMF_BBPOLLING;
     }
 #ifndef _EM64T_    
     m_lazy_resolution  = get_bool_arg("lazyResolution", true);