Merge branch 'core' into testing

Author: perlfu

MMTk/src/org/mmtk/plan/TraceLocal.java

@@ -119,8 +119,8 @@ public final void processEdge(ObjectReference source, Address slot) {
    * @param slot The location containing the object reference to be
    * traced.  The object reference is <i>NOT</i> an interior pointer.
    */
-  @Inline
-  public final void reportDelayedRootEdge(Address slot) {
+  @Inline  
+  public void reportDelayedRootEdge(Address slot) { 
     rootLocations.push(slot);
   }
 
@@ -447,6 +447,8 @@ public ObjectReference retainForFinalize(ObjectReference object) {
   }
 
   /**
+   * OBSOLETE? 
+   * 
    * Return true if an object is ready to move to the finalizable
    * queue, i.e. it has no regular references to it.  This method may
    * (and in some cases is) be overridden by subclasses. If this method
@@ -560,7 +562,7 @@ protected void processRememberedSets() {}
    * it is its own responsibility to ensure that they are flushed before
    * returning to MMTk.
    */
-  private void assertMutatorRemsetsFlushed() {
+  protected void assertMutatorRemsetsFlushed() {
     /* FIXME: PNT
     if (VM.VERIFY_ASSERTIONS) {
       for (int m = 0; m < VM.activePlan.mutatorCount(); m++) {

MMTk/src/org/mmtk/utility/heap/Map.java

@@ -285,7 +285,7 @@ public static void finalizeStaticSpaceMap() {
   public static boolean isFinalized() {
     return finalized;
   }
-
+  
   /**
    * Return the ordinal number for some free list space wishing to share a discontiguous region.
    * @return The ordinal number for a free list space wishing to share a discontiguous region

rvm/src/org/jikesrvm/VM.java

@@ -44,6 +44,7 @@
 import org.jikesrvm.scheduler.TestThread;
 import org.jikesrvm.runtime.FileSystem;
 import org.jikesrvm.tuningfork.TraceEngine;
+import org.mmtk.policy.Space;
 import org.vmmagic.pragma.Entrypoint;
 import org.vmmagic.pragma.Inline;
 import org.vmmagic.pragma.Interruptible;

rvm/src/org/jikesrvm/classloader/RVMClass.java

@@ -1248,9 +1248,34 @@ public synchronized void resolve() {
     } else {
       referenceOffsets = MemoryManager.newNonMovingIntArray(referenceFieldCount);
       int j = 0;
+      // build a sorted array
       for (RVMField field : instanceFields) {
         if (field.isTraced()) {
-          referenceOffsets[j++] = field.getOffset().toInt();
+          int offset = field.getOffset().toInt();
+          if (j > 0) {
+            if (referenceOffsets[j-1] < offset) {
+              // append to array
+              referenceOffsets[j++] = offset;
+            } else {
+              int k, l;
+              // find insertion point (k)
+              for (k = 0; k < j; ++k) {
+                if (referenceOffsets[k] > offset)
+                  break;
+              }
+              // move data away from insertion point
+              for (l = j; l > k; --l) {
+                referenceOffsets[l] = referenceOffsets[l-1];
+              }
+              // insert
+              referenceOffsets[k] = offset;
+              // increase array size
+              j++;
+            }
+          } else {
+            // first element; append to array
+            referenceOffsets[j++] = offset;
+          }
         }
       }
     }

rvm/src/org/jikesrvm/mm/mminterface/Barriers.java

@@ -19,6 +19,7 @@
 import org.vmmagic.pragma.Inline;
 import org.vmmagic.pragma.Uninterruptible;
 import org.vmmagic.unboxed.Address;
+import org.vmmagic.unboxed.AddressArray;
 import org.vmmagic.unboxed.Extent;
 import org.vmmagic.unboxed.ObjectReference;
 import org.vmmagic.unboxed.Offset;

rvm/src/org/jikesrvm/objectmodel/JavaHeader.java

@@ -78,7 +78,7 @@ public class JavaHeader implements JavaHeaderConstants {
   /** offset of object reference from the lowest memory word */
   public static final int OBJECT_REF_OFFSET = ARRAY_HEADER_SIZE;  // from start to ref
   protected static final Offset TIB_OFFSET = JAVA_HEADER_OFFSET;
-  protected static final Offset STATUS_OFFSET = TIB_OFFSET.plus(STATUS_BYTES);
+  public static final Offset STATUS_OFFSET = TIB_OFFSET.plus(STATUS_BYTES);
   protected static final Offset AVAILABLE_BITS_OFFSET =
       VM.LittleEndian ? (STATUS_OFFSET) : (STATUS_OFFSET.plus(STATUS_BYTES - 1));
 

rvm/src/org/jikesrvm/scheduler/RVMThread.java

@@ -43,6 +43,7 @@
 import org.jikesrvm.mm.mminterface.CollectorThread;
 import org.jikesrvm.mm.mminterface.MemoryManager;
 import org.jikesrvm.mm.mminterface.ThreadContext;
+import org.jikesrvm.mm.mmtk.Collection;
 import org.jikesrvm.objectmodel.ObjectModel;
 import org.jikesrvm.objectmodel.ThinLockConstants;
 import org.jikesrvm.runtime.Entrypoints;
@@ -78,6 +79,8 @@
 import org.jikesrvm.classloader.NormalMethod;
 import org.jikesrvm.tuningfork.TraceEngine;
 import org.jikesrvm.tuningfork.Feedlet;
+import org.mmtk.plan.MutatorContext;
+import org.mmtk.utility.options.Options;
 
 /**
  * A generic java thread's execution context.