Add NonReplicating connections.

Author: perlfu

common/vmmagic/src/org/vmmagic/pragma/NonReplicatingAllocation.java

@@ -0,0 +1,27 @@
+/*
+ *  This file is part of the Jikes RVM project (http://jikesrvm.org).
+ *
+ *  This file is licensed to You under the Eclipse Public License (EPL);
+ *  You may not use this file except in compliance with the License. You
+ *  may obtain a copy of the License at
+ *
+ *      http://www.opensource.org/licenses/eclipse-1.0.php
+ *
+ *  See the COPYRIGHT.txt file distributed with this work for information
+ *  regarding copyright ownership.
+ */
+package org.vmmagic.pragma;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.ElementType;
+
+/**
+ * Use this annotation to mark methods for which all allocation must never be in
+ * a MirrorGC replicated space because the allocated objects are written to
+ * directly bypassing write barriers
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface NonReplicatingAllocation { }

rvm/src/org/jikesrvm/CommandLineArgs.java

@@ -825,25 +825,21 @@ private static final class ArgReader {
     // reallocation really soon.
     int buflen = 512;
 
-    byte[] buf;                 // gets freed with the class instance.
-
-    ArgReader() {
-      buf = new byte[buflen];
-    }
-
     /** Read argument # @param i
      * Assume arguments are encoded in the platform's
      * "default character set". */
     @SuppressWarnings({"deprecation"})
+    @NonReplicatingAllocation
     String getArg(int i) {
       int cnt;
+      byte[] buf = new byte[buflen];  // buf needs to allocated in Non replicated space to ensure correctness
       for (; ;) {
         cnt = sysArg(i, buf);
         if (cnt >= 0) {
           break;
         }
         buflen += 1024;
-        buf = new byte[buflen];
+        buf = new byte[buflen]; // buf needs to allocated in Non replicated space to ensure correctness
       }
       if (VM.VerifyAssertions) VM._assert(cnt != -1);
       /*
@@ -868,7 +864,9 @@ String getArg(int i) {
       return new String(buf, 0, 0, cnt);
     }
 
+    @NonReplicatingAllocation
     int numArgs() {
+      byte[] buf = new byte[buflen];  // buf needs to allocated in Non replicated space to ensure correctness
       return sysArg(-1, buf);
     }
   }

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

@@ -380,4 +380,12 @@ public final boolean hasNonMovingAnnotation() {
   public final boolean hasNonMovingAllocationAnnotation() {
     return isAnnotationDeclared(TypeReference.NonMovingAllocation);
   }
+
+  /**
+   * Return true if this element has a NonReplicatingAllocation annotation.
+   * @see org.vmmagic.pragma.NonReplicatingAllocation
+   */
+  public final boolean hasNonReplicatingAllocationAnnotation() {
+    return isAnnotationDeclared(TypeReference.NonReplicatingAllocation);
+  }
 }

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

@@ -677,6 +677,13 @@ public boolean isNonMovingAllocation() {
     return hasNonMovingAllocationAnnotation();
   }
 
+  /**
+   * Should all allocation from this method go to a non-replicated space?
+   */
+  public boolean isNonReplicatingAllocation() {
+    return hasNonReplicatingAllocationAnnotation();
+  }
+
   //------------------------------------------------------------------//
   //                        Section 2.                                //
   // The following are available after the declaring class has been   //

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

@@ -172,6 +172,7 @@ public final class TypeReference {
   public static final TypeReference Untraced = findOrCreate(org.vmmagic.pragma.Untraced.class);
   public static final TypeReference NonMoving = findOrCreate(org.vmmagic.pragma.NonMoving.class);
   public static final TypeReference NonMovingAllocation = findOrCreate(org.vmmagic.pragma.NonMovingAllocation.class);
+  public static final TypeReference NonReplicatingAllocation = findOrCreate(org.vmmagic.pragma.NonReplicatingAllocation.class);
   public static final TypeReference BaselineNoRegisters = findOrCreate(org.vmmagic.pragma.BaselineNoRegisters.class);
   public static final TypeReference BaselineSaveLSRegisters = findOrCreate(org.vmmagic.pragma.BaselineSaveLSRegisters.class);
   public static final TypeReference ReferenceFieldsVary = findOrCreate(org.vmmagic.pragma.ReferenceFieldsVary.class);

rvm/src/org/jikesrvm/compilers/baseline/EdgeCounts.java

@@ -25,6 +25,7 @@
 import org.jikesrvm.classloader.NormalMethod;
 import org.jikesrvm.runtime.Magic;
 import org.vmmagic.pragma.Entrypoint;
+import org.vmmagic.pragma.NonReplicatingAllocation;
 
 /**
  * A repository of edge counters for bytecode-level edge conditional branches.
@@ -93,6 +94,7 @@ public static synchronized void allocateCounters(NormalMethod m, int numEntries)
     allocateCounters(m.getId(), numEntries);
   }
 
+  @NonReplicatingAllocation
   private static synchronized void allocateCounters(int id, int numEntries) {
     if (data == null) {
       data = new int[id + 500][];