[vmkit-commits] [vmkit] r180301 - Corrected Object Copy in generational GC (hidden header stuff)

[Peter Senna Tschudin]

Author: peter.senna
Date: Thu Apr 25 11:50:27 2013
New Revision: 180301

URL: http://llvm.org/viewvc/llvm-project?rev=180301&view=rev
Log:
Corrected Object Copy in generational GC (hidden header stuff)
(cherry picked from commit dbeee0d18fae66a6b5ae693e761006ddbc3a01c3)

Modified:
    vmkit/trunk/mmtk/java/src/org/j3/bindings/Bindings.java

Modified: vmkit/trunk/mmtk/java/src/org/j3/bindings/Bindings.java
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/java/src/org/j3/bindings/Bindings.java?rev=180301&r1=180300&r2=180301&view=diff
==============================================================================
--- vmkit/trunk/mmtk/java/src/org/j3/bindings/Bindings.java (original)
+++ vmkit/trunk/mmtk/java/src/org/j3/bindings/Bindings.java Thu Apr 25 11:50:27 2013
@@ -126,7 +126,7 @@ public final class Bindings {
     Selected.Collector plan = Selected.Collector.get();
     allocator = plan.copyCheckAllocator(from, wholeSize, 0, allocator);
     Address to = plan.allocCopy(from, wholeSize, 0, 0, allocator);
-    memcpy(to, from.toAddress(), wholeSize);
+    memcpy(to.toObjectReference(), from, size);
     plan.postCopy(to.toObjectReference(), virtualTable, size, allocator);
     return to.toObjectReference();
   }
@@ -139,13 +139,8 @@ public final class Bindings {
   
   @Inline
   private static native void memcpy(
-      Address to, Address from, int size);
-
-  @Inline
-  private static native void memcpy(
       ObjectReference to, ObjectReference from, int size);
 
-  
   @Inline
   private static void arrayWriteBarrier(ObjectReference ref, Address slot, ObjectReference value) {
     if (Selected.Constraints.get().needsObjectReferenceWriteBarrier()) {