[vmkit-commits] [vmkit] r180315 - Updated with the latest changes in master (trunk).

[Peter Senna Tschudin]

Author: peter.senna
Date: Thu Apr 25 11:53:34 2013
New Revision: 180315

URL: http://llvm.org/viewvc/llvm-project?rev=180315&view=rev
Log:
Updated with the latest changes in master (trunk).
(cherry picked from commit e6c19909a7a54242171f395e4e31d982a9d4248b)

Modified:
    vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.h
    vmkit/trunk/mmtk/java/src/org/j3/bindings/Bindings.java

Modified: vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.h?rev=180315&r1=180314&r2=180315&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.h (original)
+++ vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.h Thu Apr 25 11:53:34 2013
@@ -132,7 +132,7 @@ public:
  
   /// getIsolate - Returns the isolate that created this class loader.
   ///
-  Jnjvm* getIsolate() const { return vm; }
+  Jnjvm* getJVM() const { return vm; }
 
   /// getClasses - Returns the classes this class loader has loaded.
   ///

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=180315&r1=180314&r2=180315&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:53:34 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.toObjectReference(), from, size);
+    memcpy(to, from.toAddress(), wholeSize);
     plan.postCopy(to.toObjectReference(), virtualTable, size, allocator);
     return to.toObjectReference();
   }
@@ -139,8 +139,13 @@ 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()) {