harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfur...@apache.org
Subject svn commit: r599032 - in /harmony/enhanced/drlvm/trunk/vm: gc_gen/javasrc/org/apache/harmony/drlvm/gc_gen/GCHelper.java gc_gen/src/common/gc_for_vm.cpp vmcore/src/jit/rt_helper_info.cpp
Date Wed, 28 Nov 2007 15:45:07 GMT
Author: mfursov
Date: Wed Nov 28 07:45:06 2007
New Revision: 599032

URL: http://svn.apache.org/viewvc?rev=599032&view=rev
Log:
[drlvm] Fixing write barrier vmmagic based helper after the recent vmmagic package refactoring

Modified:
    harmony/enhanced/drlvm/trunk/vm/gc_gen/javasrc/org/apache/harmony/drlvm/gc_gen/GCHelper.java
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_vm.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/rt_helper_info.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/javasrc/org/apache/harmony/drlvm/gc_gen/GCHelper.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/javasrc/org/apache/harmony/drlvm/gc_gen/GCHelper.java?rev=599032&r1=599031&r2=599032&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/javasrc/org/apache/harmony/drlvm/gc_gen/GCHelper.java
(original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/javasrc/org/apache/harmony/drlvm/gc_gen/GCHelper.java
Wed Nov 28 07:45:06 2007
@@ -92,7 +92,7 @@
     public static boolean GEN_MODE = getGenMode();
 
     @Inline
-    public static void write_barrier_slot_rem(Address p_objBase, Address p_objSlot, Address
p_target) {
+    public static void write_barrier_slot_rem(Address p_target, Address p_objSlot, Address
p_objBase) {
       
        /* If the slot is in NOS or the target is not in NOS, we simply return*/
         if(p_objSlot.GE(NOS_BOUNDARY) || p_target.LT(NOS_BOUNDARY) || !GEN_MODE) {

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_vm.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_vm.cpp?rev=599032&r1=599031&r2=599032&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_vm.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_vm.cpp Wed Nov 28 07:45:06 2007
@@ -59,6 +59,7 @@
     set_property("vm.component.classpath.gc_gen", "gc_gen.jar", VM_PROPERTIES);
     vm_helper_register_magic_helper(VM_RT_NEW_RESOLVED_USING_VTABLE_AND_SIZE, "org/apache/harmony/drlvm/gc_gen/GCHelper",
"alloc");
     vm_helper_register_magic_helper(VM_RT_NEW_VECTOR_USING_VTABLE,  "org/apache/harmony/drlvm/gc_gen/GCHelper",
"allocArray");
+    vm_helper_register_magic_helper(VM_RT_GC_HEAP_WRITE_REF,  "org/apache/harmony/drlvm/gc_gen/GCHelper",
"write_barrier_slot_rem");
 }
 
 int gc_init() 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/rt_helper_info.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/rt_helper_info.cpp?rev=599032&r1=599031&r2=599032&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/rt_helper_info.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/rt_helper_info.cpp Wed Nov 28 07:45:06
2007
@@ -139,7 +139,7 @@
 
     {VM_RT_GC_HEAP_WRITE_REF,                  "VM_RT_GC_HEAP_WRITE_REF",
             INTERRUPTIBLE_NEVER,               CALLING_CONVENTION_CDECL,                3,
-            NULL,   NULL,   NULL,   NULL},
+            NULL,   NULL,  "(Lorg/vmmagic/unboxed/Address;Lorg/vmmagic/unboxed/Address;Lorg/vmmagic/unboxed/Address;)V",
NULL},
     {VM_RT_GC_SAFE_POINT,                      "VM_RT_GC_SAFE_POINT",
             INTERRUPTIBLE_ALWAYS,              CALLING_CONVENTION_STDCALL,              0,
             NULL,   NULL,   NULL,   NULL},



Mime
View raw message