Nabble - Jikes RVM - Commits

SF.net SVN: jikesrvm:[15795] rvmroot/trunk

2009-11-25T16:51:05Z

Revision: 15795
http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15795&view=rev
Author: steveb-oss
Date: 2009-11-26 00:51:05 +0000 (Thu, 26 Nov 2009)

Log Message:
-----------
Another step toward RVM845. Added Word and Address APIs to the barrier interface.

Modified Paths:
--------------
rvmroot/trunk/MMTk/src/org/mmtk/plan/MutatorContext.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/PlanConstraints.java
rvmroot/trunk/rvm/src/org/jikesrvm/mm/mminterface/Barriers.java

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/MutatorContext.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/MutatorContext.java 2009-11-25 04:44:53 UTC (rev 15794)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/MutatorContext.java 2009-11-26 00:51:05 UTC (rev 15795)
@@ -763,6 +763,126 @@
}

/**
+ * Write a word. Take appropriate write barrier actions.
+ *
+ * By default do nothing, override if appropriate.
+ *
+ * @param src The object into which the new reference will be stored
+ * @param slot The address into which the new reference will be
+ * stored.
+ * @param value The value of the new word
+ * @param metaDataA A value that assists the host VM in creating a store
+ * @param metaDataB A value that assists the host VM in creating a store
+ * @param mode The context in which the store occurred
+ */
+ public void wordWrite(ObjectReference src, Address slot, Word value, Word metaDataA, Word metaDataB, int mode) {
+ // Either: write barriers are used and this is overridden, or
+ // write barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ }
+
+ /**
+ * Read a word. Take appropriate read barrier action, and
+ * return the value that was read. This is a substituting
+ * barrier. The call to this barrier takes the place of a load.
+ *
+ * @param src The object reference holding the field being read.
+ * @param slot The address of the slot being read.
+ * @param metaDataA A value that assists the host VM in creating a load
+ * @param metaDataB A value that assists the host VM in creating a load
+ * @param mode The context in which the load occurred
+ * @return The word that was read.
+ */
+ @Inline
+ public Word wordRead(ObjectReference src, Address slot, Word metaDataA, Word metaDataB, int mode) {
+ // Either: read barriers are used and this is overridden, or
+ // read barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ return Word.zero();
+ }
+
+ /**
+ * A number of words are about to be copied from object
+ * <code>src</code> to object <code>dst</code> (as in an array
+ * copy). Thus, <code>dst</code> is the mutated object. Take
+ * appropriate write barrier actions.
+ *
+ * @param src The source array
+ * @param srcOffset The starting source offset
+ * @param dst The destination array
+ * @param dstOffset The starting destination offset
+ * @param bytes The number of bytes to be copied
+ * @return True if the update was performed by the barrier, false if
+ * left to the caller (always false in this case).
+ */
+ public boolean wordBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
+ // Either: bulk copy is supported and this is overridden, or
+ // write barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ return false;
+ }
+
+ /**
+ * Write an address. Take appropriate write barrier actions.
+ *
+ * By default do nothing, override if appropriate.
+ *
+ * @param src The object into which the new reference will be stored
+ * @param slot The address into which the new reference will be
+ * stored.
+ * @param value The value of the new address
+ * @param metaDataA A value that assists the host VM in creating a store
+ * @param metaDataB A value that assists the host VM in creating a store
+ * @param mode The context in which the store occurred
+ */
+ public void addressWrite(ObjectReference src, Address slot, Address value, Word metaDataA, Word metaDataB, int mode) {
+ // Either: write barriers are used and this is overridden, or
+ // write barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ }
+
+ /**
+ * Read an address. Take appropriate read barrier action, and
+ * return the value that was read. This is a substituting
+ * barrier. The call to this barrier takes the place of a load.
+ *
+ * @param src The object reference holding the field being read.
+ * @param slot The address of the slot being read.
+ * @param metaDataA A value that assists the host VM in creating a load
+ * @param metaDataB A value that assists the host VM in creating a load
+ * @param mode The context in which the load occurred
+ * @return The address that was read.
+ */
+ @Inline
+ public Address addressRead(ObjectReference src, Address slot, Word metaDataA, Word metaDataB, int mode) {
+ // Either: read barriers are used and this is overridden, or
+ // read barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ return Address.zero();
+ }
+
+ /**
+ * A number of addresses are about to be copied from object
+ * <code>src</code> to object <code>dst</code> (as in an array
+ * copy). Thus, <code>dst</code> is the mutated object. Take
+ * appropriate write barrier actions.
+ *
+ * @param src The source array
+ * @param srcOffset The starting source offset
+ * @param dst The destination array
+ * @param dstOffset The starting destination offset
+ * @param bytes The number of bytes to be copied
+ * @return True if the update was performed by the barrier, false if
+ * left to the caller (always false in this case).
+ */
+ public boolean addressBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
+ // Either: bulk copy is supported and this is overridden, or
+ // write barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ return false;
+ }
+
+ /**
* Write an object reference. Take appropriate write barrier actions.
*
* By default do nothing, override if appropriate.

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/PlanConstraints.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/PlanConstraints.java 2009-11-25 04:44:53 UTC (rev 15794)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/PlanConstraints.java 2009-11-26 00:51:05 UTC (rev 15795)
@@ -22,13 +22,13 @@
* issues with ordering of static initialization.
*/
@Uninterruptible public abstract class PlanConstraints {
- /** @return True of this Plan requires read barriers on java.lang.reference types. */
+ /** @return True if this Plan requires read barriers on java.lang.reference types. */
public boolean needsJavaLangReferenceReadBarrier() { return false; }

/** @return True if this Plan requires write barriers on booleans. */
public boolean needsBooleanWriteBarrier() { return false; }

- /** @return True of this Plan requires read barriers on booleans. */
+ /** @return True if this Plan requires read barriers on booleans. */
public boolean needsBooleanReadBarrier() { return false; }

/** @return True if this Plan can perform bulk boolean arraycopy barriers. */
@@ -37,7 +37,7 @@
/** @return True if this Plan requires write barriers on bytes. */
public boolean needsByteWriteBarrier() { return false; }

- /** @return True of this Plan requires read barriers on bytes. */
+ /** @return True if this Plan requires read barriers on bytes. */
public boolean needsByteReadBarrier() { return false; }

/** @return True if this Plan can perform bulk byte arraycopy barriers. */
@@ -46,7 +46,7 @@
/** @return True if this Plan requires write barriers on chars. */
public boolean needsCharWriteBarrier() { return false; }

- /** @return True of this Plan requires read barriers on chars. */
+ /** @return True if this Plan requires read barriers on chars. */
public boolean needsCharReadBarrier() { return false; }

/** @return True if this Plan can perform bulk char arraycopy barriers. */
@@ -55,7 +55,7 @@
/** @return True if this Plan requires write barriers on shorts. */
public boolean needsShortWriteBarrier() { return false; }

- /** @return True of this Plan requires read barriers on shorts. */
+ /** @return True if this Plan requires read barriers on shorts. */
public boolean needsShortReadBarrier() { return false; }

/** @return True if this Plan can perform bulk short arraycopy barriers. */
@@ -64,7 +64,7 @@
/** @return True if this Plan requires write barriers on ints. */
public boolean needsIntWriteBarrier() { return false; }

- /** @return True of this Plan requires read barriers on ints. */
+ /** @return True if this Plan requires read barriers on ints. */
public boolean needsIntReadBarrier() { return false; }

/** @return True if this Plan can perform bulk int arraycopy barriers. */
@@ -73,7 +73,7 @@
/** @return True if this Plan requires write barriers on longs. */
public boolean needsLongWriteBarrier() { return false; }

- /** @return True of this Plan requires read barriers on longs. */
+ /** @return True if this Plan requires read barriers on longs. */
public boolean needsLongReadBarrier() { return false; }

/** @return True if this Plan can perform bulk long arraycopy barriers. */
@@ -82,7 +82,7 @@
/** @return True if this Plan requires write barriers on floats. */
public boolean needsFloatWriteBarrier() { return false; }

- /** @return True of this Plan requires read barriers on floats. */
+ /** @return True if this Plan requires read barriers on floats. */
public boolean needsFloatReadBarrier() { return false; }

/** @return True if this Plan can perform bulk float arraycopy barriers. */
@@ -91,16 +91,34 @@
/** @return True if this Plan requires write barriers on doubles. */
public boolean needsDoubleWriteBarrier() { return false; }

- /** @return True of this Plan requires read barriers on doubles. */
+ /** @return True if this Plan requires read barriers on doubles. */
public boolean needsDoubleReadBarrier() { return false; }

/** @return True if this Plan can perform bulk double arraycopy barriers. */
public boolean doubleBulkCopySupported() { return false; }

+ /** @return True if this Plan requires write barriers on words. */
+ public boolean needsWordWriteBarrier() { return false; }
+
+ /** @return True if this Plan requires read barriers on words. */
+ public boolean needsWordReadBarrier() { return false; }
+
+ /** @return True if this Plan can perform bulk word arraycopy barriers. */
+ public boolean wordBulkCopySupported() { return false; }
+
+ /** @return True if this Plan requires write barriers on addresss. */
+ public boolean needsAddressWriteBarrier() { return false; }
+
+ /** @return True if this Plan requires read barriers on addresss. */
+ public boolean needsAddressReadBarrier() { return false; }
+
+ /** @return True if this Plan can perform bulk address arraycopy barriers. */
+ public boolean addressBulkCopySupported() { return false; }
+
/** @return True if this Plan requires write barriers on object references. */
public boolean needsObjectReferenceWriteBarrier() { return false; }

- /** @return True of this Plan requires read barriers on object references. */
+ /** @return True if this Plan requires read barriers on object references. */
public boolean needsObjectReferenceReadBarrier() { return false; }

/** @return True if this Plan requires non-heap write barriers on object references. */

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/mm/mminterface/Barriers.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/mm/mminterface/Barriers.java 2009-11-25 04:44:53 UTC (rev 15794)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/mm/mminterface/Barriers.java 2009-11-26 00:51:05 UTC (rev 15795)
@@ -18,9 +18,12 @@
import org.vmmagic.pragma.Entrypoint;
import org.vmmagic.pragma.Inline;
import org.vmmagic.pragma.Uninterruptible;
+import org.vmmagic.unboxed.Address;
+import org.vmmagic.unboxed.AddressArray;
import org.vmmagic.unboxed.ObjectReference;
import org.vmmagic.unboxed.Offset;
import org.vmmagic.unboxed.Word;
+import org.vmmagic.unboxed.WordArray;

@Uninterruptible
public class Barriers implements org.mmtk.utility.Constants {
@@ -912,10 +915,10 @@
* Barrier for a bulk copy of doubles (i.e. in an array copy).
*
* @param src The source array
- * @param srcOffset The starting source offset
+ * @param srcIdx The starting source index
* @param dst The destination array
- * @param dstOffset The starting destination offset
- * @param bytes The number of bytes to be copied
+ * @param dstIdx The starting source index
+ * @param len The number of array elements to be copied
*/
@Inline
public static void doubleBulkCopy(double[] src, Offset srcOffset, double[] dst, Offset dstOffset, int bytes) {
@@ -927,6 +930,226 @@
}

+ /** True if the garbage collector requires write barriers on word putfield, arraystore or modifycheck */
+ private static final boolean NEEDS_WORD_GC_WRITE_BARRIER = Selected.Constraints.get().needsWordWriteBarrier();
+ /** True if the VM requires write barriers on word putfield */
+ public static final boolean NEEDS_WORD_PUTFIELD_BARRIER = NEEDS_WORD_GC_WRITE_BARRIER;
+ /** True if the VM requires write barriers on word arraystore */
+ public static final boolean NEEDS_WORD_ASTORE_BARRIER = NEEDS_WORD_GC_WRITE_BARRIER;
+ /** True if the garbage collector requires read barriers on word getfield or arrayload */
+ private static final boolean NEEDS_WORD_GC_READ_BARRIER = Selected.Constraints.get().needsWordReadBarrier();
+ /** True if the VM requires read barriers on word getfield */
+ public static final boolean NEEDS_WORD_GETFIELD_BARRIER = NEEDS_WORD_GC_READ_BARRIER;
+ /** True if the VM requires read barriers on word arrayload */
+ public static final boolean NEEDS_WORD_ALOAD_BARRIER = NEEDS_WORD_GC_READ_BARRIER;
+ /** True if the garbage collector supports the bulk copy operation */
+ public static final boolean WORD_BULK_COPY_SUPPORTED = !(NEEDS_WORD_ASTORE_BARRIER || NEEDS_WORD_ALOAD_BARRIER) || Selected.Constraints.get().wordBulkCopySupported();
+
+ /**
+ * Barrier for writes of words into fields of instances (ie putfield).
+ *
+ * @param ref the object which is the subject of the putfield
+ * @param value the new value for the field
+ * @param offset the offset of the field to be modified
+ * @param locationMetadata an int that encodes the source location being modified
+ */
+ @Inline
+ @Entrypoint
+ public static void wordFieldWrite(Object ref, Word value, Offset offset, int locationMetadata) {
+ if (NEEDS_WORD_GC_WRITE_BARRIER) {
+ ObjectReference src = ObjectReference.fromObject(ref);
+ Selected.Mutator.get().wordWrite(src, src.toAddress().plus(offset), value, offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
+ }
+
+ /**
+ * Barrier for writes of objects into arrays (ie astore).
+ *
+ * @param ref the array which is the subject of the astore
+ * @param index the index into the array where the new reference
+ * resides. The index is the "natural" index into the array, for
+ * example a[index].
+ * @param value the value to be stored.
+ */
+ @Inline
+ @Entrypoint
+ public static void wordArrayWrite(WordArray ref, int index, Word value) {
+ if (NEEDS_WORD_GC_WRITE_BARRIER) {
+ ObjectReference array = ObjectReference.fromObject(ref);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_WORD);
+ Selected.Mutator.get().wordWrite(array, array.toAddress().plus(offset), value, offset.toWord(), Word.zero(), ARRAY_ELEMENT);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
+ }
+
+ /**
+ * Barrier for loads of objects from fields of instances (ie getfield).
+ *
+ * @param ref the object which is the subject of the getfield
+ * @param offset the offset of the field to be read
+ * @param locationMetadata an int that encodes the source location being read
+ * @return The value read from the field.
+ */
+ @Inline
+ @Entrypoint
+ public static Word wordFieldRead(Object ref, Offset offset, int locationMetadata) {
+ if (NEEDS_WORD_GC_READ_BARRIER) {
+ ObjectReference src = ObjectReference.fromObject(ref);
+ return Selected.Mutator.get().wordRead(src, src.toAddress().plus(offset), offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
+ return Word.zero();
+ }
+
+ /**
+ * Barrier for loads of objects from fields of arrays (ie aload).
+ *
+ * @param ref the array containing the reference.
+ * @param index the index into the array were the reference resides.
+ * @return the value read from the array
+ */
+ @Inline
+ @Entrypoint
+ public static Word wordArrayRead(WordArray ref, int index) {
+ if (NEEDS_WORD_GC_READ_BARRIER) {
+ ObjectReference array = ObjectReference.fromObject(ref);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_WORD);
+ return Selected.Mutator.get().wordRead(array, array.toAddress().plus(offset), offset.toWord(), Word.zero(), ARRAY_ELEMENT);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
+ return Word.zero();
+ }
+
+ /**
+ * Barrier for a bulk copy of words (i.e. in an array copy).
+ *
+ * @param src The source array
+ * @param srcOffset The starting source offset
+ * @param dst The destination array
+ * @param dstOffset The starting destination offset
+ * @param bytes The number of bytes to be copied
+ */
+ @Inline
+ public static void wordBulkCopy(WordArray src, Offset srcOffset, WordArray dst, Offset dstOffset, int bytes) {
+ if (VM.VerifyAssertions) VM._assert(WORD_BULK_COPY_SUPPORTED);
+
+ if (!Selected.Mutator.get().wordBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(dst), dstOffset, bytes)) {
+ Memory.alignedWordCopy(Magic.objectAsAddress(dst).plus(dstOffset), Magic.objectAsAddress(src).plus(srcOffset), bytes);
+ }
+ }
+
+
+ /** True if the garbage collector requires write barriers on address putfield, arraystore or modifycheck */
+ private static final boolean NEEDS_ADDRESS_GC_WRITE_BARRIER = Selected.Constraints.get().needsAddressWriteBarrier();
+ /** True if the VM requires write barriers on address putfield */
+ public static final boolean NEEDS_ADDRESS_PUTFIELD_BARRIER = NEEDS_ADDRESS_GC_WRITE_BARRIER;
+ /** True if the VM requires write barriers on address arraystore */
+ public static final boolean NEEDS_ADDRESS_ASTORE_BARRIER = NEEDS_ADDRESS_GC_WRITE_BARRIER;
+ /** True if the garbage collector requires read barriers on address getfield or arrayload */
+ private static final boolean NEEDS_ADDRESS_GC_READ_BARRIER = Selected.Constraints.get().needsAddressReadBarrier();
+ /** True if the VM requires read barriers on address getfield */
+ public static final boolean NEEDS_ADDRESS_GETFIELD_BARRIER = NEEDS_ADDRESS_GC_READ_BARRIER;
+ /** True if the VM requires read barriers on address arrayload */
+ public static final boolean NEEDS_ADDRESS_ALOAD_BARRIER = NEEDS_ADDRESS_GC_READ_BARRIER;
+ /** True if the garbage collector supports the bulk copy operation */
+ public static final boolean ADDRESS_BULK_COPY_SUPPORTED = !(NEEDS_ADDRESS_ASTORE_BARRIER || NEEDS_ADDRESS_ALOAD_BARRIER) || Selected.Constraints.get().addressBulkCopySupported();
+
+ /**
+ * Barrier for writes of addresss into fields of instances (ie putfield).
+ *
+ * @param ref the object which is the subject of the putfield
+ * @param value the new value for the field
+ * @param offset the offset of the field to be modified
+ * @param locationMetadata an int that encodes the source location being modified
+ */
+ @Inline
+ @Entrypoint
+ public static void addressFieldWrite(Object ref, Address value, Offset offset, int locationMetadata) {
+ if (NEEDS_ADDRESS_GC_WRITE_BARRIER) {
+ ObjectReference src = ObjectReference.fromObject(ref);
+ Selected.Mutator.get().addressWrite(src, src.toAddress().plus(offset), value, offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
+ }
+
+ /**
+ * Barrier for writes of objects into arrays (ie astore).
+ *
+ * @param ref the array which is the subject of the astore
+ * @param index the index into the array where the new reference
+ * resides. The index is the "natural" index into the array, for
+ * example a[index].
+ * @param value the value to be stored.
+ */
+ @Inline
+ @Entrypoint
+ public static void addressArrayWrite(AddressArray ref, int index, Address value) {
+ if (NEEDS_ADDRESS_GC_WRITE_BARRIER) {
+ ObjectReference array = ObjectReference.fromObject(ref);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Selected.Mutator.get().addressWrite(array, array.toAddress().plus(offset), value, offset.toWord(), Word.zero(), ARRAY_ELEMENT);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
+ }
+
+ /**
+ * Barrier for loads of objects from fields of instances (ie getfield).
+ *
+ * @param ref the object which is the subject of the getfield
+ * @param offset the offset of the field to be read
+ * @param locationMetadata an int that encodes the source location being read
+ * @return The value read from the field.
+ */
+ @Inline
+ @Entrypoint
+ public static Address addressFieldRead(Object ref, Offset offset, int locationMetadata) {
+ if (NEEDS_ADDRESS_GC_READ_BARRIER) {
+ ObjectReference src = ObjectReference.fromObject(ref);
+ return Selected.Mutator.get().addressRead(src, src.toAddress().plus(offset), offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
+ return Address.zero();
+ }
+
+ /**
+ * Barrier for loads of objects from fields of arrays (ie aload).
+ *
+ * @param ref the array containing the reference.
+ * @param index the index into the array were the reference resides.
+ * @return the value read from the array
+ */
+ @Inline
+ @Entrypoint
+ public static Address addressArrayRead(AddressArray ref, int index) {
+ if (NEEDS_ADDRESS_GC_READ_BARRIER) {
+ ObjectReference array = ObjectReference.fromObject(ref);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ return Selected.Mutator.get().addressRead(array, array.toAddress().plus(offset), offset.toWord(), Word.zero(), ARRAY_ELEMENT);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
+ return Address.zero();
+ }
+
+ /**
+ * Barrier for a bulk copy of addresss (i.e. in an array copy).
+ *
+ * @param src The source array
+ * @param srcOffset The starting source offset
+ * @param dst The destination array
+ * @param dstOffset The starting destination offset
+ * @param bytes The number of bytes to be copied
+ */
+ @Inline
+ public static void addressBulkCopy(AddressArray src, Offset srcOffset, AddressArray dst, Offset dstOffset, int bytes) {
+ if (VM.VerifyAssertions) VM._assert(ADDRESS_BULK_COPY_SUPPORTED);
+
+ if (!Selected.Mutator.get().addressBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(dst), dstOffset, bytes)) {
+ Memory.alignedWordCopy(Magic.objectAsAddress(dst).plus(dstOffset), Magic.objectAsAddress(src).plus(srcOffset), bytes);
+ }
+ }
+
+
/** True if the garbage collector requires write barriers on reference putfield, arraystore or modifycheck */
private static final boolean NEEDS_OBJECT_GC_WRITE_BARRIER = Selected.Constraints.get().needsObjectReferenceWriteBarrier();
/** True if the VM requires write barriers on reference putfield */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Jikesrvm-commits mailing list
Jikesrvm-commits@...
https://lists.sourceforge.net/lists/listinfo/jikesrvm-commits

SF.net SVN: jikesrvm:[15794] rvmroot/trunk

2009-11-24T20:44:53Z

Revision: 15794
http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15794&view=rev
Author: steveb-oss
Date: 2009-11-25 04:44:53 +0000 (Wed, 25 Nov 2009)

Log Message:
-----------
Refactor bulk copying for RVM845 and RVM861

Modified Paths:
--------------
rvmroot/trunk/MMTk/src/org/mmtk/plan/MutatorContext.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/PlanConstraints.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenConstraints.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenMutator.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/poisoned/PoisonedMutator.java
rvmroot/trunk/MMTk/src/org/mmtk/utility/Constants.java
rvmroot/trunk/rvm/src/org/jikesrvm/classloader/RVMArray.java
rvmroot/trunk/rvm/src/org/jikesrvm/mm/mminterface/Barriers.java
rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Entrypoints.java
rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Memory.java

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/MutatorContext.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/MutatorContext.java 2009-11-12 11:47:04 UTC (rev 15793)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/MutatorContext.java 2009-11-25 04:44:53 UTC (rev 15794)
@@ -326,20 +326,16 @@
* copy). Thus, <code>dst</code> is the mutated object. Take
* appropriate write barrier actions.
*
- * @param src The source of the values to be copied
- * @param srcOffset The offset of the first source address, in
- * bytes, relative to <code>src</code> (in principle, this could be
- * negative).
- * @param dst The mutated object, i.e. the destination of the copy.
- * @param dstOffset The offset of the first destination address, in
- * bytes relative to <code>tgt</code> (in principle, this could be
- * negative).
- * @param bytes The size of the region being copied, in bytes.
+ * @param src The source array
+ * @param srcOffset The starting source offset
+ * @param dst The destination array
+ * @param dstOffset The starting destination offset
+ * @param bytes The number of bytes to be copied
* @return True if the update was performed by the barrier, false if
* left to the caller (always false in this case).
*/
public boolean booleanBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
- // Either: write barriers are used and this is overridden, or
+ // Either: bulk copy is supported and this is overridden, or
// write barriers are not used and this is never called
if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
return false;
@@ -390,20 +386,16 @@
* copy). Thus, <code>dst</code> is the mutated object. Take
* appropriate write barrier actions.
*
- * @param src The source of the values to be copied
- * @param srcOffset The offset of the first source address, in
- * bytes, relative to <code>src</code> (in principle, this could be
- * negative).
- * @param dst The mutated object, i.e. the destination of the copy.
- * @param dstOffset The offset of the first destination address, in
- * bytes relative to <code>tgt</code> (in principle, this could be
- * negative).
- * @param bytes The size of the region being copied, in bytes.
+ * @param src The source array
+ * @param srcOffset The starting source offset
+ * @param dst The destination array
+ * @param dstOffset The starting destination offset
+ * @param bytes The number of bytes to be copied
* @return True if the update was performed by the barrier, false if
* left to the caller (always false in this case).
*/
public boolean byteBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
- // Either: write barriers are used and this is overridden, or
+ // Either: bulk copy is supported and this is overridden, or
// write barriers are not used and this is never called
if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
return false;
@@ -454,20 +446,16 @@
* copy). Thus, <code>dst</code> is the mutated object. Take
* appropriate write barrier actions.
*
- * @param src The source of the values to be copied
- * @param srcOffset The offset of the first source address, in
- * bytes, relative to <code>src</code> (in principle, this could be
- * negative).
- * @param dst The mutated object, i.e. the destination of the copy.
- * @param dstOffset The offset of the first destination address, in
- * bytes relative to <code>tgt</code> (in principle, this could be
- * negative).
- * @param bytes The size of the region being copied, in bytes.
+ * @param src The source array
+ * @param srcOffset The starting source offset
+ * @param dst The destination array
+ * @param dstOffset The starting destination offset
+ * @param bytes The number of bytes to be copied
* @return True if the update was performed by the barrier, false if
* left to the caller (always false in this case).
*/
public boolean charBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
- // Either: write barriers are used and this is overridden, or
+ // Either: bulk copy is supported and this is overridden, or
// write barriers are not used and this is never called
if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
return false;
@@ -518,25 +506,22 @@
* copy). Thus, <code>dst</code> is the mutated object. Take
* appropriate write barrier actions.
*
- * @param src The source of the values to be copied
- * @param srcOffset The offset of the first source address, in
- * bytes, relative to <code>src</code> (in principle, this could be
- * negative).
- * @param dst The mutated object, i.e. the destination of the copy.
- * @param dstOffset The offset of the first destination address, in
- * bytes relative to <code>tgt</code> (in principle, this could be
- * negative).
- * @param bytes The size of the region being copied, in bytes.
+ * @param src The source array
+ * @param srcOffset The starting source offset
+ * @param dst The destination array
+ * @param dstOffset The starting destination offset
+ * @param bytes The number of bytes to be copied
* @return True if the update was performed by the barrier, false if
* left to the caller (always false in this case).
*/
public boolean shortBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
- // Either: write barriers are used and this is overridden, or
+ // Either: bulk copy is supported and this is overridden, or
// write barriers are not used and this is never called
if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
return false;
}

+
/**
* Write a int. Take appropriate write barrier actions.
*
@@ -582,20 +567,16 @@
* copy). Thus, <code>dst</code> is the mutated object. Take
* appropriate write barrier actions.
*
- * @param src The source of the values to be copied
- * @param srcOffset The offset of the first source address, in
- * bytes, relative to <code>src</code> (in principle, this could be
- * negative).
- * @param dst The mutated object, i.e. the destination of the copy.
- * @param dstOffset The offset of the first destination address, in
- * bytes relative to <code>tgt</code> (in principle, this could be
- * negative).
- * @param bytes The size of the region being copied, in bytes.
+ * @param src The source array
+ * @param srcOffset The starting source offset
+ * @param dst The destination array
+ * @param dstOffset The starting destination offset
+ * @param bytes The number of bytes to be copied
* @return True if the update was performed by the barrier, false if
* left to the caller (always false in this case).
*/
public boolean intBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
- // Either: write barriers are used and this is overridden, or
+ // Either: bulk copy is supported and this is overridden, or
// write barriers are not used and this is never called
if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
return false;
@@ -646,20 +627,16 @@
* copy). Thus, <code>dst</code> is the mutated object. Take
* appropriate write barrier actions.
*
- * @param src The source of the values to be copied
- * @param srcOffset The offset of the first source address, in
- * bytes, relative to <code>src</code> (in principle, this could be
- * negative).
- * @param dst The mutated object, i.e. the destination of the copy.
- * @param dstOffset The offset of the first destination address, in
- * bytes relative to <code>tgt</code> (in principle, this could be
- * negative).
- * @param bytes The size of the region being copied, in bytes.
+ * @param src The source array
+ * @param srcOffset The starting source offset
+ * @param dst The destination array
+ * @param dstOffset The starting destination offset
+ * @param bytes The number of bytes to be copied
* @return True if the update was performed by the barrier, false if
* left to the caller (always false in this case).
*/
public boolean longBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
- // Either: write barriers are used and this is overridden, or
+ // Either: bulk copy is supported and this is overridden, or
// write barriers are not used and this is never called
if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
return false;
@@ -710,20 +687,16 @@
* copy). Thus, <code>dst</code> is the mutated object. Take
* appropriate write barrier actions.
*
- * @param src The source of the values to be copied
- * @param srcOffset The offset of the first source address, in
- * bytes, relative to <code>src</code> (in principle, this could be
- * negative).
- * @param dst The mutated object, i.e. the destination of the copy.
- * @param dstOffset The offset of the first destination address, in
- * bytes relative to <code>tgt</code> (in principle, this could be
- * negative).
- * @param bytes The size of the region being copied, in bytes.
+ * @param src The source array
+ * @param srcOffset The starting source offset
+ * @param dst The destination array
+ * @param dstOffset The starting destination offset
+ * @param bytes The number of bytes to be copied
* @return True if the update was performed by the barrier, false if
* left to the caller (always false in this case).
*/
public boolean floatBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
- // Either: write barriers are used and this is overridden, or
+ // Either: bulk copy is supported and this is overridden, or
// write barriers are not used and this is never called
if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
return false;
@@ -774,20 +747,16 @@
* copy). Thus, <code>dst</code> is the mutated object. Take
* appropriate write barrier actions.
*
- * @param src The source of the values to be copied
- * @param srcOffset The offset of the first source address, in
- * bytes, relative to <code>src</code> (in principle, this could be
- * negative).
- * @param dst The mutated object, i.e. the destination of the copy.
- * @param dstOffset The offset of the first destination address, in
- * bytes relative to <code>tgt</code> (in principle, this could be
- * negative).
- * @param bytes The size of the region being copied, in bytes.
+ * @param src The source array
+ * @param srcOffset The starting source offset
+ * @param dst The destination array
+ * @param dstOffset The starting destination offset
+ * @param bytes The number of bytes to be copied
* @return True if the update was performed by the barrier, false if
* left to the caller (always false in this case).
*/
public boolean doubleBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
- // Either: write barriers are used and this is overridden, or
+ // Either: bulk copy is supported and this is overridden, or
// write barriers are not used and this is never called
if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
return false;
@@ -838,20 +807,16 @@
* copy). Thus, <code>dst</code> is the mutated object. Take
* appropriate write barrier actions.
*
- * @param src The source of the values to be copied
- * @param srcOffset The offset of the first source address, in
- * bytes, relative to <code>src</code> (in principle, this could be
- * negative).
- * @param dst The mutated object, i.e. the destination of the copy.
- * @param dstOffset The offset of the first destination address, in
- * bytes relative to <code>tgt</code> (in principle, this could be
- * negative).
- * @param bytes The size of the region being copied, in bytes.
+ * @param src The source array
+ * @param srcOffset The starting source offset
+ * @param dst The destination array
+ * @param dstOffset The starting destination offset
+ * @param bytes The number of bytes to be copied
* @return True if the update was performed by the barrier, false if
* left to the caller (always false in this case).
*/
public boolean objectReferenceBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
- // Either: write barriers are used and this is overridden, or
+ // Either: bulk copy is supported and this is overridden, or
// write barriers are not used and this is never called
if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
return false;

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/PlanConstraints.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/PlanConstraints.java 2009-11-12 11:47:04 UTC (rev 15793)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/PlanConstraints.java 2009-11-25 04:44:53 UTC (rev 15794)
@@ -31,48 +31,72 @@
/** @return True of this Plan requires read barriers on booleans. */
public boolean needsBooleanReadBarrier() { return false; }

+ /** @return True if this Plan can perform bulk boolean arraycopy barriers. */
+ public boolean booleanBulkCopySupported() { return false; }
+
/** @return True if this Plan requires write barriers on bytes. */
public boolean needsByteWriteBarrier() { return false; }

/** @return True of this Plan requires read barriers on bytes. */
public boolean needsByteReadBarrier() { return false; }

+ /** @return True if this Plan can perform bulk byte arraycopy barriers. */
+ public boolean byteBulkCopySupported() { return false; }
+
/** @return True if this Plan requires write barriers on chars. */
public boolean needsCharWriteBarrier() { return false; }

/** @return True of this Plan requires read barriers on chars. */
public boolean needsCharReadBarrier() { return false; }

+ /** @return True if this Plan can perform bulk char arraycopy barriers. */
+ public boolean charBulkCopySupported() { return false; }
+
/** @return True if this Plan requires write barriers on shorts. */
public boolean needsShortWriteBarrier() { return false; }

/** @return True of this Plan requires read barriers on shorts. */
public boolean needsShortReadBarrier() { return false; }

+ /** @return True if this Plan can perform bulk short arraycopy barriers. */
+ public boolean shortBulkCopySupported() { return false; }
+
/** @return True if this Plan requires write barriers on ints. */
public boolean needsIntWriteBarrier() { return false; }

/** @return True of this Plan requires read barriers on ints. */
public boolean needsIntReadBarrier() { return false; }

+ /** @return True if this Plan can perform bulk int arraycopy barriers. */
+ public boolean intBulkCopySupported() { return false; }
+
/** @return True if this Plan requires write barriers on longs. */
public boolean needsLongWriteBarrier() { return false; }

/** @return True of this Plan requires read barriers on longs. */
public boolean needsLongReadBarrier() { return false; }

+ /** @return True if this Plan can perform bulk long arraycopy barriers. */
+ public boolean longBulkCopySupported() { return false; }
+
/** @return True if this Plan requires write barriers on floats. */
public boolean needsFloatWriteBarrier() { return false; }

/** @return True of this Plan requires read barriers on floats. */
public boolean needsFloatReadBarrier() { return false; }

+ /** @return True if this Plan can perform bulk float arraycopy barriers. */
+ public boolean floatBulkCopySupported() { return false; }
+
/** @return True if this Plan requires write barriers on doubles. */
public boolean needsDoubleWriteBarrier() { return false; }

/** @return True of this Plan requires read barriers on doubles. */
public boolean needsDoubleReadBarrier() { return false; }

+ /** @return True if this Plan can perform bulk double arraycopy barriers. */
+ public boolean doubleBulkCopySupported() { return false; }
+
/** @return True if this Plan requires write barriers on object references. */
public boolean needsObjectReferenceWriteBarrier() { return false; }

@@ -85,6 +109,9 @@
/** @return True if this Plan requires non-heap read barriers on object references. */
public boolean needsObjectReferenceNonHeapReadBarrier() { return false; }

+ /** @return True if this Plan can perform bulk object arraycopy barriers. */
+ public boolean objectReferenceBulkCopySupported() { return false; }
+
/** @return True if this Plan requires linear scanning. */
public boolean needsLinearScan() { return org.mmtk.utility.Constants.SUPPORT_CARD_SCANNING;}

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenConstraints.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenConstraints.java 2009-11-12 11:47:04 UTC (rev 15793)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenConstraints.java 2009-11-25 04:44:53 UTC (rev 15794)
@@ -52,6 +52,10 @@
@Override
public boolean needsObjectReferenceNonHeapWriteBarrier() { return Gen.USE_NON_HEAP_OBJECT_REFERENCE_WRITE_BARRIER; }

+ /** @return True if this Plan can perform bulk object arraycopy barriers. */
+ @Override
+ public boolean objectReferenceBulkCopySupported() { return true; }
+
/** @return The specialized scan methods required */
@Override
public int numSpecializedScans() { return 2; }

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenMutator.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenMutator.java 2009-11-12 11:47:04 UTC (rev 15793)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenMutator.java 2009-11-25 04:44:53 UTC (rev 15794)
@@ -259,26 +259,21 @@
* In this case, we remember the mutated source address range and
* will scan that address range at GC time.
*
- * @param src The source of the values to copied
- * @param srcOffset The offset of the first source address, in
- * bytes, relative to <code>src</code> (in principle, this could be
- * negative).
+ * @param src The source of the values to be copied
+ * @param srcIdx The starting source index
* @param dst The mutated object, i.e. the destination of the copy.
- * @param dstOffset The offset of the first destination address, in
- * bytes relative to <code>tgt</code> (in principle, this could be
- * negative).
- * @param bytes The size of the region being copied, in bytes.
+ * @param srcIdx The starting source index
+ * @param len The number of array elements to be copied
* @return True if the update was performed by the barrier, false if
* left to the caller (always false in this case).
*/
@Inline
- public final boolean objectReferenceBulkCopy(ObjectReference src, Offset srcOffset,
- ObjectReference dst, Offset dstOffset,
- int bytes) {
- // We can ignore when src is in old space, right?
- if (!Gen.inNursery(dst))
- arrayRemset.insert(dst.toAddress().plus(dstOffset),
- dst.toAddress().plus(dstOffset.plus(bytes)));
+ @Override
+ public final boolean objectReferenceBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
+ if (!Gen.inNursery(dst)) {
+ Address start = dst.toAddress().plus(dstOffset);
+ arrayRemset.insert(start, start.plus(bytes));
+ }
return false;
}

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/poisoned/PoisonedMutator.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/poisoned/PoisonedMutator.java 2009-11-12 11:47:04 UTC (rev 15793)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/poisoned/PoisonedMutator.java 2009-11-25 04:44:53 UTC (rev 15794)
@@ -18,7 +18,6 @@
import org.vmmagic.pragma.*;
import org.vmmagic.unboxed.Address;
import org.vmmagic.unboxed.ObjectReference;
-import org.vmmagic.unboxed.Offset;
import org.vmmagic.unboxed.Word;

/**
@@ -78,32 +77,6 @@
}

/**
- * A number of references are about to be copied from object
- * <code>src</code> to object <code>dst</code> (as in an array
- * copy). Thus, <code>dst</code> is the mutated object. Take
- * appropriate write barrier actions.
- *
- * @param src The source of the values to be copied
- * @param srcOffset The offset of the first source address, in
- * bytes, relative to <code>src</code> (in principle, this could be
- * negative).
- * @param dst The mutated object, i.e. the destination of the copy.
- * @param dstOffset The offset of the first destination address, in
- * bytes relative to <code>tgt</code> (in principle, this could be
- * negative).
- * @param bytes The size of the region being copied, in bytes.
- * @return True if the update was performed by the barrier, false if
- * left to the caller (always false in this case).
- */
- @Override
- public boolean objectReferenceBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
- // TODO: Currently, read barriers implies that this is never used, perhaps
- // we might want to use it sometime anyway?
- if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
- return false;
- }
-
- /**
* Read a reference. Take appropriate read barrier action, and
* return the value that was read. This is a substituting
* barrier. The call to this barrier takes the place of a load.

Modified: rvmroot/trunk/MMTk/src/org/mmtk/utility/Constants.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/utility/Constants.java 2009-11-12 11:47:04 UTC (rev 15793)
+++ rvmroot/trunk/MMTk/src/org/mmtk/utility/Constants.java 2009-11-25 04:44:53 UTC (rev 15794)
@@ -72,6 +72,11 @@
*
* TODO MMTk should really become independent of these Java types
*/
+ byte LOG_BYTES_IN_CHAR= 1;
+ int BYTES_IN_CHAR = 1 << LOG_BYTES_IN_CHAR;
+ byte LOG_BITS_IN_CHAR = LOG_BITS_IN_BYTE + LOG_BYTES_IN_CHAR;
+ int BITS_IN_CHAR = 1 << LOG_BITS_IN_CHAR;
+
byte LOG_BYTES_IN_SHORT = 1;
int BYTES_IN_SHORT = 1 << LOG_BYTES_IN_SHORT;
byte LOG_BITS_IN_SHORT = LOG_BITS_IN_BYTE + LOG_BYTES_IN_SHORT;

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/classloader/RVMArray.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/RVMArray.java 2009-11-12 11:47:04 UTC (rev 15793)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/classloader/RVMArray.java 2009-11-25 04:44:53 UTC (rev 15794)
@@ -616,20 +616,34 @@
(srcIdx + len) <= src.length &&
(dstIdx + len) >= 0 &&
(dstIdx + len) <= dst.length) {
- if (src != dst || srcIdx >= (dstIdx + BYTES_IN_ADDRESS)) {
- Memory.arraycopy8Bit(src, srcIdx, dst, dstIdx, len);
+ if ((src != dst || srcIdx >= (dstIdx + BYTES_IN_ADDRESS)) && BYTE_BULK_COPY_SUPPORTED) {
+ if (NEEDS_BOOLEAN_ASTORE_BARRIER || NEEDS_BOOLEAN_ALOAD_BARRIER) {
+ Offset srcOffset = Offset.fromIntZeroExtend(srcIdx);
+ Offset dstOffset = Offset.fromIntZeroExtend(dstIdx);
+ Barriers.byteBulkCopy(src, srcOffset, dst, dstOffset, len);
+ } else {
+ Memory.arraycopy8Bit(src, srcIdx, dst, dstIdx, len);
+ }
} else {
- arraycopyOverlap(src, srcIdx, dst, dstIdx, len);
+ arraycopyPiecemeal(src, srcIdx, dst, dstIdx, len);
}
} else {
failWithIndexOutOfBoundsException();
}
}

- // Outlined unlikely case of potentially overlapping subarrays
- // Motivation is to reduce code space costs of inlined array copy.
- @NoInline
- private static void arraycopyOverlap(byte[] src, int srcIdx, byte[] dst, int dstIdx, int len) {
+ /**
+ * Perform element-by-element arraycopy for array of bytes. Used
+ * when bulk copy is not possible.
+ *
+ * @param src The source array
+ * @param srcIdx The starting source index
+ * @param dst The destination array
+ * @param dstIdx The starting destination index
+ * @param len The number of array elements to be copied
+ */
+ @NoInline // unlikely case, so reduce code space costs
+ private static void arraycopyPiecemeal(byte[] src, int srcIdx, byte[] dst, int dstIdx, int len) {
if (srcIdx < dstIdx) {
srcIdx += len;
dstIdx += len;
@@ -663,20 +677,34 @@
(srcIdx + len) <= src.length &&
(dstIdx + len) >= 0 &&
(dstIdx + len) <= dst.length) {
- if (src != dst || srcIdx >= (dstIdx + BYTES_IN_ADDRESS / BYTES_IN_BOOLEAN)) {
- Memory.arraycopy8Bit(src, srcIdx, dst, dstIdx, len);
+ if ((src != dst || srcIdx >= (dstIdx + BYTES_IN_ADDRESS / BYTES_IN_BOOLEAN)) && BOOLEAN_BULK_COPY_SUPPORTED) {
+ if (NEEDS_BOOLEAN_ASTORE_BARRIER || NEEDS_BOOLEAN_ALOAD_BARRIER) {
+ Offset srcOffset = Offset.fromIntZeroExtend(srcIdx<<LOG_BYTES_IN_BOOLEAN);
+ Offset dstOffset = Offset.fromIntZeroExtend(dstIdx<<LOG_BYTES_IN_BOOLEAN);
+ Barriers.booleanBulkCopy(src, srcOffset, dst, dstOffset, len);
+ } else {
+ Memory.arraycopy8Bit(src, srcIdx, dst, dstIdx, len);
+ }
} else {
- arraycopyOverlap(src, srcIdx, dst, dstIdx, len);
+ arraycopyPiecemeal(src, srcIdx, dst, dstIdx, len);
}
} else {
failWithIndexOutOfBoundsException();
}
}

- // Outlined unlikely case of potentially overlapping subarrays
- // Motivation is to reduce code space costs of inlined array copy.
- @NoInline
- private static void arraycopyOverlap(boolean[] src, int srcIdx, boolean[] dst, int dstIdx, int len) {
+ /**
+ * Perform element-by-element arraycopy for array of booleans. Used
+ * when bulk copy is not possible.
+ *
+ * @param src The source array
+ * @param srcIdx The starting source index
+ * @param dst The destination array
+ * @param dstIdx The starting destination index
+ * @param len The number of array elements to be copied
+ */
+ @NoInline // unlikely case, so reduce code space costs
+ private static void arraycopyPiecemeal(boolean[] src, int srcIdx, boolean[] dst, int dstIdx, int len) {
if (srcIdx < dstIdx) {
srcIdx += len;
dstIdx += len;
@@ -710,20 +738,34 @@
(srcIdx + len) <= src.length &&
(dstIdx + len) >= 0 &&
(dstIdx + len) <= dst.length) {
- if (src != dst || srcIdx >= (dstIdx + BYTES_IN_ADDRESS / BYTES_IN_SHORT)) {
- Memory.arraycopy16Bit(src, srcIdx, dst, dstIdx, len);
+ if ((src != dst || srcIdx >= (dstIdx + BYTES_IN_ADDRESS / BYTES_IN_SHORT)) && SHORT_BULK_COPY_SUPPORTED) {
+ if (NEEDS_SHORT_ASTORE_BARRIER || NEEDS_SHORT_ALOAD_BARRIER) {
+ Offset srcOffset = Offset.fromIntZeroExtend(srcIdx<<LOG_BYTES_IN_SHORT);
+ Offset dstOffset = Offset.fromIntZeroExtend(dstIdx<<LOG_BYTES_IN_SHORT);
+ Barriers.shortBulkCopy(src, srcOffset, dst, dstOffset, len);
+ } else {
+ Memory.arraycopy16Bit(src, srcIdx, dst, dstIdx, len);
+ }
} else {
- arraycopyOverlap(src, srcIdx, dst, dstIdx, len);
+ arraycopyPiecemeal(src, srcIdx, dst, dstIdx, len);
}
} else {
failWithIndexOutOfBoundsException();
}
}

- // Outlined unlikely case of potentially overlapping subarrays
- // Motivation is to reduce code space costs of inlined array copy.
- @NoInline
- private static void arraycopyOverlap(short[] src, int srcIdx, short[] dst, int dstIdx, int len) {
+ /**
+ * Perform element-by-element arraycopy for array of shorts. Used
+ * when bulk copy is not possible.
+ *
+ * @param src The source array
+ * @param srcIdx The starting source index
+ * @param dst The destination array
+ * @param dstIdx The starting destination index
+ * @param len The number of array elements to be copied
+ */
+ @NoInline // unlikely case, so reduce code space costs
+ private static void arraycopyPiecemeal(short[] src, int srcIdx, short[] dst, int dstIdx, int len) {
if (srcIdx < dstIdx) {
srcIdx += len;
dstIdx += len;
@@ -757,20 +799,34 @@
(srcIdx + len) <= src.length &&
(dstIdx + len) >= 0 &&
(dstIdx + len) <= dst.length) {
- if (src != dst || srcIdx >= (dstIdx + BYTES_IN_ADDRESS / BYTES_IN_CHAR)) {
- Memory.arraycopy16Bit(src, srcIdx, dst, dstIdx, len);
+ if ((src != dst || srcIdx >= (dstIdx + BYTES_IN_ADDRESS / BYTES_IN_CHAR)) && CHAR_BULK_COPY_SUPPORTED) {
+ if (NEEDS_CHAR_ASTORE_BARRIER || NEEDS_CHAR_ALOAD_BARRIER) {
+ Offset srcOffset = Offset.fromIntZeroExtend(srcIdx<<LOG_BYTES_IN_CHAR);
+ Offset dstOffset = Offset.fromIntZeroExtend(dstIdx<<LOG_BYTES_IN_CHAR);
+ Barriers.charBulkCopy(src, srcOffset, dst, dstOffset, len);
+ } else {
+ Memory.arraycopy16Bit(src, srcIdx, dst, dstIdx, len);
+ }
} else {
- arraycopyOverlap(src, srcIdx, dst, dstIdx, len);
+ arraycopyPiecemeal(src, srcIdx, dst, dstIdx, len);
}
} else {
failWithIndexOutOfBoundsException();
}
}

- // Outlined unlikely case of potentially overlapping subarrays
- // Motivation is to reduce code space costs of inlined array copy.
- @NoInline
- private static void arraycopyOverlap(char[] src, int srcIdx, char[] dst, int dstIdx, int len) {
+ /**
+ * Perform element-by-element arraycopy for array of chars. Used
+ * when bulk copy is not possible.
+ *
+ * @param src The source array
+ * @param srcIdx The starting source index
+ * @param dst The destination array
+ * @param dstIdx The starting destination index
+ * @param len The number of array elements to be copied
+ */
+ @NoInline // unlikely case, so reduce code space costs
+ private static void arraycopyPiecemeal(char[] src, int srcIdx, char[] dst, int dstIdx, int len) {
if (srcIdx < dstIdx) {
srcIdx += len;
dstIdx += len;
@@ -804,20 +860,34 @@
(srcIdx + len) <= src.length &&
(dstIdx + len) >= 0 &&
(dstIdx + len) <= dst.length) {
- if (src != dst || srcIdx >= dstIdx) {
- Memory.arraycopy32Bit(src, srcIdx, dst, dstIdx, len);
+ if ((src != dst || srcIdx >= dstIdx) && INT_BULK_COPY_SUPPORTED) {
+ if (NEEDS_INT_ASTORE_BARRIER || NEEDS_INT_ALOAD_BARRIER) {
+ Offset srcOffset = Offset.fromIntZeroExtend(srcIdx<<LOG_BYTES_IN_INT);
+ Offset dstOffset = Offset.fromIntZeroExtend(dstIdx<<LOG_BYTES_IN_INT);
+ Barriers.intBulkCopy(src, srcOffset, dst, dstOffset, len);
+ } else {
+ Memory.arraycopy32Bit(src, srcIdx, dst, dstIdx, len);
+ }
} else {
- arraycopyOverlap(src, srcIdx, dst, dstIdx, len);
+ arraycopyPiecemeal(src, srcIdx, dst, dstIdx, len);
}
} else {
failWithIndexOutOfBoundsException();
}
}

- // Outlined unlikely case of potentially overlapping subarrays
- // Motivation is to reduce code space costs of inlined array copy.
- @NoInline
- private static void arraycopyOverlap(int[] src, int srcIdx, int[] dst, int dstIdx, int len) {
+ /**
+ * Perform element-by-element arraycopy for array of ints. Used
+ * when bulk copy is not possible.
+ *
+ * @param src The source array
+ * @param srcIdx The starting source index
+ * @param dst The destination array
+ * @param dstIdx The starting destination index
+ * @param len The number of array elements to be copied
+ */
+ @NoInline // unlikely case, so reduce code space costs
+ private static void arraycopyPiecemeal(int[] src, int srcIdx, int[] dst, int dstIdx, int len) {
if (srcIdx < dstIdx) {
srcIdx += len;
dstIdx += len;
@@ -851,20 +921,34 @@
(srcIdx + len) <= src.length &&
(dstIdx + len) >= 0 &&
(dstIdx + len) <= dst.length) {
- if (src != dst || srcIdx > dstIdx) {
- Memory.arraycopy32Bit(src, srcIdx, dst, dstIdx, len);
+ if (src != dst || srcIdx > dstIdx && FLOAT_BULK_COPY_SUPPORTED) {
+ if (NEEDS_FLOAT_ASTORE_BARRIER || NEEDS_FLOAT_ALOAD_BARRIER) {
+ Offset srcOffset = Offset.fromIntZeroExtend(srcIdx<<LOG_BYTES_IN_FLOAT);
+ Offset dstOffset = Offset.fromIntZeroExtend(dstIdx<<LOG_BYTES_IN_FLOAT);
+ Barriers.floatBulkCopy(src, srcOffset, dst, dstOffset, len);
+ } else {
+ Memory.arraycopy32Bit(src, srcIdx, dst, dstIdx, len);
+ }
} else {
- arraycopyOverlap(src, srcIdx, dst, dstIdx, len);
+ arraycopyPiecemeal(src, srcIdx, dst, dstIdx, len);
}
} else {
failWithIndexOutOfBoundsException();
}
}

- // Outlined unlikely case of potentially overlapping subarrays
- // Motivation is to reduce code space costs of inlined array copy.
- @NoInline
- private static void arraycopyOverlap(float[] src, int srcIdx, float[] dst, int dstIdx, int len) {
+ /**
+ * Perform element-by-element arraycopy for array of floats. Used
+ * when bulk copy is not possible.
+ *
+ * @param src The source array
+ * @param srcIdx The starting source index
+ * @param dst The destination array
+ * @param dstIdx The starting destination index
+ * @param len The number of array elements to be copied
+ */
+ @NoInline // unlikely case, so reduce code space costs
+ private static void arraycopyPiecemeal(float[] src, int srcIdx, float[] dst, int dstIdx, int len) {
if (srcIdx < dstIdx) {
srcIdx += len;
dstIdx += len;
@@ -898,20 +982,34 @@
(srcIdx + len) <= src.length &&
(dstIdx + len) >= 0 &&
(dstIdx + len) <= dst.length) {
- if (src != dst || srcIdx > dstIdx) {
- Memory.arraycopy64Bit(src, srcIdx, dst, dstIdx, len);
+ if ((src != dst || srcIdx > dstIdx) && LONG_BULK_COPY_SUPPORTED) {
+ if (NEEDS_LONG_ASTORE_BARRIER || NEEDS_LONG_ALOAD_BARRIER) {
+ Offset srcOffset = Offset.fromIntZeroExtend(srcIdx<<LOG_BYTES_IN_LONG);
+ Offset dstOffset = Offset.fromIntZeroExtend(dstIdx<<LOG_BYTES_IN_LONG);
+ Barriers.longBulkCopy(src, srcOffset, dst, dstOffset, len);
+ } else {
+ Memory.arraycopy64Bit(src, srcIdx, dst, dstIdx, len);
+ }
} else {
- arraycopyOverlap(src, srcIdx, dst, dstIdx, len);
+ arraycopyPiecemeal(src, srcIdx, dst, dstIdx, len);
}
} else {
failWithIndexOutOfBoundsException();
}
}

- // Outlined unlikely case of potentially overlapping subarrays
- // Motivation is to reduce code space costs of inlined array copy.
- @NoInline
- private static void arraycopyOverlap(long[] src, int srcIdx, long[] dst, int dstIdx, int len) {
+ /**
+ * Perform element-by-element arraycopy for array of longs. Used
+ * when bulk copy is not possible.
+ *
+ * @param src The source array
+ * @param srcIdx The starting source index
+ * @param dst The destination array
+ * @param dstIdx The starting destination index
+ * @param len The number of array elements to be copied
+ */
+ @NoInline // unlikely case, so reduce code space costs
+ private static void arraycopyPiecemeal(long[] src, int srcIdx, long[] dst, int dstIdx, int len) {
if (srcIdx < dstIdx) {
srcIdx += len;
dstIdx += len;
@@ -945,20 +1043,34 @@
(srcIdx + len) <= src.length &&
(dstIdx + len) >= 0 &&
(dstIdx + len) <= dst.length) {
- if (src != dst || srcIdx > dstIdx) {
- Memory.arraycopy64Bit(src, srcIdx, dst, dstIdx, len);
+ if ((src != dst || srcIdx > dstIdx) && DOUBLE_BULK_COPY_SUPPORTED) {
+ if (NEEDS_DOUBLE_ASTORE_BARRIER || NEEDS_DOUBLE_ALOAD_BARRIER) {
+ Offset srcOffset = Offset.fromIntZeroExtend(srcIdx<<LOG_BYTES_IN_DOUBLE);
+ Offset dstOffset = Offset.fromIntZeroExtend(dstIdx<<LOG_BYTES_IN_DOUBLE);
+ Barriers.doubleBulkCopy(src, srcOffset, dst, dstOffset, len);
+ } else {
+ Memory.arraycopy64Bit(src, srcIdx, dst, dstIdx, len);
+ }
} else {
- arraycopyOverlap(src, srcIdx, dst, dstIdx, len);
+ arraycopyPiecemeal(src, srcIdx, dst, dstIdx, len);
}
} else {
failWithIndexOutOfBoundsException();
}
}

- // Outlined unlikely case of potentially overlapping subarrays
- // Motivation is to reduce code space costs of inlined array copy.
- @NoInline
- private static void arraycopyOverlap(double[] src, int srcIdx, double[] dst, int dstIdx, int len) {
+ /**
+ * Perform element-by-element arraycopy for array of doubles. Used
+ * when bulk copy is not possible.
+ *
+ * @param src The source array
+ * @param srcIdx The starting source index
+ * @param dst The destination array
+ * @param dstIdx The starting destination index
+ * @param len The number of array elements to be copied
+ */
+ @NoInline // unlikely case, so reduce code space costs
+ private static void arraycopyPiecemeal(double[] src, int srcIdx, double[] dst, int dstIdx, int len) {
if (srcIdx < dstIdx) {
srcIdx += len;
dstIdx += len;
@@ -994,10 +1106,11 @@
(dstIdx + len) <= dst.length) {
RVMType lhs = Magic.getObjectType(dst).asArray().getElementType();
RVMType rhs = Magic.getObjectType(src).asArray().getElementType();
+
if ((lhs == rhs) || (lhs == RVMType.JavaLangObjectType) || RuntimeEntrypoints.isAssignableWith(lhs, rhs)) {
- fastArrayCopy(src, srcIdx, dst, dstIdx, len);
+ arraycopyNoCheckcast(src, srcIdx, dst, dstIdx, len);
} else {
- slowArrayCopy(src, srcIdx, dst, dstIdx, len);
+ arraycopyPiecemeal(src, srcIdx, dst, dstIdx, len);
}
} else {
failWithIndexOutOfBoundsException();
@@ -1015,50 +1128,65 @@
* @param src The source array
* @param srcIdx The starting source index
* @param dst The destination array
- * @param dstIdx The starting destination index
+ * @param dstIdx The starting source index
* @param len The number of array elements to be copied
*/
- private static void fastArrayCopy(Object[] src, int srcIdx, Object[] dst, int dstIdx, int len) {
-
- boolean loToHi = (srcIdx > dstIdx); // direction of copy
+ private static void arraycopyNoCheckcast(Object[] src, int srcIdx, Object[] dst, int dstIdx, int len) {
Offset srcOffset = Offset.fromIntZeroExtend(srcIdx << LOG_BYTES_IN_ADDRESS);
Offset dstOffset = Offset.fromIntZeroExtend(dstIdx << LOG_BYTES_IN_ADDRESS);
int bytes = len << LOG_BYTES_IN_ADDRESS;

- if (!NEEDS_OBJECT_ALOAD_BARRIER && ((src != dst) || loToHi)) {
- if (!NEEDS_OBJECT_ASTORE_BARRIER ||
- !Barriers.objectBulkCopy(src, srcOffset, dst, dstOffset, bytes)) {
- Memory.alignedWordCopy(Magic.objectAsAddress(dst).plus(dstOffset),
- Magic.objectAsAddress(src).plus(srcOffset),
- bytes);
+ if (((src != dst) || (srcIdx > dstIdx)) && OBJECT_BULK_COPY_SUPPORTED) {
+ if (NEEDS_OBJECT_ASTORE_BARRIER || NEEDS_OBJECT_ALOAD_BARRIER) {
+ Barriers.objectBulkCopy(src, srcOffset, dst, dstOffset, bytes);
+ } else {
+ Memory.alignedWordCopy(Magic.objectAsAddress(dst).plus(dstOffset), Magic.objectAsAddress(src).plus(srcOffset), bytes);
}
} else {
- // set up things according to the direction of the copy
- int increment;
- if (loToHi) {
- increment = BYTES_IN_ADDRESS;
+ arraycopyPiecemealNoCheckcast(src, dst, len, srcOffset, dstOffset, bytes);
+ }
+ }
+
+ /**
+ * Perform element-by-element arraycopy for array of objects without
+ * performing checkcast. Used when bulk copy is not possible, but
+ * checkcast is still not necessary. If barriers are required they
+ * must be explicitly invoked.
+ *
+ * @param src The source array
+ * @param srcIdx The starting source index
+ * @param dst The destination array
+ * @param dstIdx The starting destination index
+ * @param len The number of array elements to be copied
+ */
+ private static void arraycopyPiecemealNoCheckcast(Object[] src, Object[] dst, int len,
+ Offset srcOffset, Offset dstOffset, int bytes) {
+
+ // set up things according to the direction of the copy
+ int increment;
+ if (srcOffset.sGT(dstOffset)) { // direction of copy
+ increment = BYTES_IN_ADDRESS;
+ } else {
+ srcOffset = srcOffset.plus(bytes - BYTES_IN_ADDRESS);
+ dstOffset = dstOffset.plus(bytes - BYTES_IN_ADDRESS);
+ increment = -BYTES_IN_ADDRESS;
+ }
+
+ // perform the copy
+ while (len-- != 0) {
+ Object value;
+ if (NEEDS_OBJECT_GETFIELD_BARRIER) {
+ value = Barriers.objectArrayRead(src, srcOffset.toInt() >> LOG_BYTES_IN_ADDRESS);
} else {
- srcOffset = srcOffset.plus(bytes - BYTES_IN_ADDRESS);
- dstOffset = dstOffset.plus(bytes - BYTES_IN_ADDRESS);
- increment = -BYTES_IN_ADDRESS;
+ value = Magic.getObjectAtOffset(src, srcOffset);
}
-
- // perform the copy
- while (len-- != 0) {
- Object value;
- if (NEEDS_OBJECT_GETFIELD_BARRIER) {
- value = Barriers.objectArrayRead(src, srcOffset.toInt() >> LOG_BYTES_IN_ADDRESS);
- } else {
- value = Magic.getObjectAtOffset(src, srcOffset);
- }
- if (NEEDS_OBJECT_PUTFIELD_BARRIER) {
- Barriers.objectArrayWrite(dst, dstOffset.toInt() >> LOG_BYTES_IN_ADDRESS, value);
- } else {
- Magic.setObjectAtOffset(dst, dstOffset, value);
- }
- srcOffset = srcOffset.plus(increment);
- dstOffset = dstOffset.plus(increment);
+ if (NEEDS_OBJECT_PUTFIELD_BARRIER) {
+ Barriers.objectArrayWrite(dst, dstOffset.toInt() >> LOG_BYTES_IN_ADDRESS, value);
+ } else {
+ Magic.setObjectAtOffset(dst, dstOffset, value);
}
+ srcOffset = srcOffset.plus(increment);
+ dstOffset = dstOffset.plus(increment);
}
}

@@ -1076,7 +1204,7 @@
* @param dstIdx The starting destination index
* @param len The number of array elements to be copied
*/
- private static void slowArrayCopy(Object[] src, int srcIdx, Object[] dst, int dstIdx, int len) {
+ private static void arraycopyPiecemeal(Object[] src, int srcIdx, Object[] dst, int dstIdx, int len) {
// must perform copy in correct order
if ((src != dst) || srcIdx > dstIdx) {
// non-overlapping case: straightforward

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/mm/mminterface/Barriers.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/mm/mminterface/Barriers.java 2009-11-12 11:47:04 UTC (rev 15793)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/mm/mminterface/Barriers.java 2009-11-25 04:44:53 UTC (rev 15794)
@@ -13,7 +13,8 @@
package org.jikesrvm.mm.mminterface;

import org.jikesrvm.runtime.Magic;
-import org.mmtk.vm.VM;
+import org.jikesrvm.runtime.Memory;
+import org.jikesrvm.VM;
import org.vmmagic.pragma.Entrypoint;
import org.vmmagic.pragma.Inline;
import org.vmmagic.pragma.Uninterruptible;
@@ -38,8 +39,8 @@
if (NEEDS_JAVA_LANG_REFERENCE_GC_READ_BARRIER) {
ObjectReference result = Selected.Mutator.get().javaLangReferenceReadBarrier(ObjectReference.fromObject(obj));
return result.toObject();
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
return null;
}

@@ -57,6 +58,8 @@
public static final boolean NEEDS_BOOLEAN_GETFIELD_BARRIER = NEEDS_BOOLEAN_GC_READ_BARRIER;
/** True if the VM requires read barriers on boolean arrayload */
public static final boolean NEEDS_BOOLEAN_ALOAD_BARRIER = NEEDS_BOOLEAN_GC_READ_BARRIER;
+ /** True if the garbage collector does not support the bulk copy operation */
+ public static final boolean BOOLEAN_BULK_COPY_SUPPORTED = !(NEEDS_BOOLEAN_ASTORE_BARRIER || NEEDS_BOOLEAN_ALOAD_BARRIER) || Selected.Constraints.get().booleanBulkCopySupported();

/**
* Barrier for writes of booleans into fields of instances (ie putfield).
@@ -72,8 +75,8 @@
if (NEEDS_BOOLEAN_GC_WRITE_BARRIER) {
ObjectReference src = ObjectReference.fromObject(ref);
Selected.Mutator.get().booleanWrite(src, src.toAddress().plus(offset), value, offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
}

/**
@@ -87,13 +90,13 @@
*/
@Inline
@Entrypoint
- public static void booleanArrayWrite(Object ref, int index, boolean value) {
- if (NEEDS_OBJECT_GC_WRITE_BARRIER) {
+ public static void booleanArrayWrite(boolean[] ref, int index, boolean value) {
+ if (NEEDS_BOOLEAN_GC_WRITE_BARRIER) {
ObjectReference array = ObjectReference.fromObject(ref);
- Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_BOOLEAN);
Selected.Mutator.get().booleanWrite(array, array.toAddress().plus(offset), value, offset.toWord(), Word.zero(), ARRAY_ELEMENT);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
}

/**
@@ -107,11 +110,11 @@
@Inline
@Entrypoint
public static boolean booleanFieldRead(Object ref, Offset offset, int locationMetadata) {
- if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ if (NEEDS_BOOLEAN_GC_READ_BARRIER) {
ObjectReference src = ObjectReference.fromObject(ref);
return Selected.Mutator.get().booleanRead(src, src.toAddress().plus(offset), offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
return false;
}

@@ -124,38 +127,32 @@
*/
@Inline
@Entrypoint
- public static boolean booleanArrayRead(Object ref, int index) {
- if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ public static boolean booleanArrayRead(boolean[] ref, int index) {
+ if (NEEDS_BOOLEAN_GC_READ_BARRIER) {
ObjectReference array = ObjectReference.fromObject(ref);
- Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_BOOLEAN);
return Selected.Mutator.get().booleanRead(array, array.toAddress().plus(offset), offset.toWord(), Word.zero(), ARRAY_ELEMENT);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
return false;
}

/**
* Barrier for a bulk copy of booleans (i.e. in an array copy).
*
- * @param src The source object
- * @param srcOffset The offset of the first source address, in
- * bytes, relative to <code>src</code> (in principle, this could be
- * negative).
- * @param tgt The target object
- * @param tgtOffset The offset of the first target address, in bytes
- * relative to <code>tgt</code> (in principle, this could be
- * negative).
- * @param bytes The size of the region being copied, in bytes.
- * @return True if the update was performed by the barrier, false if
- * left to the caller (always false in this case).
+ * @param src The source array
+ * @param srcOffset The starting source offset
+ * @param dst The destination array
+ * @param dstOffset The starting destination offset
+ * @param bytes The number of bytes to be copied
*/
@Inline
- public static boolean booleanBulkCopy(Object src, Offset srcOffset, Object tgt, Offset tgtOffset, int bytes) {
- if (NEEDS_OBJECT_GC_WRITE_BARRIER || NEEDS_OBJECT_GC_READ_BARRIER) {
- return Selected.Mutator.get().booleanBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(tgt), tgtOffset, bytes);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
- return false;
+ public static void booleanBulkCopy(boolean[] src, Offset srcOffset, boolean[] dst, Offset dstOffset, int bytes) {
+ if (VM.VerifyAssertions) VM._assert(BOOLEAN_BULK_COPY_SUPPORTED);
+
+ if (!Selected.Mutator.get().booleanBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(dst), dstOffset, bytes)) {
+ Memory.arraycopy8Bit(Magic.objectAsAddress(dst).plus(dstOffset), Magic.objectAsAddress(src).plus(srcOffset), bytes);
+ }
}

/** True if the garbage collector requires write barriers on byte putfield, arraystore or modifycheck */
@@ -170,6 +167,8 @@
public static final boolean NEEDS_BYTE_GETFIELD_BARRIER = NEEDS_BYTE_GC_READ_BARRIER;
/** True if the VM requires read barriers on byte arrayload */
public static final boolean NEEDS_BYTE_ALOAD_BARRIER = NEEDS_BYTE_GC_READ_BARRIER;
+ /** True if the garbage collector does not support the bulk copy operation */
+ public static final boolean BYTE_BULK_COPY_SUPPORTED = !(NEEDS_BYTE_ASTORE_BARRIER || NEEDS_BYTE_ALOAD_BARRIER) || Selected.Constraints.get().byteBulkCopySupported();

/**
* Barrier for writes of bytes into fields of instances (ie putfield).
@@ -185,8 +184,8 @@
if (NEEDS_BYTE_GC_WRITE_BARRIER) {
ObjectReference src = ObjectReference.fromObject(ref);
Selected.Mutator.get().byteWrite(src, src.toAddress().plus(offset), value, offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
}

/**
@@ -200,13 +199,13 @@
*/
@Inline
@Entrypoint
- public static void byteArrayWrite(Object ref, int index, byte value) {
- if (NEEDS_OBJECT_GC_WRITE_BARRIER) {
+ public static void byteArrayWrite(byte[] ref, int index, byte value) {
+ if (NEEDS_BYTE_GC_WRITE_BARRIER) {
ObjectReference array = ObjectReference.fromObject(ref);
- Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Offset offset = Offset.fromIntZeroExtend(index);
Selected.Mutator.get().byteWrite(array, array.toAddress().plus(offset), value, offset.toWord(), Word.zero(), ARRAY_ELEMENT);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
}

/**
@@ -220,11 +219,11 @@
@Inline
@Entrypoint
public static byte byteFieldRead(Object ref, Offset offset, int locationMetadata) {
- if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ if (NEEDS_BYTE_GC_READ_BARRIER) {
ObjectReference src = ObjectReference.fromObject(ref);
return Selected.Mutator.get().byteRead(src, src.toAddress().plus(offset), offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
return 0;
}

@@ -237,38 +236,32 @@
*/
@Inline
@Entrypoint
- public static byte byteArrayRead(Object ref, int index) {
- if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ public static byte byteArrayRead(byte[] ref, int index) {
+ if (NEEDS_BYTE_GC_READ_BARRIER) {
ObjectReference array = ObjectReference.fromObject(ref);
- Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Offset offset = Offset.fromIntZeroExtend(index);
return Selected.Mutator.get().byteRead(array, array.toAddress().plus(offset), offset.toWord(), Word.zero(), ARRAY_ELEMENT);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
return 0;
}

/**
- * Barrier for a bulk copy of objects (i.e. in an array copy).
+ * Barrier for a bulk copy of bytes (i.e. in an array copy).
*
- * @param src The source object
- * @param srcOffset The offset of the first source address, in
- * bytes, relative to <code>src</code> (in principle, this could be
- * negative).
- * @param tgt The target object
- * @param tgtOffset The offset of the first target address, in bytes
- * relative to <code>tgt</code> (in principle, this could be
- * negative).
- * @param bytes The size of the region being copied, in bytes.
- * @return True if the update was performed by the barrier, false if
- * left to the caller (always false in this case).
+ * @param src The source array
+ * @param srcOffset The starting source offset
+ * @param dst The destination array
+ * @param dstOffset The starting destination offset
+ * @param bytes The number of bytes to be copied
*/
@Inline
- public static boolean byteBulkCopy(Object src, Offset srcOffset, Object tgt, Offset tgtOffset, int bytes) {
- if (NEEDS_OBJECT_GC_WRITE_BARRIER || NEEDS_OBJECT_GC_READ_BARRIER) {
- return Selected.Mutator.get().byteBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(tgt), tgtOffset, bytes);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
- return false;
+ public static void byteBulkCopy(byte[] src, Offset srcOffset, byte[] dst, Offset dstOffset, int bytes) {
+ if (VM.VerifyAssertions) VM._assert(BYTE_BULK_COPY_SUPPORTED);
+
+ if (!Selected.Mutator.get().byteBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(dst), dstOffset, bytes)) {
+ Memory.arraycopy8Bit(Magic.objectAsAddress(dst).plus(dstOffset), Magic.objectAsAddress(src).plus(srcOffset), bytes);
+ }
}

@@ -284,6 +277,8 @@
public static final boolean NEEDS_CHAR_GETFIELD_BARRIER = NEEDS_CHAR_GC_READ_BARRIER;
/** True if the VM requires read barriers on char arrayload */
public static final boolean NEEDS_CHAR_ALOAD_BARRIER = NEEDS_CHAR_GC_READ_BARRIER;
+ /** True if the garbage collector does not support the bulk copy operation */
+ public static final boolean CHAR_BULK_COPY_SUPPORTED = !(NEEDS_CHAR_ASTORE_BARRIER || NEEDS_CHAR_ALOAD_BARRIER) || Selected.Constraints.get().charBulkCopySupported();

/**
* Barrier for writes of chars into fields of instances (ie putfield).
@@ -299,8 +294,8 @@
if (NEEDS_CHAR_GC_WRITE_BARRIER) {
ObjectReference src = ObjectReference.fromObject(ref);
Selected.Mutator.get().charWrite(src, src.toAddress().plus(offset), value, offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
}

/**
@@ -314,13 +309,13 @@
*/
@Inline
@Entrypoint
- public static void charArrayWrite(Object ref, int index, char value) {
- if (NEEDS_OBJECT_GC_WRITE_BARRIER) {
+ public static void charArrayWrite(char[] ref, int index, char value) {
+ if (NEEDS_CHAR_GC_WRITE_BARRIER) {
ObjectReference array = ObjectReference.fromObject(ref);
Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
Selected.Mutator.get().charWrite(array, array.toAddress().plus(offset), value, offset.toWord(), Word.zero(), ARRAY_ELEMENT);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
}

/**
@@ -334,11 +329,11 @@
@Inline
@Entrypoint
public static char charFieldRead(Object ref, Offset offset, int locationMetadata) {
- if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ if (NEEDS_CHAR_GC_READ_BARRIER) {
ObjectReference src = ObjectReference.fromObject(ref);
return Selected.Mutator.get().charRead(src, src.toAddress().plus(offset), offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
return 0;
}

@@ -351,38 +346,32 @@
*/
@Inline
@Entrypoint
- public static char charArrayRead(Object ref, int index) {
- if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ public static char charArrayRead(char[] ref, int index) {
+ if (NEEDS_CHAR_GC_READ_BARRIER) {
ObjectReference array = ObjectReference.fromObject(ref);
- Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_CHAR);
return Selected.Mutator.get().charRead(array, array.toAddress().plus(offset), offset.toWord(), Word.zero(), ARRAY_ELEMENT);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
return 0;
}

/**
- * Barrier for a bulk copy of objects (i.e. in an array copy).
+ * Barrier for a bulk copy of chars (i.e. in an array copy).
*
- * @param src The source object
- * @param srcOffset The offset of the first source address, in
- * bytes, relative to <code>src</code> (in principle, this could be
- * negative).
- * @param tgt The target object
- * @param tgtOffset The offset of the first target address, in bytes
- * relative to <code>tgt</code> (in principle, this could be
- * negative).
- * @param bytes The size of the region being copied, in bytes.
- * @return True if the update was performed by the barrier, false if
- * left to the caller (always false in this case).
+ * @param src The source array
+ * @param srcOffset The starting source offset
+ * @param dst The destination array
+ * @param dstOffset The starting destination offset
+ * @param bytes The number of bytes to be copied
*/
@Inline
- public static boolean charBulkCopy(Object src, Offset srcOffset, Object tgt, Offset tgtOffset, int bytes) {
- if (NEEDS_OBJECT_GC_WRITE_BARRIER || NEEDS_OBJECT_GC_READ_BARRIER) {
- return Selected.Mutator.get().charBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(tgt), tgtOffset, bytes);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
- return false;
+ public static void charBulkCopy(char[] src, Offset srcOffset, char[] dst, Offset dstOffset, int bytes) {
+ if (VM.VerifyAssertions) VM._assert(CHAR_BULK_COPY_SUPPORTED);
+
+ if (!Selected.Mutator.get().charBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(dst), dstOffset, bytes)) {
+ Memory.arraycopy16Bit(Magic.objectAsAddress(dst).plus(dstOffset), Magic.objectAsAddress(src).plus(srcOffset), bytes);
+ }
}

@@ -398,6 +387,8 @@
public static final boolean NEEDS_SHORT_GETFIELD_BARRIER = NEEDS_SHORT_GC_READ_BARRIER;
/** True if the VM requires read barriers on short arrayload */
public static final boolean NEEDS_SHORT_ALOAD_BARRIER = NEEDS_SHORT_GC_READ_BARRIER;
+ /** True if the garbage collector does not support the bulk copy operation */
+ public static final boolean SHORT_BULK_COPY_SUPPORTED = !(NEEDS_SHORT_ASTORE_BARRIER || NEEDS_SHORT_ALOAD_BARRIER) || Selected.Constraints.get().shortBulkCopySupported();

/**
* Barrier for writes of shorts into fields of instances (ie putfield).
@@ -413,8 +404,8 @@
if (NEEDS_SHORT_GC_WRITE_BARRIER) {
ObjectReference src = ObjectReference.fromObject(ref);
Selected.Mutator.get().shortWrite(src, src.toAddress().plus(offset), value, offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
}

/**
@@ -428,13 +419,13 @@
*/
@Inline
@Entrypoint
- public static void shortArrayWrite(Object ref, int index, short value) {
- if (NEEDS_OBJECT_GC_WRITE_BARRIER) {
+ public static void shortArrayWrite(short[] ref, int index, short value) {
+ if (NEEDS_SHORT_GC_WRITE_BARRIER) {
ObjectReference array = ObjectReference.fromObject(ref);
- Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_SHORT);
Selected.Mutator.get().shortWrite(array, array.toAddress().plus(offset), value, offset.toWord(), Word.zero(), ARRAY_ELEMENT);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
}

/**
@@ -448,11 +439,11 @@
@Inline
@Entrypoint
public static short shortFieldRead(Object ref, Offset offset, int locationMetadata) {
- if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ if (NEEDS_SHORT_GC_READ_BARRIER) {
ObjectReference src = ObjectReference.fromObject(ref);
return Selected.Mutator.get().shortRead(src, src.toAddress().plus(offset), offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
return 0;
}

@@ -465,41 +456,36 @@
*/
@Inline
@Entrypoint
- public static short shortArrayRead(Object ref, int index) {
- if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ public static short shortArrayRead(short[] ref, int index) {
+ if (NEEDS_SHORT_GC_READ_BARRIER) {
ObjectReference array = ObjectReference.fromObject(ref);
- Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_SHORT);
return Selected.Mutator.get().shortRead(array, array.toAddress().plus(offset), offset.toWord(), Word.zero(), ARRAY_ELEMENT);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
return 0;
}

/**
- * Barrier for a bulk copy of objects (i.e. in an array copy).
+ * Barrier for a bulk copy of shorts (i.e. in an array copy).
*
- * @param src The source object
- * @param srcOffset The offset of the first source address, in
- * bytes, relative to <code>src</code> (in principle, this could be
- * negative).
- * @param tgt The target object
- * @param tgtOffset The offset of the first target address, in bytes
- * relative to <code>tgt</code> (in principle, this could be
- * negative).
- * @param bytes The size of the region being copied, in bytes.
- * @return True if the update was performed by the barrier, false if
- * left to the caller (always false in this case).
+ * @param src The source array
+ * @param srcOffset The starting source offset
+ * @param dst The destination array
+ * @param dstOffset The starting destination offset
+ * @param bytes The number of bytes to be copied
*/
@Inline
- public static boolean shortBulkCopy(Object src, Offset srcOffset, Object tgt, Offset tgtOffset, int bytes) {
- if (NEEDS_OBJECT_GC_WRITE_BARRIER || NEEDS_OBJECT_GC_READ_BARRIER) {
- return Selected.Mutator.get().shortBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(tgt), tgtOffset, bytes);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
- return false;
+ public static void shortBulkCopy(short[] src, Offset srcOffset, short[] dst, Offset dstOffset, int bytes) {
+ if (VM.VerifyAssertions) VM._assert(SHORT_BULK_COPY_SUPPORTED);
+
+ if (!Selected.Mutator.get().shortBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(dst), dstOffset, bytes)) {
+ Memory.arraycopy16Bit(Magic.objectAsAddress(dst).plus(dstOffset), Magic.objectAsAddress(src).plus(srcOffset), bytes);
+ }
}

+
/** True if the garbage collector requires write barriers on int putfield, arraystore or modifycheck */
private static final boolean NEEDS_INT_GC_WRITE_BARRIER = Selected.Constraints.get().needsIntWriteBarrier();
/** True if the VM requires write barriers on int putfield */
@@ -512,6 +498,8 @@
public static final boolean NEEDS_INT_GETFIELD_BARRIER = NEEDS_INT_GC_READ_BARRIER;
/** True if the VM requires read barriers on int arrayload */
public static final boolean NEEDS_INT_ALOAD_BARRIER = NEEDS_INT_GC_READ_BARRIER;
+ /** True if the garbage collector does not support the bulk copy operation */
+ public static final boolean INT_BULK_COPY_SUPPORTED = !(NEEDS_INT_ASTORE_BARRIER || NEEDS_INT_ALOAD_BARRIER) || Selected.Constraints.get().intBulkCopySupported();

/**
* Barrier for writes of ints into fields of instances (ie putfield).
@@ -527,8 +515,8 @@
if (NEEDS_INT_GC_WRITE_BARRIER) {
ObjectReference src = ObjectReference.fromObject(ref);
Selected.Mutator.get().intWrite(src, src.toAddress().plus(offset), value, offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
}

/**
@@ -542,13 +530,13 @@
*/
@Inline
@Entrypoint
- public static void intArrayWrite(Object ref, int index, int value) {
- if (NEEDS_OBJECT_GC_WRITE_BARRIER) {
+ public static void intArrayWrite(int[] ref, int index, int value) {
+ if (NEEDS_INT_GC_WRITE_BARRIER) {
ObjectReference array = ObjectReference.fromObject(ref);
- Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_INT);
Selected.Mutator.get().intWrite(array, array.toAddress().plus(offset), value, offset.toWord(), Word.zero(), ARRAY_ELEMENT);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
}

/**
@@ -562,11 +550,11 @@
@Inline
@Entrypoint
public static int intFieldRead(Object ref, Offset offset, int locationMetadata) {
- if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ if (NEEDS_INT_GC_READ_BARRIER) {
ObjectReference src = ObjectReference.fromObject(ref);
return Selected.Mutator.get().intRead(src, src.toAddress().plus(offset), offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
return 0;
}

@@ -579,41 +567,36 @@
*/
@Inline
@Entrypoint
- public static int intArrayRead(Object ref, int index) {
- if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ public static int intArrayRead(int[] ref, int index) {
+ if (NEEDS_INT_GC_READ_BARRIER) {
ObjectReference array = ObjectReference.fromObject(ref);
- Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_INT);
return Selected.Mutator.get().intRead(array, array.toAddress().plus(offset), offset.toWord(), Word.zero(), ARRAY_ELEMENT);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
return 0;
}

/**
- * Barrier for a bulk copy of objects (i.e. in an array copy).
+ * Barrier for a bulk copy of ints (i.e. in an array copy).
*
- * @param src The source object
- * @param srcOffset The offset of the first source address, in
- * bytes, relative to <code>src</code> (in principle, this could be
- * negative).
- * @param tgt The target object
- * @param tgtOffset The offset of the first target address, in bytes
- * relative to <code>tgt</code> (in principle, this could be
- * negative).
- * @param bytes The size of the region being copied, in bytes.
- * @return True if the update was performed by the barrier, false if
- * left to the caller (always false in this case).
+ * @param src The source array
+ * @param srcOffset The starting source offset
+ * @param dst The destination array
+ * @param dstOffset The starting destination offset
+ * @param bytes The number of bytes to be copied
*/
@Inline
- public static boolean intBulkCopy(Object src, Offset srcOffset, Object tgt, Offset tgtOffset, int bytes) {
- if (NEEDS_OBJECT_GC_WRITE_BARRIER || NEEDS_OBJECT_GC_READ_BARRIER) {
- return Selected.Mutator.get().intBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(tgt), tgtOffset, bytes);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
- return false;
+ public static void intBulkCopy(int[] src, Offset srcOffset, int[] dst, Offset dstOffset, int bytes) {
+ if (VM.VerifyAssertions) VM._assert(INT_BULK_COPY_SUPPORTED);
+
+ if (!Selected.Mutator.get().intBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(dst), dstOffset, bytes)) {
+ Memory.arraycopy32Bit(Magic.objectAsAddress(dst).plus(dstOffset), Magic.objectAsAddress(src).plus(srcOffset), bytes);
+ }
}

+
/** True if the garbage collector requires write barriers on long putfield, arraystore or modifycheck */
private static final boolean NEEDS_LONG_GC_WRITE_BARRIER = Selected.Constraints.get().needsLongWriteBarrier();
/** True if the VM requires write barriers on long putfield */
@@ -626,6 +609,8 @@
public static final boolean NEEDS_LONG_GETFIELD_BARRIER = NEEDS_LONG_GC_READ_BARRIER;
/** True if the VM requires read barriers on long arrayload */
public static final boolean NEEDS_LONG_ALOAD_BARRIER = NEEDS_LONG_GC_READ_BARRIER;
+ /** True if the garbage collector supports the bulk copy operation */
+ public static final boolean LONG_BULK_COPY_SUPPORTED = !(NEEDS_LONG_ASTORE_BARRIER || NEEDS_LONG_ALOAD_BARRIER) || Selected.Constraints.get().longBulkCopySupported();

/**
* Barrier for writes of longs into fields of instances (ie putfield).
@@ -641,8 +626,8 @@
if (NEEDS_LONG_GC_WRITE_BARRIER) {
ObjectReference src = ObjectReference.fromObject(ref);
Selected.Mutator.get().longWrite(src, src.toAddress().plus(offset), value, offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
}

/**
@@ -656,13 +641,13 @@
*/
@Inline
@Entrypoint
- public static void longArrayWrite(Object ref, int index, long value) {
- if (NEEDS_OBJECT_GC_WRITE_BARRIER) {
+ public static void longArrayWrite(long[] ref, int index, long value) {
+ if (NEEDS_LONG_GC_WRITE_BARRIER) {
ObjectReference array = ObjectReference.fromObject(ref);
- Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_LONG);
Selected.Mutator.get().longWrite(array, array.toAddress().plus(offset), value, offset.toWord(), Word.zero(), ARRAY_ELEMENT);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
}

/**
@@ -676,11 +661,11 @@
@Inline
@Entrypoint
public static long longFieldRead(Object ref, Offset offset, int locationMetadata) {
- if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ if (NEEDS_LONG_GC_READ_BARRIER) {
ObjectReference src = ObjectReference.fromObject(ref);
return Selected.Mutator.get().longRead(src, src.toAddress().plus(offset), offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
return 0;
}

@@ -693,38 +678,32 @@
*/
@Inline
@Entrypoint
- public static long longArrayRead(Object ref, int index) {
- if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ public static long longArrayRead(long[] ref, int index) {
+ if (NEEDS_LONG_GC_READ_BARRIER) {
ObjectReference array = ObjectReference.fromObject(ref);
- Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_LONG);
return Selected.Mutator.get().longRead(array, array.toAddress().plus(offset), offset.toWord(), Word.zero(), ARRAY_ELEMENT);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
return 0;
}

/**
- * Barrier for a bulk copy of objects (i.e. in an array copy).
+ * Barrier for a bulk copy of longs (i.e. in an array copy).
*
- * @param src The source object
- * @param srcOffset The offset of the first source address, in
- * bytes, relative to <code>src</code> (in principle, this could be
- * negative).
- * @param tgt The target object
- * @param tgtOffset The offset of the first target address, in bytes
- * relative to <code>tgt</code> (in principle, this could be
- * negative).
- * @param bytes The size of the region being copied, in bytes.
- * @return True if the update was performed by the barrier, false if
- * left to the caller (always false in this case).
+ * @param src The source array
+ * @param srcOffset The starting source offset
+ * @param dst The destination array
+ * @param dstOffset The starting destination offset
+ * @param bytes The number of bytes to be copied
*/
@Inline
- public static boolean longBulkCopy(Object src, Offset srcOffset, Object tgt, Offset tgtOffset, int bytes) {
- if (NEEDS_OBJECT_GC_WRITE_BARRIER || NEEDS_OBJECT_GC_READ_BARRIER) {
- return Selected.Mutator.get().longBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(tgt), tgtOffset, bytes);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
- return false;
+ public static void longBulkCopy(long[] src, Offset srcOffset, long[] dst, Offset dstOffset, int bytes) {
+ if (VM.VerifyAssertions) VM._assert(LONG_BULK_COPY_SUPPORTED);
+
+ if (!Selected.Mutator.get().longBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(dst), dstOffset, bytes)) {
+ Memory.arraycopy64Bit(Magic.objectAsAddress(dst).plus(dstOffset), Magic.objectAsAddress(src).plus(srcOffset), bytes);
+ }
}

@@ -740,6 +719,8 @@
public static final boolean NEEDS_FLOAT_GETFIELD_BARRIER = NEEDS_FLOAT_GC_READ_BARRIER;
/** True if the VM requires read barriers on float arrayload */
public static final boolean NEEDS_FLOAT_ALOAD_BARRIER = NEEDS_FLOAT_GC_READ_BARRIER;
+ /** True if the garbage collector supports the bulk copy operation */
+ public static final boolean FLOAT_BULK_COPY_SUPPORTED = !(NEEDS_FLOAT_ASTORE_BARRIER || NEEDS_FLOAT_ALOAD_BARRIER) || Selected.Constraints.get().floatBulkCopySupported();

/**
* Barrier for writes of floats into fields of instances (ie putfield).
@@ -755,8 +736,8 @@
if (NEEDS_FLOAT_GC_WRITE_BARRIER) {
ObjectReference src = ObjectReference.fromObject(ref);
Selected.Mutator.get().floatWrite(src, src.toAddress().plus(offset), value, offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
}

/**
@@ -770,13 +751,13 @@
*/
@Inline
@Entrypoint
- public static void floatArrayWrite(Object ref, int index, float value) {
- if (NEEDS_OBJECT_GC_WRITE_BARRIER) {
+ public static void floatArrayWrite(float[] ref, int index, float value) {
+ if (NEEDS_FLOAT_GC_WRITE_BARRIER) {
ObjectReference array = ObjectReference.fromObject(ref);
- Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_FLOAT);
Selected.Mutator.get().floatWrite(array, array.toAddress().plus(offset), value, offset.toWord(), Word.zero(), ARRAY_ELEMENT);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
}

/**
@@ -790,11 +771,11 @@
@Inline
@Entrypoint
public static float floatFieldRead(Object ref, Offset offset, int locationMetadata) {
- if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ if (NEEDS_FLOAT_GC_READ_BARRIER) {
ObjectReference src = ObjectReference.fromObject(ref);
return Selected.Mutator.get().floatRead(src, src.toAddress().plus(offset), offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
return 0;
}

@@ -807,38 +788,32 @@
*/
@Inline
@Entrypoint
- public static float floatArrayRead(Object ref, int index) {
- if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ public static float floatArrayRead(float[] ref, int index) {
+ if (NEEDS_FLOAT_GC_READ_BARRIER) {
ObjectReference array = ObjectReference.fromObject(ref);
- Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_FLOAT);
return Selected.Mutator.get().floatRead(array, array.toAddress().plus(offset), offset.toWord(), Word.zero(), ARRAY_ELEMENT);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
return 0;
}

/**
- * Barrier for a bulk copy of objects (i.e. in an array copy).
+ * Barrier for a bulk copy of floats (i.e. in an array copy).
*
- * @param src The source object
- * @param srcOffset The offset of the first source address, in
- * bytes, relative to <code>src</code> (in principle, this could be
- * negative).
- * @param tgt The target object
- * @param tgtOffset The offset of the first target address, in bytes
- * relative to <code>tgt</code> (in principle, this could be
- * negative).
- * @param bytes The size of the region being copied, in bytes.
- * @return True if the update was performed by the barrier, false if
- * left to the caller (always false in this case).
+ * @param src The source array
+ * @param srcIdx The starting source index
+ * @param dst The destination array
+ * @param dstIdx The starting source index
+ * @param len The number of array elements to be copied
*/
@Inline
- public static boolean floatBulkCopy(Object src, Offset srcOffset, Object tgt, Offset tgtOffset, int bytes) {
- if (NEEDS_OBJECT_GC_WRITE_BARRIER || NEEDS_OBJECT_GC_READ_BARRIER) {
- return Selected.Mutator.get().floatBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(tgt), tgtOffset, bytes);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
- return false;
+ public static void floatBulkCopy(float[] src, Offset srcOffset, float[] dst, Offset dstOffset, int bytes) {
+ if (VM.VerifyAssertions) VM._assert(FLOAT_BULK_COPY_SUPPORTED);
+
+ if (!Selected.Mutator.get().floatBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(dst), dstOffset, bytes)) {
+ Memory.arraycopy32Bit(Magic.objectAsAddress(dst).plus(dstOffset), Magic.objectAsAddress(src).plus(srcOffset), bytes);
+ }
}

@@ -854,6 +829,8 @@
public static final boolean NEEDS_DOUBLE_GETFIELD_BARRIER = NEEDS_DOUBLE_GC_READ_BARRIER;
/** True if the VM requires read barriers on double arrayload */
public static final boolean NEEDS_DOUBLE_ALOAD_BARRIER = NEEDS_DOUBLE_GC_READ_BARRIER;
+ /** True if the garbage collector supports the bulk copy operation */
+ public static final boolean DOUBLE_BULK_COPY_SUPPORTED = !(NEEDS_DOUBLE_ASTORE_BARRIER || NEEDS_DOUBLE_ALOAD_BARRIER) || Selected.Constraints.get().doubleBulkCopySupported();

/**
* Barrier for writes of doubles into fields of instances (ie putfield).
@@ -869,8 +846,8 @@
if (NEEDS_DOUBLE_GC_WRITE_BARRIER) {
ObjectReference src = ObjectReference.fromObject(ref);
Selected.Mutator.get().doubleWrite(src, src.toAddress().plus(offset), value, offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
}

/**
@@ -884,13 +861,13 @@
*/
@Inline
@Entrypoint
- public static void doubleArrayWrite(Object ref, int index, double value) {
- if (NEEDS_OBJECT_GC_WRITE_BARRIER) {
+ public static void doubleArrayWrite(double[] ref, int index, double value) {
+ if (NEEDS_DOUBLE_GC_WRITE_BARRIER) {
ObjectReference array = ObjectReference.fromObject(ref);
- Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_DOUBLE);
Selected.Mutator.get().doubleWrite(array, array.toAddress().plus(offset), value, offset.toWord(), Word.zero(), ARRAY_ELEMENT);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
}

/**
@@ -904,11 +881,11 @@
@Inline
@Entrypoint
public static double doubleFieldRead(Object ref, Offset offset, int locationMetadata) {
- if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ if (NEEDS_DOUBLE_GC_READ_BARRIER) {
ObjectReference src = ObjectReference.fromObject(ref);
return Selected.Mutator.get().doubleRead(src, src.toAddress().plus(offset), offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
return 0;
}

@@ -921,38 +898,32 @@
*/
@Inline
@Entrypoint
- public static double doubleArrayRead(Object ref, int index) {
- if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ public static double doubleArrayRead(double[] ref, int index) {
+ if (NEEDS_DOUBLE_GC_READ_BARRIER) {
ObjectReference array = ObjectReference.fromObject(ref);
- Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_DOUBLE);
return Selected.Mutator.get().doubleRead(array, array.toAddress().plus(offset), offset.toWord(), Word.zero(), ARRAY_ELEMENT);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
return 0;
}

/**
- * Barrier for a bulk copy of objects (i.e. in an array copy).
+ * Barrier for a bulk copy of doubles (i.e. in an array copy).
*
- * @param src The source object
- * @param srcOffset The offset of the first source address, in
- * bytes, relative to <code>src</code> (in principle, this could be
- * negative).
- * @param tgt The target object
- * @param tgtOffset The offset of the first target address, in bytes
- * relative to <code>tgt</code> (in principle, this could be
- * negative).
- * @param bytes The size of the region being copied, in bytes.
- * @return True if the update was performed by the barrier, false if
- * left to the caller (always false in this case).
+ * @param src The source array
+ * @param srcOffset The starting source offset
+ * @param dst The destination array
+ * @param dstOffset The starting destination offset
+ * @param bytes The number of bytes to be copied
*/
@Inline
- public static boolean doubleBulkCopy(Object src, Offset srcOffset, Object tgt, Offset tgtOffset, int bytes) {
- if (NEEDS_OBJECT_GC_WRITE_BARRIER || NEEDS_OBJECT_GC_READ_BARRIER) {
- return Selected.Mutator.get().doubleBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(tgt), tgtOffset, bytes);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
- return false;
+ public static void doubleBulkCopy(double[] src, Offset srcOffset, double[] dst, Offset dstOffset, int bytes) {
+ if (VM.VerifyAssertions) VM._assert(DOUBLE_BULK_COPY_SUPPORTED);
+
+ if (!Selected.Mutator.get().doubleBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(dst), dstOffset, bytes)) {
+ Memory.arraycopy64Bit(Magic.objectAsAddress(dst).plus(dstOffset), Magic.objectAsAddress(src).plus(srcOffset), bytes);
+ }
}

@@ -968,6 +939,8 @@
public static final boolean NEEDS_OBJECT_GETFIELD_BARRIER = NEEDS_OBJECT_GC_READ_BARRIER;
/** True if the VM requires read barriers on reference arrayload */
public static final boolean NEEDS_OBJECT_ALOAD_BARRIER = NEEDS_OBJECT_GC_READ_BARRIER;
+ /** True if the garbage collector supports the bulk copy operation */
+ public static final boolean OBJECT_BULK_COPY_SUPPORTED = !(NEEDS_OBJECT_ASTORE_BARRIER || NEEDS_OBJECT_ALOAD_BARRIER) || Selected.Constraints.get().objectReferenceBulkCopySupported();

/**
* Barrier for writes of objects into fields of instances (ie putfield).
@@ -983,8 +956,8 @@
if (NEEDS_OBJECT_GC_WRITE_BARRIER) {
ObjectReference src = ObjectReference.fromObject(ref);
Selected.Mutator.get().objectReferenceWrite(src, src.toAddress().plus(offset), ObjectReference.fromObject(value), offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
}

/**
@@ -998,13 +971,13 @@
*/
@Inline
@Entrypoint
- public static void objectArrayWrite(Object ref, int index, Object value) {
+ public static void objectArrayWrite(Object[] ref, int index, Object value) {
if (NEEDS_OBJECT_GC_WRITE_BARRIER) {
ObjectReference array = ObjectReference.fromObject(ref);
Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
Selected.Mutator.get().objectReferenceWrite(array, array.toAddress().plus(offset), ObjectReference.fromObject(value), offset.toWord(), Word.zero(), ARRAY_ELEMENT);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
}

/**
@@ -1021,8 +994,8 @@
if (NEEDS_OBJECT_GC_READ_BARRIER) {
ObjectReference src = ObjectReference.fromObject(ref);
return Selected.Mutator.get().objectReferenceRead(src, src.toAddress().plus(offset), offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD).toObject();
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
return null;
}

@@ -1035,38 +1008,32 @@
*/
@Inline
@Entrypoint
- public static Object objectArrayRead(Object ref, int index) {
+ public static Object objectArrayRead(Object[] ref, int index) {
if (NEEDS_OBJECT_GC_READ_BARRIER) {
ObjectReference array = ObjectReference.fromObject(ref);
Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
return Selected.Mutator.get().objectReferenceRead(array, array.toAddress().plus(offset), offset.toWord(), Word.zero(), ARRAY_ELEMENT).toObject();
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
return null;
}

/**
* Barrier for a bulk copy of objects (i.e. in an array copy).
*
- * @param src The source object
- * @param srcOffset The offset of the first source address, in
- * bytes, relative to <code>src</code> (in principle, this could be
- * negative).
- * @param tgt The target object
- * @param tgtOffset The offset of the first target address, in bytes
- * relative to <code>tgt</code> (in principle, this could be
- * negative).
- * @param bytes The size of the region being copied, in bytes.
- * @return True if the update was performed by the barrier, false if
- * left to the caller (always false in this case).
+ * @param src The source array
+ * @param srcOffset The starting source offset
+ * @param dst The destination array
+ * @param dstOffset The starting destination offset
+ * @param bytes The number of bytes to be copied
*/
@Inline
- public static boolean objectBulkCopy(Object src, Offset srcOffset, Object tgt, Offset tgtOffset, int bytes) {
- if (NEEDS_OBJECT_GC_WRITE_BARRIER || NEEDS_OBJECT_GC_READ_BARRIER) {
- return Selected.Mutator.get().objectReferenceBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(tgt), tgtOffset, bytes);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
- return false;
+ public static void objectBulkCopy(Object[] src, Offset srcOffset, Object[] dst, Offset dstOffset, int bytes) {
+ if (VM.VerifyAssertions) VM._assert(OBJECT_BULK_COPY_SUPPORTED);
+
+ if (!Selected.Mutator.get().objectReferenceBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(dst), dstOffset, bytes)) {
+ Memory.alignedWordCopy(Magic.objectAsAddress(dst).plus(dstOffset), Magic.objectAsAddress(src).plus(srcOffset), bytes);
+ }
}

@@ -1095,8 +1062,8 @@
ObjectReference.fromObject(value),
offset.toWord(),
Word.fromIntZeroExtend(locationMetadata));
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
}

/**
@@ -1115,8 +1082,8 @@
src.toAddress().plus(offset),
offset.toWord(),
Word.fromIntZeroExtend(locationMetadata)).toObject();
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
return null;
}

@@ -1140,8 +1107,8 @@
offset.toWord(),
Word.zero(), // do not have location metadata
INSTANCE_FIELD);
- } else if (VM.VERIFY_ASSERTIONS)
- VM.assertions._assert(false);
+ } else if (VM.VerifyAssertions)
+ VM._assert(false);
return false;
}
}

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Entrypoints.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Entrypoints.java 2009-11-12 11:47:04 UTC (rev 15793)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Entrypoints.java 2009-11-25 04:44:53 UTC (rev 15794)
@@ -266,83 +266,83 @@
public static final NormalMethod booleanFieldWriteBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "booleanFieldWrite", "(Ljava/lang/Object;ZLorg/vmmagic/unboxed/Offset;I)V");
public static final NormalMethod booleanArrayWriteBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "booleanArrayWrite", "(Ljava/lang/Object;IZ)V");
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "booleanArrayWrite", "([ZIZ)V");
public static final NormalMethod booleanFieldReadBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "booleanFieldRead", "(Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;I)Z");
public static final NormalMethod booleanArrayReadBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "booleanArrayRead", "(Ljava/lang/Object;I)Z");
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "booleanArrayRead", "([ZI)Z");

public static final NormalMethod byteFieldWriteBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "byteFieldWrite", "(Ljava/lang/Object;BLorg/vmmagic/unboxed/Offset;I)V");
public static final NormalMethod byteArrayWriteBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "byteArrayWrite", "(Ljava/lang/Object;IB)V");
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "byteArrayWrite", "([BIB)V");
public static final NormalMethod byteFieldReadBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "byteFieldRead", "(Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;I)B");
public static final NormalMethod byteArrayReadBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "byteArrayRead", "(Ljava/lang/Object;I)B");
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "byteArrayRead", "([BI)B");

public static final NormalMethod charFieldWriteBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "charFieldWrite", "(Ljava/lang/Object;CLorg/vmmagic/unboxed/Offset;I)V");
public static final NormalMethod charArrayWriteBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "charArrayWrite", "(Ljava/lang/Object;IC)V");
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "charArrayWrite", "([CIC)V");
public static final NormalMethod charFieldReadBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "charFieldRead", "(Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;I)C");
public static final NormalMethod charArrayReadBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "charArrayRead", "(Ljava/lang/Object;I)C");
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "charArrayRead", "([CI)C");

public static final NormalMethod shortFieldWriteBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "shortFieldWrite", "(Ljava/lang/Object;SLorg/vmmagic/unboxed/Offset;I)V");
public static final NormalMethod shortArrayWriteBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "shortArrayWrite", "(Ljava/lang/Object;IS)V");
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "shortArrayWrite", "([SIS)V");
public static final NormalMethod shortFieldReadBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "shortFieldRead", "(Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;I)S");
public static final NormalMethod shortArrayReadBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "shortArrayRead", "(Ljava/lang/Object;I)S");
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "shortArrayRead", "([SI)S");

public static final NormalMethod intFieldWriteBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "intFieldWrite", "(Ljava/lang/Object;ILorg/vmmagic/unboxed/Offset;I)V");
public static final NormalMethod intArrayWriteBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "intArrayWrite", "(Ljava/lang/Object;II)V");
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "intArrayWrite", "([III)V");
public static final NormalMethod intFieldReadBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "intFieldRead", "(Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;I)I");
public static final NormalMethod intArrayReadBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "intArrayRead", "(Ljava/lang/Object;I)I");
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "intArrayRead", "([II)I");

public static final NormalMethod longFieldWriteBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "longFieldWrite", "(Ljava/lang/Object;JLorg/vmmagic/unboxed/Offset;I)V");
public static final NormalMethod longArrayWriteBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "longArrayWrite", "(Ljava/lang/Object;IJ)V");
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "longArrayWrite", "([JIJ)V");
public static final NormalMethod longFieldReadBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "longFieldRead", "(Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;I)J");
public static final NormalMethod longArrayReadBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "longArrayRead", "(Ljava/lang/Object;I)J");
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "longArrayRead", "([JI)J");

public static final NormalMethod floatFieldWriteBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "floatFieldWrite", "(Ljava/lang/Object;FLorg/vmmagic/unboxed/Offset;I)V");
public static final NormalMethod floatArrayWriteBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "floatArrayWrite", "(Ljava/lang/Object;IF)V");
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "floatArrayWrite", "([FIF)V");
public static final NormalMethod floatFieldReadBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "floatFieldRead", "(Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;I)F");
public static final NormalMethod floatArrayReadBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "floatArrayRead", "(Ljava/lang/Object;I)F");
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "floatArrayRead", "([FI)F");

public static final NormalMethod doubleFieldWriteBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "doubleFieldWrite", "(Ljava/lang/Object;DLorg/vmmagic/unboxed/Offset;I)V");
public static final NormalMethod doubleArrayWriteBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "doubleArrayWrite", "(Ljava/lang/Object;ID)V");
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "doubleArrayWrite", "([DID)V");
public static final NormalMethod doubleFieldReadBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "doubleFieldRead", "(Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;I)D");
public static final NormalMethod doubleArrayReadBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "doubleArrayRead", "(Ljava/lang/Object;I)D");
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "doubleArrayRead", "([DI)D");

public static final NormalMethod objectFieldWriteBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "objectFieldWrite", "(Ljava/lang/Object;Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;I)V");
public static final NormalMethod objectArrayWriteBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "objectArrayWrite", "(Ljava/lang/Object;ILjava/lang/Object;)V");
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "objectArrayWrite", "([Ljava/lang/Object;ILjava/lang/Object;)V");
public static final NormalMethod objectFieldReadBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "objectFieldRead", "(Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;I)Ljava/lang/Object;");
public static final NormalMethod objectArrayReadBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "objectArrayRead", "(Ljava/lang/Object;I)Ljava/lang/Object;");
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "objectArrayRead", "([Ljava/lang/Object;I)Ljava/lang/Object;");

public static final NormalMethod objectStaticWriteBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "objectStaticWrite", "(Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;I)V");

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Memory.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Memory.java 2009-11-12 11:47:04 UTC (rev 15793)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Memory.java 2009-11-25 04:44:53 UTC (rev 15794)
@@ -94,14 +94,29 @@
* @param len number of array elements to copy
*/
public static void arraycopy8Bit(Object src, int srcPos, Object dst, int dstPos, int len) {
- if (USE_NATIVE && len > NATIVE_THRESHOLD) {
- memcopy(Magic.objectAsAddress(dst).plus(dstPos), Magic.objectAsAddress(src).plus(srcPos), len);
+ Address srcPtr = Magic.objectAsAddress(src).plus(srcPos);
+ Address dstPtr = Magic.objectAsAddress(dst).plus(dstPos);
+ arraycopy8Bit(srcPtr, dstPtr, len);
+ }
+
+ /**
+ * Low level copy of <code>copyBytes</code> bytes from <code>src[srcPos]</code> to <code>dst[dstPos]</code>.
+ *
+ * Assumption <code>src != dst || (srcPos >= dstPos)</code> and element size is 4 bytes.
+ *
+ * @param srcPtr The source start address
+ * @param dstPtr The destination start address
+ * @param copyBytes The number of bytes to be copied
+ */
+ public static void arraycopy8Bit(Address srcPtr, Address dstPtr , int copyBytes) {
+ if (USE_NATIVE && copyBytes > NATIVE_THRESHOLD) {
+ memcopy(dstPtr, srcPtr, copyBytes);
} else {

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Jikesrvm-commits mailing list
Jikesrvm-commits@...
https://lists.sourceforge.net/lists/listinfo/jikesrvm-commits

SF.net SVN: jikesrvm:[15793] rvmroot/trunk/MMTk/src/org/mmtk/utility/heap/ FreeListPageResource.java

2009-11-12T03:47:04Z

Revision: 15793
http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15793&view=rev
Author: steveb-oss
Date: 2009-11-12 11:47:04 +0000 (Thu, 12 Nov 2009)

Log Message:
-----------
Fix boundary condition bug which probably lead to a 4MB memory leak in each Immix space. Sigh.

Modified Paths:
--------------
rvmroot/trunk/MMTk/src/org/mmtk/utility/heap/FreeListPageResource.java

Modified: rvmroot/trunk/MMTk/src/org/mmtk/utility/heap/FreeListPageResource.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/utility/heap/FreeListPageResource.java 2009-11-05 06:01:07 UTC (rev 15792)
+++ rvmroot/trunk/MMTk/src/org/mmtk/utility/heap/FreeListPageResource.java 2009-11-12 11:47:04 UTC (rev 15793)
@@ -159,7 +159,7 @@
} else {
pagesCurrentlyOnFreeList -= pages;
if (pageOffset > highWaterMark) {
- if ((pageOffset ^ highWaterMark) > EmbeddedMetaData.PAGES_IN_REGION) {
+ if (highWaterMark == 0 || (pageOffset ^ highWaterMark) > EmbeddedMetaData.PAGES_IN_REGION) {
int regions = 1 + ((pageOffset - highWaterMark) >> EmbeddedMetaData.LOG_PAGES_IN_REGION);
int metapages = regions * metaDataPagesPerRegion;
reserved += metapages;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Jikesrvm-commits mailing list
Jikesrvm-commits@...
https://lists.sourceforge.net/lists/listinfo/jikesrvm-commits

SF.net SVN: jikesrvm:[15792] rvmroot/branches/RVM-777-NewMMTkGlue/work

2009-11-04T22:01:07Z

Revision: 15792
http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15792&view=rev
Author: dframpton-oss
Date: 2009-11-05 06:01:07 +0000 (Thu, 05 Nov 2009)

Log Message:
-----------
cleaning up the merge

Added Paths:
-----------
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/TraceWriteBuffer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/net/

Removed Paths:
-------------
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/CPL/
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Harmony/CPL/

Added: rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/TraceWriteBuffer.java
===================================================================
--- rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/TraceWriteBuffer.java (rev 0)
+++ rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/TraceWriteBuffer.java 2009-11-05 06:01:07 UTC (rev 15792)
@@ -0,0 +1,72 @@
+/*
+ * 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.mmtk.plan;
+
+import org.mmtk.utility.deque.WriteBuffer;
+import org.vmmagic.pragma.*;
+import org.vmmagic.unboxed.*;
+
+/**
+ * This class is used to push values in one direction during a trace. It
+ * was designed for use in mutators that use write barriers to push
+ * work to collector threads during concurrent tracing.
+ *
+ * @see org.mmtk.plan.TraceLocal
+ */
+@Uninterruptible
+public final class TraceWriteBuffer extends TransitiveClosure {
+ /****************************************************************************
+ *
+ * Instance variables
+ */
+ private final WriteBuffer buffer;
+
+ /****************************************************************************
+ *
+ * Initialization
+ */
+
+ /**
+ * Constructor
+ *
+ * @param trace The global trace class to use.
+ */
+ public TraceWriteBuffer(Trace trace) {
+ buffer = new WriteBuffer(trace.valuePool);
+ }
+
+ /**
+ * Flush the buffer to the trace.
+ */
+ public void flush() {
+ buffer.flushLocal();
+ }
+
+
+ /**
+ * @return True if the buffer is flushed.
+ */
+ public boolean isFlushed() {
+ return buffer.isFlushed();
+ }
+
+ /**
+ * Enqueue an object during a trace.
+ *
+ * @param object The object to enqueue
+ */
+ @Inline
+ public void processNode(ObjectReference object) {
+ buffer.insert(object.toAddress());
+ }
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Jikesrvm-commits mailing list
Jikesrvm-commits@...
https://lists.sourceforge.net/lists/listinfo/jikesrvm-commits

SF.net SVN: jikesrvm:[15791] rvmroot/branches/RVM-777-NewMMTkGlue/tag/

2009-11-04T21:24:36Z

Revision: 15791
http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15791&view=rev
Author: dframpton-oss
Date: 2009-11-05 05:24:36 +0000 (Thu, 05 Nov 2009)

Log Message:
-----------
new tag

Added Paths:
-----------
rvmroot/branches/RVM-777-NewMMTkGlue/tag/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Jikesrvm-commits mailing list
Jikesrvm-commits@...
https://lists.sourceforge.net/lists/listinfo/jikesrvm-commits

SF.net SVN: jikesrvm:[15790] rvmroot/branches/RVM-777-NewMMTkGlue/tag/

2009-11-04T21:23:28Z

Revision: 15790
http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15790&view=rev
Author: dframpton-oss
Date: 2009-11-05 05:23:27 +0000 (Thu, 05 Nov 2009)

Log Message:
-----------
remove old tag

Removed Paths:
-------------
rvmroot/branches/RVM-777-NewMMTkGlue/tag/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Jikesrvm-commits mailing list
Jikesrvm-commits@...
https://lists.sourceforge.net/lists/listinfo/jikesrvm-commits

SF.net SVN: jikesrvm:[15789] rvmroot/branches/RVM-777-NewMMTkGlue/work

2009-11-04T20:56:16Z

Revision: 15789
http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15789&view=rev
Author: dframpton-oss
Date: 2009-11-05 04:56:08 +0000 (Thu, 05 Nov 2009)

Log Message:
-----------
Merge to 15788

Modified Paths:
--------------
rvmroot/branches/RVM-777-NewMMTkGlue/work/COPYRIGHT.txt
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/ActivePlan.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Assert.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Barriers.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/BuildTimeConfig.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Collection.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Factory.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/FinalizableProcessor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/MMTkEvents.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Memory.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/ObjectModel.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/ReferenceProcessor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Scanning.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Statistics.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Strings.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/SynchronizedCounter.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ActivePlan.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Assert.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Barriers.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/BuildTimeConfig.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Collection.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Factory.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/FinalizableProcessor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Lock.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/MMTk_Events.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Memory.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Monitor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ObjectModel.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ReferenceProcessor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ScanBootImage.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ScanStatics.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ScanThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Scanning.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Statistics.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Strings.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/SynchronizedCounter.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/TraceInterface.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/ByteStream.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/IntStream.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/ServerInterpreter.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/ServerSpace.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/ShortStream.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/Util.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/Collector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/Harness.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/Main.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/Mutator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/Checker.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/Compiler.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/Declaration.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/Env.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/Intrinsics.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/PrettyPrinter.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/Trace.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/UnsyncStack.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/Visitor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/AST.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/AbstractAST.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/Alloc.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/Assert.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/Assignment.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/BinaryExpression.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/Call.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/Constant.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/Empty.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/Expect.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/Expression.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/IfStatement.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/IntrinsicMethod.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/LoadField.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/Method.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/MethodProxy.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/NormalMethod.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/Operator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/PrintStatement.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/Return.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/Sequence.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/Spawn.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/Statement.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/StoreField.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/UnaryExpression.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/Variable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/WhileStatement.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/compiler/CompiledMethod.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/compiler/CompiledMethodProxy.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/compiler/CompiledMethodTable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/compiler/Register.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/compiler/Temporary.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/parser/MethodTable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/parser/Source.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/parser/Symbol.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/parser/SymbolTable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/AllocOp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/BinaryOp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/BinaryOperation.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/Branch.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/CallIntrinsicOp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/CallNormalOp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/CallOp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/EnnaryOp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/ExitOp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/ExpectOp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/Goto.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/LoadFieldOp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/NullaryOp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/PrintOp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/PseudoOp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/ResolvableOp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/ReturnOp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/SpawnOp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/StoreFieldOp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/StoreLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/TernaryOp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/UnaryOp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/UnaryOperation.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/runtime/AllocationSite.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/runtime/BoolValue.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/runtime/ConstantPool.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/runtime/IntValue.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/runtime/ObjectValue.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/runtime/PcodeInterpreter.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/runtime/StackFrame.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/runtime/StringValue.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/runtime/Value.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/Bits.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/Collectors.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/DumpPcode.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/GcEvery.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/HarnessOptionSet.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/InitHeap.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/MaxHeap.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/Plan.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/PolicyStats.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/RandomPolicyLength.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/RandomPolicyMax.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/RandomPolicyMin.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/RandomPolicySeed.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/Scheduler.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/SchedulerPolicy.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/Trace.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/YieldInterval.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/AbstractPolicy.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/Lock.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/Policy.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/Schedulable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/Scheduler.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/ThreadModel.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/YieldAlways.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/YieldEvery.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/YieldNever.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/YieldRandomly.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/JavaLock.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/JavaThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/JavaThreadModel.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/Rendezvous.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/rawthreads/RawLock.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/rawthreads/RawThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/rawthreads/RawThreadModel.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src-generated/org/mmtk/harness/lang/parser/Parser.jj
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/Alignment.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/CyclicGarbage.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/HashCode.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/LargeObject.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/OutOfMemory.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/Quicksort.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/Spawn.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/SpreadAlloc.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/lang/alloc.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/lang/assert.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/lang/assign.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/lang/call.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/lang/const.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/lang/expr.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/lang/fields.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/lang/getfield.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/lang/if-then-else.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/lang/if-then-else2.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/lang/intrinsic.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/lang/list.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/lang/recursive1.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/lang/recursive2.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/lang/while.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/Address.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/AddressArray.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/Extent.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/ExtentArray.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/ObjectReference.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/ObjectReferenceArray.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/Offset.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/OffsetArray.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/Word.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/WordArray.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/CollectorContext.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/ComplexPhase.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/ControllerCollectorContext.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/GCspyPlan.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/MutatorContext.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/ParallelCollector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/ParallelCollectorGroup.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/Phase.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/Plan.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/PlanConstraints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/Simple.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/SimpleCollector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/SimpleConstraints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/SimpleMutator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/SimplePhase.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/StopTheWorld.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/StopTheWorldCollector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/StopTheWorldConstraints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/StopTheWorldMutator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/Trace.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/TraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/TransitiveClosure.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/copyms/CopyMS.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/copyms/CopyMSCollector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/copyms/CopyMSConstraints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/copyms/CopyMSMutator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/copyms/CopyMSTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/generational/Gen.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/generational/GenCollector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/generational/GenConstraints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/generational/GenMatureTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/generational/GenMutator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/generational/GenNurseryTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/generational/copying/GenCopy.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/generational/copying/GenCopyCollector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/generational/copying/GenCopyConstraints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/generational/copying/GenCopyMatureTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/generational/copying/GenCopyMutator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/generational/immix/GenImmix.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/generational/immix/GenImmixCollector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/generational/immix/GenImmixConstraints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/generational/immix/GenImmixMatureDefragTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/generational/immix/GenImmixMatureTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/generational/immix/GenImmixMutator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/generational/marksweep/GenMS.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/generational/marksweep/GenMSCollector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/generational/marksweep/GenMSConstraints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/generational/marksweep/GenMSMatureTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/generational/marksweep/GenMSMutator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/immix/Immix.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/immix/ImmixCollector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/immix/ImmixConstraints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/immix/ImmixDefragTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/immix/ImmixMutator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/immix/ImmixTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/markcompact/MC.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/markcompact/MCCollector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/markcompact/MCConstraints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/markcompact/MCForwardTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/markcompact/MCMarkTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/markcompact/MCMutator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/marksweep/MS.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/marksweep/MSCollector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/marksweep/MSConstraints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/marksweep/MSMutator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/marksweep/MSTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/nogc/NoGC.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/nogc/NoGCCollector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/nogc/NoGCConstraints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/nogc/NoGCMutator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/nogc/NoGCTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/poisoned/Poisoned.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/poisoned/PoisonedCollector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/poisoned/PoisonedConstraints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/poisoned/PoisonedMutator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/RCBase.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/RCBaseCollector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/RCBaseConstraints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/RCBaseMutator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/RCDecBuffer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/RCHeader.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/RCZero.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTDecMarked.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTDecMarkedAndZero.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTFreeLargeObjectSweeper.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTScanLargeObjectSweeper.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTSweepImmortalScanner.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTSweeper.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/fullheap/RC.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/fullheap/RCCollector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/fullheap/RCConstraints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/fullheap/RCFindRootSetTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/fullheap/RCModifiedProcessor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/fullheap/RCMutator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/generational/GenRC.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/generational/GenRCCollector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/generational/GenRCConstraints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/generational/GenRCFindRootSetTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/generational/GenRCModifiedProcessor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/refcount/generational/GenRCMutator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/semispace/SS.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/semispace/SSCollector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/semispace/SSConstraints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/semispace/SSMutator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/semispace/SSTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspy.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspyCollector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspyConstraints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspyMutator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspyTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTrace.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceCollector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceConstraints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceMutator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmix.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixCollector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixConstraints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixMutator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixNurseryTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/stickyms/StickyMS.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/stickyms/StickyMSCollector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/stickyms/StickyMSConstraints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/stickyms/StickyMSMutator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/plan/stickyms/StickyMSNurseryTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/BaseLargeObjectSpace.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/CopyLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/CopySpace.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/ExplicitFreeListLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/ExplicitFreeListSpace.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/ExplicitLargeObjectSpace.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/ImmortalLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/ImmortalSpace.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/LargeObjectLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/LargeObjectSpace.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/MarkCompactLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/MarkCompactSpace.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/MarkSweepLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/MarkSweepSpace.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/RawPageSpace.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/SegregatedFreeListSpace.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/Space.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/immix/Block.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/immix/Chunk.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/immix/ChunkList.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/immix/CollectorLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/immix/Defrag.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/immix/ImmixConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/immix/ImmixSpace.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/immix/Line.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/immix/MutatorLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/policy/immix/ObjectHeader.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/BaseGenericFreeList.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/CallSite.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/Constants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/Conversions.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/CycleDetector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/DoublyLinkedList.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/GenericFreeList.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/Log.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/Memory.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/SimpleHashtable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/Synchronize.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/TraceGenerator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/TracingConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/Treadmill.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/alloc/Allocator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/alloc/BlockAllocator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/alloc/BumpPointer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/alloc/DumpLinearScan.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/alloc/EmbeddedMetaData.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/alloc/ImmixAllocator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/alloc/LargeObjectAllocator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/alloc/LinearScan.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/alloc/SegregatedFreeList.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/alloc/SegregatedFreeListLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/deque/AddressDeque.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/deque/AddressPairDeque.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/deque/AddressTripleDeque.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/deque/Deque.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/deque/LocalDeque.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/deque/LocalQueue.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/deque/LocalSSB.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/deque/ObjectReferenceBuffer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/deque/ObjectReferenceDeque.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/deque/SharedDeque.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/deque/SortSharedDeque.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/deque/SortTODAddressStack.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/deque/SortTODObjectReferenceStack.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/deque/SortTODSharedDeque.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/deque/TraceBuffer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/deque/WriteBuffer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/gcspy/Color.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/gcspy/GCspy.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/gcspy/LinearScan.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/gcspy/StreamConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/gcspy/Subspace.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/gcspy/drivers/AbstractDriver.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/gcspy/drivers/GenImmortalSpaceDriver.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/gcspy/drivers/GenLOSDriver.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/gcspy/drivers/ImmortalSpaceDriver.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/gcspy/drivers/LinearSpaceDriver.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/gcspy/drivers/TreadmillDriver.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/heap/FreeListPageResource.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/heap/HeapGrowthManager.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/heap/Map.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/heap/Mmapper.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/heap/MonotonePageResource.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/heap/PageResource.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/heap/SpaceDescriptor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/heap/VMRequest.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/BoundedNursery.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/ConcurrentTrigger.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/CycleFilterThreshold.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/CycleMetaDataLimit.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/CycleTriggerThreshold.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/DebugAddress.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/DefragFreeHeadroom.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/DefragFreeHeadroomFraction.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/DefragHeadroom.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/DefragHeadroomFraction.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/DefragLineReuseRatio.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/DefragSimpleSpillThreshold.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/DummyEnum.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/EagerCompleteSweep.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/EagerMmapSpaces.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/EchoOptions.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/FixedNursery.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/FragmentationStats.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/FullHeapSystemGC.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/GCTimeCap.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/GCspyPort.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/GCspyTileSize.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/GCspyWait.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/GenCycleDetection.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/HarnessAll.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/IgnoreSystemGC.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/LineReuseRatio.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/MarkSweepMarkBits.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/MetaDataLimit.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/NoFinalizer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/NoReferenceTypes.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/NurserySize.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/Options.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/PerfMetric.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/PrintPhaseStats.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/ProtectOnRelease.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/SanityCheck.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/StressFactor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/Threads.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/TraceRate.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/VariableSizeHeap.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/Verbose.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/VerboseFragmentationStats.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/VerboseTiming.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/XmlStats.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/sanitychecker/SanityChecker.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/sanitychecker/SanityCheckerLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/sanitychecker/SanityDataTable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/sanitychecker/SanityLinearScan.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/sanitychecker/SanityRootTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/sanitychecker/SanityTraceLocal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/statistics/BooleanCounter.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/statistics/Counter.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/statistics/EventCounter.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/statistics/LongCounter.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/statistics/PerfCounter.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/statistics/SizeCounter.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/statistics/Stats.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/statistics/Timer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/statistics/Xml.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/ActivePlan.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/Assert.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/Barriers.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/BuildTimeConfig.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/Collection.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/Config.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/Factory.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/FinalizableProcessor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/Lock.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/MMTk_Events.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/Memory.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/Monitor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/ObjectModel.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/ReferenceProcessor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/Scanning.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/Statistics.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/Strings.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/SynchronizedCounter.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/TraceInterface.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/VM.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/gcspy/ByteStream.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/gcspy/IntStream.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/gcspy/ServerInterpreter.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/gcspy/ServerSpace.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/gcspy/ShortStream.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/gcspy/Stream.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/gcspy/Util.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/NEWS.txt
rvmroot/branches/RVM-777-NewMMTkGlue/work/bin/buildit
rvmroot/branches/RVM-777-NewMMTkGlue/work/bin/buildit.base_config
rvmroot/branches/RVM-777-NewMMTkGlue/work/bin/extractcompilerstats
rvmroot/branches/RVM-777-NewMMTkGlue/work/bin/extractmmtkstats
rvmroot/branches/RVM-777-NewMMTkGlue/work/bin/findDeviantFiles.sh
rvmroot/branches/RVM-777-NewMMTkGlue/work/bin/headerExceptionsFilter.awk
rvmroot/branches/RVM-777-NewMMTkGlue/work/bin/license-check.rb
rvmroot/branches/RVM-777-NewMMTkGlue/work/bin/normalizeSVNProperties.sh
rvmroot/branches/RVM-777-NewMMTkGlue/work/bin/test-mmtk
rvmroot/branches/RVM-777-NewMMTkGlue/work/bin/timedrun
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/base.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/checkstyle/License-Header.txt
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/checkstyle/rvm-checks.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/checkstyle/text-output.xsl
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/components/asm.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/components/base.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/components/caffeinemark.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/components/checkstyle.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/components/classpath.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/components/dacapo.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/components/ecj.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/components/gcspy.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/components/harmony.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/components/jai.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/components/javacc.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/components/jdocs.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/components/jsr166-tck.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/components/junit.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/components/pmd.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/components/specjvm.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/components/x10.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseAdaptiveCopyMS.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseAdaptiveGenImmix.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseAdaptiveGenMS.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseAdaptiveMarkSweep.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseAdaptivePoisoned.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseAdaptiveSemiSpace.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseAdaptiveSemiSpaceGCSpy.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseBaseCopyMS.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseBaseGCTrace.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseBaseGenCopy.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseBaseGenImmix.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseBaseGenMS.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseBaseGenRC.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseBaseImmix.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseBaseMarkCompact.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseBaseMarkSweep.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseBaseNoGC.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseBasePoisoned.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseBaseRefCount.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseBaseSemiSpace.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseBaseSemiSpaceGCSpy.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseBaseSemiSpaceGCSpyStub.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseBaseStickyImmix.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/BaseBaseStickyMS.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/ExtremeAssertionsBaseBaseCopyMS.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/ExtremeAssertionsBaseBaseGenMS.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/ExtremeAssertionsBaseBaseSemiSpace.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/ExtremeAssertionsFullAdaptiveCopyMS.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/ExtremeAssertionsFullBaseAdaptiveCopyMS.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/ExtremeAssertionsOptAdaptiveCopyMS.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FastAdaptiveCopyMS.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FastAdaptiveGCTrace.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FastAdaptiveGenCopy.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FastAdaptiveGenImmix.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FastAdaptiveGenMS.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FastAdaptiveGenRC.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FastAdaptiveImmix.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FastAdaptiveMarkCompact.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FastAdaptiveMarkSweep.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FastAdaptiveNoGC.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FastAdaptivePoisoned.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FastAdaptiveRefCount.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FastAdaptiveSemiSpace.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FastAdaptiveStickyImmix.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FastAdaptiveStickyMS.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FastBaseAdaptiveCopyMS.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FastBaseAdaptiveGenMS.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FastBaseBaseSemiSpace.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FullAdaptiveCopyMS.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FullAdaptiveGCTrace.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FullAdaptiveGenCopy.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FullAdaptiveGenImmix.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FullAdaptiveGenMS.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FullAdaptiveGenRC.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FullAdaptiveImmix.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FullAdaptiveMarkCompact.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FullAdaptiveMarkSweep.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FullAdaptiveNoGC.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FullAdaptivePoisoned.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FullAdaptiveRefCount.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FullAdaptiveSemiSpace.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FullAdaptiveSemiSpaceGCSpy.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FullAdaptiveStickyImmix.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FullAdaptiveStickyMS.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/FullBaseAdaptiveCopyMS.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/config.properties.defaults
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/config.properties.example
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/development.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/gcstress.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/production.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/production_Base.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/production_Opt_0.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/production_Opt_1.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/production_Opt_2.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/prototype-opt.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/configs/prototype.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/eclipse/classpath.harmony.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/eclipse/classpath.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/eclipse/mmtk-harness-classpath
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/eclipse/project.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/hosts/ia32-cygwin.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/hosts/ia32-linux.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/hosts/ia32-osx.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/hosts/ia32-solaris.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/hosts/ppc32-aix.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/hosts/ppc32-linux.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/hosts/ppc32-osx.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/hosts/ppc64-aix.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/hosts/ppc64-linux.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/hosts/x86_64-linux.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/hosts/x86_64_m64-linux.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/mmtk/default.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/mmtk/sideMarkBit.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/pmd/rulesets/rvm.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/primordials/Classpath-0.97.2.txt
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/primordials/Harmony.txt
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/primordials/RVM.txt
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/primordials/RVM_AOS.txt
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/primordials/RVM_IA32.txt
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/primordials/RVM_OPT.txt
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/primordials/RVM_PPC.txt
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/results2report.xsl
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/targets/ia32-linux.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/targets/ia32-osx.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/targets/ia32-solaris.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/targets/ppc32-aix.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/targets/ppc32-linux.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/targets/ppc32-osx.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/targets/ppc64-aix.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/targets/ppc64-linux.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/targets/target.properties.example
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/targets/x86_64-linux.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/targets/x86_64_m64-linux.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/tasks.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/test-runs/SPECjvm2008.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/test-runs/compiler-dna.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/test-runs/core.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/test-runs/gcmap-sanity.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/test-runs/jsr166.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/test-runs/perf.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/test-runs/performance.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/test-runs/pre-commit.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/test-runs/quarantine.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/test-runs/sanity-tier2.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/test-runs/sanity.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/test-runs/stress.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/test-runs/tiny.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/test-runs/x10.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/testing/report2html.xsl
rvmroot/branches/RVM-777-NewMMTkGlue/work/build/tests.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/options/src/org/vmutil/options/AddressOption.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/options/src/org/vmutil/options/BooleanOption.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/options/src/org/vmutil/options/EnumOption.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/options/src/org/vmutil/options/FloatOption.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/options/src/org/vmutil/options/IntOption.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/options/src/org/vmutil/options/MicrosecondsOption.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/options/src/org/vmutil/options/Option.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/options/src/org/vmutil/options/OptionSet.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/options/src/org/vmutil/options/PagesOption.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/options/src/org/vmutil/options/StringOption.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/Intrinsic.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/Pragma.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/Unboxed.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/BaselineNoRegisters.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/BaselineSaveLSRegisters.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/DynamicBridge.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/Entrypoint.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/Inline.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/Interruptible.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/LogicallyUninterruptible.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/NativeBridge.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/NoBoundsCheck.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/NoCheckStore.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/NoEscapes.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/NoInline.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/NoNullCheck.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/NoOptCompile.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/NonMoving.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/NonMovingAllocation.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/Preemptible.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/Pure.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/RawStorage.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/RuntimeFinal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/RuntimePure.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/SaveVolatile.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/SpecializedMethodInvoke.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/SysCallNative.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/Uninterruptible.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/UninterruptibleNoWarn.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/Unpreemptible.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/UnpreemptibleNoWarn.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/pragma/Untraced.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/unboxed/Address.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/unboxed/AddressArray.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/unboxed/Extent.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/unboxed/ExtentArray.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/unboxed/ObjectReference.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/unboxed/ObjectReferenceArray.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/unboxed/Offset.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/unboxed/OffsetArray.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/unboxed/Word.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/src/org/vmmagic/unboxed/WordArray.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/docs/unity/stylesheets/print.css
rvmroot/branches/RVM-777-NewMMTkGlue/work/docs/unity/stylesheets/screen.css
rvmroot/branches/RVM-777-NewMMTkGlue/work/docs/unity/unity-html-print.tmpl
rvmroot/branches/RVM-777-NewMMTkGlue/work/docs/unity/unity-html-screen.tmpl
rvmroot/branches/RVM-777-NewMMTkGlue/work/external/tuningforklib/src/com/ibm/tuningfork/tracegen/types/EventType.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/include/jni.h
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Common/src/java/lang/Class.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Common/src/java/lang/Compiler.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Common/src/java/lang/Object.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Common/src/java/lang/VMCommonLibrarySupport.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Common/src/java/lang/ref/JikesRVMSupport.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Common/src/java/lang/ref/PhantomReference.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Common/src/java/lang/ref/Reference.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Common/src/java/lang/ref/SoftReference.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Common/src/java/lang/ref/WeakReference.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Common/src/java/lang/reflect/VMCommonLibrarySupport.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Common/src/sun/misc/Unsafe.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Harmony/ASF/src/java/lang/Runtime.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Harmony/ASF/src/java/lang/ref/ReferenceQueue.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Harmony/ASF/src/org/apache/harmony/luni/platform/OSMemory.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/README.txt
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/Dummy.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/OptDummy.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/Callbacks.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/CommandLineArgs.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/Constants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/MachineSpecific.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/PrintContainer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/PrintLN.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/Properties.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/Services.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/SizeConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/UnimplementedError.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/VM.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/AosEntrypoints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/OSRListener.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/OSROrganizerThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/OnStackReplacementEvent.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/OnStackReplacementPlan.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/OnStackReplacementTrigger.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/controller/AINewHotEdgeEvent.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/controller/AdaptiveInlining.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/controller/AnalyticModel.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/controller/Controller.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/controller/ControllerInputEvent.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/controller/ControllerMemory.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/controller/ControllerPlan.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/controller/ControllerThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/controller/HotMethodEvent.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/controller/HotMethodRecompilationEvent.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/controller/MultiLevelAdaptiveModel.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/controller/RecompilationChoice.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/controller/RecompilationStrategy.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/controller/RecompileOptChoice.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/database/AOSDatabase.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/database/callgraph/CallSite.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/database/callgraph/PartialCallGraph.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/database/callgraph/WeightedCallTargets.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/database/methodsamples/MethodCountData.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/database/methodsamples/MethodCountSet.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/Decayable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/Reportable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/RuntimeMeasurements.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/CounterArrayManager.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/CounterNameFunction.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/Instrumentation.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/ManagedCounterData.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/MethodInvocationCounterData.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/MethodNameFunction.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/StringEventCounterData.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/YieldpointCounterData.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/listeners/CallDensityListener.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/listeners/ContextListener.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/listeners/EdgeListener.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/listeners/Listener.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/listeners/MethodListener.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/listeners/NullListener.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/listeners/YieldCounterListener.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/organizers/AccumulatingMethodSampleOrganizer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/organizers/DecayOrganizer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/organizers/DynamicCallGraphOrganizer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/organizers/MethodSampleOrganizer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/measurements/organizers/Organizer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/recompilation/CompilationThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/recompilation/CompilerDNA.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/recompilation/InvocationCounts.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/recompilation/PreCompile.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/AOSInstrumentationPlan.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/CounterBasedSampling.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InsertInstructionCounters.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InsertMethodInvocationCounter.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InsertYieldpointCounters.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InstrumentationSamplingFramework.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/LowerInstrumentation.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/util/AOSGenerator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/util/AOSLogging.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/util/AOSOptions.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/util/BlockingPriorityQueue.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/util/CompilerAdvice.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/util/CompilerAdviceAttribute.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/util/CompilerAdviceInfoReader.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/util/DynamicCallFileInfoReader.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/util/UnResolvedCallSite.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/adaptive/util/UnResolvedWeightedCallTargets.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/apt/annotations/GenerateImplementation.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/apt/annotations/SysCallTemplate.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/AbstractMethod.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/AnnotatedElement.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/ApplicationClassLoader.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/Atom.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/BootImageMemberLookupError.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/BootstrapClassLoader.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/BytecodeConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/BytecodeStream.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/ClassFileReader.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/ClassLoaderConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/ClassLoadingListener.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/DynamicTypeCheck.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/ExceptionHandlerMap.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/FieldReference.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/FieldVector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/InterfaceInvocation.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/InterfaceMethodSignature.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/LocalVariableTable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/MemberReference.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/MethodReference.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/MethodVector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/NativeMethod.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/NormalMethod.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/Primitive.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/RVMAnnotation.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/RVMArray.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/RVMClass.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/RVMClassLoader.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/RVMField.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/RVMMember.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/RVMMethod.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/RVMType.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/SpecializedMethod.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/SpecializedMethodManager.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/TableBasedDynamicLinker.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/TypeDescriptorParsing.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/TypeReference.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/TypeReferenceVector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/UTF8Convert.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/classloader/UnboxedType.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/BBConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/BaselineBootImageCompiler.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/BaselineCompiledMethod.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/BaselineCompiler.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/BaselineExceptionTable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/BasicBlock.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/BasicBlockFactory.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/BranchProfile.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/BranchProfiles.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/BuildBB.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/BuildReferenceMaps.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/ConditionalBranchProfile.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/EdgeCounts.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/JSRInfo.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/JSRSubroutineInfo.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/PendingRETInfo.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/ReferenceMaps.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/SwitchBranchProfile.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/UnusualMaps.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/ia32/Barriers.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineCompilerImpl.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineExceptionDeliverer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineGCMapIterator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineMagic.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/ppc/Barriers.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineCompilerImpl.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineExceptionDeliverer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineGCMapIterator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/common/BootImageCompiler.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/common/CompiledMethod.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/common/CompiledMethods.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/common/ExceptionTable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/common/HardwareTrapCompiledMethod.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/common/HardwareTrapGCMapIterator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/common/RecompilationManager.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/common/RuntimeCompiler.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/common/assembler/AbstractAssembler.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/common/assembler/ForwardReference.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/common/assembler/ia32/AssemblerConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/common/assembler/ia32/Lister.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/common/assembler/ppc/Assembler.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/common/assembler/ppc/AssemblerConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/common/assembler/ppc/AssemblerShortBranch.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/AdjustBranchProbabilities.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ClassLoaderProxy.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/DefUse.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ExpressionFolding.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/FieldAnalysis.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/FieldDatabase.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/InstrumentedEventCounterManager.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/LocalCSE.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/LocalCastOptimization.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/LocalConstantProp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/LocalCopyProp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/MagicNotImplementedException.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/MutateSplits.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/NullCheckCombining.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/OperationNotImplementedException.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/OptimizingCompilerException.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/Simple.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/Simplifier.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/StaticFieldReader.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/bc2ir/BC2IR.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/bc2ir/ConvertBCtoHIR.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/bc2ir/GenerateMagic.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/bc2ir/GenerationContext.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/bc2ir/IRGenOptions.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/bc2ir/OsrPointConstructor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/bc2ir/ia32/GenerateMachineSpecificMagic.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/bc2ir/ppc/GenerateMachineSpecificMagic.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/AnnotatedLSTGraph.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/AnnotatedLSTNode.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/BranchOptimizationDriver.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/BranchOptimizations.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/BranchSimplifier.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/BuildLST.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/CFGTransformations.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/Diamond.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominanceFrontier.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorCell.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorInfo.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorOperator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorSystem.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorTree.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorTreeNode.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorTreePhase.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/Dominators.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorsPhase.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/EstimateBlockFrequencies.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/LSTGraph.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/LSTNode.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/LTDominatorInfo.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/LTDominators.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/LoopAnalysis.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/LoopUnrolling.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/MIRBranchOptimizations.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/PostDominatorsPhase.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/ReorderingPhase.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/StaticSplitting.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/TailRecursionElimination.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/controlflow/YieldPoints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraph.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraphConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraphEdge.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraphNode.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraphStats.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_AbstractCell.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_Equation.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_Graph.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_LatticeCell.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_Operator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_Solution.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_System.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/driver/CompilationPlan.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/driver/CompilerPhase.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/driver/IRPrinter.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/driver/InstrumentationPlan.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/driver/OptConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizationPlanAtomicElement.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizationPlanCompositeElement.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizationPlanElement.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizationPlanner.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizingBootImageCompiler.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizingCompiler.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/driver/ia32/MIROptimizationPlanner.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/driver/ppc/MIROptimizationPlanner.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/escape/AggregateReplacer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/escape/EscapeTransformations.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/escape/FI_EscapeSummary.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/escape/MethodSummary.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/escape/ObjectReplacer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/escape/ShortArrayReplacer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/escape/SimpleEscape.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/escape/SummaryDatabase.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/escape/UnsyncReplacer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ConvertHIRtoLIR.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ConvertToLowLevelIR.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/hir2lir/DynamicTypeCheckExpansion.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ExpandRuntimeServices.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/inlining/CallSiteTree.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/inlining/CallSiteTreeNode.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/inlining/ClassLoadingDependencyManager.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/inlining/CompilationState.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/inlining/DefaultInlineOracle.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/inlining/InlineDecision.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/inlining/InlineOracle.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/inlining/InlineSequence.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/inlining/InlineTools.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/inlining/Inliner.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/inlining/InterfaceHierarchy.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/inlining/InvalidationDatabase.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/instrsched/DefaultPriority.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/instrsched/PrePassScheduler.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/instrsched/Priority.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/instrsched/ResourceMap.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/instrsched/ResourceReservation.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/instrsched/Scheduler.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/instrsched/SchedulingInfo.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/AbstractRegisterPool.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/BasicBlock.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/BasicBlockEnumeration.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/ControlFlowGraph.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/EmptyBasicBlockEnumeration.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/ExceptionHandlerBasicBlock.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/ExceptionHandlerBasicBlockBag.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/GCIRMap.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/GCIRMapElement.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/GenericPhysicalRegisterSet.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/GenericPhysicalRegisterTools.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/GenericRegisterPool.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/HIRInfo.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/IR.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/IREnumeration.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/IRSummary.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/IRTools.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/Instruction.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/InstructionEnumeration.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/LIRInfo.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/MIRInfo.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/MachineSpecificIR.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/OperandEnumeration.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/RegSpillListElement.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/Register.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/RegisterOperandEnumeration.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/WeightedBranchTargets.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/ia32/MachineSpecificIRIA.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/ia32/PhysicalDefUse.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/ia32/PhysicalRegisterSet.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/ia32/PhysicalRegisterTools.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/ia32/RegisterPool.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/AddressConstantOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/BasicBlockOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/BranchOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/BranchProfileOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ClassConstantOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/CodeConstantOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ConditionOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ConstantOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/DoubleConstantOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/FloatConstantOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/HeapOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/InlinedOsrTypeInfoOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/IntConstantOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/LocationOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/LongConstantOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/MemoryOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/MethodOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/NullConstantOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ObjectConstantOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/Operand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/OsrTypeInfoOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/RegisterOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/StackLocationOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/StringConstantOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/TIBConstantOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/TrapCodeOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/TrueGuardOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/TypeOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/UnreachableOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ia32/BURSManagedFPROperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ia32/IA32ConditionOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ppc/PowerPCConditionOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ppc/PowerPCTrapOperand.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/ppc/MachineSpecificIRPowerPC.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/ppc/PhysicalDefUse.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/ppc/PhysicalRegisterSet.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/ppc/PhysicalRegisterTools.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ir/ppc/RegisterPool.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/lir2mir/BURS.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/lir2mir/BURS_Common_Helpers.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/lir2mir/BURS_IntConstantTreeNode.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/lir2mir/BURS_MemOp_Helpers.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ConvertLIRtoMIR.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/lir2mir/MinimalBURS.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/lir2mir/NormalBURS.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/lir2mir/SplitBasicBlock.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ia32/BURS_Helpers.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ia32/ComplexLIR2MIRExpansion.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ia32/ConvertALUOperators.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ia32/NormalizeConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/BURS_Helpers.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/ComplexLIR2MIRExpansion.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/ConvertALUOperators.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/NormalizeConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveAnalysis.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveInterval.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveIntervalEnumeration.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveSet.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveSetElement.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveSetEnumerator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/mir2mc/AssemblerDriver.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/mir2mc/ConvertMIRtoMC.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/mir2mc/FinalMIRExpansionDriver.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/mir2mc/ia32/AssemblerBase.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/mir2mc/ia32/FinalMIRExpansion.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/mir2mc/ppc/AssemblerOpt.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/mir2mc/ppc/FinalMIRExpansion.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/BlockCountSpillCost.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/BrainDeadSpillCost.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/Coalesce.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/CoalesceGraph.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/CoalesceMoves.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/ExpandCallingConvention.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/GenericRegisterPreferences.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/GenericRegisterRestrictions.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/GenericStackManager.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/LinearScan.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/LiveIntervalElement.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/PrologueEpilogueCreator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/RegisterAllocator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/RegisterAllocatorState.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/ScratchMap.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/SimpleSpillCost.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/SpillCostEstimator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/CallingConvention.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/ExpandFPRStackConvention.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/MIRSplitRanges.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/PhysicalRegisterConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/RegisterPreferences.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/RegisterRestrictions.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/StackManager.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/CallingConvention.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/MIRSplitRanges.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/PhysicalRegisterConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/RegisterPreferences.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/RegisterRestrictions.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/StackManager.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptCompiledMethod.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptEncodedCallSiteTree.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptExceptionTable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptGCMap.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptGenericGCMapIterator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptLinker.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptMachineCodeMap.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptSaveVolatile.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ia32/OptExceptionDeliverer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ia32/OptGCMapIterator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ia32/OptGCMapIteratorConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ppc/OptExceptionDeliverer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ppc/OptGCMapIterator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ppc/OptGCMapIteratorConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/specialization/InvokeeThreadLocalContext.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/specialization/SpecializationContext.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/specialization/SpecializationDatabase.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/specialization/SpecializedMethod.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/specialization/SpecializedMethodPool.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/EnterSSA.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/GCP.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/GVCongruenceClass.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/GlobalCSE.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/GlobalValueNumber.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/GlobalValueNumberState.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/HeapVariable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/IndexPropagation.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/IndexPropagationSystem.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/LICM.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/LeaveSSA.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/LiveRangeSplitting.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/LoadElimination.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/LoopVersioning.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/PiNodes.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/RedundantBranchElimination.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/SSA.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/SSADictionary.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/SSAOptions.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/SSATuneUp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/UniformlyGeneratedGVN.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/ValueGraph.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/ValueGraphEdge.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/ValueGraphParamLabel.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/ValueGraphVertex.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/ssa/ValueNumberPair.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/BitSet.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/BitSetMapping.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/Bits.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/CompoundEnumerator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/DFSenumerateByFinish.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/DepthFirstEnumerator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/EmptyEnumerator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/EmptyIterator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/FilterEnumerator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/FilterIterator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/FilteredDFSenumerateByFinish.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/Graph.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/GraphEdge.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/GraphEdgeFilter.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/GraphElement.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/GraphNode.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/GraphNodeEnumeration.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/GraphNodeEnumerator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/GraphUtilities.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/Queue.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/ReverseDFSenumerateByFinish.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/ReverseEnumerator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/ReverseFilteredDFSenumerateByFinish.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/SortedGraphIterator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/SortedGraphNode.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraph.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphEdge.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphEdgeList.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphNode.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphNodeList.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphNodeListHeader.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/Stack.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/TopSort.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/TopSortInterface.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/Tree.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/TreeBottomUpEnumerator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/TreeNode.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/TreeNodeChildrenEnumerator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/compilers/opt/util/TreeTopDownEnumerator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ia32/ArchConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ia32/BaselineConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ia32/Code.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ia32/CodeArray.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ia32/DynamicLinkerHelper.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ia32/InterfaceMethodConflictResolver.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ia32/LazyCompilationTrampoline.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ia32/MachineCode.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ia32/MachineReflection.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ia32/MachineSpecificIA.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ia32/MultianewarrayHelper.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ia32/OutOfLineMachineCode.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ia32/RegisterConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ia32/Registers.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ia32/StackframeLayoutConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ia32/ThreadLocalState.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ia32/TrapConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/jni/FunctionTable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/jni/JNICompiledMethod.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/jni/JNIEnvironment.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/jni/JNIFunctions.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/jni/JNIGenericHelpers.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/jni/JNIGlobalRefTable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/jni/LinkageTripletTable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/jni/ia32/JNICompiler.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/jni/ia32/JNIExceptionDeliverer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/jni/ia32/JNIGCMapIterator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/jni/ia32/JNIHelpers.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/jni/ppc/JNICompiler.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/jni/ppc/JNIGCMapIterator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/jni/ppc/JNIHelpers.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/jni/ppc/JNIStackframeLayoutConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/mm/mminterface/CollectorThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/mm/mminterface/DebugUtil.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/mm/mminterface/GCMapIterator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/mm/mminterface/GCMapIteratorGroup.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/mm/mminterface/MemoryManager.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/mm/mminterface/MemoryManagerConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/mm/mminterface/Monitor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/mm/mminterface/SpecializedScanMethod.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/mm/mminterface/ThreadContext.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/objectmodel/BootImageInterface.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/objectmodel/FieldLayout.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/objectmodel/FieldLayoutContext.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/objectmodel/FieldLayoutPacked.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/objectmodel/FieldLayoutUnpacked.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/objectmodel/IMT.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/objectmodel/ITable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/objectmodel/ITableArray.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/objectmodel/JavaHeader.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/objectmodel/JavaHeaderConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/objectmodel/MiscHeader.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/objectmodel/MiscHeaderConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/objectmodel/ObjectModel.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/objectmodel/RuntimeTable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/objectmodel/TIB.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/objectmodel/TIBLayoutConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/objectmodel/ThinLockConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/options/OptionSet.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/AdjustBCIndexes.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/BytecodeTraverser.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/EncodedOSRMap.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/ExecutionState.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/ExecutionStateExtractor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/LocalRegPair.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/MethodVariables.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/OSRConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/OSRMapIterator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/OSRProfiler.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/ObjectHolder.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/SpecialCompiler.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/TypeStack.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/VariableElement.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/VariableMap.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/VariableMapElement.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/bytecodes/AConstNull.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/bytecodes/CheckCast.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/bytecodes/DoubleStore.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/bytecodes/FloatStore.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/bytecodes/Goto.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/bytecodes/IntStore.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/bytecodes/InvokeCompiledMethod.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/bytecodes/InvokeStatic.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/bytecodes/LoadDoubleConst.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/bytecodes/LoadFloatConst.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/bytecodes/LoadIntConst.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/bytecodes/LoadLongConst.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/bytecodes/LoadRetAddrConst.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/bytecodes/LoadWordConst.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/bytecodes/LongStore.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/bytecodes/Nop.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/bytecodes/ParamInitEnd.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/bytecodes/Pop.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/bytecodes/PseudoBytecode.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/bytecodes/RefStore.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/ia32/BaselineExecutionStateExtractor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/ia32/CodeInstaller.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/ia32/OptExecutionStateExtractor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/ia32/PostThreadSwitch.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/ia32/TempRegisters.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/ppc/BaselineExecutionStateExtractor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/ppc/CodeInstaller.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/ppc/OptExecutionStateExtractor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/ppc/PostThreadSwitch.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/osr/ppc/TempRegisters.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ppc/ArchConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ppc/BaselineConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ppc/Code.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ppc/CodeArray.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ppc/Disassembler.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ppc/DynamicLinkerHelper.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ppc/InterfaceMethodConflictResolver.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ppc/LazyCompilationTrampoline.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ppc/MachineCode.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ppc/MachineReflection.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ppc/MachineSpecificPowerPC.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ppc/MultianewarrayHelper.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ppc/OpcodeTab.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ppc/OpcodeXX.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ppc/OutOfLineMachineCode.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ppc/RegisterConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ppc/Registers.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ppc/StackframeLayoutConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ppc/ThreadLocalState.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/ppc/TrapConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/ArchEntrypoints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/BootRecord.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/DynamicLibrary.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/DynamicLink.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/DynamicLinker.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/EntrypointHelper.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/Entrypoints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/ExceptionDeliverer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/ExitStatus.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/FileSystem.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/Magic.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/MagicNames.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/MathConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/Memory.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/ObjectAddressRemapper.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/Reflection.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/ReflectionBase.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/RuntimeEntrypoints.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/StackBrowser.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/StackTrace.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/Statics.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/SysCall.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/Time.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/runtime/TimeoutException.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/scheduler/BootThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/scheduler/FinalizerThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/scheduler/Latch.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/scheduler/Lock.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/scheduler/MainThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/scheduler/Monitor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/scheduler/NoYieldpointsMonitor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/scheduler/RVMThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/scheduler/SoftLatch.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/scheduler/SpinLock.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/scheduler/Synchronization.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/scheduler/SystemThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/scheduler/ThinLock.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/scheduler/ThreadQueue.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/scheduler/TimerThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/tools/header_gen/GenArch.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/tools/header_gen/GenArch_ia32.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/tools/header_gen/GenArch_ppc.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/tools/header_gen/GenerateInterfaceDeclarations.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/tools/header_gen/SortableField.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/tools/oth/OptTestHarness.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/tuningfork/ChunkQueue.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/tuningfork/EventChunkQueue.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/tuningfork/Feedlet.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/tuningfork/SpaceDescriptorChunk.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/tuningfork/TraceEngine.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/util/AbstractHashMapRVM.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/util/AbstractHashSetRVM.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/util/AddressInputStream.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/util/BitVector.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/util/EmptyIterator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/util/HashMapRVM.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/util/HashSetRVM.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/util/IdentityHashMapRVM.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/util/ImmutableEntryHashMapRVM.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/util/ImmutableEntryHashSetRVM.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/util/ImmutableEntryIdentityHashMapRVM.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/util/LinkedListIteratorRVM.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/util/LinkedListRVM.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/util/Pair.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/util/PriorityQueueRVM.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/util/StringUtilities.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/ia32-assembler/Assembler.in
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/ia32-assembler/genAssembler.sh
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/ia32-assembler-opt/ArchitectureSpecific.fake
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/ia32-assembler-opt/BaselineCompilerImpl.fake
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/ia32-assembler-opt/CodeArray.fake
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/ia32-assembler-opt/GenerateAssembler.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/ia32-assembler-opt/InstructionFormatTables.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/ia32-assembler-opt/JikesRVMSupport.fake
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/ia32-assembler-opt/Lister.fake
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/ia32-assembler-opt/MachineCode.fake
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/ia32-assembler-opt/Magic.fake
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/ia32-assembler-opt/OperatorFormatTable.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/ia32-assembler-opt/OperatorFormatTables.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/ia32-assembler-opt/OutOfLineMachineCode.fake
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/ia32-assembler-opt/RVMField.fake
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/ia32-assembler-opt/VM.fake
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-burs/BURS_TreeNode.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-burs/ia32/IA32.rules
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-burs/ia32/IA32_SSE2.rules
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-burs/ia32/IA32_x87.rules
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-burs/ir.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-burs/jburg/burg.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-burs/ppc/PPC_Alu32.rules
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-burs/ppc/PPC_Alu64.rules
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-burs/ppc/PPC_Common.rules
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-burs/ppc/PPC_Mem32.rules
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-burs/ppc/PPC_Mem64.rules
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-ir/CommonOperands.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-ir/InstructionFormatList.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-ir/InstructionFormats.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-ir/Operator.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-ir/OperatorList.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-ir/OperatorNames.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-ir/Operators.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-ir/ia32/InstructionFormatList.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-ir/ia32/OperatorList.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-ir/ppc/InstructionFormatList.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-ir/ppc/OperatorList_Alu32.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-ir/ppc/OperatorList_Alu64.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-ir/ppc/OperatorList_Common.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-ir/ppc/OperatorList_Mem32.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-ir/ppc/OperatorList_Mem64.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-ir/splitInstructionFormats.perl
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-scheduler/OperatorClass.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-scheduler/ia32/OperatorClassList.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-scheduler/ia32/ResourceList.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-scheduler/ppc/OperatorClassList.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/opt-scheduler/ppc/ResourceList.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/options/AOSOptions.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/options/BaselineOptions.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/options/BooleanOptions.aos.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/options/BooleanOptions.baseline.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/options/BooleanOptions.opt.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/options/BooleanOptions.vm.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/options/MasterOptions.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/options/OptOptions.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/options/Options.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/options/SharedBooleanOptions.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/options/SharedValueOptions.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/options/ValueOptions.aos.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/options/ValueOptions.baseline.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/options/ValueOptions.opt.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/options/ValueOptions.vm.dat
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/vm-configuration/ArchitectureSpecific.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/vm-configuration/ArchitectureSpecificOpt.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/vm-configuration/Configuration.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/vm-configuration/HeapLayoutConstants.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src-generated/vm-configuration/Selected.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/test.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/CaffeineMark/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/CaffeineMark/src/RunCaffeine.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/SPECjbb2000/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/SPECjbb2005/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/SPECjvm2008/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/SPECjvm98/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/SPECjvm98/parseSPECmark
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/SPECjvm98/parse_spec
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/SPECjvm98/parse_spec_min
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/SPECjvm98/run.bash
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/SPECjvm98/specmark.reference
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644449.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644460.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644460_B.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1657236.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1722506.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/RVM_550.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/RVM_708.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/annotation/TestAnnotationInheritance.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/annotation/TestAnnotations.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArithmetic.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArrayAccess.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassHierarchy.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassInitializer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClone.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestCompare.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFieldAccess.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFinally.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFloatingRem.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestInstanceOf.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestInvoke.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestMiranda.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnCheckcast.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnInstanceof.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnInvokeInterface.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestReturn.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestSwitch.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestThrownException.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/data/SubClassInDifferentPackage.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestClassLoading.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestLoadingWithoutName.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestUTF8.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/instrument/AgentX.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/instrument/TestAgent.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/TestFieldReflection.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tArray.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tClass.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tInstance.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tNewInstance.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/SerializationData.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/TestSerialization.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/Flag.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/Mailbox.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/Task.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestBackEdgeGC.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestDispatch.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptAndSpin.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedSleep.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedSleep2.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedWait.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestNotification.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestParallelHardwareTrap.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestShutdownHook.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestShutdownHookAfterExit.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestStop.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestSuspend.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestTimeSlicing.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestTimedWait.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestVolatiles.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/XThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/java/lang/TestMath.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/java/nio/TestFileChannel.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/stats/JikesImageSizes.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/util/IdentityClassFileTransformer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/classpath-testsuite/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/dacapo/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/dacapo-head/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/gctest/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/gctest/src/Exhaust.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/gctest/src/FixedLive.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/gctest/src/InlineAllocation.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/gctest/src/LargeAlloc.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/gctest/src/Node2I2A.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/gctest/src/ReferenceStress.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/gctest/src/ReferenceTest.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/gctracingtest/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/gctracingtest/src/TracingTest.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/ipsixql/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jBYTEmark/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/javalex/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jgf/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jgf/src/JGF_SerialBenchmark.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jgf-threads/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jgf-threads/src/JGF_MultithreadedBenchmark.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/Allocation.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/Allocation.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/ArgumentPassing.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/ArgumentPassing.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/ArrayFunctions.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/ArrayFunctions.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/AttachJVM.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/BlockingThreadsWorker.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/BlockingWorker.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/ClassQuery.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/ClassQuery.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/ClassQuerySuper.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/CriticalCopy.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/CriticalCopy.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/FieldAccess.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/FieldAccess.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/GetEnv.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/GetEnv.h
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/GetEnv.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/JNI12.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/JNI12.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/JNI_OnLoad.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/JNI_OnLoad.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/Mangled_Name_s_.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/Mangled_Name_s_.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/MethodInvocation.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/MethodInvocation.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/MethodInvocationSub.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/MonitorTest.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/MonitorTest.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/NativeException.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/NativeException.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/NativeThreadsWorker.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/NullIdentity.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/NullIdentity.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/SelectTest.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/SelectTest.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/StackResize.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/StackResize.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/StringFunctions.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/StringFunctions.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/StringRegion.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/StringRegion.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/TestDeadVPQueue.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/TestDeadVPQueueWorker.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/TestDeadVPQueueWorker.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/TestGC.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/TestGC.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/TestJNIDirectBuffers.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/TestJNIDirectBuffers.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/TestProcessDestroy.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/TestRuntimeExec.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/Worker.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/myMain.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/t3GT3.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/t3GT3.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/t3GT3Worker.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/t3GTWorker2.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/tBlockingThreads.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/tBlockingThreads.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/tNative.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/tNative.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/tNativeThreads.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/tNativeThreads.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/testlib.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jsr166-tck/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/mmtk/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/mmtk/src/org/mmtk/utility/deque/ObjectReferenceDequeTest.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/mmtk/src/org/vmmagic/unboxed/AddressTest.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/mmtk/src/org/vmmagic/unboxed/AddressTestBasic.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/mmtk/src/org/vmmagic/unboxed/All.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/mmtk/src/org/vmmagic/unboxed/ObjectReferenceTest.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/mmtk/src/org/vmmagic/unboxed/WordTest.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/CheckStore.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/DeBruijn.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/EscapeTest.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/ExceptionTest.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/ExceptionTest2.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/ExceptionTest3.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/ExceptionTest4.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/ExceptionTest5.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/ExceptionTest6.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/ExceptionTest7.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/ExceptionTest8.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/FinallyTest.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/InvokeReflect.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/PingPong.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestArithmetic.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestArray.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestArrayAccess.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestBarrier.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestCall.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestClassInitializer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestCompare.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestConversions.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestEncodedCallSiteTree.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestExceptionThrow.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestFieldAccess.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestFinally.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestInstanceOf.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestInterfaceCall.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestLookupSwitch.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestMath.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestReturn.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestSpecialCall.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestStackAccess.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestSwitch.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestThrow.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestThrow2.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TestUnresolved.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/TypeCheck.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/bug.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/dtc.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/fibo.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/gctest.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/hanoi.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/hanoioo.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/hello.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/inlineDeep.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/inlineExcept.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/inlineTest.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/inlineTest2.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/inlineTest3.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/inlineTest5.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/inlineTest6.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/inlineTest7.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/interf.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/largeMethod.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/logic.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/matmul.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/milestone.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/sieve.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/stPutGet.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/stack.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/table.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/tak_db.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/tak_fp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/tak_int.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/tak_long.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/testCounts.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/testSwitchHIR.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/testpm.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/threadTest1.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/unresolved.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/virtUnPutGet.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/virtUnresolved.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/virtual.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/opttests/src/whet.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/perf-dacapo/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/perf-dacapo/dacapo.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/perf-jbb2000/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/perf-jbb2000/jbb2000.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/perf-jbb2005/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/perf-jbb2005/jbb2005.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/perf-jvm98/bin/extractfinalresult
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/perf-jvm98/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/perf-jvm98/jvm98.properties
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/soot/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/soot/src/Hello.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/x10/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/xerces/build.xml
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/ant-tasks/src/org/jikesrvm/tools/ant/ErrorRecordingAntTask.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/ant-tasks/src/org/jikesrvm/tools/ant/ErrorRecordingXMLValidateTask.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/ant-tasks/src/org/jikesrvm/tools/ant/ForEachTask.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/ant-tasks/src/org/jikesrvm/tools/ant/HostnameTask.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/ant-tasks/src/org/jikesrvm/tools/ant/IfTask.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/ant-tasks/src/org/jikesrvm/tools/ant/LineFilterTask.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/ant-tasks/src/org/jikesrvm/tools/ant/SelectRegexTask.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/ant-tasks/src/org/jikesrvm/tools/ant/TimerTask.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/ant-tasks/src/org/jikesrvm/tools/ant/ToAsciiTask.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/ant-tasks/src/org/jikesrvm/tools/ant/TruncateTask.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/ant-tasks/src/org/jikesrvm/tools/apt/SysCallProcessor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/ant-tasks/src/org/jikesrvm/tools/apt/SysCallProcessorFactory.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/ant-tasks/src/org/jikesrvm/tools/template/GenerateFromTemplate.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/ant-tasks/src/org/jikesrvm/tools/template/QuotedStringTokenizer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/ant-tasks/src/org/jikesrvm/tools/template/UnterminatedStringException.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/asm-tasks/src/org/jikesrvm/tools/asm/AnnotationAdder.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/RunBootImage.C
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/bootImageRunner.h
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/cAttributePortability.h
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/cmdLine.h
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/harmony.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/ia32/disasm.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/ia32/disasm.h
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/ia32/ihnpdsm.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/ia32/ihnpdsm.h
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/ia32/initBootRecord.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/ia32/libvm.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/ia32/linux_ucontext.h
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/ia32/osx_ucontext.h
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/ia32/solaris_ucontext.h
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/jvm.C
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/org_jikesrvm_runtime_DynamicLibrary.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/org_jikesrvm_scheduler_greenthreads_VMProcess.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/parse_map.perl
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/perfctr.C
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/perfctr.h
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/ppc/AixLinkageLayout.h
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/ppc/bootThread.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/ppc/initBootRecord.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/ppc/libvm.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/rvm.classpath
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/rvm.harmony
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageRunner/sys.C
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImage.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageMap.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageObjectAddressRemapper.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWorker.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWriter.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWriterConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWriterMessages.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BuildJNIFunctionTable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/Address.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/AddressArray.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ArchitecturalWord.template
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/Extent.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ExtentArray.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ObjectReference.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ObjectReferenceArray.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/Offset.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/OffsetArray.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/Word.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/WordArray.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/gcspy-stub/src/gcspy_buffered_output.h
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/gcspy-stub/src/gcspy_color_db.h
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/gcspy-stub/src/gcspy_command_stream.h
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/gcspy-stub/src/gcspy_gc_driver.h
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/gcspy-stub/src/gcspy_gc_stream.h
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/gcspy-stub/src/gcspy_interpreter.h
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/gcspy-stub/src/gcspy_main_server.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/gcspy-stub/src/gcspy_main_server.h
rvmroot/branches/RVM-777-NewMMTkGlue/work/tools/gcspy-stub/src/gcspy_utils.h
rvmroot/branches/RVM-777-NewMMTkGlue/work/userguide/index.html

Added Paths:
-----------
rvmroot/branches/RVM-777-NewMMTkGlue/work/LICENSE.html
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/LICENSE.html
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Debug.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Debug.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/Mutators.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/exception/
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/exception/OutOfMemory.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/CheckerException.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/AllocUserType.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/LoadNamedField.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/StoreNamedField.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/parser/GlobalDefs.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/parser/TypeTable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/AllocUserOp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/LoadFixedFieldOp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/pcode/StoreFixedFieldOp.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/runtime/NullValue.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/runtime/PhantomReferenceValue.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/runtime/ReferenceValue.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/runtime/SoftReferenceValue.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/runtime/WeakReferenceValue.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/type/
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/type/AbstractType.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/type/BooleanType.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/type/Field.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/type/IntType.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/type/ObjectType.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/type/ReferenceType.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/type/StringType.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/type/Type.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/type/TypeReference.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/type/UserType.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/type/UserTypeImpl.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/type/VoidType.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/EnumSetOption.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/IntSetOption.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/SanityUsesReadBarrier.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/Timeout.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/WatchAddress.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/WatchObject.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/options/WordSetOption.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/sanity/
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/sanity/FromSpaceInvariant.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/sanity/HeapEntry.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/sanity/HeapSnapshot.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/sanity/HeapVisitor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/sanity/Sanity.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/sanity/Traversal.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/MMTkThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/CollectorContextThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/CollectorThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/MutatorThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/rawthreads/CollectorContextThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/rawthreads/CollectorThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/scheduler/rawthreads/MutatorThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/FixedLive.options
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/FixedLive.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/Lists.options
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/Lists.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/ReferenceTypes.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/SpreadAlloc16.options
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/SpreadAlloc16.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/lang/barriers.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/lang/phantomref.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/lang/softref.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/lang/type1.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/test-scripts/lang/weakref.script
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/harness/
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/harness/ArchitecturalWord.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/harness/ArchitecturalWord32.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/harness/ArchitecturalWord64.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/harness/Architecture.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/harness/MemoryConstants.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/harness/MemoryPage.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/harness/PageTable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/harness/SimulatedMemory.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/harness/WordComparator.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/ForwardingWord.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/HeaderByte.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/utility/options/DefragStress.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/src/org/mmtk/vm/Debug.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/bin/test-mmtk-selected
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/options/LICENSE.html
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/LICENSE.html
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Common/LICENSE.html
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/LICENSE.html
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/gnu/
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/gnu/classpath/
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/gnu/classpath/JikesRVMSupport.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/gnu/classpath/VMStackWalker.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/gnu/classpath/VMSystemProperties.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/gnu/java/
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/gnu/java/lang/
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/gnu/java/lang/JikesRVMSupport.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/gnu/java/lang/VMCPStringBuilder.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/gnu/java/lang/VMInstrumentationImpl.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/io/
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/io/VMObjectStreamClass.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/lang/
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/lang/JikesRVMHelpers.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/lang/JikesRVMSupport.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/lang/VMClassLoader.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/lang/VMDouble.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/lang/VMFloat.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/lang/VMMath.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/lang/VMRuntime.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/lang/VMString.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/lang/VMSystem.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/lang/VMThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/lang/VMThrowable.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/lang/reflect/
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/lang/reflect/JikesRVMHelpers.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/lang/reflect/JikesRVMSupport.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/lang/reflect/VMArray.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/lang/reflect/VMConstructor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/lang/reflect/VMField.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/lang/reflect/VMMethod.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/nio/
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/nio/JikesRVMSupport.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/nio/VMDirectByteBuffer.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/util/
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/EPL/src/java/util/VMTimeZone.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/LGPL/src/java/lang/
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/LGPL/src/java/lang/ref/
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/GNUClasspath/LGPL/src/java/lang/ref/ReferenceQueue.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Harmony/EPL/
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Harmony/EPL/src/
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Harmony/EPL/src/java/
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Harmony/EPL/src/java/lang/
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Harmony/EPL/src/java/lang/JikesRVMHelpers.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Harmony/EPL/src/java/lang/JikesRVMSupport.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Harmony/EPL/src/java/lang/reflect/
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Harmony/EPL/src/java/lang/reflect/JikesRVMSupport.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Harmony/EPL/src/java/nio/
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Harmony/EPL/src/java/nio/JikesRVMSupport.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/mm/mminterface/Barriers.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/rvm/src/org/jikesrvm/scheduler/LightMonitor.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/RVM_703.expected
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/RVM_703.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/TestJNIGetFieldID.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/TestJNIGetFieldID.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/TestNestedGC.c
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/jni/src/TestNestedGC.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/mmtk/src/org/mmtk/harness/
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/mmtk/src/org/mmtk/harness/sanity/
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/mmtk/src/org/mmtk/harness/sanity/HeapEntryTest.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/mmtk/src/org/mmtk/harness/sanity/HeapSnapshotTest.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/mmtk/src/org/mmtk/harness/scheduler/
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/mmtk/src/org/mmtk/harness/scheduler/DeterministicTests.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/mmtk/src/org/mmtk/harness/scheduler/DeterministicTests2.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/mmtk/src/org/mmtk/harness/scheduler/JavaSchedulerTest.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/mmtk/src/org/mmtk/harness/scheduler/SchedulerTestCases.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/testing/tests/mmtk/src/org/mmtk/harness/scheduler/TestMutator.java

Removed Paths:
-------------
rvmroot/branches/RVM-777-NewMMTkGlue/work/LICENSE.txt
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/LICENSE.txt
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/MMTkThread.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/src/org/mmtk/harness/lang/ast/Type.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/ArchitecturalWord.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/ArchitecturalWord32.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/ArchitecturalWord64.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/Architecture.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/harness/vmmagic/org/vmmagic/unboxed/SimulatedMemory.java
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/options/LICENSE.txt
rvmroot/branches/RVM-777-NewMMTkGlue/work/common/vmmagic/LICENSE.txt
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Common/LICENSE.txt
rvmroot/branches/RVM-777-NewMMTkGlue/work/libraryInterface/Common/src/java/net/JikesRVMSupport.java

Modified: rvmroot/branches/RVM-777-NewMMTkGlue/work/COPYRIGHT.txt
===================================================================
--- rvmroot/branches/RVM-777-NewMMTkGlue/work/COPYRIGHT.txt 2009-09-25 18:37:26 UTC (rev 15788)
+++ rvmroot/branches/RVM-777-NewMMTkGlue/work/COPYRIGHT.txt 2009-11-05 04:56:08 UTC (rev 15789)
@@ -1,7 +1,7 @@
The initial contribution to Jikes RVM (Oct 2001) was copyright by the IBM
Corporation. Since 2001, a number of individuals and other entities have
-contributed code to the project under the terms of the CPL in which they
-retain copyright ownership. We know that at least the following
+contributed code to the project under the terms of the CPL/EPL in which they
+retain copyright ownership. We know that at least the following
individuals/entities have copyright in one or more project files. More
precise details on the copyright status of a particular file can only be
accurately determined by examining the history of the file in question.

Added: rvmroot/branches/RVM-777-NewMMTkGlue/work/LICENSE.html
===================================================================
--- rvmroot/branches/RVM-777-NewMMTkGlue/work/LICENSE.html (rev 0)
+++ rvmroot/branches/RVM-777-NewMMTkGlue/work/LICENSE.html 2009-11-05 04:56:08 UTC (rev 15789)
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>License Information</title>
+<style type="text/css">
+ body {
+ size: 8.5in 11.0in;
+ margin: 0.25in 0.5in 0.25in 0.5in;
+ tab-interval: 0.5in;
+ }
+ p {
+ margin-left: auto;
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+ }
+ p.list {
+ margin-left: 0.5in;
+ margin-top: 0.05em;
+ margin-bottom: 0.05em;
+ }
+ </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>General Information</h2>
+
+Jikes RVM is free, open source software, distributed and freely
+redistributable under the Eclipse Public License (EPL). The EPL has
+been certified by the Open Source Initiative as an open source
+license. The EPL meets the Debian Free Software Guidelines.
+
+Note: some code in the libraryInterface tree is distributed under
+other open source licenses. See the various LICENSE files in that
+tree for details.
+
+Note: some code in the external tree is distributed under
+other open source licenses. See the various LICENSE files in that
+tree for details.
+
+Note: rvm/src-generated/opt-burs/jburg contains a tool, jburg,
+which was derived from iburg and is not distributed under the EPL.
+See rvm/src-generated/opt-burs/jburg/LICENSE for details.
+
+The legal text of the Eclipse Public License is appended below for
+reference
+
+<hline>
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program;
+where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes
+the Program.
+
+"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance
+with this Agreement.
+
+"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.
+
+b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.
+
+c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this
+Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and
+
+iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each
+copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained
+within the Program.
+
+Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.
+
+</body>
+
+</html>
\ No newline at end of file

Deleted: rvmroot/branches/RVM-777-NewMMTkGlue/work/LICENSE.txt
===================================================================
--- rvmroot/branches/RVM-777-NewMMTkGlue/work/LICENSE.txt 2009-09-25 18:37:26 UTC (rev 15788)
+++ rvmroot/branches/RVM-777-NewMMTkGlue/work/LICENSE.txt 2009-11-05 04:56:08 UTC (rev 15789)
@@ -1,266 +0,0 @@
-Jikes RVM is free, open source software, distributed and freely
-redistributable under the Common Public License (CPL). The CPL has
-been certified by the Open Source Initiative as an open source
-license. The CPL meets the Debian Free Software Guidelines.
-
-Note: some code in the libraryInterface tree is distributed under
-other open source licenses. See the various LICENSE files in that
-tree for details.
-
-Note: some code in the external tree is distributed under
-other open source licenses. See the various LICENSE files in that
-tree for details.
-
-Note: rvm/src-generated/opt-burs/jburg contains a tool, jburg,
-which was derived from iburg and is not distributed under the CPL.
-See rvm/src-generated/opt-burs/jburg/LICENSE for details.
-
--------- The following is the legal text of the Common Public License ---------
-
- Common Public License - v 1.0
-
- THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON
- PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
- THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
- 1. DEFINITIONS
-
- "Contribution" means:
-
- a) in the case of the initial Contributor, the initial code and
- documentation distributed under this Agreement, and
-
- b) in the case of each subsequent Contributor:
-
- i) changes to the Program, and
-
- ii) additions to the Program;
-
- where such changes and/or additions to the Program originate from
- and are distributed by that particular Contributor. A Contribution
- 'originates' from a Contributor if it was added to the Program by
- such Contributor itself or anyone acting on such Contributor's
- behalf. Contributions do not include additions to the Program
- which: (i) are separate modules of software distributed in
- conjunction with the Program under their own license agreement, and
- (ii) are not derivative works of the Program.
-
- "Contributor" means any person or entity that distributes the
- Program.
-
- "Licensed Patents" mean patent claims licensable by a Contributor
- which are necessarily infringed by the use or sale of its
- Contribution alone or when combined with the Program.
-
- "Program" means the Contributions distributed in accordance with
- this Agreement.
-
- "Recipient" means anyone who receives the Program under this
- Agreement, including all Contributors.
-
-
- 2. GRANT OF RIGHTS
-
- a) Subject to the terms of this Agreement, each Contributor hereby
- grants Recipient a non-exclusive, worldwide, royalty-free
- copyright license to reproduce, prepare derivative works of,
- publicly display, publicly perform, distribute and sublicense
- the Contribution of such Contributor, if any, and such
- derivative works, in source code and object code form.
-
- b) Subject to the terms of this Agreement, each Contributor hereby
- grants Recipient a non-exclusive, worldwide, royalty-free
- patent license under Licensed Patents to make, use, sell, offer
- to sell, import and otherwise transfer the Contribution of such
- Contributor, if any, in source code and object code form. This
- patent license shall apply to the combination of the
- Contribution and the Program if, at the time the Contribution
- is added by the Contributor, such addition of the Contribution
- causes such combination to be covered by the Licensed
- Patents. The patent license shall not apply to any other
- combinations which include the Contribution. No hardware per se
- is licensed hereunder.
-
- c) Recipient understands that although each Contributor grants the
- licenses to its Contributions set forth herein, no assurances
- are provided by any Contributor that the Program does not
- infringe the patent or other intellectual property rights of
- any other entity. Each Contributor disclaims any liability to
- Recipient for claims brought by any other entity based on
- infringement of intellectual property rights or otherwise. As
- a condition to exercising the rights and licenses granted
- hereunder, each Recipient hereby assumes sole responsibility to
- secure any other intellectual property rights needed, if any.
- For example, if a third party patent license is required to
- allow Recipient to distribute the Program, it is Recipient's
- responsibility to acquire that license before distributing the
- Program.
-
- d) Each Contributor represents that to its knowledge it has
- sufficient copyright rights in its Contribution, if any, to
- grant the copyright license set forth in this Agreement.
-
- 3. REQUIREMENTS
-
- A Contributor may choose to distribute the Program in object code
- form under its own license agreement, provided that:
-
- a) it complies with the terms and conditions of this Agreement; and
-
- b) its license agreement:
-
- i) effectively disclaims on behalf of all Contributors all
- warranties and conditions, express and implied, including
- warranties or conditions of title and non-infringement, and
- implied warranties or conditions of merchantability and fitness
- for a particular purpose;
-
- ii) effectively excludes on behalf of all Contributors all
- liability for damages, including direct, indirect, special,
- incidental and consequential damages, such as lost profits;
-
- iii) states that any provisions which differ from this Agreement
- are offered by that Contributor alone and not by any other
- party; and
-
- iv) states that source code for the Program is available from such
- Contributor, and informs licensees how to obtain it in a
- reasonable manner on or through a medium customarily used for
- software exchange.
-
- When the Program is made available in source code form:
-
- a) it must be made available under this Agreement; and
-
- b) a copy of this Agreement must be included with each copy of the
- Program.
-
- Contributors may not remove or alter any copyright notices
- contained within the Program.
-
- Each Contributor must identify itself as the originator of its
- Contribution, if any, in a manner that reasonably allows subsequent
- Recipients to identify the originator of the Contribution.
-
- 4. COMMERCIAL DISTRIBUTION
-
- Commercial distributors of software may accept certain
- responsibilities with respect to end users, business partners and
- the like. While this license is intended to facilitate the
- commercial use of the Program, the Contributor who includes the
- Program in a commercial product offering should do so in a manner
- which does not create potential liability for other
- Contributors. Therefore, if a Contributor includes the Program in a
- commercial product offering, such Contributor ("Commercial
- Contributor") hereby agrees to defend and indemnify every other
- Contributor ("Indemnified Contributor") against any losses, damages
- and costs (collectively "Losses") arising from claims, lawsuits and
- other legal actions brought by a third party against the
- Indemnified Contributor to the extent caused by the acts or
- omissions of such Commercial Contributor in connection with its
- distribution of the Program in a commercial product offering. The
- obligations in this section do not apply to any claims or Losses
- relating to any actual or alleged intellectual property
- infringement. In order to qualify, an Indemnified Contributor
- must: a) promptly notify the Commercial Contributor in writing of
- such claim, and b) allow the Commercial Contributor to control, and
- cooperate with the Commercial Contributor in, the defense and any
- related settlement negotiations. The Indemnified Contributor may
- participate in any such claim at its own expense.
-
- For example, a Contributor might include the Program in a
- commercial product offering, Product X. That Contributor is then a
- Commercial Contributor. If that Commercial Contributor then makes
- performance claims, or offers warranties related to Product X,
- those performance claims and warranties are such Commercial
- Contributor's responsibility alone. Under this section, the
- Commercial Contributor would have to defend claims against the
- other Contributors related to those performance claims and
- warranties, and if a court requires any other Contributor to pay
- any damages as a result, the Commercial Contributor must pay those
- damages.
-
- 5. NO WARRANTY
-
- EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
- PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
- ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
- ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
- Recipient is solely responsible for determining the appropriateness
- of using and distributing the Program and assumes all risks
- associated with its exercise of rights under this Agreement,
- including but not limited to the risks and costs of program errors,
- compliance with applicable laws, damage to or loss of data,
- programs or equipment, and unavailability or interruption of
- operations.
-
- 6. DISCLAIMER OF LIABILITY
-
- EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
- NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY
- RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGES.
-
- 7. GENERAL
-
- If any provision of this Agreement is invalid or unenforceable
- under applicable law, it shall not affect the validity or
- enforceability of the remainder of the terms of this Agreement, and
- without further action by the parties hereto, such provision shall
- be reformed to the minimum extent necessary to make such provision
- valid and enforceable.
-
- If Recipient institutes patent litigation against a Contributor
- with respect to a patent applicable to software (including a
- cross-claim or counterclaim in a lawsuit), then any patent licenses
- granted by that Contributor to such Recipient under this Agreement
- shall terminate as of the date such litigation is filed. In
- addition, if Recipient institutes patent litigation against any
- entity (including a cross-claim or counterclaim in a lawsuit)
- alleging that the Program itself (excluding combinations of the
- Program with other software or hardware) infringes such Recipient's
- patent(s), then such Recipient's rights granted under Section 2(b)
- shall terminate as of the date such litigation is filed.
-
- All Recipient's rights under this Agreement shall terminate if it
- fails to comply with any of the material terms or conditions of
- this Agreement and does not cure such failure in a reasonable
- period of time after becoming aware of such noncompliance. If all
- Recipient's rights under this Agreement terminate, Recipient agrees
- to cease use and distribution of the Program as soon as reasonably
- practicable. However, Recipient's obligations under this Agreement
- and any licenses granted by Recipient relating to the Program shall
- continue and survive.
-
- Everyone is permitted to copy and distribute copies of this
- Agreement, but in order to avoid inconsistency the Agreement is
- copyrighted and may only be modified in the following manner. The
- Agreement Steward reserves the right to publish new versions
- (including revisions) of this Agreement from time to time. No one
- other than the Agreement Steward has the right to modify this
- Agreement. IBM is the initial Agreement Steward. IBM may assign
- the responsibility to serve as the Agreement Steward to a suitable
- separate entity. Each new version of the Agreement will be given a
- distinguishing version number. The Program (including
- Contributions) may always be distributed subject to the version of
- the Agreement under which it was received. In addition, after a new
- version of the Agreement is published, Contributor may elect to
- distribute the Program (including its Contributions) under the new
- version. Except as expressly stated in Sections 2(a) and 2(b)
- above, Recipient receives no rights or licenses to the intellectual
- property of any Contributor under this Agreement, whether
- expressly, by implication, estoppel or otherwise. All rights in the
- Program not expressly granted under this Agreement are reserved.
-
- This Agreement is governed by the laws of the State of New York and
- the intellectual property laws of the United States of America. No
- party to this Agreement will bring a legal action under this
- Agreement more than one year after the cause of action arose. Each
- party waives its rights to a jury trial in any resulting
- litigation.

Added: rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/LICENSE.html
===================================================================
--- rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/LICENSE.html (rev 0)
+++ rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/LICENSE.html 2009-11-05 04:56:08 UTC (rev 15789)
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>License Information</title>
+<style type="text/css">
+ body {
+ size: 8.5in 11.0in;
+ margin: 0.25in 0.5in 0.25in 0.5in;
+ tab-interval: 0.5in;
+ }
+ p {
+ margin-left: auto;
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+ }
+ p.list {
+ margin-left: 0.5in;
+ margin-top: 0.05em;
+ margin-bottom: 0.05em;
+ }
+ </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>General Information</h2>
+
+MMTk is free, open source software, distributed and freely
+redistributable under the Eclipse Public License (EPL). The EPL has
+been certified by the Open Source Initiative as an open source
+license. The EPL meets the Debian Free Software Guidelines.
+
+The legal text of the Eclipse Public License is appended below for
+reference
+
+<hline>
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program;
+where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes
+the Program.
+
+"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance
+with this Agreement.
+
+"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.
+
+b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.
+
+c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this
+Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and
+
+iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each
+copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained
+within the Program.
+
+Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.
+
+</body>
+
+</html>
\ No newline at end of file

Deleted: rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/LICENSE.txt
===================================================================
--- rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/LICENSE.txt 2009-09-25 18:37:26 UTC (rev 15788)
+++ rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/LICENSE.txt 2009-11-05 04:56:08 UTC (rev 15789)
@@ -1,254 +0,0 @@
-MMTk is free, open source software, distributed and freely
-redistributable under the Common Public License (CPL). The CPL has
-been certified by the Open Source Initiative as an open source
-license. The CPL meets the Debian Free Software Guidelines.
-
--------- The following is the legal text of the Common Public License ---------
-
- Common Public License - v 1.0
-
- THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON
- PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
- THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
- 1. DEFINITIONS
-
- "Contribution" means:
-
- a) in the case of the initial Contributor, the initial code and
- documentation distributed under this Agreement, and
-
- b) in the case of each subsequent Contributor:
-
- i) changes to the Program, and
-
- ii) additions to the Program;
-
- where such changes and/or additions to the Program originate from
- and are distributed by that particular Contributor. A Contribution
- 'originates' from a Contributor if it was added to the Program by
- such Contributor itself or anyone acting on such Contributor's
- behalf. Contributions do not include additions to the Program
- which: (i) are separate modules of software distributed in
- conjunction with the Program under their own license agreement, and
- (ii) are not derivative works of the Program.
-
- "Contributor" means any person or entity that distributes the
- Program.
-
- "Licensed Patents" mean patent claims licensable by a Contributor
- which are necessarily infringed by the use or sale of its
- Contribution alone or when combined with the Program.
-
- "Program" means the Contributions distributed in accordance with
- this Agreement.
-
- "Recipient" means anyone who receives the Program under this
- Agreement, including all Contributors.
-
-
- 2. GRANT OF RIGHTS
-
- a) Subject to the terms of this Agreement, each Contributor hereby
- grants Recipient a non-exclusive, worldwide, royalty-free
- copyright license to reproduce, prepare derivative works of,
- publicly display, publicly perform, distribute and sublicense
- the Contribution of such Contributor, if any, and such
- derivative works, in source code and object code form.
-
- b) Subject to the terms of this Agreement, each Contributor hereby
- grants Recipient a non-exclusive, worldwide, royalty-free
- patent license under Licensed Patents to make, use, sell, offer
- to sell, import and otherwise transfer the Contribution of such
- Contributor, if any, in source code and object code form. This
- patent license shall apply to the combination of the
- Contribution and the Program if, at the time the Contribution
- is added by the Contributor, such addition of the Contribution
- causes such combination to be covered by the Licensed
- Patents. The patent license shall not apply to any other
- combinations which include the Contribution. No hardware per se
- is licensed hereunder.
-
- c) Recipient understands that although each Contributor grants the
- licenses to its Contributions set forth herein, no assurances
- are provided by any Contributor that the Program does not
- infringe the patent or other intellectual property rights of
- any other entity. Each Contributor disclaims any liability to
- Recipient for claims brought by any other entity based on
- infringement of intellectual property rights or otherwise. As
- a condition to exercising the rights and licenses granted
- hereunder, each Recipient hereby assumes sole responsibility to
- secure any other intellectual property rights needed, if any.
- For example, if a third party patent license is required to
- allow Recipient to distribute the Program, it is Recipient's
- responsibility to acquire that license before distributing the
- Program.
-
- d) Each Contributor represents that to its knowledge it has
- sufficient copyright rights in its Contribution, if any, to
- grant the copyright license set forth in this Agreement.
-
- 3. REQUIREMENTS
-
- A Contributor may choose to distribute the Program in object code
- form under its own license agreement, provided that:
-
- a) it complies with the terms and conditions of this Agreement; and
-
- b) its license agreement:
-
- i) effectively disclaims on behalf of all Contributors all
- warranties and conditions, express and implied, including
- warranties or conditions of title and non-infringement, and
- implied warranties or conditions of merchantability and fitness
- for a particular purpose;
-
- ii) effectively excludes on behalf of all Contributors all
- liability for damages, including direct, indirect, special,
- incidental and consequential damages, such as lost profits;
-
- iii) states that any provisions which differ from this Agreement
- are offered by that Contributor alone and not by any other
- party; and
-
- iv) states that source code for the Program is available from such
- Contributor, and informs licensees how to obtain it in a
- reasonable manner on or through a medium customarily used for
- software exchange.
-
- When the Program is made available in source code form:
-
- a) it must be made available under this Agreement; and
-
- b) a copy of this Agreement must be included with each copy of the
- Program.
-
- Contributors may not remove or alter any copyright notices
- contained within the Program.
-
- Each Contributor must identify itself as the originator of its
- Contribution, if any, in a manner that reasonably allows subsequent
- Recipients to identify the originator of the Contribution.
-
- 4. COMMERCIAL DISTRIBUTION
-
- Commercial distributors of software may accept certain
- responsibilities with respect to end users, business partners and
- the like. While this license is intended to facilitate the
- commercial use of the Program, the Contributor who includes the
- Program in a commercial product offering should do so in a manner
- which does not create potential liability for other
- Contributors. Therefore, if a Contributor includes the Program in a
- commercial product offering, such Contributor ("Commercial
- Contributor") hereby agrees to defend and indemnify every other
- Contributor ("Indemnified Contributor") against any losses, damages
- and costs (collectively "Losses") arising from claims, lawsuits and
- other legal actions brought by a third party against the
- Indemnified Contributor to the extent caused by the acts or
- omissions of such Commercial Contributor in connection with its
- distribution of the Program in a commercial product offering. The
- obligations in this section do not apply to any claims or Losses
- relating to any actual or alleged intellectual property
- infringement. In order to qualify, an Indemnified Contributor
- must: a) promptly notify the Commercial Contributor in writing of
- such claim, and b) allow the Commercial Contributor to control, and
- cooperate with the Commercial Contributor in, the defense and any
- related settlement negotiations. The Indemnified Contributor may
- participate in any such claim at its own expense.
-
- For example, a Contributor might include the Program in a
- commercial product offering, Product X. That Contributor is then a
- Commercial Contributor. If that Commercial Contributor then makes
- performance claims, or offers warranties related to Product X,
- those performance claims and warranties are such Commercial
- Contributor's responsibility alone. Under this section, the
- Commercial Contributor would have to defend claims against the
- other Contributors related to those performance claims and
- warranties, and if a court requires any other Contributor to pay
- any damages as a result, the Commercial Contributor must pay those
- damages.
-
- 5. NO WARRANTY
-
- EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
- PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
- ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
- ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
- Recipient is solely responsible for determining the appropriateness
- of using and distributing the Program and assumes all risks
- associated with its exercise of rights under this Agreement,
- including but not limited to the risks and costs of program errors,
- compliance with applicable laws, damage to or loss of data,
- programs or equipment, and unavailability or interruption of
- operations.
-
- 6. DISCLAIMER OF LIABILITY
-
- EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
- NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY
- RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGES.
-
- 7. GENERAL
-
- If any provision of this Agreement is invalid or unenforceable
- under applicable law, it shall not affect the validity or
- enforceability of the remainder of the terms of this Agreement, and
- without further action by the parties hereto, such provision shall
- be reformed to the minimum extent necessary to make such provision
- valid and enforceable.
-
- If Recipient institutes patent litigation against a Contributor
- with respect to a patent applicable to software (including a
- cross-claim or counterclaim in a lawsuit), then any patent licenses
- granted by that Contributor to such Recipient under this Agreement
- shall terminate as of the date such litigation is filed. In
- addition, if Recipient institutes patent litigation against any
- entity (including a cross-claim or counterclaim in a lawsuit)
- alleging that the Program itself (excluding combinations of the
- Program with other software or hardware) infringes such Recipient's
- patent(s), then such Recipient's rights granted under Section 2(b)
- shall terminate as of the date such litigation is filed.
-
- All Recipient's rights under this Agreement shall terminate if it
- fails to comply with any of the material terms or conditions of
- this Agreement and does not cure such failure in a reasonable
- period of time after becoming aware of such noncompliance. If all
- Recipient's rights under this Agreement terminate, Recipient agrees
- to cease use and distribution of the Program as soon as reasonably
- practicable. However, Recipient's obligations under this Agreement
- and any licenses granted by Recipient relating to the Program shall
- continue and survive.
-
- Everyone is permitted to copy and distribute copies of this
- Agreement, but in order to avoid inconsistency the Agreement is
- copyrighted and may only be modified in the following manner. The
- Agreement Steward reserves the right to publish new versions
- (including revisions) of this Agreement from time to time. No one
- other than the Agreement Steward has the right to modify this
- Agreement. IBM is the initial Agreement Steward. IBM may assign
- the responsibility to serve as the Agreement Steward to a suitable
- separate entity. Each new version of the Agreement will be given a
- distinguishing version number. The Program (including
- Contributions) may always be distributed subject to the version of
- the Agreement under which it was received. In addition, after a new
- version of the Agreement is published, Contributor may elect to
- distribute the Program (including its Contributions) under the new
- version. Except as expressly stated in Sections 2(a) and 2(b)
- above, Recipient receives no rights or licenses to the intellectual
- property of any Contributor under this Agreement, whether
- expressly, by implication, estoppel or otherwise. All rights in the
- Program not expressly granted under this Agreement are reserved.
-
- This Agreement is governed by the laws of the State of New York and
- the intellectual property laws of the United States of America. No
- party to this Agreement will bring a legal action under this
- Agreement more than one year after the cause of action arose. Each
- party waives its rights to a jury trial in any resulting
- litigation.

Modified: rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/ActivePlan.java
===================================================================
--- rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/ActivePlan.java 2009-09-25 18:37:26 UTC (rev 15788)
+++ rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/ActivePlan.java 2009-11-05 04:56:08 UTC (rev 15789)
@@ -1,19 +1,22 @@
/*
* This file is part of the Jikes RVM project (http://jikesrvm.org).
*
- * This file is licensed to You under the Common Public License (CPL);
+ * 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/cpl1.0.php
+ * 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.mmtk.harness.vm;

+import java.util.concurrent.BlockingQueue;
+
import org.mmtk.harness.Collector;
import org.mmtk.harness.Mutator;
+import org.mmtk.harness.Mutators;
import org.mmtk.harness.scheduler.Scheduler;
import org.mmtk.plan.Plan;
import org.mmtk.plan.CollectorContext;
@@ -29,7 +32,10 @@
@Uninterruptible
public final class ActivePlan extends org.mmtk.vm.ActivePlan {

- /** Initialise static state */
+ /**
+ * Initialise static state
+ * @param prefix The name of the plan class (prefix for the associated classes)
+ */
public static void init(String prefix) {
try {
constraints = (PlanConstraints)Class.forName(prefix + "Constraints").newInstance();
@@ -49,9 +55,6 @@
/** The global constraints */
public static PlanConstraints constraints;

- /** Used for iterating over mutators */
- private static int mutatorIndex;
-
/** @return The active Plan instance. */
@Override
public Plan global() { return plan; };
@@ -76,9 +79,11 @@
@Override
public int collectorCount() { return Collector.count(); }

+ private BlockingQueue<Mutator> mutators = null;
+
/** Reset the mutator iterator */
@Override
- public void resetMutatorIterator() { mutatorIndex = 0; }
+ public void resetMutatorIterator() { mutators = null; }

/**
* Return the next <code>MutatorContext</code> in a
@@ -91,8 +96,11 @@
@Override
public MutatorContext getNextMutator() {
synchronized(ActivePlan.class) {
- if (mutatorIndex >= Mutator.count()) return null;
- return Mutator.get(mutatorIndex++).getContext();
+ if (mutators == null) {
+ mutators = Mutators.getAll();
+ }
}
+ Mutator m = mutators.poll();
+ return m == null ? null : m.getContext();
}
}

Modified: rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Assert.java
===================================================================
--- rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Assert.java 2009-09-25 18:37:26 UTC (rev 15788)
+++ rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Assert.java 2009-11-05 04:56:08 UTC (rev 15789)
@@ -1,11 +1,11 @@
/*
* This file is part of the Jikes RVM project (http://jikesrvm.org).
*
- * This file is licensed to You under the Common Public License (CPL);
+ * 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/cpl1.0.php
+ * http://www.opensource.org/licenses/eclipse-1.0.php
*
* See the COPYRIGHT.txt file distributed with this work for information
* regarding copyright ownership.
@@ -14,6 +14,9 @@

import org.vmmagic.pragma.Uninterruptible;

+/**
+ * MMTk Harness implementation of Assert
+ */
@Uninterruptible
public class Assert extends org.mmtk.vm.Assert {

@@ -29,6 +32,7 @@
*
* @param message the string to log
*/
+ @Override
public void fail(String message) {
throw new RuntimeException("Assertion Failed: " + message);
}
@@ -40,6 +44,7 @@
*
* @param cond the condition to be checked
*/
+ @Override
public void _assert(boolean cond) {
if (!cond) fail("");
}
@@ -52,6 +57,7 @@
* @param cond the condition to be checked
* @param message the message to print
*/
+ @Override
public void _assert(boolean cond, String message) {
if (!cond) fail(message);
}
@@ -59,6 +65,7 @@
/**
* Print a stack trace
*/
+ @Override
public void dumpStack() {
new Exception().printStackTrace();
}
@@ -70,11 +77,13 @@
*
* @return <code>true</code> if the virtual machine is running
*/
+ @Override
public boolean runningVM() {
return true;
}

/** @return true if assertions should be verified */
+ @Override
protected boolean getVerifyAssertionsConstant() {
return true;
}

Modified: rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Barriers.java
===================================================================
--- rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Barriers.java 2009-09-25 18:37:26 UTC (rev 15788)
+++ rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Barriers.java 2009-11-05 04:56:08 UTC (rev 15789)
@@ -1,11 +1,11 @@
/*
* This file is part of the Jikes RVM project (http://jikesrvm.org).
*
- * This file is licensed to You under the Common Public License (CPL);
+ * 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/cpl1.0.php
+ * http://www.opensource.org/licenses/eclipse-1.0.php
*
* See the COPYRIGHT.txt file distributed with this work for information
* regarding copyright ownership.
@@ -15,125 +15,347 @@
import org.vmmagic.pragma.Uninterruptible;
import org.vmmagic.unboxed.*;

+/**
+ * MMTk Harness implementation of Barriers interface
+ */
@Uninterruptible
public class Barriers extends org.mmtk.vm.Barriers {
/**
- * Sets an element of an object array without invoking any write
- * barrier. This method is called by the Map class to ensure
- * potentially-allocation-triggering write barriers do not occur in
- * allocation slow path code.
+ * Perform the actual write of a boolean write barrier.
*
- * @param dst the destination array
- * @param index the index of the element to set
- * @param value the new value for the element
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param slot The address to be written to
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
*/
- public void setArrayNoBarrier(Object [] dst, int index, Object value) {
- dst[index] = value;
+ @Override
+ public void booleanWrite(ObjectReference ref, boolean value, Word slot, Word unused, int mode) {
+ slot.toAddress().store((byte) (value ? 1 : 0));
}

/**
- * Perform the actual write of the write barrier.
+ * Perform the actual read of a boolean read barrier.
*
* @param ref The object that has the reference field
- * @param slot The slot that holds the reference
- * @param target The value that the slot will be updated to
- * @param metaDataA Unused
- * @param metaDataB Unused
- * @param mode The context in which the write is occuring
+ * @param slot The address to be read from
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
*/
- public void performWriteInBarrier(ObjectReference ref, Address slot,
- ObjectReference target, Word metaDataA,
- Word metaDataB, int mode) {
- slot.store(target);
+ @Override
+ public boolean booleanRead(ObjectReference ref, Word slot, Word unused, int mode) {
+ return slot.toAddress().loadByte() != 0;
}

/**
- * Perform the actual write of the write barrier, writing the value as a raw Word.
+ * Perform the actual write of a byte write barrier.
*
* @param ref The object that has the reference field
- * @param slot The slot that holds the reference
- * @param rawTarget The value that the slot will be updated to
- * @param metaDataA Unused
- * @param metaDataB Unused
- * @param mode The context in which the write is occuring
+ * @param value The value that the slot will be updated to
+ * @param slot The address to be written to
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
*/
- public void performRawWriteInBarrier(ObjectReference ref, Address slot,
- Word rawTarget, Word metaDataA,
- Word metaDataB, int mode) {
- slot.store(rawTarget);
+ @Override
+ public void byteWrite(ObjectReference ref, byte value, Word slot, Word unused, int mode) {
+ slot.toAddress().store(value);
}

/**
- * Perform the actual read of the read barrier.
+ * Perform the actual read of a byte read barrier.
*
* @param ref The object that has the reference field
- * @param slot The slot that holds the reference
- * @param metaDataA Unused
- * @param metaDataB Unused
- * @param mode The context in which the write is occuring
+ * @param slot The address to be read from
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
* @return the read value
*/
- public ObjectReference performReadInBarrier(ObjectReference ref, Address slot,
- Word metaDataA, Word metaDataB, int mode) {
- return slot.loadObjectReference();
+ @Override
+ public byte byteRead(ObjectReference ref, Word slot, Word unused, int mode) {
+ return slot.toAddress().loadByte();
}

/**
- * Perform the actual read of the read barrier, returning the value as a raw Word.
+ * Perform the actual write of a char write barrier.
*
* @param ref The object that has the reference field
- * @param slot The slot that holds the reference
- * @param metaDataA Unused
- * @param metaDataB Unused
- * @param mode The context in which the write is occuring
+ * @param value The value that the slot will be updated to
+ * @param slot The address to be written to
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Override
+ public void charWrite(ObjectReference ref, char value, Word slot, Word unused, int mode) {
+ slot.toAddress().store(value);
+ }
+
+ /**
+ * Perform the actual read of a char read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param slot The address to be read from
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
* @return the read value
*/
- public Word performRawReadInBarrier(ObjectReference ref, Address slot,
- Word metaDataA, Word metaDataB, int mode) {
- return slot.loadWord();
+ @Override
+ public char charRead(ObjectReference ref, Word slot, Word unused, int mode) {
+ return slot.toAddress().loadChar();
}

/**
+ * Perform the actual write of a short write barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param slot The address to be written to
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Override
+ public void shortWrite(ObjectReference ref, short value, Word slot, Word unused, int mode) {
+ slot.toAddress().store(value);
+ }
+
+ /**
+ * Perform the actual read of a short read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param slot The address to be read from
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Override
+ public short shortRead(ObjectReference ref, Word slot, Word unused, int mode) {
+ return slot.toAddress().loadShort();
+ }
+
+ /**
+ * Perform the actual write of a int write barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param slot The address to be written to
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Override
+ public void intWrite(ObjectReference ref, int value, Word slot, Word unused, int mode) {
+ slot.toAddress().store(value);
+ }
+
+ /**
+ * Perform the actual read of a int read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param slot The address to be read from
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Override
+ public int intRead(ObjectReference ref, Word slot, Word unused, int mode) {
+ return slot.toAddress().loadInt();
+ }
+
+ /**
+ * Perform the actual write of a long write barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param slot The address to be written to
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Override
+ public void longWrite(ObjectReference ref, long value, Word slot, Word unused, int mode) {
+ slot.toAddress().store(value);
+ }
+
+ /**
+ * Perform the actual read of a long read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param slot The address to be read from
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Override
+ public long longRead(ObjectReference ref, Word slot, Word unused, int mode) {
+ return slot.toAddress().loadLong();
+ }
+
+ /**
+ * Perform the actual write of a float write barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param slot The address to be written to
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Override
+ public void floatWrite(ObjectReference ref, float value, Word slot, Word unused, int mode) {
+ slot.toAddress().store(value);
+ }
+
+ /**
+ * Perform the actual read of a float read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param slot The address to be read from
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Override
+ public float floatRead(ObjectReference ref, Word slot, Word unused, int mode) {
+ return slot.toAddress().loadFloat();
+ }
+
+ /**
+ * Perform the actual write of a double write barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param slot The address to be written to
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Override
+ public void doubleWrite(ObjectReference ref, double value, Word slot, Word unused, int mode) {
+ slot.toAddress().store(value);
+ }
+
+ /**
+ * Perform the actual read of a double read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param slot The address to be read from
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Override
+ public double doubleRead(ObjectReference ref, Word slot, Word unused, int mode) {
+ return slot.toAddress().loadDouble();
+ }
+
+ /**
+ * Perform the actual write of an object reference write barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param slot The address to be written to
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Override
+ public void objectReferenceWrite(ObjectReference ref, ObjectReference value, Word slot, Word unused, int mode) {
+ slot.toAddress().store(value);
+ }
+
+ /**
+ * Perform the actual read of an object reference read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param slot The address to be read from
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Override
+ public ObjectReference objectReferenceRead(ObjectReference ref,Word slot, Word unused, int mode) {
+ return slot.toAddress().loadObjectReference();
+ }
+
+ /**
+ * Perform the actual write of the non-heap write barrier. This is
+ * used when the store is not to an object, but to a non-heap location
+ * such as statics or the stack.
+ *
+ * @param slot The address that contains the reference field
+ * @param target The value that the slot will be updated to
+ * @param unusedA Opaque, VM-specific, meta-data identifying the slot
+ * @param unusedB Opaque, VM-specific, meta-data identifying the slot
+ */
+ @Override
+ public void objectReferenceNonHeapWrite(Address slot, ObjectReference target, Word unusedA, Word unusedB) {
+ slot.store(target);
+ }
+
+ /**
* Atomically write a reference field of an object or array and return
* the old value of the reference field.
*
* @param ref The object that has the reference field
- * @param slot The slot that holds the reference
* @param target The value that the slot will be updated to
- * @param metaDataA Unused
- * @param metaDataB Unused
- * @param mode The context in which the write is occuring
+ * @param slot The address to be written to
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
* @return The value that was replaced by the write.
*/
- public ObjectReference performWriteInBarrierAtomic(ObjectReference ref, Address slot,
- ObjectReference target, Word metaDataA,
- Word metaDataB, int mode) {
+ @Override
+ public ObjectReference objectReferenceAtomicWrite(ObjectReference ref, ObjectReference target, Word slot, Word unused, int mode) {
ObjectReference old;
do {
- old = slot.prepareObjectReference();
- } while (!slot.attempt(old, target));
+ old = slot.toAddress().prepareObjectReference();
+ } while (!slot.toAddress().attempt(old, target));
return old;
}

/**
+ * Attempt an atomic compare and exchange in a write barrier sequence.
+ *
+ * @param ref The object that has the reference field
+ * @param old The old reference to be swapped out
+ * @param target The value that the slot will be updated to
+ * @param slot The address to be written to
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return True if the compare and swap was successful
+ */
+ @Override
+ public boolean objectReferenceTryCompareAndSwap(ObjectReference ref, ObjectReference old, ObjectReference target, Word slot, Word unused, int mode) {
+ return slot.toAddress().attempt(old, target);
+ }
+
+
+ /**
+ * Perform the actual write of the write barrier, writing the value as a raw Word.
+ *
+ * @param ref The object that has the reference field
+ * @param target The value that the slot will be updated to
+ * @param slot The address to be written to
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Override
+ public void wordWrite(ObjectReference ref, Word target, Word slot, Word unused, int mode) {
+ slot.toAddress().store(target);
+ }
+
+ /**
* Atomically write a reference field of an object or array and return
* the old value of the reference field.
*
* @param ref The object that has the reference field
- * @param slot The slot that holds the reference
- * @param rawTarget The raw value that the slot will be updated to
- * @param metaDataA Unused
- * @param metaDataB Unused
- * @param mode The context in which the write is occuring
+ * @param target The value that the slot will be updated to
+ * @param slot Unused
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
* @return The raw value that was replaced by the write.
*/
- public Word performRawWriteInBarrierAtomic(ObjectReference ref, Address slot,
- Word rawTarget, Word metaDataA,
- Word metaDataB, int mode) {
+ @Override
+ public Word wordAtomicWrite(ObjectReference ref, Word target,
+ Word slot, Word unused, int mode) {
Word old;
do {
- old = slot.prepareWord();
- } while (!slot.attempt(old, rawTarget));
+ old = slot.toAddress().prepareWord();
+ } while (!slot.toAddress().attempt(old, target));
return old;
}

@@ -144,32 +366,43 @@
* @param slot The slot that holds the reference
* @param old The old reference to be swapped out
* @param target The value that the slot will be updated to
- * @param metaDataA Unused
- * @param metaDataB Unused
- * @param mode The context in which the write is occuring
+ * @param slot The address to be written to
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
* @return True if the compare and swap was successful
*/
- public boolean tryCompareAndSwapWriteInBarrier(ObjectReference ref, Address slot,
- ObjectReference old, ObjectReference target,
- Word metaDataA, Word metaDataB, int mode) {
- return slot.attempt(old, target);
+ @Override
+ public boolean wordTryCompareAndSwap(ObjectReference ref, Word old, Word target,
+ Word slot, Word unused, int mode) {
+ return slot.toAddress().attempt(old, target);
}

/**
- * Attempt an atomic compare and exchange in a write barrier sequence.
+ * Perform the actual read of the read barrier, returning the value as a raw Word.
*
* @param ref The object that has the reference field
- * @param slot The slot that holds the reference
- * @param rawOld The old reference to be swapped out
- * @param rawTarget The value that the slot will be updated to
- * @param metaDataA Unused
- * @param metaDataB Unused
- * @param mode The context in which the write is occuring
- * @return True if the compare and swap was successful
+ * @param slot The address to be read from
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
*/
- public boolean tryRawCompareAndSwapWriteInBarrier(ObjectReference ref, Address slot,
- Word rawOld, Word rawTarget,
- Word metaDataA, Word metaDataB, int mode) {
- return slot.attempt(rawOld, rawTarget);
+ @Override
+ public Word wordRead(ObjectReference ref, Word slot, Word unused, int mode) {
+ return slot.toAddress().loadWord();
}
+
+ /**
+ * Sets an element of an object array without invoking any write
+ * barrier. This method is called by the Map class to ensure
+ * potentially-allocation-triggering write barriers do not occur in
+ * allocation slow path code.
+ *
+ * @param dst the destination array
+ * @param index the index of the element to set
+ * @param value the new value for the element
+ */
+ @Override
+ public void objectArrayStoreNoGCBarrier(Object [] dst, int index, Object value) {
+ dst[index] = value;
+ }
}

Modified: rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/BuildTimeConfig.java
===================================================================
--- rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/BuildTimeConfig.java 2009-09-25 18:37:26 UTC (rev 15788)
+++ rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/BuildTimeConfig.java 2009-11-05 04:56:08 UTC (rev 15789)
@@ -1,11 +1,11 @@
/*
* This file is part of the Jikes RVM project (http://jikesrvm.org).
*
- * This file is licensed to You under the Common Public License (CPL);
+ * 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/cpl1.0.php
+ * http://www.opensource.org/licenses/eclipse-1.0.php
*
* See the COPYRIGHT.txt file distributed with this work for information
* regarding copyright ownership.

Modified: rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Collection.java
===================================================================
--- rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Collection.java 2009-09-25 18:37:26 UTC (rev 15788)
+++ rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Collection.java 2009-11-05 04:56:08 UTC (rev 15789)
@@ -1,11 +1,11 @@
/*
* This file is part of the Jikes RVM project (http://jikesrvm.org).
*
- * This file is licensed to You under the Common Public License (CPL);
+ * 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/cpl1.0.php
+ * http://www.opensource.org/licenses/eclipse-1.0.php
*
* See the COPYRIGHT.txt file distributed with this work for information
* regarding copyright ownership.
@@ -15,6 +15,8 @@
import org.mmtk.harness.Collector;
import org.mmtk.harness.Harness;
import org.mmtk.harness.Mutator;
+import org.mmtk.harness.Mutators;
+import org.mmtk.harness.exception.OutOfMemory;
import org.mmtk.harness.scheduler.Scheduler;
import org.mmtk.plan.CollectorContext;
import org.mmtk.plan.MutatorContext;
@@ -37,6 +39,7 @@
* @param why the reason why a collection was triggered. 0 to
* <code>TRIGGER_REASONS - 1</code>.
*/
+ @Override
public void triggerCollection(int why) {
if (Options.verbose.getValue() >= 4) {
new Exception("Collection trigger: " + triggerReasons[why]).printStackTrace();
@@ -57,19 +60,20 @@
mutator.reportCollectionAttempt();
}

- if (mutator.isOutOfMemory()) throw new Mutator.OutOfMemory();
+ if (mutator.isOutOfMemory()) throw new OutOfMemory();

Collector.triggerGC(why);
Scheduler.waitForGC();

if (mutator.isOutOfMemory() && !mutator.isPhysicalAllocationFailure()) {
- throw new Mutator.OutOfMemory();
+ throw new OutOfMemory();
}
}

/**
* Joins an already requested collection.
*/
+ @Override
public void joinCollection() {
while (Plan.isCollectionTriggered()) {
/* allow a gc thread to run */
@@ -77,7 +81,7 @@
}
Mutator mutator = Mutator.current();
if (mutator.isOutOfMemory() && !mutator.isPhysicalAllocationFailure()) {
- throw new Mutator.OutOfMemory();
+ throw new OutOfMemory();
}
}

@@ -88,6 +92,7 @@
* @param why the reason why a collection was triggered. 0 to
* <code>TRIGGER_REASONS - 1</code>.
*/
+ @Override
public void triggerAsyncCollection(int why) {
Plan.setCollectionTriggered();
if (Options.verbose.getValue() >= 1) {
@@ -102,13 +107,13 @@
}

/**
- * The maximum number collection attempts across threads.
+ * @return The maximum number of collection attempts across threads.
*/
+ @Override
public int maximumCollectionAttempt() {
int max = 1;
- for(int m=0; m < Mutator.count(); m++) {
- Mutator mutator = Mutator.get(m);
- int current = mutator.getCollectionAttempts();
+ for(Mutator m : Mutators.getAll()) {
+ int current = m.getCollectionAttempts();
if (current > max) max = current;
}
return max + Collector.getCollectionAttemptBase();
@@ -117,6 +122,7 @@
/**
* Report that the allocation has succeeded.
*/
+ @Override
public void reportAllocationSuccess() {
Mutator mutator = Mutator.current();
mutator.setOutOfMemory(false);
@@ -127,6 +133,7 @@
/**
* Report that a physical allocation has failed.
*/
+ @Override
public void reportPhysicalAllocationFailed() {
Mutator.current().setPhysicalAllocationFailure(true);
}
@@ -135,6 +142,7 @@
* Does the VM consider this an emergency alloction, where the normal
* heap size rules can be ignored.
*/
+ @Override
public boolean isEmergencyAllocation() {
// Not required
return false;
@@ -148,6 +156,7 @@
*
* @return True if GC is not in progress.
*/
+ @Override
public boolean noThreadsInGC() {
return Scheduler.noThreadsInGC();
}
@@ -157,6 +166,7 @@
*
* @param m the mutator to prepare
*/
+ @Override
public void prepareMutator(MutatorContext m) {
// Nothing to do
}
@@ -166,6 +176,7 @@
*
* @param c the collector to prepare
*/
+ @Override
public void prepareCollector(CollectorContext c) {
// Nothing to do
}
@@ -174,11 +185,13 @@
* Rendezvous with all other processors, returning the rank
* (that is, the order this processor arrived at the barrier).
*/
+ @Override
public int rendezvous(int where) {
return Collector.rendezvous(where);
}

/** @return The number of active collector threads */
+ @Override
public int activeGCThreads() {
return Harness.collectors.getValue();
}
@@ -187,6 +200,7 @@
* @return The ordinal ID of the running collector thread w.r.t.
* the set of active collector threads (zero based)
*/
+ @Override
public int activeGCThreadOrdinal() {
return Collector.current().getContext().getId();
}
@@ -203,6 +217,7 @@
* will trigger the flush and then yield until all processors have
* flushed.
*/
+ @Override
public void requestMutatorFlush() {
Assert.notImplemented();
}

Added: rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Debug.java
===================================================================
--- rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Debug.java (rev 0)
+++ rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Debug.java 2009-11-05 04:56:08 UTC (rev 15789)
@@ -0,0 +1,90 @@
+/*
+ * 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.mmtk.harness.vm;
+
+import org.mmtk.harness.lang.Trace;
+import org.mmtk.harness.lang.Trace.Item;
+import org.mmtk.harness.sanity.FromSpaceInvariant;
+import org.mmtk.plan.Simple;
+import org.mmtk.plan.TraceLocal;
+import org.vmmagic.unboxed.Address;
+import org.vmmagic.unboxed.ObjectReference;
+
+/**
+ * Debugger support for the MMTk harness
+ */
+public final class Debug extends org.mmtk.vm.Debug {
+
+ /**
+ * Enable MMTk debugger support
+ */
+ @Override
+ public boolean isEnabled() {
+ return true;
+ }
+
+ private String format(ObjectReference obj) {
+ if (obj.isNull()) {
+ return obj.toString();
+ }
+ return ObjectModel.getString(obj);
+ }
+
+ private String format(Address addr) {
+ return ObjectModel.addressAndSpaceString(addr);
+ }
+
+ /**
+ * @see org.mmtk.vm.Debug#arrayRemsetEntry(org.vmmagic.unboxed.Address, org.vmmagic.unboxed.Address)
+ */
+ @Override
+ public void arrayRemsetEntry(Address start, Address guard) {
+ Trace.trace(Item.REMSET, "arrayRemset: [%s,%s)", start, guard);
+ }
+
+ /**
+ * @see org.mmtk.vm.Debug#modbufEntry(org.vmmagic.unboxed.ObjectReference)
+ */
+ @Override
+ public void modbufEntry(ObjectReference object) {
+ Trace.trace(Item.REMSET, "modbuf: %s", format(object));
+ }
+
+ /**
+ * @see org.mmtk.vm.Debug#remsetEntry(org.vmmagic.unboxed.Address)
+ */
+ @Override
+ public void remsetEntry(Address slot) {
+ Trace.trace(Item.REMSET, "remset: %s->%s", format(slot), format(slot.loadObjectReference()));
+ }
+
+ /**
+ * @see org.mmtk.vm.Debug#globalPhase(short, boolean)
+ */
+ @Override
+ public void globalPhase(short phaseId, boolean before) {
+ if (phaseId == Simple.RELEASE && before) {
+ new FromSpaceInvariant();
+ }
+ }
+
+ /**
+ * @see org.mmtk.vm.Debug#traceObject(org.mmtk.plan.TraceLocal, org.vmmagic.unboxed.ObjectReference)
+ */
+ @Override
+ public void traceObject(TraceLocal trace, ObjectReference object) {
+ Trace.trace(Item.TRACEOBJECT, "traceObject: %s", format(object));
+ }
+
+
+}

Modified: rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Factory.java
===================================================================
--- rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Factory.java 2009-09-25 18:37:26 UTC (rev 15788)
+++ rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Factory.java 2009-11-05 04:56:08 UTC (rev 15789)
@@ -1,11 +1,11 @@
/*
* This file is part of the Jikes RVM project (http://jikesrvm.org).
*
- * This file is licensed to You under the Common Public License (CPL);
+ * 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/cpl1.0.php
+ * http://www.opensource.org/licenses/eclipse-1.0.php
*
* See the COPYRIGHT.txt file distributed with this work for information
* regarding copyright ownership.
@@ -135,12 +135,13 @@
/**
* Create a new ReferenceProcessor instance using the appropriate VM-specific
* concrete ReferenceProcessor sub-class.
+ * @param semantics The reference semantics for this processor
*
* @see ReferenceProcessor
* @return A concrete VM-specific ReferenceProcessor instance.
*/
public ReferenceProcessor newReferenceProcessor(ReferenceProcessor.Semantics semantics) {
- return new ReferenceProcessor();
+ return ReferenceProcessor.getProcessorFor(semantics);
}

/**
@@ -396,4 +397,9 @@
public org.mmtk.vm.MMTk_Events newEvents() {
return new MMTkEvents();
}
+
+ @Override
+ public Debug newDebug() {
+ return new Debug();
+ }
}

Modified: rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/FinalizableProcessor.java
===================================================================
--- rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/FinalizableProcessor.java 2009-09-25 18:37:26 UTC (rev 15788)
+++ rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/FinalizableProcessor.java 2009-11-05 04:56:08 UTC (rev 15789)
@@ -1,11 +1,11 @@
/*
* This file is part of the Jikes RVM project (http://jikesrvm.org).
*
- * This file is licensed to You under the Common Public License (CPL);
+ * 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/cpl1.0.php
+ * http://www.opensource.org/licenses/eclipse-1.0.php
*
* See the COPYRIGHT.txt file distributed with this work for information
* regarding copyright ownership.

Modified: rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/MMTkEvents.java
===================================================================
--- rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/MMTkEvents.java 2009-09-25 18:37:26 UTC (rev 15788)
+++ rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/MMTkEvents.java 2009-11-05 04:56:08 UTC (rev 15789)
@@ -1,11 +1,11 @@
/*
* This file is part of the Jikes RVM project (http://jikesrvm.org).
*
- * This file is licensed to You under the Common Public License (CPL);
+ * 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/cpl1.0.php
+ * http://www.opensource.org/licenses/eclipse-1.0.php
*
* See the COPYRIGHT.txt file distributed with this work for information
* regarding copyright ownership.

Modified: rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Memory.java
===================================================================
--- rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Memory.java 2009-09-25 18:37:26 UTC (rev 15788)
+++ rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/Memory.java 2009-11-05 04:56:08 UTC (rev 15789)
@@ -1,11 +1,11 @@
/*
* This file is part of the Jikes RVM project (http://jikesrvm.org).
*
- * This file is licensed to You under the Common Public License (CPL);
+ * 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/cpl1.0.php
+ * http://www.opensource.org/licenses/eclipse-1.0.php
*
* See the COPYRIGHT.txt file distributed with this work for information
* regarding copyright ownership.
@@ -17,6 +17,8 @@
import org.mmtk.utility.heap.VMRequest;

import org.vmmagic.unboxed.*;
+import org.vmmagic.unboxed.harness.MemoryConstants;
+import org.vmmagic.unboxed.harness.SimulatedMemory;
import org.vmmagic.pragma.*;

@Uninterruptible
@@ -207,17 +209,17 @@
/** @return The highest address in the contiguous address space available to MMTk */
protected Address getAvailableEndConstant() { return HEAP_END; }
/** @return The log base two of the size of an address */
- protected byte getLogBytesInAddressConstant() { return (byte) SimulatedMemory.LOG_BYTES_IN_WORD; }
+ protected byte getLogBytesInAddressConstant() { return (byte) MemoryConstants.LOG_BYTES_IN_WORD; }
/** @return The log base two of the size of a word */
- protected byte getLogBytesInWordConstant() { return (byte) SimulatedMemory.LOG_BYTES_IN_WORD; }
+ protected byte getLogBytesInWordConstant() { return (byte) MemoryConstants.LOG_BYTES_IN_WORD; }
/** @return The log base two of the size of an OS page */
- protected byte getLogBytesInPageConstant() { return SimulatedMemory.LOG_BYTES_IN_PAGE; }
+ protected byte getLogBytesInPageConstant() { return MemoryConstants.LOG_BYTES_IN_PAGE; }
/** @return The log base two of the minimum allocation alignment */
- protected byte getLogMinAlignmentConstant() { return (byte) SimulatedMemory.LOG_BYTES_IN_WORD; }
+ protected byte getLogMinAlignmentConstant() { return (byte) MemoryConstants.LOG_BYTES_IN_WORD; }
/** @return The log base two of (MAX_ALIGNMENT/MIN_ALIGNMENT) */
protected byte getMaxAlignmentShiftConstant() { return 1; }
/** @return The maximum number of bytes of padding to prepend to an object */
- protected int getMaxBytesPaddingConstant() { return SimulatedMemory.BYTES_IN_WORD; }
+ protected int getMaxBytesPaddingConstant() { return MemoryConstants.BYTES_IN_WORD; }
/** @return The value to store in alignment holes */
protected int getAlignmentValueConstant() { return ObjectModel.ALIGNMENT_VALUE; }
}

Modified: rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/ObjectModel.java
===================================================================
--- rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/ObjectModel.java 2009-09-25 18:37:26 UTC (rev 15788)
+++ rvmroot/branches/RVM-777-NewMMTkGlue/work/MMTk/ext/vm/harness/org/mmtk/harness/vm/ObjectModel.java 2009-11-05 04:56:08 UTC (rev 15789)
@@ -1,11 +1,11 @@
/*
* This file is part of the Jikes RVM project (http://jikesrvm.org).
*
- * This file is licensed to You under the Common Public License (CPL);
+ * 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/cpl1.0.php
+ * http://www.opensource.org/licenses/eclipse-1.0.php
*
* See the COPYRIGHT.txt file distributed with this work for information
* regarding copyright ownership.
@@ -13,7 +13,11 @@
package org.mmtk.harness.vm;

import java.io.PrintStream;
-import java.util.Stack;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.Collection;

import org.mmtk.harness.Collector;
import org.mmtk.harness.Mutator;
@@ -22,47 +26,49 @@
import org.mmtk.plan.CollectorContext;
import org.mmtk.plan.MutatorContext;
import org.mmtk.plan.Plan;
+import org.mmtk.policy.Space;
import org.vmmagic.pragma.Uninterruptible;
import org.vmmagic.unboxed.*;
+import org.vmmagic.unboxed.harness.ArchitecturalWord;
+import org.vmmagic.unboxed.harness.MemoryConstants;
+import org.vmmagic.unboxed.harness.SimulatedMemory;

+/**
+ * MMTk Harness implementation of MMTk object model
+ * Object id (age in allocations); (Word)
+ * Allocation site (Word)
+ * The size of the data section in words. (UInt16)
+ * The number of reference words. (UInt16)
+ * Status Word (includes GC)
+ * References
+ * Data
+ */
@Uninterruptible
public final class ObjectModel extends org.mmtk.vm.ObjectModel {

- /*
- * The object model for the harness stores:
- *
- * Object id (age in allocations); (Word)
- * Allocation site (Word)
- * The size of the data section in words. (UInt16)
- * The number of reference words. (UInt16)
- * Status Word (includes GC)
- * References
- * Data
- */
-
private static final boolean IS_32_BIT = ArchitecturalWord.getModel().bitsInWord() == 32;

/** The total header size (including any requested GC words) */
public static final int HEADER_WORDS = (IS_32_BIT ? 5 : 3) + ActivePlan.constraints.gcHeaderWords();
/** The number of bytes in the header */
- private static final int HEADER_SIZE = HEADER_WORDS << SimulatedMemory.LOG_BYTES_IN_WORD;
+ private static final int HEADER_SIZE = HEADER_WORDS << MemoryConstants.LOG_BYTES_IN_WORD;
/** The number of bytes requested for GC in the header */
- private static final int GC_HEADER_BYTES = ActivePlan.constraints.gcHeaderWords() << SimulatedMemory.LOG_BYTES_IN_WORD;
+ private static final int GC_HEADER_BYTES = ActivePlan.constraints.gcHeaderWords() << MemoryConstants.LOG_BYTES_IN_WORD;

/** The offset of the first GC header word */
private static final Offset GC_OFFSET = Offset.zero();
/** The offset of the object ID */
private static final Offset ID_OFFSET = GC_OFFSET.plus(GC_HEADER_BYTES);
/** The offset of the allocation site */
- private static final Offset SITE_OFFSET = ID_OFFSET.plus(SimulatedMemory.BYTES_IN_INT);
+ private static final Offset SITE_OFFSET = ID_OFFSET.plus(MemoryConstants.BYTES_IN_INT);
/** The offset of the UInt16 storing the number of data fields */
- private static final Offset DATACOUNT_OFFSET = SITE_OFFSET.plus(SimulatedMemory.BYTES_IN_INT);
+ private static final Offset DATACOUNT_OFFSET = SITE_OFFSET.plus(MemoryConstants.BYTES_IN_INT);
/** The offset of the UInt16 storing the number of reference fields */
- private static final Offset REFCOUNT_OFFSET = DATACOUNT_OFFSET.plus(SimulatedMemory.BYTES_IN_INT);
+ private static final Offset REFCOUNT_OFFSET = DATACOUNT_OFFSET.plus(MemoryConstants.BYTES_IN_INT);
/** The offset of the status word */
- private static final Offset STATUS_OFFSET = REFCOUNT_OFFSET.plus(SimulatedMemory.BYTES_IN_INT);
+ private static final Offset STATUS_OFFSET = REFCOUNT_OFFSET.plus(MemoryConstants.BYTES_IN_INT);
/** The offset of the first reference field. */
- public static final Offset REFS_OFFSET = STATUS_OFFSET.plus(SimulatedMemory.BYTES_IN_WORD);
+ public static final Offset REFS_OFFSET = STATUS_OFFSET.plus(MemoryConstants.BYTES_IN_WORD);

@SuppressWarnings("unused")
private static void printObjectLayout(PrintStream wr) {
@@ -75,24 +81,25 @@
wr.flush();
}

- static {
- //printObjectLayout(System.out);
- assert REFS_OFFSET.EQ(Offset.fromIntSignExtend(HEADER_SIZE));
- }
-
+ /** Max data fields in an object */
public static final int MAX_DATA_FIELDS = Integer.MAX_VALUE;
+ /** Max pointer fields in an object */
public static final int MAX_REF_FIELDS = Integer.MAX_VALUE;

/** Has this object been hashed? */
- private static final int HASHED = 0x1 << (3 * SimulatedMemory.BITS_IN_BYTE);
+ private static final int HASHED = 0x1 << (3 * MemoryConstants.BITS_IN_BYTE);
/** Has this object been moved since it was hashed? */

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Jikesrvm-commits mailing list
Jikesrvm-commits@...
https://lists.sourceforge.net/lists/listinfo/jikesrvm-commits

SF.net SVN: jikesrvm:[15788] rvmroot/trunk/rvm/src-generated/opt-burs/ppc/ PPC_Common.rules

2009-09-25T11:37:27Z

Revision: 15788
http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15788&view=rev
Author: dgrove-oss
Date: 2009-09-25 18:37:26 +0000 (Fri, 25 Sep 2009)

Log Message:
-----------
RVM-860 : Improper instruction format usage in PPC BURS rules

In the rules that take combinations of NEG(ADD(MULL(r, r), r)) and
produce a FNMADD instruction, the result of the NEG instruction
was being improperly accessed as if NEG was a Binary instead of
a Unary. Wouldn't have actually mattered in terms of what
code was being generated, since the Result operand is at the same
offset in both Unary and Binary instruction forms, but the code
was incorrect.

Modified Paths:
--------------
rvmroot/trunk/rvm/src-generated/opt-burs/ppc/PPC_Common.rules

Modified: rvmroot/trunk/rvm/src-generated/opt-burs/ppc/PPC_Common.rules
===================================================================
--- rvmroot/trunk/rvm/src-generated/opt-burs/ppc/PPC_Common.rules 2009-09-19 03:23:17 UTC (rev 15787)
+++ rvmroot/trunk/rvm/src-generated/opt-burs/ppc/PPC_Common.rules 2009-09-25 18:37:26 UTC (rev 15788)
@@ -859,42 +859,42 @@
r: FLOAT_NEG(FLOAT_ADD(FLOAT_MUL(r, r), r))
burs.ir.strictFP(P(p),PL(p),PLL(p))?INFINITE:10
EMIT_INSTRUCTION
-EMIT(MIR_Ternary.mutate(P(p), PPC_FNMADDS, Binary.getResult(P(p)), \
+EMIT(MIR_Ternary.mutate(P(p), PPC_FNMADDS, Unary.getResult(P(p)), \
R(Binary.getVal1(PLL(p))), R(Binary.getVal2(PLL(p))), \
R(Binary.getVal2(PL(p)))));

r: DOUBLE_NEG(DOUBLE_ADD(DOUBLE_MUL(r, r), r))
burs.ir.strictFP(P(p),PL(p),PLL(p))?INFINITE:10
EMIT_INSTRUCTION
-EMIT(MIR_Ternary.mutate(P(p), PPC_FNMADD, Binary.getResult(P(p)), \
+EMIT(MIR_Ternary.mutate(P(p), PPC_FNMADD, Unary.getResult(P(p)), \
R(Binary.getVal1(PLL(p))), R(Binary.getVal2(PLL(p))), \
R(Binary.getVal2(PL(p)))));

r: FLOAT_NEG(FLOAT_ADD(r, FLOAT_MUL(r,r)))
burs.ir.strictFP(P(p),PL(p),PLR(p))?INFINITE:10
EMIT_INSTRUCTION
-EMIT(MIR_Ternary.mutate(P(p), PPC_FNMADDS, Binary.getResult(P(p)), \
+EMIT(MIR_Ternary.mutate(P(p), PPC_FNMADDS, Unary.getResult(P(p)), \
R(Binary.getVal1(PLR(p))), R(Binary.getVal2(PLR(p))), \
R(Binary.getVal1(PL(p)))));

r: DOUBLE_NEG(DOUBLE_ADD(r, DOUBLE_MUL(r,r)))
burs.ir.strictFP(P(p),PL(p),PLR(p))?INFINITE:10
EMIT_INSTRUCTION
-EMIT(MIR_Ternary.mutate(P(p), PPC_FNMADD, Binary.getResult(P(p)), \
+EMIT(MIR_Ternary.mutate(P(p), PPC_FNMADD, Unary.getResult(P(p)), \
R(Binary.getVal1(PLR(p))), R(Binary.getVal2(PLR(p))),\
R(Binary.getVal1(PL(p)))));

r: FLOAT_NEG(FLOAT_SUB(FLOAT_MUL(r, r), r))
burs.ir.strictFP(P(p),PL(p),PLL(p))?INFINITE:10
EMIT_INSTRUCTION
-EMIT(MIR_Ternary.mutate(P(p), PPC_FNMSUBS, Binary.getResult(P(p)), \
+EMIT(MIR_Ternary.mutate(P(p), PPC_FNMSUBS, Unary.getResult(P(p)), \
R(Binary.getVal1(PLL(p))), R(Binary.getVal2(PLL(p))), \
R(Binary.getVal2(PL(p)))));

r: DOUBLE_NEG(DOUBLE_SUB(DOUBLE_MUL(r, r), r))
burs.ir.strictFP(P(p),PL(p),PLL(p))?INFINITE:10
EMIT_INSTRUCTION
-EMIT(MIR_Ternary.mutate(P(p), PPC_FNMSUB, Binary.getResult(P(p)), \
+EMIT(MIR_Ternary.mutate(P(p), PPC_FNMSUB, Unary.getResult(P(p)), \
R(Binary.getVal1(PLL(p))), R(Binary.getVal2(PLL(p))), \
R(Binary.getVal2(PL(p)))));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Jikesrvm-commits mailing list
Jikesrvm-commits@...
https://lists.sourceforge.net/lists/listinfo/jikesrvm-commits

SF.net SVN: jikesrvm:[15787] rvmroot/trunk

2009-09-18T20:23:21Z

Revision: 15787
http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15787&view=rev
Author: steveb-oss
Date: 2009-09-19 03:23:17 +0000 (Sat, 19 Sep 2009)

Log Message:
-----------
Pad out barrier plumbing to include primitive types. This should conclude RVM-589.

Modified Paths:
--------------
rvmroot/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Barriers.java
rvmroot/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Barriers.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/MutatorContext.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/PlanConstraints.java
rvmroot/trunk/MMTk/src/org/mmtk/vm/Barriers.java
rvmroot/trunk/rvm/src/org/jikesrvm/mm/mminterface/Barriers.java
rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Entrypoints.java

Modified: rvmroot/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Barriers.java
===================================================================
--- rvmroot/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Barriers.java 2009-09-19 02:54:48 UTC (rev 15786)
+++ rvmroot/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Barriers.java 2009-09-19 03:23:17 UTC (rev 15787)
@@ -21,21 +21,21 @@
@Uninterruptible
public class Barriers extends org.mmtk.vm.Barriers {
/**
- * Perform the actual write of the write barrier.
+ * Perform the actual write of a boolean write barrier.
*
* @param ref The object that has the reference field
- * @param target The value that the slot will be updated to
+ * @param value The value that the slot will be updated to
* @param slot The address to be written to
* @param unused Unused
* @param mode The context in which the write is occurring
*/
@Override
- public void objectReferenceWrite(ObjectReference ref, ObjectReference target, Word slot, Word unused, int mode) {
- slot.toAddress().store(target);
+ public void booleanWrite(ObjectReference ref, boolean value, Word slot, Word unused, int mode) {
+ slot.toAddress().store((byte) (value ? 1 : 0));
}

/**
- * Perform the actual read of the read barrier.
+ * Perform the actual read of a boolean read barrier.
*
* @param ref The object that has the reference field
* @param slot The address to be read from
@@ -44,6 +44,230 @@
* @return the read value
*/
@Override
+ public boolean booleanRead(ObjectReference ref, Word slot, Word unused, int mode) {
+ return slot.toAddress().loadByte() != 0;
+ }
+
+ /**
+ * Perform the actual write of a byte write barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param slot The address to be written to
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Override
+ public void byteWrite(ObjectReference ref, byte value, Word slot, Word unused, int mode) {
+ slot.toAddress().store(value);
+ }
+
+ /**
+ * Perform the actual read of a byte read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param slot The address to be read from
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Override
+ public byte byteRead(ObjectReference ref, Word slot, Word unused, int mode) {
+ return slot.toAddress().loadByte();
+ }
+
+ /**
+ * Perform the actual write of a char write barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param slot The address to be written to
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Override
+ public void charWrite(ObjectReference ref, char value, Word slot, Word unused, int mode) {
+ slot.toAddress().store(value);
+ }
+
+ /**
+ * Perform the actual read of a char read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param slot The address to be read from
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Override
+ public char charRead(ObjectReference ref, Word slot, Word unused, int mode) {
+ return slot.toAddress().loadChar();
+ }
+
+ /**
+ * Perform the actual write of a short write barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param slot The address to be written to
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Override
+ public void shortWrite(ObjectReference ref, short value, Word slot, Word unused, int mode) {
+ slot.toAddress().store(value);
+ }
+
+ /**
+ * Perform the actual read of a short read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param slot The address to be read from
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Override
+ public short shortRead(ObjectReference ref, Word slot, Word unused, int mode) {
+ return slot.toAddress().loadShort();
+ }
+
+ /**
+ * Perform the actual write of a int write barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param slot The address to be written to
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Override
+ public void intWrite(ObjectReference ref, int value, Word slot, Word unused, int mode) {
+ slot.toAddress().store(value);
+ }
+
+ /**
+ * Perform the actual read of a int read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param slot The address to be read from
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Override
+ public int intRead(ObjectReference ref, Word slot, Word unused, int mode) {
+ return slot.toAddress().loadInt();
+ }
+
+ /**
+ * Perform the actual write of a long write barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param slot The address to be written to
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Override
+ public void longWrite(ObjectReference ref, long value, Word slot, Word unused, int mode) {
+ slot.toAddress().store(value);
+ }
+
+ /**
+ * Perform the actual read of a long read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param slot The address to be read from
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Override
+ public long longRead(ObjectReference ref, Word slot, Word unused, int mode) {
+ return slot.toAddress().loadLong();
+ }
+
+ /**
+ * Perform the actual write of a float write barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param slot The address to be written to
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Override
+ public void floatWrite(ObjectReference ref, float value, Word slot, Word unused, int mode) {
+ slot.toAddress().store(value);
+ }
+
+ /**
+ * Perform the actual read of a float read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param slot The address to be read from
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Override
+ public float floatRead(ObjectReference ref, Word slot, Word unused, int mode) {
+ return slot.toAddress().loadFloat();
+ }
+
+ /**
+ * Perform the actual write of a double write barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param slot The address to be written to
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Override
+ public void doubleWrite(ObjectReference ref, double value, Word slot, Word unused, int mode) {
+ slot.toAddress().store(value);
+ }
+
+ /**
+ * Perform the actual read of a double read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param slot The address to be read from
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Override
+ public double doubleRead(ObjectReference ref, Word slot, Word unused, int mode) {
+ return slot.toAddress().loadDouble();
+ }
+
+ /**
+ * Perform the actual write of an object reference write barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param slot The address to be written to
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Override
+ public void objectReferenceWrite(ObjectReference ref, ObjectReference value, Word slot, Word unused, int mode) {
+ slot.toAddress().store(value);
+ }
+
+ /**
+ * Perform the actual read of an object reference read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param slot The address to be read from
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Override
public ObjectReference objectReferenceRead(ObjectReference ref,Word slot, Word unused, int mode) {
return slot.toAddress().loadObjectReference();
}

Modified: rvmroot/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Barriers.java
===================================================================
--- rvmroot/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Barriers.java 2009-09-19 02:54:48 UTC (rev 15786)
+++ rvmroot/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Barriers.java 2009-09-19 03:23:17 UTC (rev 15787)
@@ -22,29 +22,271 @@
@Uninterruptible
public class Barriers extends org.mmtk.vm.Barriers implements SizeConstants {
/**
- * Perform the actual write of the write barrier.
+ * Perform the actual write of a boolean write barrier.
*
* @param objref The object that has the reference field
- * @param target The value that the slot will be updated to
+ * @param value The value that the slot will be updated to
* @param offset The offset from the ref
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Inline
+ @Override
+ public final void booleanWrite(ObjectReference objref, boolean value, Word offset, Word location, int mode) {
+ Magic.setByteAtOffset(objref.toObject(), offset.toOffset(), (byte) (value ? 1 : 0));
+ }
+
+ /**
+ * Perform the actual read of a boolean read barrier.
+ *
+ * @param objref The object that has the reference field
+ * @param offset The offset from the ref
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Inline
+ @Override
+ public final boolean booleanRead(ObjectReference objref, Word offset, Word location, int mode) {
+ return Magic.getByteAtOffset(objref.toObject(), offset.toOffset()) == 0;
+ }
+
+ /**
+ * Perform the actual write of a byte write barrier.
+ *
+ * @param objref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param offset The offset from the ref
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Inline
+ @Override
+ public final void byteWrite(ObjectReference objref, byte value, Word offset, Word location, int mode) {
+ Magic.setByteAtOffset(objref.toObject(), offset.toOffset(), value);
+ }
+
+ /**
+ * Perform the actual read of a byte read barrier.
+ *
+ * @param objref The object that has the reference field
+ * @param offset The offset from the ref
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Inline
+ @Override
+ public final byte byteRead(ObjectReference objref, Word offset, Word location, int mode) {
+ return Magic.getByteAtOffset(objref.toObject(), offset.toOffset());
+ }
+
+ /**
+ * Perform the actual write of a char write barrier.
+ *
+ * @param objref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param offset The offset from the ref
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Inline
+ @Override
+ public final void charWrite(ObjectReference objref, char value, Word offset, Word location, int mode) {
+ Magic.setCharAtOffset(objref.toObject(), offset.toOffset(), value);
+ }
+
+ /**
+ * Perform the actual read of a char read barrier.
+ *
+ * @param objref The object that has the reference field
+ * @param offset The offset from the ref
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Inline
+ @Override
+ public final char charRead(ObjectReference objref, Word offset, Word location, int mode) {
+ return Magic.getCharAtOffset(objref.toObject(), offset.toOffset());
+ }
+
+ /**
+ * Perform the actual write of a short write barrier.
+ *
+ * @param objref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param offset The offset from the ref
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Inline
+ @Override
+ public final void shortWrite(ObjectReference objref, short value, Word offset, Word location, int mode) {
+ Magic.setShortAtOffset(objref.toObject(), offset.toOffset(), value);
+ }
+
+ /**
+ * Perform the actual read of a short read barrier.
+ *
+ * @param objref The object that has the reference field
+ * @param offset The offset from the ref
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Inline
+ @Override
+ public final short shortRead(ObjectReference objref, Word offset, Word location, int mode) {
+ return Magic.getShortAtOffset(objref.toObject(), offset.toOffset());
+ }
+
+ /**
+ * Perform the actual write of a int write barrier.
+ *
+ * @param objref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param offset The offset from the ref
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Inline
+ @Override
+ public final void intWrite(ObjectReference objref, int value, Word offset, Word location, int mode) {
+ Magic.setIntAtOffset(objref.toObject(), offset.toOffset(), value);
+ }
+
+ /**
+ * Perform the actual read of a int read barrier.
+ *
+ * @param objref The object that has the reference field
+ * @param offset The offset from the ref
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Inline
+ @Override
+ public final int intRead(ObjectReference objref, Word offset, Word location, int mode) {
+ return Magic.getIntAtOffset(objref.toObject(), offset.toOffset());
+ }
+
+ /**
+ * Perform the actual write of a long write barrier.
+ *
+ * @param objref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param offset The offset from the ref
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Inline
+ @Override
+ public final void longWrite(ObjectReference objref, long value, Word offset, Word location, int mode) {
+ Magic.setLongAtOffset(objref.toObject(), offset.toOffset(), value);
+ }
+
+ /**
+ * Perform the actual read of a long read barrier.
+ *
+ * @param objref The object that has the reference field
+ * @param offset The offset from the ref
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Inline
+ @Override
+ public final long longRead(ObjectReference objref, Word offset, Word location, int mode) {
+ return Magic.getLongAtOffset(objref.toObject(), offset.toOffset());
+ }
+
+ /**
+ * Perform the actual write of a float write barrier.
+ *
+ * @param objref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param offset The offset from the ref
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Inline
+ @Override
+ public final void floatWrite(ObjectReference objref, float value, Word offset, Word location, int mode) {
+ Magic.setFloatAtOffset(objref.toObject(), offset.toOffset(), value);
+ }
+
+ /**
+ * Perform the actual read of a float read barrier.
+ *
+ * @param objref The object that has the reference field
+ * @param offset The offset from the ref
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Inline
+ @Override
+ public final float floatRead(ObjectReference objref, Word offset, Word location, int mode) {
+ return Magic.getFloatAtOffset(objref.toObject(), offset.toOffset());
+ }
+
+ /**
+ * Perform the actual write of a double write barrier.
+ *
+ * @param objref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param offset The offset from the ref
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ */
+ @Inline
+ @Override
+ public final void doubleWrite(ObjectReference objref, double value, Word offset, Word location, int mode) {
+ Magic.setDoubleAtOffset(objref.toObject(), offset.toOffset(), value);
+ }
+
+ /**
+ * Perform the actual read of a double read barrier.
+ *
+ * @param objref The object that has the reference field
+ * @param offset The offset from the ref
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Inline
+ @Override
+ public final double doubleRead(ObjectReference objref, Word offset, Word location, int mode) {
+ return Magic.getDoubleAtOffset(objref.toObject(), offset.toOffset());
+ }
+
+ /**
+ * Perform the actual write of an object reference write barrier.
+ *
+ * @param objref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param offset The offset from the ref
* @param location The index of the FieldReference
* @param mode The context in which the write is occurring
*/
@Inline
- public final void objectReferenceWrite(ObjectReference objref, ObjectReference target, Word offset, Word location, int mode) {
- Magic.setObjectAtOffset(objref.toObject(), offset.toOffset(), target.toObject(), location.toInt());
+ @Override
+ public final void objectReferenceWrite(ObjectReference objref, ObjectReference value, Word offset, Word location, int mode) {
+ Magic.setObjectAtOffset(objref.toObject(), offset.toOffset(), value.toObject(), location.toInt());
}

/**
- * Perform the actual read of the read barrier.
+ * Perform the actual read of an object reference read barrier.
*
* @param objref The object that has the reference field
* @param offset The offset from the ref
* @param location The index of the FieldReference
* @param mode The context in which the write is occurring
- * @return the read value
+ * @return the object reference read value
*/
@Inline
+ @Override
public final ObjectReference objectReferenceRead(ObjectReference objref, Word offset, Word location, int mode) {
return ObjectReference.fromObject(Magic.getObjectAtOffset(objref.toObject(), offset.toOffset(), location.toInt()));
}
@@ -59,6 +301,7 @@
* @param ref The object that has the reference field
*/
@Inline
+ @Override
public final void objectReferenceNonHeapWrite(Address slot, ObjectReference target, Word unusedA, Word unusedB) {
slot.store(target);
}
@@ -75,6 +318,7 @@
* @return The value that was replaced by the write.
*/
@Inline
+ @Override
public final ObjectReference objectReferenceAtomicWrite(ObjectReference objref, ObjectReference target, Word offset, Word unused, int mode) {
Object obj = objref.toObject();
Object newObject = target.toObject();
@@ -97,6 +341,7 @@
* @return True if the compare and swap was successful
*/
@Inline
+ @Override
public final boolean objectReferenceTryCompareAndSwap(ObjectReference objref, ObjectReference old, ObjectReference target, Word offset, Word unused, int mode) {
Object oldValue;
do {
@@ -116,6 +361,7 @@
* @param mode The context in which the write is occurring
*/
@Inline
+ @Override
public final void wordWrite(ObjectReference ref, Word target,
Word offset, Word location, int mode) {
Magic.setWordAtOffset(ref.toObject(), offset.toOffset(), target, location.toInt());
@@ -133,6 +379,7 @@
* @return The value that was replaced by the write.
*/
@Inline
+ @Override
public final Word wordAtomicWrite(ObjectReference ref, Word target,
Word offset, Word unused, int mode) {
Word oldValue;
@@ -154,6 +401,7 @@
* @return True if the compare and swap was successful
*/
@Inline
+ @Override
public final boolean wordTryCompareAndSwap(ObjectReference ref, Word old, Word target,
Word offset, Word unused, int mode) {
do {
@@ -173,6 +421,7 @@
* @return the read value
*/
@Inline
+ @Override
public final Word wordRead(ObjectReference ref,
Word offset, Word location, int mode) {
return Magic.getWordAtOffset(ref.toObject(), offset.toOffset(), location.toInt());
@@ -189,6 +438,7 @@
* @param value the new value for the element
*/
@UninterruptibleNoWarn
+ @Override
public final void objectArrayStoreNoGCBarrier(Object[] dst, int index, Object value) {
if (org.jikesrvm.VM.runningVM) {
Address base = ObjectReference.fromObject(dst).toAddress();

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/MutatorContext.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/MutatorContext.java 2009-09-19 02:54:48 UTC (rev 15786)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/MutatorContext.java 2009-09-19 03:23:17 UTC (rev 15787)
@@ -282,6 +282,518 @@
}

/**
+ * Write a boolean. Take appropriate write barrier actions.
+ *
+ * By default do nothing, override if appropriate.
+ *
+ * @param src The object into which the new reference will be stored
+ * @param slot The address into which the new reference will be
+ * stored.
+ * @param value The value of the new boolean
+ * @param metaDataA A value that assists the host VM in creating a store
+ * @param metaDataB A value that assists the host VM in creating a store
+ * @param mode The context in which the store occurred
+ */
+ public void booleanWrite(ObjectReference src, Address slot, boolean value, Word metaDataA, Word metaDataB, int mode) {
+ // Either: write barriers are used and this is overridden, or
+ // write barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ }
+
+ /**
+ * Read a boolean. Take appropriate read barrier action, and
+ * return the value that was read. This is a substituting
+ * barrier. The call to this barrier takes the place of a load.
+ *
+ * @param src The object reference holding the field being read.
+ * @param slot The address of the slot being read.
+ * @param metaDataA A value that assists the host VM in creating a load
+ * @param metaDataB A value that assists the host VM in creating a load
+ * @param mode The context in which the load occurred
+ * @return The boolean that was read.
+ */
+ @Inline
+ public boolean booleanRead(ObjectReference src, Address slot, Word metaDataA, Word metaDataB, int mode) {
+ // Either: read barriers are used and this is overridden, or
+ // read barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ return false;
+ }
+
+ /**
+ * A number of booleans are about to be copied from object
+ * <code>src</code> to object <code>dst</code> (as in an array
+ * copy). Thus, <code>dst</code> is the mutated object. Take
+ * appropriate write barrier actions.
+ *
+ * @param src The source of the values to be copied
+ * @param srcOffset The offset of the first source address, in
+ * bytes, relative to <code>src</code> (in principle, this could be
+ * negative).
+ * @param dst The mutated object, i.e. the destination of the copy.
+ * @param dstOffset The offset of the first destination address, in
+ * bytes relative to <code>tgt</code> (in principle, this could be
+ * negative).
+ * @param bytes The size of the region being copied, in bytes.
+ * @return True if the update was performed by the barrier, false if
+ * left to the caller (always false in this case).
+ */
+ public boolean booleanBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
+ // Either: write barriers are used and this is overridden, or
+ // write barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ return false;
+ }
+
+ /**
+ * Write a byte. Take appropriate write barrier actions.
+ *
+ * By default do nothing, override if appropriate.
+ *
+ * @param src The object into which the new reference will be stored
+ * @param slot The address into which the new reference will be
+ * stored.
+ * @param value The value of the new byte
+ * @param metaDataA A value that assists the host VM in creating a store
+ * @param metaDataB A value that assists the host VM in creating a store
+ * @param mode The context in which the store occurred
+ */
+ public void byteWrite(ObjectReference src, Address slot, byte value, Word metaDataA, Word metaDataB, int mode) {
+ // Either: write barriers are used and this is overridden, or
+ // write barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ }
+
+ /**
+ * Read a byte. Take appropriate read barrier action, and
+ * return the value that was read. This is a substituting
+ * barrier. The call to this barrier takes the place of a load.
+ *
+ * @param src The object reference holding the field being read.
+ * @param slot The address of the slot being read.
+ * @param metaDataA A value that assists the host VM in creating a load
+ * @param metaDataB A value that assists the host VM in creating a load
+ * @param mode The context in which the load occurred
+ * @return The byte that was read.
+ */
+ @Inline
+ public byte byteRead(ObjectReference src, Address slot, Word metaDataA, Word metaDataB, int mode) {
+ // Either: read barriers are used and this is overridden, or
+ // read barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ return 0;
+ }
+
+ /**
+ * A number of bytes are about to be copied from object
+ * <code>src</code> to object <code>dst</code> (as in an array
+ * copy). Thus, <code>dst</code> is the mutated object. Take
+ * appropriate write barrier actions.
+ *
+ * @param src The source of the values to be copied
+ * @param srcOffset The offset of the first source address, in
+ * bytes, relative to <code>src</code> (in principle, this could be
+ * negative).
+ * @param dst The mutated object, i.e. the destination of the copy.
+ * @param dstOffset The offset of the first destination address, in
+ * bytes relative to <code>tgt</code> (in principle, this could be
+ * negative).
+ * @param bytes The size of the region being copied, in bytes.
+ * @return True if the update was performed by the barrier, false if
+ * left to the caller (always false in this case).
+ */
+ public boolean byteBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
+ // Either: write barriers are used and this is overridden, or
+ // write barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ return false;
+ }
+
+ /**
+ * Write a char. Take appropriate write barrier actions.
+ *
+ * By default do nothing, override if appropriate.
+ *
+ * @param src The object into which the new reference will be stored
+ * @param slot The address into which the new reference will be
+ * stored.
+ * @param value The value of the new char
+ * @param metaDataA A value that assists the host VM in creating a store
+ * @param metaDataB A value that assists the host VM in creating a store
+ * @param mode The context in which the store occurred
+ */
+ public void charWrite(ObjectReference src, Address slot, char value, Word metaDataA, Word metaDataB, int mode) {
+ // Either: write barriers are used and this is overridden, or
+ // write barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ }
+
+ /**
+ * Read a char. Take appropriate read barrier action, and
+ * return the value that was read. This is a substituting
+ * barrier. The call to this barrier takes the place of a load.
+ *
+ * @param src The object reference holding the field being read.
+ * @param slot The address of the slot being read.
+ * @param metaDataA A value that assists the host VM in creating a load
+ * @param metaDataB A value that assists the host VM in creating a load
+ * @param mode The context in which the load occurred
+ * @return The char that was read.
+ */
+ @Inline
+ public char charRead(ObjectReference src, Address slot, Word metaDataA, Word metaDataB, int mode) {
+ // Either: read barriers are used and this is overridden, or
+ // read barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ return 0;
+ }
+
+ /**
+ * A number of chars are about to be copied from object
+ * <code>src</code> to object <code>dst</code> (as in an array
+ * copy). Thus, <code>dst</code> is the mutated object. Take
+ * appropriate write barrier actions.
+ *
+ * @param src The source of the values to be copied
+ * @param srcOffset The offset of the first source address, in
+ * bytes, relative to <code>src</code> (in principle, this could be
+ * negative).
+ * @param dst The mutated object, i.e. the destination of the copy.
+ * @param dstOffset The offset of the first destination address, in
+ * bytes relative to <code>tgt</code> (in principle, this could be
+ * negative).
+ * @param bytes The size of the region being copied, in bytes.
+ * @return True if the update was performed by the barrier, false if
+ * left to the caller (always false in this case).
+ */
+ public boolean charBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
+ // Either: write barriers are used and this is overridden, or
+ // write barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ return false;
+ }
+
+ /**
+ * Write a short. Take appropriate write barrier actions.
+ *
+ * By default do nothing, override if appropriate.
+ *
+ * @param src The object into which the new reference will be stored
+ * @param slot The address into which the new reference will be
+ * stored.
+ * @param value The value of the new short
+ * @param metaDataA A value that assists the host VM in creating a store
+ * @param metaDataB A value that assists the host VM in creating a store
+ * @param mode The context in which the store occurred
+ */
+ public void shortWrite(ObjectReference src, Address slot, short value, Word metaDataA, Word metaDataB, int mode) {
+ // Either: write barriers are used and this is overridden, or
+ // write barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ }
+
+ /**
+ * Read a short. Take appropriate read barrier action, and
+ * return the value that was read. This is a substituting
+ * barrier. The call to this barrier takes the place of a load.
+ *
+ * @param src The object reference holding the field being read.
+ * @param slot The address of the slot being read.
+ * @param metaDataA A value that assists the host VM in creating a load
+ * @param metaDataB A value that assists the host VM in creating a load
+ * @param mode The context in which the load occurred
+ * @return The short that was read.
+ */
+ @Inline
+ public short shortRead(ObjectReference src, Address slot, Word metaDataA, Word metaDataB, int mode) {
+ // Either: read barriers are used and this is overridden, or
+ // read barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ return 0;
+ }
+
+ /**
+ * A number of shorts are about to be copied from object
+ * <code>src</code> to object <code>dst</code> (as in an array
+ * copy). Thus, <code>dst</code> is the mutated object. Take
+ * appropriate write barrier actions.
+ *
+ * @param src The source of the values to be copied
+ * @param srcOffset The offset of the first source address, in
+ * bytes, relative to <code>src</code> (in principle, this could be
+ * negative).
+ * @param dst The mutated object, i.e. the destination of the copy.
+ * @param dstOffset The offset of the first destination address, in
+ * bytes relative to <code>tgt</code> (in principle, this could be
+ * negative).
+ * @param bytes The size of the region being copied, in bytes.
+ * @return True if the update was performed by the barrier, false if
+ * left to the caller (always false in this case).
+ */
+ public boolean shortBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
+ // Either: write barriers are used and this is overridden, or
+ // write barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ return false;
+ }
+
+ /**
+ * Write a int. Take appropriate write barrier actions.
+ *
+ * By default do nothing, override if appropriate.
+ *
+ * @param src The object into which the new reference will be stored
+ * @param slot The address into which the new reference will be
+ * stored.
+ * @param value The value of the new int
+ * @param metaDataA A value that assists the host VM in creating a store
+ * @param metaDataB A value that assists the host VM in creating a store
+ * @param mode The context in which the store occurred
+ */
+ public void intWrite(ObjectReference src, Address slot, int value, Word metaDataA, Word metaDataB, int mode) {
+ // Either: write barriers are used and this is overridden, or
+ // write barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ }
+
+ /**
+ * Read a int. Take appropriate read barrier action, and
+ * return the value that was read. This is a substituting
+ * barrier. The call to this barrier takes the place of a load.
+ *
+ * @param src The object reference holding the field being read.
+ * @param slot The address of the slot being read.
+ * @param metaDataA A value that assists the host VM in creating a load
+ * @param metaDataB A value that assists the host VM in creating a load
+ * @param mode The context in which the load occurred
+ * @return The int that was read.
+ */
+ @Inline
+ public int intRead(ObjectReference src, Address slot, Word metaDataA, Word metaDataB, int mode) {
+ // Either: read barriers are used and this is overridden, or
+ // read barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ return 0;
+ }
+
+ /**
+ * A number of ints are about to be copied from object
+ * <code>src</code> to object <code>dst</code> (as in an array
+ * copy). Thus, <code>dst</code> is the mutated object. Take
+ * appropriate write barrier actions.
+ *
+ * @param src The source of the values to be copied
+ * @param srcOffset The offset of the first source address, in
+ * bytes, relative to <code>src</code> (in principle, this could be
+ * negative).
+ * @param dst The mutated object, i.e. the destination of the copy.
+ * @param dstOffset The offset of the first destination address, in
+ * bytes relative to <code>tgt</code> (in principle, this could be
+ * negative).
+ * @param bytes The size of the region being copied, in bytes.
+ * @return True if the update was performed by the barrier, false if
+ * left to the caller (always false in this case).
+ */
+ public boolean intBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
+ // Either: write barriers are used and this is overridden, or
+ // write barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ return false;
+ }
+
+ /**
+ * Write a long. Take appropriate write barrier actions.
+ *
+ * By default do nothing, override if appropriate.
+ *
+ * @param src The object into which the new reference will be stored
+ * @param slot The address into which the new reference will be
+ * stored.
+ * @param value The value of the new int
+ * @param metaDataA A value that assists the host VM in creating a store
+ * @param metaDataB A value that assists the host VM in creating a store
+ * @param mode The context in which the store occurred
+ */
+ public void longWrite(ObjectReference src, Address slot, long value, Word metaDataA, Word metaDataB, int mode) {
+ // Either: write barriers are used and this is overridden, or
+ // write barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ }
+
+ /**
+ * Read a long. Take appropriate read barrier action, and
+ * return the value that was read. This is a substituting
+ * barrier. The call to this barrier takes the place of a load.
+ *
+ * @param src The object reference holding the field being read.
+ * @param slot The address of the slot being read.
+ * @param metaDataA A value that assists the host VM in creating a load
+ * @param metaDataB A value that assists the host VM in creating a load
+ * @param mode The context in which the load occurred
+ * @return The long that was read.
+ */
+ @Inline
+ public long longRead(ObjectReference src, Address slot, Word metaDataA, Word metaDataB, int mode) {
+ // Either: read barriers are used and this is overridden, or
+ // read barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ return 0;
+ }
+
+ /**
+ * A number of longs are about to be copied from object
+ * <code>src</code> to object <code>dst</code> (as in an array
+ * copy). Thus, <code>dst</code> is the mutated object. Take
+ * appropriate write barrier actions.
+ *
+ * @param src The source of the values to be copied
+ * @param srcOffset The offset of the first source address, in
+ * bytes, relative to <code>src</code> (in principle, this could be
+ * negative).
+ * @param dst The mutated object, i.e. the destination of the copy.
+ * @param dstOffset The offset of the first destination address, in
+ * bytes relative to <code>tgt</code> (in principle, this could be
+ * negative).
+ * @param bytes The size of the region being copied, in bytes.
+ * @return True if the update was performed by the barrier, false if
+ * left to the caller (always false in this case).
+ */
+ public boolean longBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
+ // Either: write barriers are used and this is overridden, or
+ // write barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ return false;
+ }
+
+ /**
+ * Write a float. Take appropriate write barrier actions.
+ *
+ * By default do nothing, override if appropriate.
+ *
+ * @param src The object into which the new reference will be stored
+ * @param slot The address into which the new reference will be
+ * stored.
+ * @param value The value of the new float
+ * @param metaDataA A value that assists the host VM in creating a store
+ * @param metaDataB A value that assists the host VM in creating a store
+ * @param mode The context in which the store occurred
+ */
+ public void floatWrite(ObjectReference src, Address slot, float value, Word metaDataA, Word metaDataB, int mode) {
+ // Either: write barriers are used and this is overridden, or
+ // write barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ }
+
+ /**
+ * Read a float. Take appropriate read barrier action, and
+ * return the value that was read. This is a substituting
+ * barrier. The call to this barrier takes the place of a load.
+ *
+ * @param src The object reference holding the field being read.
+ * @param slot The address of the slot being read.
+ * @param metaDataA A value that assists the host VM in creating a load
+ * @param metaDataB A value that assists the host VM in creating a load
+ * @param mode The context in which the load occurred
+ * @return The float that was read.
+ */
+ @Inline
+ public float floatRead(ObjectReference src, Address slot, Word metaDataA, Word metaDataB, int mode) {
+ // Either: read barriers are used and this is overridden, or
+ // read barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ return 0;
+ }
+
+ /**
+ * A number of floats are about to be copied from object
+ * <code>src</code> to object <code>dst</code> (as in an array
+ * copy). Thus, <code>dst</code> is the mutated object. Take
+ * appropriate write barrier actions.
+ *
+ * @param src The source of the values to be copied
+ * @param srcOffset The offset of the first source address, in
+ * bytes, relative to <code>src</code> (in principle, this could be
+ * negative).
+ * @param dst The mutated object, i.e. the destination of the copy.
+ * @param dstOffset The offset of the first destination address, in
+ * bytes relative to <code>tgt</code> (in principle, this could be
+ * negative).
+ * @param bytes The size of the region being copied, in bytes.
+ * @return True if the update was performed by the barrier, false if
+ * left to the caller (always false in this case).
+ */
+ public boolean floatBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
+ // Either: write barriers are used and this is overridden, or
+ // write barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ return false;
+ }
+
+ /**
+ * Write a double. Take appropriate write barrier actions.
+ *
+ * By default do nothing, override if appropriate.
+ *
+ * @param src The object into which the new reference will be stored
+ * @param slot The address into which the new reference will be
+ * stored.
+ * @param value The value of the new double
+ * @param metaDataA A value that assists the host VM in creating a store
+ * @param metaDataB A value that assists the host VM in creating a store
+ * @param mode The context in which the store occurred
+ */
+ public void doubleWrite(ObjectReference src, Address slot, double value, Word metaDataA, Word metaDataB, int mode) {
+ // Either: write barriers are used and this is overridden, or
+ // write barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ }
+
+ /**
+ * Read a double. Take appropriate read barrier action, and
+ * return the value that was read. This is a substituting
+ * barrier. The call to this barrier takes the place of a load.
+ *
+ * @param src The object reference holding the field being read.
+ * @param slot The address of the slot being read.
+ * @param metaDataA A value that assists the host VM in creating a load
+ * @param metaDataB A value that assists the host VM in creating a load
+ * @param mode The context in which the load occurred
+ * @return The double that was read.
+ */
+ @Inline
+ public double doubleRead(ObjectReference src, Address slot, Word metaDataA, Word metaDataB, int mode) {
+ // Either: read barriers are used and this is overridden, or
+ // read barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ return 0;
+ }
+
+ /**
+ * A number of doubles are about to be copied from object
+ * <code>src</code> to object <code>dst</code> (as in an array
+ * copy). Thus, <code>dst</code> is the mutated object. Take
+ * appropriate write barrier actions.
+ *
+ * @param src The source of the values to be copied
+ * @param srcOffset The offset of the first source address, in
+ * bytes, relative to <code>src</code> (in principle, this could be
+ * negative).
+ * @param dst The mutated object, i.e. the destination of the copy.
+ * @param dstOffset The offset of the first destination address, in
+ * bytes relative to <code>tgt</code> (in principle, this could be
+ * negative).
+ * @param bytes The size of the region being copied, in bytes.
+ * @return True if the update was performed by the barrier, false if
+ * left to the caller (always false in this case).
+ */
+ public boolean doubleBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
+ // Either: write barriers are used and this is overridden, or
+ // write barriers are not used and this is never called
+ if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ return false;
+ }
+
+ /**
* Write an object reference. Take appropriate write barrier actions.
*
* By default do nothing, override if appropriate.
@@ -289,12 +801,12 @@
* @param src The object into which the new reference will be stored
* @param slot The address into which the new reference will be
* stored.
- * @param tgt The target of the new reference
+ * @param value The value of the new reference
* @param metaDataA A value that assists the host VM in creating a store
* @param metaDataB A value that assists the host VM in creating a store
* @param mode The context in which the store occurred
*/
- public void objectReferenceWrite(ObjectReference src, Address slot, ObjectReference tgt, Word metaDataA, Word metaDataB, int mode) {
+ public void objectReferenceWrite(ObjectReference src, Address slot, ObjectReference value, Word metaDataA, Word metaDataB, int mode) {
// Either: write barriers are used and this is overridden, or
// write barriers are not used and this is never called
if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/PlanConstraints.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/PlanConstraints.java 2009-09-19 02:54:48 UTC (rev 15786)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/PlanConstraints.java 2009-09-19 03:23:17 UTC (rev 15787)
@@ -25,6 +25,54 @@
/** @return True of this Plan requires read barriers on java.lang.reference types. */
public boolean needsJavaLangReferenceReadBarrier() { return false; }

+ /** @return True if this Plan requires write barriers on booleans. */
+ public boolean needsBooleanWriteBarrier() { return false; }
+
+ /** @return True of this Plan requires read barriers on booleans. */
+ public boolean needsBooleanReadBarrier() { return false; }
+
+ /** @return True if this Plan requires write barriers on bytes. */
+ public boolean needsByteWriteBarrier() { return false; }
+
+ /** @return True of this Plan requires read barriers on bytes. */
+ public boolean needsByteReadBarrier() { return false; }
+
+ /** @return True if this Plan requires write barriers on chars. */
+ public boolean needsCharWriteBarrier() { return false; }
+
+ /** @return True of this Plan requires read barriers on chars. */
+ public boolean needsCharReadBarrier() { return false; }
+
+ /** @return True if this Plan requires write barriers on shorts. */
+ public boolean needsShortWriteBarrier() { return false; }
+
+ /** @return True of this Plan requires read barriers on shorts. */
+ public boolean needsShortReadBarrier() { return false; }
+
+ /** @return True if this Plan requires write barriers on ints. */
+ public boolean needsIntWriteBarrier() { return false; }
+
+ /** @return True of this Plan requires read barriers on ints. */
+ public boolean needsIntReadBarrier() { return false; }
+
+ /** @return True if this Plan requires write barriers on longs. */
+ public boolean needsLongWriteBarrier() { return false; }
+
+ /** @return True of this Plan requires read barriers on longs. */
+ public boolean needsLongReadBarrier() { return false; }
+
+ /** @return True if this Plan requires write barriers on floats. */
+ public boolean needsFloatWriteBarrier() { return false; }
+
+ /** @return True of this Plan requires read barriers on floats. */
+ public boolean needsFloatReadBarrier() { return false; }
+
+ /** @return True if this Plan requires write barriers on doubles. */
+ public boolean needsDoubleWriteBarrier() { return false; }
+
+ /** @return True of this Plan requires read barriers on doubles. */
+ public boolean needsDoubleReadBarrier() { return false; }
+
/** @return True if this Plan requires write barriers on object references. */
public boolean needsObjectReferenceWriteBarrier() { return false; }

Modified: rvmroot/trunk/MMTk/src/org/mmtk/vm/Barriers.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/vm/Barriers.java 2009-09-19 02:54:48 UTC (rev 15786)
+++ rvmroot/trunk/MMTk/src/org/mmtk/vm/Barriers.java 2009-09-19 03:23:17 UTC (rev 15787)
@@ -18,18 +18,194 @@
@Uninterruptible
public abstract class Barriers {
/**
+ * Perform the actual write of a boolean write barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param metaDataA Opaque, VM-specific, meta-data identifying the slot
+ * @param metaDataB Opaque, VM-specific, meta-data identifying the slot
+ * @param mode The context in which the write is occurring
+ */
+ public abstract void booleanWrite(ObjectReference ref, boolean value, Word metaDataA, Word metaDataB, int mode);
+
+ /**
+ * Perform the actual read of a boolean read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param metaDataA Opaque, VM-specific, meta-data identifying the slot
+ * @param metaDataB Opaque, VM-specific, meta-data identifying the slot
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ public abstract boolean booleanRead(ObjectReference ref, Word metaDataA, Word metaDataB, int mode);
+
+ /**
+ * Perform the actual write of a byte write barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param metaDataA Opaque, VM-specific, meta-data identifying the slot
+ * @param metaDataB Opaque, VM-specific, meta-data identifying the slot
+ * @param mode The context in which the write is occurring
+ */
+ public abstract void byteWrite(ObjectReference ref, byte value, Word metaDataA, Word metaDataB, int mode);
+
+ /**
+ * Perform the actual read of a byte read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param metaDataA Opaque, VM-specific, meta-data identifying the slot
+ * @param metaDataB Opaque, VM-specific, meta-data identifying the slot
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ public abstract byte byteRead(ObjectReference ref, Word metaDataA, Word metaDataB, int mode);
+
+ /**
+ * Perform the actual write of a char write barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param metaDataA Opaque, VM-specific, meta-data identifying the slot
+ * @param metaDataB Opaque, VM-specific, meta-data identifying the slot
+ * @param mode The context in which the write is occurring
+ */
+ public abstract void charWrite(ObjectReference ref, char value, Word metaDataA, Word metaDataB, int mode);
+
+ /**
+ * Perform the actual read of a char read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param metaDataA Opaque, VM-specific, meta-data identifying the slot
+ * @param metaDataB Opaque, VM-specific, meta-data identifying the slot
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ public abstract char charRead(ObjectReference ref, Word metaDataA, Word metaDataB, int mode);
+
+ /**
+ * Perform the actual write of a short write barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param metaDataA Opaque, VM-specific, meta-data identifying the slot
+ * @param metaDataB Opaque, VM-specific, meta-data identifying the slot
+ * @param mode The context in which the write is occurring
+ */
+ public abstract void shortWrite(ObjectReference ref, short value, Word metaDataA, Word metaDataB, int mode);
+
+ /**
+ * Perform the actual read of a short read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param metaDataA Opaque, VM-specific, meta-data identifying the slot
+ * @param metaDataB Opaque, VM-specific, meta-data identifying the slot
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ public abstract short shortRead(ObjectReference ref, Word metaDataA, Word metaDataB, int mode);
+
+ /**
+ * Perform the actual write of a int write barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param metaDataA Opaque, VM-specific, meta-data identifying the slot
+ * @param metaDataB Opaque, VM-specific, meta-data identifying the slot
+ * @param mode The context in which the write is occurring
+ */
+ public abstract void intWrite(ObjectReference ref, int value, Word metaDataA, Word metaDataB, int mode);
+
+ /**
+ * Perform the actual read of a int read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param metaDataA Opaque, VM-specific, meta-data identifying the slot
+ * @param metaDataB Opaque, VM-specific, meta-data identifying the slot
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ public abstract int intRead(ObjectReference ref, Word metaDataA, Word metaDataB, int mode);
+
+ /**
+ * Perform the actual write of a long write barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param metaDataA Opaque, VM-specific, meta-data identifying the slot
+ * @param metaDataB Opaque, VM-specific, meta-data identifying the slot
+ * @param mode The context in which the write is occurring
+ */
+ public abstract void longWrite(ObjectReference ref, long value, Word metaDataA, Word metaDataB, int mode);
+
+ /**
+ * Perform the actual read of a long read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param metaDataA Opaque, VM-specific, meta-data identifying the slot
+ * @param metaDataB Opaque, VM-specific, meta-data identifying the slot
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ public abstract long longRead(ObjectReference ref, Word metaDataA, Word metaDataB, int mode);
+
+ /**
+ * Perform the actual write of a float write barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param metaDataA Opaque, VM-specific, meta-data identifying the slot
+ * @param metaDataB Opaque, VM-specific, meta-data identifying the slot
+ * @param mode The context in which the write is occurring
+ */
+ public abstract void floatWrite(ObjectReference ref, float value, Word metaDataA, Word metaDataB, int mode);
+
+ /**
+ * Perform the actual read of a float read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param metaDataA Opaque, VM-specific, meta-data identifying the slot
+ * @param metaDataB Opaque, VM-specific, meta-data identifying the slot
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ public abstract float floatRead(ObjectReference ref, Word metaDataA, Word metaDataB, int mode);
+
+ /**
+ * Perform the actual write of a double write barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param value The value that the slot will be updated to
+ * @param metaDataA Opaque, VM-specific, meta-data identifying the slot
+ * @param metaDataB Opaque, VM-specific, meta-data identifying the slot
+ * @param mode The context in which the write is occurring
+ */
+ public abstract void doubleWrite(ObjectReference ref, double value, Word metaDataA, Word metaDataB, int mode);
+
+ /**
+ * Perform the actual read of a double read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param metaDataA Opaque, VM-specific, meta-data identifying the slot
+ * @param metaDataB Opaque, VM-specific, meta-data identifying the slot
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ public abstract double doubleRead(ObjectReference ref, Word metaDataA, Word metaDataB, int mode);
+
+ /**
* Perform the actual write of an object reference write barrier.
*
* @param ref The object that has the reference field
- * @param target The value that the slot will be updated to
+ * @param value The value that the slot will be updated to
* @param metaDataA Opaque, VM-specific, meta-data identifying the slot
* @param metaDataB Opaque, VM-specific, meta-data identifying the slot
* @param mode The context in which the write is occurring
*/
- public abstract void objectReferenceWrite(ObjectReference ref, ObjectReference target, Word metaDataA, Word metaDataB, int mode);
+ public abstract void objectReferenceWrite(ObjectReference ref, ObjectReference value, Word metaDataA, Word metaDataB, int mode);

/**
- * Perform the actual read of the read barrier.
+ * Perform the actual read of a read barrier.
*
* @param ref The object that has the reference field
* @param metaDataA Opaque, VM-specific, meta-data identifying the slot

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/mm/mminterface/Barriers.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/mm/mminterface/Barriers.java 2009-09-19 02:54:48 UTC (rev 15786)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/mm/mminterface/Barriers.java 2009-09-19 03:23:17 UTC (rev 15787)
@@ -43,6 +43,919 @@
return null;
}

+ /* bool byte char short int long float double */
+
+ /** True if the garbage collector requires write barriers on boolean putfield, arraystore or modifycheck */
+ private static final boolean NEEDS_BOOLEAN_GC_WRITE_BARRIER = Selected.Constraints.get().needsBooleanWriteBarrier();
+ /** True if the VM requires write barriers on boolean putfield */
+ public static final boolean NEEDS_BOOLEAN_PUTFIELD_BARRIER = NEEDS_BOOLEAN_GC_WRITE_BARRIER;
+ /** True if the VM requires write barriers on boolean arraystore */
+ public static final boolean NEEDS_BOOLEAN_ASTORE_BARRIER = NEEDS_BOOLEAN_GC_WRITE_BARRIER;
+ /** True if the garbage collector requires read barriers on boolean getfield or arrayload */
+ private static final boolean NEEDS_BOOLEAN_GC_READ_BARRIER = Selected.Constraints.get().needsBooleanReadBarrier();
+ /** True if the VM requires read barriers on boolean getfield */
+ public static final boolean NEEDS_BOOLEAN_GETFIELD_BARRIER = NEEDS_BOOLEAN_GC_READ_BARRIER;
+ /** True if the VM requires read barriers on boolean arrayload */
+ public static final boolean NEEDS_BOOLEAN_ALOAD_BARRIER = NEEDS_BOOLEAN_GC_READ_BARRIER;
+
+ /**
+ * Barrier for writes of booleans into fields of instances (ie putfield).
+ *
+ * @param ref the object which is the subject of the putfield
+ * @param value the new value for the field
+ * @param offset the offset of the field to be modified
+ * @param locationMetadata an int that encodes the source location being modified
+ */
+ @Inline
+ @Entrypoint
+ public static void booleanFieldWrite(Object ref, boolean value, Offset offset, int locationMetadata) {
+ if (NEEDS_BOOLEAN_GC_WRITE_BARRIER) {
+ ObjectReference src = ObjectReference.fromObject(ref);
+ Selected.Mutator.get().booleanWrite(src, src.toAddress().plus(offset), value, offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ }
+
+ /**
+ * Barrier for writes of booleans into arrays (ie astore).
+ *
+ * @param ref the array which is the subject of the astore
+ * @param index the index into the array where the new reference
+ * resides. The index is the "natural" index into the array, for
+ * example a[index].
+ * @param value the value to be stored.
+ */
+ @Inline
+ @Entrypoint
+ public static void booleanArrayWrite(Object ref, int index, boolean value) {
+ if (NEEDS_OBJECT_GC_WRITE_BARRIER) {
+ ObjectReference array = ObjectReference.fromObject(ref);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Selected.Mutator.get().booleanWrite(array, array.toAddress().plus(offset), value, offset.toWord(), Word.zero(), ARRAY_ELEMENT);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ }
+
+ /**
+ * Barrier for loads of booleans from fields of instances (ie getfield).
+ *
+ * @param ref the object which is the subject of the getfield
+ * @param offset the offset of the field to be read
+ * @param locationMetadata an int that encodes the source location being read
+ * @return The value read from the field.
+ */
+ @Inline
+ @Entrypoint
+ public static boolean booleanFieldRead(Object ref, Offset offset, int locationMetadata) {
+ if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ ObjectReference src = ObjectReference.fromObject(ref);
+ return Selected.Mutator.get().booleanRead(src, src.toAddress().plus(offset), offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ return false;
+ }
+
+ /**
+ * Barrier for loads of booleans from fields of arrays (ie aload).
+ *
+ * @param ref the array containing the reference.
+ * @param index the index into the array were the reference resides.
+ * @return the value read from the array
+ */
+ @Inline
+ @Entrypoint
+ public static boolean booleanArrayRead(Object ref, int index) {
+ if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ ObjectReference array = ObjectReference.fromObject(ref);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ return Selected.Mutator.get().booleanRead(array, array.toAddress().plus(offset), offset.toWord(), Word.zero(), ARRAY_ELEMENT);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ return false;
+ }
+
+ /**
+ * Barrier for a bulk copy of booleans (i.e. in an array copy).
+ *
+ * @param src The source object
+ * @param srcOffset The offset of the first source address, in
+ * bytes, relative to <code>src</code> (in principle, this could be
+ * negative).
+ * @param tgt The target object
+ * @param tgtOffset The offset of the first target address, in bytes
+ * relative to <code>tgt</code> (in principle, this could be
+ * negative).
+ * @param bytes The size of the region being copied, in bytes.
+ * @return True if the update was performed by the barrier, false if
+ * left to the caller (always false in this case).
+ */
+ @Inline
+ public static boolean booleanBulkCopy(Object src, Offset srcOffset, Object tgt, Offset tgtOffset, int bytes) {
+ if (NEEDS_OBJECT_GC_WRITE_BARRIER || NEEDS_OBJECT_GC_READ_BARRIER) {
+ return Selected.Mutator.get().booleanBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(tgt), tgtOffset, bytes);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ return false;
+ }
+
+ /** True if the garbage collector requires write barriers on byte putfield, arraystore or modifycheck */
+ private static final boolean NEEDS_BYTE_GC_WRITE_BARRIER = Selected.Constraints.get().needsByteWriteBarrier();
+ /** True if the VM requires write barriers on byte putfield */
+ public static final boolean NEEDS_BYTE_PUTFIELD_BARRIER = NEEDS_BYTE_GC_WRITE_BARRIER;
+ /** True if the VM requires write barriers on byte arraystore */
+ public static final boolean NEEDS_BYTE_ASTORE_BARRIER = NEEDS_BYTE_GC_WRITE_BARRIER;
+ /** True if the garbage collector requires read barriers on byte getfield or arrayload */
+ private static final boolean NEEDS_BYTE_GC_READ_BARRIER = Selected.Constraints.get().needsByteReadBarrier();
+ /** True if the VM requires read barriers on byte getfield */
+ public static final boolean NEEDS_BYTE_GETFIELD_BARRIER = NEEDS_BYTE_GC_READ_BARRIER;
+ /** True if the VM requires read barriers on byte arrayload */
+ public static final boolean NEEDS_BYTE_ALOAD_BARRIER = NEEDS_BYTE_GC_READ_BARRIER;
+
+ /**
+ * Barrier for writes of bytes into fields of instances (ie putfield).
+ *
+ * @param ref the object which is the subject of the putfield
+ * @param value the new value for the field
+ * @param offset the offset of the field to be modified
+ * @param locationMetadata an int that encodes the source location being modified
+ */
+ @Inline
+ @Entrypoint
+ public static void byteFieldWrite(Object ref, byte value, Offset offset, int locationMetadata) {
+ if (NEEDS_BYTE_GC_WRITE_BARRIER) {
+ ObjectReference src = ObjectReference.fromObject(ref);
+ Selected.Mutator.get().byteWrite(src, src.toAddress().plus(offset), value, offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ }
+
+ /**
+ * Barrier for writes of objects into arrays (ie astore).
+ *
+ * @param ref the array which is the subject of the astore
+ * @param index the index into the array where the new reference
+ * resides. The index is the "natural" index into the array, for
+ * example a[index].
+ * @param value the value to be stored.
+ */
+ @Inline
+ @Entrypoint
+ public static void byteArrayWrite(Object ref, int index, byte value) {
+ if (NEEDS_OBJECT_GC_WRITE_BARRIER) {
+ ObjectReference array = ObjectReference.fromObject(ref);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Selected.Mutator.get().byteWrite(array, array.toAddress().plus(offset), value, offset.toWord(), Word.zero(), ARRAY_ELEMENT);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ }
+
+ /**
+ * Barrier for loads of objects from fields of instances (ie getfield).
+ *
+ * @param ref the object which is the subject of the getfield
+ * @param offset the offset of the field to be read
+ * @param locationMetadata an int that encodes the source location being read
+ * @return The value read from the field.
+ */
+ @Inline
+ @Entrypoint
+ public static byte byteFieldRead(Object ref, Offset offset, int locationMetadata) {
+ if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ ObjectReference src = ObjectReference.fromObject(ref);
+ return Selected.Mutator.get().byteRead(src, src.toAddress().plus(offset), offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ return 0;
+ }
+
+ /**
+ * Barrier for loads of objects from fields of arrays (ie aload).
+ *
+ * @param ref the array containing the reference.
+ * @param index the index into the array were the reference resides.
+ * @return the value read from the array
+ */
+ @Inline
+ @Entrypoint
+ public static byte byteArrayRead(Object ref, int index) {
+ if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ ObjectReference array = ObjectReference.fromObject(ref);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ return Selected.Mutator.get().byteRead(array, array.toAddress().plus(offset), offset.toWord(), Word.zero(), ARRAY_ELEMENT);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ return 0;
+ }
+
+ /**
+ * Barrier for a bulk copy of objects (i.e. in an array copy).
+ *
+ * @param src The source object
+ * @param srcOffset The offset of the first source address, in
+ * bytes, relative to <code>src</code> (in principle, this could be
+ * negative).
+ * @param tgt The target object
+ * @param tgtOffset The offset of the first target address, in bytes
+ * relative to <code>tgt</code> (in principle, this could be
+ * negative).
+ * @param bytes The size of the region being copied, in bytes.
+ * @return True if the update was performed by the barrier, false if
+ * left to the caller (always false in this case).
+ */
+ @Inline
+ public static boolean byteBulkCopy(Object src, Offset srcOffset, Object tgt, Offset tgtOffset, int bytes) {
+ if (NEEDS_OBJECT_GC_WRITE_BARRIER || NEEDS_OBJECT_GC_READ_BARRIER) {
+ return Selected.Mutator.get().byteBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(tgt), tgtOffset, bytes);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ return false;
+ }
+
+
+ /** True if the garbage collector requires write barriers on char putfield, arraystore or modifycheck */
+ private static final boolean NEEDS_CHAR_GC_WRITE_BARRIER = Selected.Constraints.get().needsCharWriteBarrier();
+ /** True if the VM requires write barriers on char putfield */
+ public static final boolean NEEDS_CHAR_PUTFIELD_BARRIER = NEEDS_CHAR_GC_WRITE_BARRIER;
+ /** True if the VM requires write barriers on char arraystore */
+ public static final boolean NEEDS_CHAR_ASTORE_BARRIER = NEEDS_CHAR_GC_WRITE_BARRIER;
+ /** True if the garbage collector requires read barriers on char getfield or arrayload */
+ private static final boolean NEEDS_CHAR_GC_READ_BARRIER = Selected.Constraints.get().needsCharReadBarrier();
+ /** True if the VM requires read barriers on char getfield */
+ public static final boolean NEEDS_CHAR_GETFIELD_BARRIER = NEEDS_CHAR_GC_READ_BARRIER;
+ /** True if the VM requires read barriers on char arrayload */
+ public static final boolean NEEDS_CHAR_ALOAD_BARRIER = NEEDS_CHAR_GC_READ_BARRIER;
+
+ /**
+ * Barrier for writes of chars into fields of instances (ie putfield).
+ *
+ * @param ref the object which is the subject of the putfield
+ * @param value the new value for the field
+ * @param offset the offset of the field to be modified
+ * @param locationMetadata an int that encodes the source location being modified
+ */
+ @Inline
+ @Entrypoint
+ public static void charFieldWrite(Object ref, char value, Offset offset, int locationMetadata) {
+ if (NEEDS_CHAR_GC_WRITE_BARRIER) {
+ ObjectReference src = ObjectReference.fromObject(ref);
+ Selected.Mutator.get().charWrite(src, src.toAddress().plus(offset), value, offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ }
+
+ /**
+ * Barrier for writes of objects into arrays (ie astore).
+ *
+ * @param ref the array which is the subject of the astore
+ * @param index the index into the array where the new reference
+ * resides. The index is the "natural" index into the array, for
+ * example a[index].
+ * @param value the value to be stored.
+ */
+ @Inline
+ @Entrypoint
+ public static void charArrayWrite(Object ref, int index, char value) {
+ if (NEEDS_OBJECT_GC_WRITE_BARRIER) {
+ ObjectReference array = ObjectReference.fromObject(ref);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Selected.Mutator.get().charWrite(array, array.toAddress().plus(offset), value, offset.toWord(), Word.zero(), ARRAY_ELEMENT);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ }
+
+ /**
+ * Barrier for loads of objects from fields of instances (ie getfield).
+ *
+ * @param ref the object which is the subject of the getfield
+ * @param offset the offset of the field to be read
+ * @param locationMetadata an int that encodes the source location being read
+ * @return The value read from the field.
+ */
+ @Inline
+ @Entrypoint
+ public static char charFieldRead(Object ref, Offset offset, int locationMetadata) {
+ if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ ObjectReference src = ObjectReference.fromObject(ref);
+ return Selected.Mutator.get().charRead(src, src.toAddress().plus(offset), offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ return 0;
+ }
+
+ /**
+ * Barrier for loads of objects from fields of arrays (ie aload).
+ *
+ * @param ref the array containing the reference.
+ * @param index the index into the array were the reference resides.
+ * @return the value read from the array
+ */
+ @Inline
+ @Entrypoint
+ public static char charArrayRead(Object ref, int index) {
+ if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ ObjectReference array = ObjectReference.fromObject(ref);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ return Selected.Mutator.get().charRead(array, array.toAddress().plus(offset), offset.toWord(), Word.zero(), ARRAY_ELEMENT);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ return 0;
+ }
+
+ /**
+ * Barrier for a bulk copy of objects (i.e. in an array copy).
+ *
+ * @param src The source object
+ * @param srcOffset The offset of the first source address, in
+ * bytes, relative to <code>src</code> (in principle, this could be
+ * negative).
+ * @param tgt The target object
+ * @param tgtOffset The offset of the first target address, in bytes
+ * relative to <code>tgt</code> (in principle, this could be
+ * negative).
+ * @param bytes The size of the region being copied, in bytes.
+ * @return True if the update was performed by the barrier, false if
+ * left to the caller (always false in this case).
+ */
+ @Inline
+ public static boolean charBulkCopy(Object src, Offset srcOffset, Object tgt, Offset tgtOffset, int bytes) {
+ if (NEEDS_OBJECT_GC_WRITE_BARRIER || NEEDS_OBJECT_GC_READ_BARRIER) {
+ return Selected.Mutator.get().charBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(tgt), tgtOffset, bytes);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ return false;
+ }
+
+
+ /** True if the garbage collector requires write barriers on short putfield, arraystore or modifycheck */
+ private static final boolean NEEDS_SHORT_GC_WRITE_BARRIER = Selected.Constraints.get().needsShortWriteBarrier();
+ /** True if the VM requires write barriers on short putfield */
+ public static final boolean NEEDS_SHORT_PUTFIELD_BARRIER = NEEDS_SHORT_GC_WRITE_BARRIER;
+ /** True if the VM requires write barriers on short arraystore */
+ public static final boolean NEEDS_SHORT_ASTORE_BARRIER = NEEDS_SHORT_GC_WRITE_BARRIER;
+ /** True if the garbage collector requires read barriers on short getfield or arrayload */
+ private static final boolean NEEDS_SHORT_GC_READ_BARRIER = Selected.Constraints.get().needsShortReadBarrier();
+ /** True if the VM requires read barriers on short getfield */
+ public static final boolean NEEDS_SHORT_GETFIELD_BARRIER = NEEDS_SHORT_GC_READ_BARRIER;
+ /** True if the VM requires read barriers on short arrayload */
+ public static final boolean NEEDS_SHORT_ALOAD_BARRIER = NEEDS_SHORT_GC_READ_BARRIER;
+
+ /**
+ * Barrier for writes of shorts into fields of instances (ie putfield).
+ *
+ * @param ref the object which is the subject of the putfield
+ * @param value the new value for the field
+ * @param offset the offset of the field to be modified
+ * @param locationMetadata an int that encodes the source location being modified
+ */
+ @Inline
+ @Entrypoint
+ public static void shortFieldWrite(Object ref, short value, Offset offset, int locationMetadata) {
+ if (NEEDS_SHORT_GC_WRITE_BARRIER) {
+ ObjectReference src = ObjectReference.fromObject(ref);
+ Selected.Mutator.get().shortWrite(src, src.toAddress().plus(offset), value, offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ }
+
+ /**
+ * Barrier for writes of objects into arrays (ie astore).
+ *
+ * @param ref the array which is the subject of the astore
+ * @param index the index into the array where the new reference
+ * resides. The index is the "natural" index into the array, for
+ * example a[index].
+ * @param value the value to be stored.
+ */
+ @Inline
+ @Entrypoint
+ public static void shortArrayWrite(Object ref, int index, short value) {
+ if (NEEDS_OBJECT_GC_WRITE_BARRIER) {
+ ObjectReference array = ObjectReference.fromObject(ref);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Selected.Mutator.get().shortWrite(array, array.toAddress().plus(offset), value, offset.toWord(), Word.zero(), ARRAY_ELEMENT);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ }
+
+ /**
+ * Barrier for loads of objects from fields of instances (ie getfield).
+ *
+ * @param ref the object which is the subject of the getfield
+ * @param offset the offset of the field to be read
+ * @param locationMetadata an int that encodes the source location being read
+ * @return The value read from the field.
+ */
+ @Inline
+ @Entrypoint
+ public static short shortFieldRead(Object ref, Offset offset, int locationMetadata) {
+ if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ ObjectReference src = ObjectReference.fromObject(ref);
+ return Selected.Mutator.get().shortRead(src, src.toAddress().plus(offset), offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ return 0;
+ }
+
+ /**
+ * Barrier for loads of objects from fields of arrays (ie aload).
+ *
+ * @param ref the array containing the reference.
+ * @param index the index into the array were the reference resides.
+ * @return the value read from the array
+ */
+ @Inline
+ @Entrypoint
+ public static short shortArrayRead(Object ref, int index) {
+ if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ ObjectReference array = ObjectReference.fromObject(ref);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ return Selected.Mutator.get().shortRead(array, array.toAddress().plus(offset), offset.toWord(), Word.zero(), ARRAY_ELEMENT);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ return 0;
+ }
+
+ /**
+ * Barrier for a bulk copy of objects (i.e. in an array copy).
+ *
+ * @param src The source object
+ * @param srcOffset The offset of the first source address, in
+ * bytes, relative to <code>src</code> (in principle, this could be
+ * negative).
+ * @param tgt The target object
+ * @param tgtOffset The offset of the first target address, in bytes
+ * relative to <code>tgt</code> (in principle, this could be
+ * negative).
+ * @param bytes The size of the region being copied, in bytes.
+ * @return True if the update was performed by the barrier, false if
+ * left to the caller (always false in this case).
+ */
+ @Inline
+ public static boolean shortBulkCopy(Object src, Offset srcOffset, Object tgt, Offset tgtOffset, int bytes) {
+ if (NEEDS_OBJECT_GC_WRITE_BARRIER || NEEDS_OBJECT_GC_READ_BARRIER) {
+ return Selected.Mutator.get().shortBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(tgt), tgtOffset, bytes);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ return false;
+ }
+
+
+ /** True if the garbage collector requires write barriers on int putfield, arraystore or modifycheck */
+ private static final boolean NEEDS_INT_GC_WRITE_BARRIER = Selected.Constraints.get().needsIntWriteBarrier();
+ /** True if the VM requires write barriers on int putfield */
+ public static final boolean NEEDS_INT_PUTFIELD_BARRIER = NEEDS_INT_GC_WRITE_BARRIER;
+ /** True if the VM requires write barriers on int arraystore */
+ public static final boolean NEEDS_INT_ASTORE_BARRIER = NEEDS_INT_GC_WRITE_BARRIER;
+ /** True if the garbage collector requires read barriers on int getfield or arrayload */
+ private static final boolean NEEDS_INT_GC_READ_BARRIER = Selected.Constraints.get().needsIntReadBarrier();
+ /** True if the VM requires read barriers on int getfield */
+ public static final boolean NEEDS_INT_GETFIELD_BARRIER = NEEDS_INT_GC_READ_BARRIER;
+ /** True if the VM requires read barriers on int arrayload */
+ public static final boolean NEEDS_INT_ALOAD_BARRIER = NEEDS_INT_GC_READ_BARRIER;
+
+ /**
+ * Barrier for writes of ints into fields of instances (ie putfield).
+ *
+ * @param ref the object which is the subject of the putfield
+ * @param value the new value for the field
+ * @param offset the offset of the field to be modified
+ * @param locationMetadata an int that encodes the source location being modified
+ */
+ @Inline
+ @Entrypoint
+ public static void intFieldWrite(Object ref, int value, Offset offset, int locationMetadata) {
+ if (NEEDS_INT_GC_WRITE_BARRIER) {
+ ObjectReference src = ObjectReference.fromObject(ref);
+ Selected.Mutator.get().intWrite(src, src.toAddress().plus(offset), value, offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ }
+
+ /**
+ * Barrier for writes of objects into arrays (ie astore).
+ *
+ * @param ref the array which is the subject of the astore
+ * @param index the index into the array where the new reference
+ * resides. The index is the "natural" index into the array, for
+ * example a[index].
+ * @param value the value to be stored.
+ */
+ @Inline
+ @Entrypoint
+ public static void intArrayWrite(Object ref, int index, int value) {
+ if (NEEDS_OBJECT_GC_WRITE_BARRIER) {
+ ObjectReference array = ObjectReference.fromObject(ref);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Selected.Mutator.get().intWrite(array, array.toAddress().plus(offset), value, offset.toWord(), Word.zero(), ARRAY_ELEMENT);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ }
+
+ /**
+ * Barrier for loads of objects from fields of instances (ie getfield).
+ *
+ * @param ref the object which is the subject of the getfield
+ * @param offset the offset of the field to be read
+ * @param locationMetadata an int that encodes the source location being read
+ * @return The value read from the field.
+ */
+ @Inline
+ @Entrypoint
+ public static int intFieldRead(Object ref, Offset offset, int locationMetadata) {
+ if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ ObjectReference src = ObjectReference.fromObject(ref);
+ return Selected.Mutator.get().intRead(src, src.toAddress().plus(offset), offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ return 0;
+ }
+
+ /**
+ * Barrier for loads of objects from fields of arrays (ie aload).
+ *
+ * @param ref the array containing the reference.
+ * @param index the index into the array were the reference resides.
+ * @return the value read from the array
+ */
+ @Inline
+ @Entrypoint
+ public static int intArrayRead(Object ref, int index) {
+ if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ ObjectReference array = ObjectReference.fromObject(ref);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ return Selected.Mutator.get().intRead(array, array.toAddress().plus(offset), offset.toWord(), Word.zero(), ARRAY_ELEMENT);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ return 0;
+ }
+
+ /**
+ * Barrier for a bulk copy of objects (i.e. in an array copy).
+ *
+ * @param src The source object
+ * @param srcOffset The offset of the first source address, in
+ * bytes, relative to <code>src</code> (in principle, this could be
+ * negative).
+ * @param tgt The target object
+ * @param tgtOffset The offset of the first target address, in bytes
+ * relative to <code>tgt</code> (in principle, this could be
+ * negative).
+ * @param bytes The size of the region being copied, in bytes.
+ * @return True if the update was performed by the barrier, false if
+ * left to the caller (always false in this case).
+ */
+ @Inline
+ public static boolean intBulkCopy(Object src, Offset srcOffset, Object tgt, Offset tgtOffset, int bytes) {
+ if (NEEDS_OBJECT_GC_WRITE_BARRIER || NEEDS_OBJECT_GC_READ_BARRIER) {
+ return Selected.Mutator.get().intBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(tgt), tgtOffset, bytes);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ return false;
+ }
+
+
+ /** True if the garbage collector requires write barriers on long putfield, arraystore or modifycheck */
+ private static final boolean NEEDS_LONG_GC_WRITE_BARRIER = Selected.Constraints.get().needsLongWriteBarrier();
+ /** True if the VM requires write barriers on long putfield */
+ public static final boolean NEEDS_LONG_PUTFIELD_BARRIER = NEEDS_LONG_GC_WRITE_BARRIER;
+ /** True if the VM requires write barriers on long arraystore */
+ public static final boolean NEEDS_LONG_ASTORE_BARRIER = NEEDS_LONG_GC_WRITE_BARRIER;
+ /** True if the garbage collector requires read barriers on long getfield or arrayload */
+ private static final boolean NEEDS_LONG_GC_READ_BARRIER = Selected.Constraints.get().needsLongReadBarrier();
+ /** True if the VM requires read barriers on long getfield */
+ public static final boolean NEEDS_LONG_GETFIELD_BARRIER = NEEDS_LONG_GC_READ_BARRIER;
+ /** True if the VM requires read barriers on long arrayload */
+ public static final boolean NEEDS_LONG_ALOAD_BARRIER = NEEDS_LONG_GC_READ_BARRIER;
+
+ /**
+ * Barrier for writes of longs into fields of instances (ie putfield).
+ *
+ * @param ref the object which is the subject of the putfield
+ * @param value the new value for the field
+ * @param offset the offset of the field to be modified
+ * @param locationMetadata an int that encodes the source location being modified
+ */
+ @Inline
+ @Entrypoint
+ public static void longFieldWrite(Object ref, long value, Offset offset, int locationMetadata) {
+ if (NEEDS_LONG_GC_WRITE_BARRIER) {
+ ObjectReference src = ObjectReference.fromObject(ref);
+ Selected.Mutator.get().longWrite(src, src.toAddress().plus(offset), value, offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ }
+
+ /**
+ * Barrier for writes of objects into arrays (ie astore).
+ *
+ * @param ref the array which is the subject of the astore
+ * @param index the index into the array where the new reference
+ * resides. The index is the "natural" index into the array, for
+ * example a[index].
+ * @param value the value to be stored.
+ */
+ @Inline
+ @Entrypoint
+ public static void longArrayWrite(Object ref, int index, long value) {
+ if (NEEDS_OBJECT_GC_WRITE_BARRIER) {
+ ObjectReference array = ObjectReference.fromObject(ref);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Selected.Mutator.get().longWrite(array, array.toAddress().plus(offset), value, offset.toWord(), Word.zero(), ARRAY_ELEMENT);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ }
+
+ /**
+ * Barrier for loads of objects from fields of instances (ie getfield).
+ *
+ * @param ref the object which is the subject of the getfield
+ * @param offset the offset of the field to be read
+ * @param locationMetadata an int that encodes the source location being read
+ * @return The value read from the field.
+ */
+ @Inline
+ @Entrypoint
+ public static long longFieldRead(Object ref, Offset offset, int locationMetadata) {
+ if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ ObjectReference src = ObjectReference.fromObject(ref);
+ return Selected.Mutator.get().longRead(src, src.toAddress().plus(offset), offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ return 0;
+ }
+
+ /**
+ * Barrier for loads of objects from fields of arrays (ie aload).
+ *
+ * @param ref the array containing the reference.
+ * @param index the index into the array were the reference resides.
+ * @return the value read from the array
+ */
+ @Inline
+ @Entrypoint
+ public static long longArrayRead(Object ref, int index) {
+ if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ ObjectReference array = ObjectReference.fromObject(ref);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ return Selected.Mutator.get().longRead(array, array.toAddress().plus(offset), offset.toWord(), Word.zero(), ARRAY_ELEMENT);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ return 0;
+ }
+
+ /**
+ * Barrier for a bulk copy of objects (i.e. in an array copy).
+ *
+ * @param src The source object
+ * @param srcOffset The offset of the first source address, in
+ * bytes, relative to <code>src</code> (in principle, this could be
+ * negative).
+ * @param tgt The target object
+ * @param tgtOffset The offset of the first target address, in bytes
+ * relative to <code>tgt</code> (in principle, this could be
+ * negative).
+ * @param bytes The size of the region being copied, in bytes.
+ * @return True if the update was performed by the barrier, false if
+ * left to the caller (always false in this case).
+ */
+ @Inline
+ public static boolean longBulkCopy(Object src, Offset srcOffset, Object tgt, Offset tgtOffset, int bytes) {
+ if (NEEDS_OBJECT_GC_WRITE_BARRIER || NEEDS_OBJECT_GC_READ_BARRIER) {
+ return Selected.Mutator.get().longBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(tgt), tgtOffset, bytes);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ return false;
+ }
+
+
+ /** True if the garbage collector requires write barriers on float putfield, arraystore or modifycheck */
+ private static final boolean NEEDS_FLOAT_GC_WRITE_BARRIER = Selected.Constraints.get().needsFloatWriteBarrier();
+ /** True if the VM requires write barriers on float putfield */
+ public static final boolean NEEDS_FLOAT_PUTFIELD_BARRIER = NEEDS_FLOAT_GC_WRITE_BARRIER;
+ /** True if the VM requires write barriers on float arraystore */
+ public static final boolean NEEDS_FLOAT_ASTORE_BARRIER = NEEDS_FLOAT_GC_WRITE_BARRIER;
+ /** True if the garbage collector requires read barriers on float getfield or arrayload */
+ private static final boolean NEEDS_FLOAT_GC_READ_BARRIER = Selected.Constraints.get().needsFloatReadBarrier();
+ /** True if the VM requires read barriers on float getfield */
+ public static final boolean NEEDS_FLOAT_GETFIELD_BARRIER = NEEDS_FLOAT_GC_READ_BARRIER;
+ /** True if the VM requires read barriers on float arrayload */
+ public static final boolean NEEDS_FLOAT_ALOAD_BARRIER = NEEDS_FLOAT_GC_READ_BARRIER;
+
+ /**
+ * Barrier for writes of floats into fields of instances (ie putfield).
+ *
+ * @param ref the object which is the subject of the putfield
+ * @param value the new value for the field
+ * @param offset the offset of the field to be modified
+ * @param locationMetadata an int that encodes the source location being modified
+ */
+ @Inline
+ @Entrypoint
+ public static void floatFieldWrite(Object ref, float value, Offset offset, int locationMetadata) {
+ if (NEEDS_FLOAT_GC_WRITE_BARRIER) {
+ ObjectReference src = ObjectReference.fromObject(ref);
+ Selected.Mutator.get().floatWrite(src, src.toAddress().plus(offset), value, offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ }
+
+ /**
+ * Barrier for writes of objects into arrays (ie astore).
+ *
+ * @param ref the array which is the subject of the astore
+ * @param index the index into the array where the new reference
+ * resides. The index is the "natural" index into the array, for
+ * example a[index].
+ * @param value the value to be stored.
+ */
+ @Inline
+ @Entrypoint
+ public static void floatArrayWrite(Object ref, int index, float value) {
+ if (NEEDS_OBJECT_GC_WRITE_BARRIER) {
+ ObjectReference array = ObjectReference.fromObject(ref);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Selected.Mutator.get().floatWrite(array, array.toAddress().plus(offset), value, offset.toWord(), Word.zero(), ARRAY_ELEMENT);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ }
+
+ /**
+ * Barrier for loads of objects from fields of instances (ie getfield).
+ *
+ * @param ref the object which is the subject of the getfield
+ * @param offset the offset of the field to be read
+ * @param locationMetadata an int that encodes the source location being read
+ * @return The value read from the field.
+ */
+ @Inline
+ @Entrypoint
+ public static float floatFieldRead(Object ref, Offset offset, int locationMetadata) {
+ if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ ObjectReference src = ObjectReference.fromObject(ref);
+ return Selected.Mutator.get().floatRead(src, src.toAddress().plus(offset), offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ return 0;
+ }
+
+ /**
+ * Barrier for loads of objects from fields of arrays (ie aload).
+ *
+ * @param ref the array containing the reference.
+ * @param index the index into the array were the reference resides.
+ * @return the value read from the array
+ */
+ @Inline
+ @Entrypoint
+ public static float floatArrayRead(Object ref, int index) {
+ if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ ObjectReference array = ObjectReference.fromObject(ref);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ return Selected.Mutator.get().floatRead(array, array.toAddress().plus(offset), offset.toWord(), Word.zero(), ARRAY_ELEMENT);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ return 0;
+ }
+
+ /**
+ * Barrier for a bulk copy of objects (i.e. in an array copy).
+ *
+ * @param src The source object
+ * @param srcOffset The offset of the first source address, in
+ * bytes, relative to <code>src</code> (in principle, this could be
+ * negative).
+ * @param tgt The target object
+ * @param tgtOffset The offset of the first target address, in bytes
+ * relative to <code>tgt</code> (in principle, this could be
+ * negative).
+ * @param bytes The size of the region being copied, in bytes.
+ * @return True if the update was performed by the barrier, false if
+ * left to the caller (always false in this case).
+ */
+ @Inline
+ public static boolean floatBulkCopy(Object src, Offset srcOffset, Object tgt, Offset tgtOffset, int bytes) {
+ if (NEEDS_OBJECT_GC_WRITE_BARRIER || NEEDS_OBJECT_GC_READ_BARRIER) {
+ return Selected.Mutator.get().floatBulkCopy(ObjectReference.fromObject(src), srcOffset, ObjectReference.fromObject(tgt), tgtOffset, bytes);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ return false;
+ }
+
+
+ /** True if the garbage collector requires write barriers on double putfield, arraystore or modifycheck */
+ private static final boolean NEEDS_DOUBLE_GC_WRITE_BARRIER = Selected.Constraints.get().needsDoubleWriteBarrier();
+ /** True if the VM requires write barriers on double putfield */
+ public static final boolean NEEDS_DOUBLE_PUTFIELD_BARRIER = NEEDS_DOUBLE_GC_WRITE_BARRIER;
+ /** True if the VM requires write barriers on double arraystore */
+ public static final boolean NEEDS_DOUBLE_ASTORE_BARRIER = NEEDS_DOUBLE_GC_WRITE_BARRIER;
+ /** True if the garbage collector requires read barriers on double getfield or arrayload */
+ private static final boolean NEEDS_DOUBLE_GC_READ_BARRIER = Selected.Constraints.get().needsDoubleReadBarrier();
+ /** True if the VM requires read barriers on double getfield */
+ public static final boolean NEEDS_DOUBLE_GETFIELD_BARRIER = NEEDS_DOUBLE_GC_READ_BARRIER;
+ /** True if the VM requires read barriers on double arrayload */
+ public static final boolean NEEDS_DOUBLE_ALOAD_BARRIER = NEEDS_DOUBLE_GC_READ_BARRIER;
+
+ /**
+ * Barrier for writes of doubles into fields of instances (ie putfield).
+ *
+ * @param ref the object which is the subject of the putfield
+ * @param value the new value for the field
+ * @param offset the offset of the field to be modified
+ * @param locationMetadata an int that encodes the source location being modified
+ */
+ @Inline
+ @Entrypoint
+ public static void doubleFieldWrite(Object ref, double value, Offset offset, int locationMetadata) {
+ if (NEEDS_DOUBLE_GC_WRITE_BARRIER) {
+ ObjectReference src = ObjectReference.fromObject(ref);
+ Selected.Mutator.get().doubleWrite(src, src.toAddress().plus(offset), value, offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ }
+
+ /**
+ * Barrier for writes of objects into arrays (ie astore).
+ *
+ * @param ref the array which is the subject of the astore
+ * @param index the index into the array where the new reference
+ * resides. The index is the "natural" index into the array, for
+ * example a[index].
+ * @param value the value to be stored.
+ */
+ @Inline
+ @Entrypoint
+ public static void doubleArrayWrite(Object ref, int index, double value) {
+ if (NEEDS_OBJECT_GC_WRITE_BARRIER) {
+ ObjectReference array = ObjectReference.fromObject(ref);
+ Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
+ Selected.Mutator.get().doubleWrite(array, array.toAddress().plus(offset), value, offset.toWord(), Word.zero(), ARRAY_ELEMENT);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ }
+
+ /**
+ * Barrier for loads of objects from fields of instances (ie getfield).
+ *
+ * @param ref the object which is the subject of the getfield
+ * @param offset the offset of the field to be read
+ * @param locationMetadata an int that encodes the source location being read
+ * @return The value read from the field.
+ */
+ @Inline
+ @Entrypoint
+ public static double doubleFieldRead(Object ref, Offset offset, int locationMetadata) {
+ if (NEEDS_OBJECT_GC_READ_BARRIER) {
+ ObjectReference src = ObjectReference.fromObject(ref);
+ return Selected.Mutator.get().doubleRead(src, src.toAddress().plus(offset), offset.toWord(), Word.fromIntZeroExtend(locationMetadata), INSTANCE_FIELD);
+ } else if (VM.VERIFY_ASSERTIONS)
+ VM.assertions._assert(false);
+ return 0;
+ }
+
+ /**
+ * Barrier for loads of objects from fields of arrays (ie aload).
+ *
+ * @param ref the array containing the reference.

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Jikesrvm-commits mailing list
Jikesrvm-commits@...
https://lists.sourceforge.net/lists/listinfo/jikesrvm-commits

SF.net SVN: jikesrvm:[15786] rvmroot/trunk/MMTk

2009-09-18T19:54:48Z

Revision: 15786
http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15786&view=rev
Author: steveb-oss
Date: 2009-09-19 02:54:48 +0000 (Sat, 19 Sep 2009)

Log Message:
-----------
Rename for clarity--thanks to Laurence Hellyer

Modified Paths:
--------------
rvmroot/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Barriers.java
rvmroot/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Barriers.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenMutator.java
rvmroot/trunk/MMTk/src/org/mmtk/vm/Barriers.java

Modified: rvmroot/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Barriers.java
===================================================================
--- rvmroot/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Barriers.java 2009-09-19 02:11:41 UTC (rev 15785)
+++ rvmroot/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Barriers.java 2009-09-19 02:54:48 UTC (rev 15786)
@@ -59,7 +59,7 @@
* @param unusedB Opaque, VM-specific, meta-data identifying the slot
*/
@Override
- public void objectReferenceWrite(Address slot, ObjectReference target, Word unusedA, Word unusedB) {
+ public void objectReferenceNonHeapWrite(Address slot, ObjectReference target, Word unusedA, Word unusedB) {
slot.store(target);
}

Modified: rvmroot/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Barriers.java
===================================================================
--- rvmroot/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Barriers.java 2009-09-19 02:11:41 UTC (rev 15785)
+++ rvmroot/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Barriers.java 2009-09-19 02:54:48 UTC (rev 15786)
@@ -59,7 +59,7 @@
* @param ref The object that has the reference field
*/
@Inline
- public final void objectReferenceWrite(Address slot, ObjectReference target, Word unusedA, Word unusedB) {
+ public final void objectReferenceNonHeapWrite(Address slot, ObjectReference target, Word unusedA, Word unusedB) {
slot.store(target);
}

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenMutator.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenMutator.java 2009-09-19 02:11:41 UTC (rev 15785)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenMutator.java 2009-09-19 02:54:48 UTC (rev 15786)
@@ -219,7 +219,7 @@
public final void objectReferenceNonHeapWrite(Address slot, ObjectReference tgt,
Word metaDataA, Word metaDataB) {
fastPath(slot, tgt);
- VM.barriers.objectReferenceWrite(slot, tgt, metaDataA, metaDataB);
+ VM.barriers.objectReferenceNonHeapWrite(slot, tgt, metaDataA, metaDataB);
}

/**

Modified: rvmroot/trunk/MMTk/src/org/mmtk/vm/Barriers.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/vm/Barriers.java 2009-09-19 02:11:41 UTC (rev 15785)
+++ rvmroot/trunk/MMTk/src/org/mmtk/vm/Barriers.java 2009-09-19 02:54:48 UTC (rev 15786)
@@ -49,7 +49,7 @@
* @param metaDataA Opaque, VM-specific, meta-data identifying the slot
* @param metaDataB Opaque, VM-specific, meta-data identifying the slot
*/
- public abstract void objectReferenceWrite(Address slot, ObjectReference target, Word metaDataA, Word metaDataB);
+ public abstract void objectReferenceNonHeapWrite(Address slot, ObjectReference target, Word metaDataA, Word metaDataB);

/**
* Atomically write a reference field of an object or array and return

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Jikesrvm-commits mailing list
Jikesrvm-commits@...
https://lists.sourceforge.net/lists/listinfo/jikesrvm-commits

SF.net SVN: jikesrvm:[15785] rvmroot/trunk/rvm/src/org/jikesrvm

2009-09-18T19:11:45Z

Revision: 15785
http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15785&view=rev
Author: steveb-oss
Date: 2009-09-19 02:11:41 +0000 (Sat, 19 Sep 2009)

Log Message:
-----------
Added missing magic methods, as part of another step toward RVM-845

Modified Paths:
--------------
rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineMagic.java
rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineCompilerImpl.java
rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/bc2ir/GenerateMagic.java
rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/escape/SimpleEscape.java
rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Magic.java
rvmroot/trunk/rvm/src/org/jikesrvm/runtime/MagicNames.java

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineMagic.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineMagic.java 2009-09-18 09:03:36 UTC (rev 15784)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineMagic.java 2009-09-19 02:11:41 UTC (rev 15785)
@@ -298,6 +298,7 @@
generators.put(getMethodReference(Address.class, MagicNames.prepareInt, Offset.class, int.class), g);
generators.put(getMethodReference(Address.class, MagicNames.loadFloat, Offset.class, float.class), g);
generators.put(getMethodReference(Magic.class, MagicNames.getIntAtOffset, Object.class, Offset.class, int.class), g);
+ generators.put(getMethodReference(Magic.class, MagicNames.getFloatAtOffset, Object.class, Offset.class, float.class), g);
generators.put(getMethodReference(Magic.class, MagicNames.getWordAtOffset, Object.class, Offset.class, Word.class), g);
generators.put(getMethodReference(Magic.class, MagicNames.prepareInt, Object.class, Offset.class, int.class), g);
generators.put(getMethodReference(Magic.class, MagicNames.prepareAddress, Object.class, Offset.class, Address.class), g);
@@ -578,6 +579,7 @@
static {
MagicGenerator g = new Magic_Store32();
generators.put(getMethodReference(Magic.class, MagicNames.setIntAtOffset, Object.class, Offset.class, int.class, void.class), g);
+ generators.put(getMethodReference(Magic.class, MagicNames.setFloatAtOffset, Object.class, Offset.class, float.class, void.class), g);
generators.put(getMethodReference(Magic.class, MagicNames.setWordAtOffset, Object.class, Offset.class, Word.class, void.class), g);
if (VALIDATE_OBJECT_REFERENCES) {
g = new EarlyReferenceCheckDecorator(NO_SLOT, g);
@@ -695,13 +697,12 @@
MagicGenerator g = new Store16_Offset();
generators.put(getMethodReference(Address.class, MagicNames.store, short.class, Offset.class, void.class), g);
generators.put(getMethodReference(Address.class, MagicNames.store, char.class, Offset.class, void.class), g);
-
}

/**
- * Store a char to an address plus offset in the format used in {@link Magic}
+ * Store a 16 bit quantity to an address plus offset in the format used in {@link Magic}
*/
- private static final class Magic_StoreChar extends MagicGenerator {
+ private static final class Magic_Store16 extends MagicGenerator {
@Override
void generateMagic(Assembler asm, MethodReference m, RVMMethod cm, Offset sd) {
asm.emitPOP_Reg(T0); // value
@@ -711,8 +712,9 @@
}
}
static {
- MagicGenerator g = new Magic_StoreChar();
+ MagicGenerator g = new Magic_Store16();
generators.put(getMethodReference(Magic.class, MagicNames.setCharAtOffset, Object.class, Offset.class, char.class, void.class), g);
+ generators.put(getMethodReference(Magic.class, MagicNames.setShortAtOffset, Object.class, Offset.class, short.class, void.class), g);
}

/**

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineCompilerImpl.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineCompilerImpl.java 2009-09-18 09:03:36 UTC (rev 15784)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineCompilerImpl.java 2009-09-19 02:11:41 UTC (rev 15785)
@@ -4615,6 +4615,13 @@
popAddr(T0); // pop object
asm.emitLIntX(T0, T1, T0); // *(object+offset)
pushInt(T0); // push *(object+offset)
+ } else if (methodName == MagicNames.getFloatAtOffset) {
+ popInt(T1); // pop offset
+ popAddr(T0); // pop object
+ asm.emitLWZX(T0, T1, T0); // *(object+offset)
+ pushInt(T0); // push *(object+offset),
+// asm.emitLFSX (F0, T1, T0); // *(object+offset)
+// pushFloat(F0);
} else if (methodName == MagicNames.getObjectAtOffset ||
methodName == MagicNames.getWordAtOffset ||
methodName == MagicNames.getTIBAtOffset) {
@@ -4651,6 +4658,11 @@
popInt(T1); // pop offset
popAddr(T0); // pop object
asm.emitSTWX(T2, T1, T0); // *(object+offset) = newvalue
+ } else if (methodName == MagicNames.setFloatAtOffset) {
+ popInt(T2); // pop newvalue
+ popInt(T1); // pop offset
+ popAddr(T0); // pop object
+ asm.emitSTWX(T2, T1, T0); // *(object+offset) = newvalue
} else if (methodName == MagicNames.setObjectAtOffset || methodName == MagicNames.setWordAtOffset) {
if (methodToBeCalled.getParameterTypes().length == 4) {
discardSlot(); // discard locationMetadata parameter
@@ -4664,7 +4676,7 @@
popInt(T1); // pop offset
popAddr(T0); // pop object
asm.emitSTBX(T2, T1, T0); // *(object+offset) = newvalue
- } else if (methodName == MagicNames.setCharAtOffset) {
+ } else if (methodName == MagicNames.setCharAtOffset || methodName == MagicNames.setShortAtOffset) {
popInt(T2); // pop newvalue
popInt(T1); // pop offset
popAddr(T0); // pop object

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/bc2ir/GenerateMagic.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/bc2ir/GenerateMagic.java 2009-09-18 09:03:36 UTC (rev 15784)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/bc2ir/GenerateMagic.java 2009-09-19 02:11:41 UTC (rev 15785)
@@ -303,6 +303,17 @@
Operand offset = bc2ir.popAddress();
Operand object = bc2ir.popRef();
bc2ir.appendInstruction(Store.create(INT_STORE, val, object, offset, null));
+ } else if (methodName == MagicNames.getFloatAtOffset) {
+ Operand offset = bc2ir.popAddress();
+ Operand object = bc2ir.popRef();
+ RegisterOperand val = gc.temps.makeTempFloat();
+ bc2ir.appendInstruction(Load.create(FLOAT_LOAD, val, object, offset, null));
+ bc2ir.push(val.copyD2U());
+ } else if (methodName == MagicNames.setFloatAtOffset) {
+ Operand val = bc2ir.popFloat();
+ Operand offset = bc2ir.popAddress();
+ Operand object = bc2ir.popRef();
+ bc2ir.appendInstruction(Store.create(FLOAT_STORE, val, object, offset, null));
} else if (methodName == MagicNames.getWordAtOffset) {
LocationOperand loc = null;
if (meth.getParameterTypes().length == 3) {
@@ -398,7 +409,7 @@
RegisterOperand val = gc.temps.makeTemp(TypeReference.Char);
bc2ir.appendInstruction(Load.create(USHORT_LOAD, val, object, offset, null));
bc2ir.push(val.copyD2U());
- } else if (methodName == MagicNames.setCharAtOffset) {
+ } else if (methodName == MagicNames.setCharAtOffset || methodName == MagicNames.setShortAtOffset) {
Operand val = bc2ir.popInt();
Operand offset = bc2ir.popAddress();
Operand object = bc2ir.popRef();

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/escape/SimpleEscape.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/escape/SimpleEscape.java 2009-09-18 09:03:36 UTC (rev 15784)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/escape/SimpleEscape.java 2009-09-19 02:11:41 UTC (rev 15785)
@@ -62,6 +62,8 @@
import static org.jikesrvm.compilers.opt.ir.Operators.DOUBLE_STORE_opcode;
import static org.jikesrvm.compilers.opt.ir.Operators.FLOAT_ALOAD_opcode;
import static org.jikesrvm.compilers.opt.ir.Operators.FLOAT_ASTORE_opcode;
+import static org.jikesrvm.compilers.opt.ir.Operators.FLOAT_LOAD_opcode;
+import static org.jikesrvm.compilers.opt.ir.Operators.FLOAT_STORE_opcode;
import static org.jikesrvm.compilers.opt.ir.Operators.GETFIELD_opcode;
import static org.jikesrvm.compilers.opt.ir.Operators.GETSTATIC_opcode;
import static org.jikesrvm.compilers.opt.ir.Operators.GET_CAUGHT_EXCEPTION_opcode;
@@ -411,6 +413,7 @@
case REF_ALOAD_opcode:
case INT_LOAD_opcode:
case LONG_LOAD_opcode:
+ case FLOAT_LOAD_opcode:
case DOUBLE_LOAD_opcode:
case REF_LOAD_opcode:
// all is OK, unless we load this register from memory
@@ -431,6 +434,7 @@
case REF_STORE_opcode:
case INT_STORE_opcode:
case LONG_STORE_opcode:
+ case FLOAT_STORE_opcode:
case DOUBLE_STORE_opcode:
// as long as we don't store this operand elsewhere, all
// is OK. TODO: add more smarts.
@@ -611,6 +615,7 @@
case REF_ALOAD_opcode:
case INT_LOAD_opcode:
case LONG_LOAD_opcode:
+ case FLOAT_LOAD_opcode:
case DOUBLE_LOAD_opcode:
case REF_LOAD_opcode:
// all is OK, unless we load this register from memory
@@ -631,6 +636,7 @@
case REF_STORE_opcode:
case INT_STORE_opcode:
case LONG_STORE_opcode:
+ case FLOAT_STORE_opcode:
case DOUBLE_STORE_opcode:
// as long as we don't store this operand elsewhere, all
// is OK. TODO: add more smarts.

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Magic.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Magic.java 2009-09-18 09:03:36 UTC (rev 15784)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Magic.java 2009-09-19 02:11:41 UTC (rev 15785)
@@ -197,6 +197,15 @@
}

/**
+ * Get char at arbitrary (byte) offset from object. The most
+ * significant 16bits will be 0.
+ */
+ public static char getCharAtOffset(Object object, Offset offset) {
+ if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); // call site should have been hijacked by magic in compiler
+ return (char) -1;
+ }
+
+ /**
* Get short at arbitrary (byte) offset from object. The most
* significant 16bits will be the same as the most significant bit
* in the short.
@@ -207,33 +216,41 @@
}

/**
- * Get char at arbitrary (byte) offset from object. The most
- * significant 16bits will be 0.
+ * Get int at arbitrary (byte) offset from object.
+ * Use getIntAtOffset(obj, ofs) instead of getMemoryInt(objectAsAddress(obj)+ofs)
*/
- public static char getCharAtOffset(Object object, Offset offset) {
+ public static int getIntAtOffset(Object object, Offset offset) {
if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); // call site should have been hijacked by magic in compiler
- return (char) -1;
+ return -1;
}

/**
- * Get int at arbitrary (byte) offset from object.
- * Use getIntAtOffset(obj, ofs) instead of getMemoryInt(objectAsAddress(obj)+ofs)
+ * Get long at arbitrary (byte) offset from object.
+ * Use getlongAtOffset(obj, ofs) instead of two getIntAtOffset
*/
- public static int getIntAtOffset(Object object, Offset offset) {
+ public static long getLongAtOffset(Object object, Offset offset) {
if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); // call site should have been hijacked by magic in compiler
return -1;
}

/**
- * Get Word at arbitrary (byte) offset from object.
- * Use getWordAtOffset(obj, ofs) instead of getMemoryWord(objectAsAddress(obj)+ofs)
+ * Get float at arbitrary (byte) offset from object.
*/
- public static Word getWordAtOffset(Object object, Offset offset) {
+ public static float getFloatAtOffset(Object object, Offset offset) {
if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); // call site should have been hijacked by magic in compiler
- return Word.max();
+ return -1;
}

/**
+ * Get double at arbitrary (byte) offset from object.
+ * Use getDoubleAtOffset(obj, ofs) instead of two getIntAtOffset
+ */
+ public static double getDoubleAtOffset(Object object, Offset offset) {
+ if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); // call site should have been hijacked by magic in compiler
+ return -1;
+ }
+
+ /**
* Get Object at arbitrary (byte) offset from object.
* Use getObjectAtOffset(obj, ofs) instead of
* addressAsObject(getMemoryAddress(objectAsAddress(obj)+ofs))
@@ -255,7 +272,16 @@

/**
* Get Word at arbitrary (byte) offset from object.
+ * Use getWordAtOffset(obj, ofs) instead of getMemoryWord(objectAsAddress(obj)+ofs)
*/
+ public static Word getWordAtOffset(Object object, Offset offset) {
+ if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); // call site should have been hijacked by magic in compiler
+ return Word.max();
+ }
+
+ /**
+ * Get Word at arbitrary (byte) offset from object.
+ */
public static Word getWordAtOffset(Object object, Offset offset, int locationMetadata) {
if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); // call site should have been hijacked by magic in compiler
return null;
@@ -272,46 +298,58 @@
}

/**
- * Get long at arbitrary (byte) offset from object.
- * Use getlongAtOffset(obj, ofs) instead of two getIntAtOffset
+ * Set byte at arbitrary (byte) offset from object.
*/
- public static long getLongAtOffset(Object object, Offset offset) {
+ public static void setByteAtOffset(Object object, Offset offset, byte newvalue) {
if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); // call site should have been hijacked by magic in compiler
- return -1;
}

/**
- * Get double at arbitrary (byte) offset from object.
- * Use getDoubleAtOffset(obj, ofs) instead of two getIntAtOffset
+ * Set char at arbitrary (byte) offset from object.
*/
- public static double getDoubleAtOffset(Object object, Offset offset) {
+ public static void setCharAtOffset(Object object, Offset offset, char newvalue) {
if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); // call site should have been hijacked by magic in compiler
- return -1;
}

/**
- * Set byte at arbitrary (byte) offset from object.
+ * Set short at arbitrary (byte) offset from object.
*/
- public static void setByteAtOffset(Object object, Offset offset, byte newvalue) {
+ public static void setShortAtOffset(Object object, Offset offset, short newvalue) {
if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); // call site should have been hijacked by magic in compiler
}

/**
- * Set char at arbitrary (byte) offset from object.
+ * Set int at arbitrary (byte) offset from object.
+ * Use setIntAtOffset(obj, ofs, new) instead of setMemoryWord(objectAsAddress(obj)+ofs, new)
*/
- public static void setCharAtOffset(Object object, Offset offset, char newvalue) {
+ public static void setIntAtOffset(Object object, Offset offset, int newvalue) {
if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); // call site should have been hijacked by magic in compiler
}

/**
- * Set int at arbitrary (byte) offset from object.
- * Use setIntAtOffset(obj, ofs, new) instead of setMemoryWord(objectAsAddress(obj)+ofs, new)
+ * Set long at arbitrary (byte) offset from object.
+ * Use setlongAtOffset(obj, ofs) instead of two setIntAtOffset
*/
- public static void setIntAtOffset(Object object, Offset offset, int newvalue) {
+ public static void setLongAtOffset(Object object, Offset offset, long newvalue) {
if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); // call site should have been hijacked by magic in compiler
}

/**
+ * Set float at arbitrary (byte) offset from object.
+ */
+ public static void setFloatAtOffset(Object object, Offset offset, float newvalue) {
+ if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); // call site should have been hijacked by magic in compiler
+ }
+
+ /**
+ * Set double at arbitrary (byte) offset from object.
+ * Use setDoubleAtOffset(obj, ofs) instead of two setIntAtOffset
+ */
+ public static void setDoubleAtOffset(Object object, Offset offset, double newvalue) {
+ if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); // call site should have been hijacked by magic in compiler
+ }
+
+ /**
* Set word at arbitrary (byte) offset from object.
* Use setWordAtOffset(obj, ofs, new) instead of setMemoryWord(objectAsAddress(obj)+ofs, new)
*/
@@ -342,22 +380,7 @@
if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); // call site should have been hijacked by magic in compiler
}

- /**
- * Set long at arbitrary (byte) offset from object.
- * Use setlongAtOffset(obj, ofs) instead of two setIntAtOffset
- */
- public static void setLongAtOffset(Object object, Offset offset, long newvalue) {
- if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); // call site should have been hijacked by magic in compiler
- }

- /**
- * Set double at arbitrary (byte) offset from object.
- * Use setDoubleAtOffset(obj, ofs) instead of two setIntAtOffset
- */
- public static void setDoubleAtOffset(Object object, Offset offset, double newvalue) {
- if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); // call site should have been hijacked by magic in compiler
- }
-
//---------------------------------------//
// Atomic Memory Access Primitives. //
//---------------------------------------//

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/runtime/MagicNames.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/runtime/MagicNames.java 2009-09-18 09:03:36 UTC (rev 15784)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/runtime/MagicNames.java 2009-09-19 02:11:41 UTC (rev 15785)
@@ -69,21 +69,24 @@

public static final Atom getUnsignedByteAtOffset = Atom.findOrCreateAsciiAtom("getUnsignedByteAtOffset");
public static final Atom getByteAtOffset = Atom.findOrCreateAsciiAtom("getByteAtOffset");
+ public static final Atom getCharAtOffset = Atom.findOrCreateAsciiAtom("getCharAtOffset");
public static final Atom getShortAtOffset = Atom.findOrCreateAsciiAtom("getShortAtOffset");
- public static final Atom getCharAtOffset = Atom.findOrCreateAsciiAtom("getCharAtOffset");
public static final Atom getIntAtOffset = Atom.findOrCreateAsciiAtom("getIntAtOffset");
+ public static final Atom getLongAtOffset = Atom.findOrCreateAsciiAtom("getLongAtOffset");
+ public static final Atom getFloatAtOffset = Atom.findOrCreateAsciiAtom("getFloatAtOffset");
+ public static final Atom getDoubleAtOffset = Atom.findOrCreateAsciiAtom("getDoubleAtOffset");
public static final Atom getWordAtOffset = Atom.findOrCreateAsciiAtom("getWordAtOffset");
public static final Atom getObjectAtOffset = Atom.findOrCreateAsciiAtom("getObjectAtOffset");
public static final Atom getTIBAtOffset = Atom.findOrCreateAsciiAtom("getTIBAtOffset");
- public static final Atom getLongAtOffset = Atom.findOrCreateAsciiAtom("getLongAtOffset");
- public static final Atom getDoubleAtOffset = Atom.findOrCreateAsciiAtom("getDoubleAtOffset");
public static final Atom setByteAtOffset = Atom.findOrCreateAsciiAtom("setByteAtOffset");
public static final Atom setCharAtOffset = Atom.findOrCreateAsciiAtom("setCharAtOffset");
+ public static final Atom setShortAtOffset = Atom.findOrCreateAsciiAtom("setShortAtOffset");
public static final Atom setIntAtOffset = Atom.findOrCreateAsciiAtom("setIntAtOffset");
+ public static final Atom setLongAtOffset = Atom.findOrCreateAsciiAtom("setLongAtOffset");
+ public static final Atom setFloatAtOffset = Atom.findOrCreateAsciiAtom("setFloatAtOffset");
+ public static final Atom setDoubleAtOffset = Atom.findOrCreateAsciiAtom("setDoubleAtOffset");
public static final Atom setWordAtOffset = Atom.findOrCreateAsciiAtom("setWordAtOffset");
public static final Atom setObjectAtOffset = Atom.findOrCreateAsciiAtom("setObjectAtOffset");
- public static final Atom setLongAtOffset = Atom.findOrCreateAsciiAtom("setLongAtOffset");
- public static final Atom setDoubleAtOffset = Atom.findOrCreateAsciiAtom("setDoubleAtOffset");

public static final Atom getMemoryInt = Atom.findOrCreateAsciiAtom("getMemoryInt");
public static final Atom setMemoryInt = Atom.findOrCreateAsciiAtom("setMemoryInt");

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Jikesrvm-commits mailing list
Jikesrvm-commits@...
https://lists.sourceforge.net/lists/listinfo/jikesrvm-commits

SF.net SVN: jikesrvm:[15784] rvmroot/trunk/rvm/src/org/jikesrvm

2009-09-18T02:03:36Z

Revision: 15784
http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15784&view=rev
Author: steveb-oss
Date: 2009-09-18 09:03:36 +0000 (Fri, 18 Sep 2009)

Log Message:
-----------
Another minor refactoring fix missed in r15782.

Modified Paths:
--------------
rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/Barriers.java
rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/Barriers.java
rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ExpandRuntimeServices.java
rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Entrypoints.java

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/Barriers.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/Barriers.java 2009-09-18 08:44:24 UTC (rev 15783)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/Barriers.java 2009-09-18 09:03:36 UTC (rev 15784)
@@ -78,7 +78,7 @@
asm.emitPUSH_Reg(reg); // offset
asm.emitPUSH_Imm(locationMetadata);
BaselineCompilerImpl.genParameterRegisterLoad(asm, 3);
- asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectNonHeapWriteBarrierMethod.getOffset()));
+ asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectStaticWriteBarrierMethod.getOffset()));
}

static void compilePutstaticBarrierImm(Assembler asm, Offset fieldOffset, int locationMetadata) {
@@ -86,7 +86,7 @@
asm.emitPUSH_Imm(fieldOffset.toInt());
asm.emitPUSH_Imm(locationMetadata);
BaselineCompilerImpl.genParameterRegisterLoad(asm, 3);
- asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectNonHeapWriteBarrierMethod.getOffset()));
+ asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectStaticWriteBarrierMethod.getOffset()));
}

static void compileArrayLoadBarrier(Assembler asm, boolean pushResult) {
@@ -121,7 +121,7 @@
asm.emitPUSH_Reg(reg);
asm.emitPUSH_Imm(locationMetadata);
BaselineCompilerImpl.genParameterRegisterLoad(asm, 2);
- asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectNonHeapReadBarrierMethod.getOffset()));
+ asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectStaticReadBarrierMethod.getOffset()));
asm.emitPUSH_Reg(T0);
}

@@ -129,7 +129,7 @@
asm.emitPUSH_Imm(fieldOffset.toInt());
asm.emitPUSH_Imm(locationMetadata);
BaselineCompilerImpl.genParameterRegisterLoad(asm, 2);
- asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectNonHeapReadBarrierMethod.getOffset()));
+ asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectStaticReadBarrierMethod.getOffset()));
asm.emitPUSH_Reg(T0);
}

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/Barriers.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/Barriers.java 2009-09-18 08:44:24 UTC (rev 15783)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/Barriers.java 2009-09-18 09:03:36 UTC (rev 15784)
@@ -60,7 +60,7 @@
// T1 already contains the offset of the field on entry
static void compilePutstaticBarrier(BaselineCompilerImpl comp, int locationMetadata) {
Assembler asm = comp.asm;
- asm.emitLAddrToc(S0, Entrypoints.objectNonHeapWriteBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectStaticWriteBarrierMethod.getOffset());
asm.emitMTCTR(S0);
comp.peekAddr(T0, 0); // value to store
asm.emitLVAL(T2, locationMetadata);
@@ -70,7 +70,7 @@
// on entry java stack contains ...|ref_to_store|
static void compilePutstaticBarrierImm(BaselineCompilerImpl comp, Offset fieldOffset, int locationMetadata) {
Assembler asm = comp.asm;
- asm.emitLAddrToc(S0, Entrypoints.objectNonHeapWriteBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectStaticWriteBarrierMethod.getOffset());
asm.emitMTCTR(S0);
asm.emitLVALAddr(T1, fieldOffset); // offset
comp.peekAddr(T0, 0); // value to store
@@ -114,7 +114,7 @@
// T0 already contains the offset of the field on entry
static void compileGetstaticBarrier(BaselineCompilerImpl comp, int locationMetadata) {
Assembler asm = comp.asm;
- asm.emitLAddrToc(S0, Entrypoints.objectNonHeapReadBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectStaticReadBarrierMethod.getOffset());
asm.emitMTCTR(S0);
asm.emitLVAL(T1, locationMetadata);
asm.emitBCCTRL(); // MemoryManager.getstaticReadBarrier(T0,T1)
@@ -123,7 +123,7 @@
// on entry java stack contains ...|
static void compileGetstaticBarrierImm(BaselineCompilerImpl comp, Offset fieldOffset, int locationMetadata) {
Assembler asm = comp.asm;
- asm.emitLAddrToc(S0, Entrypoints.objectNonHeapReadBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectStaticReadBarrierMethod.getOffset());
asm.emitMTCTR(S0);
asm.emitLVALAddr(T0, fieldOffset); // offset
asm.emitLVAL(T1, locationMetadata);

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ExpandRuntimeServices.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ExpandRuntimeServices.java 2009-09-18 08:44:24 UTC (rev 15783)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ExpandRuntimeServices.java 2009-09-18 09:03:36 UTC (rev 15784)
@@ -478,7 +478,7 @@
LocationOperand loc = PutStatic.getLocation(inst);
FieldReference field = loc.getFieldRef();
if (!field.getFieldContentsType().isPrimitiveType()) {
- RVMMethod target = Entrypoints.objectNonHeapWriteBarrierMethod;
+ RVMMethod target = Entrypoints.objectStaticWriteBarrierMethod;
Instruction wb =
Call.create3(CALL,
null,
@@ -504,7 +504,7 @@
LocationOperand loc = GetStatic.getLocation(inst);
FieldReference field = loc.getFieldRef();
if (!field.getFieldContentsType().isPrimitiveType()) {
- RVMMethod target = Entrypoints.objectNonHeapReadBarrierMethod;
+ RVMMethod target = Entrypoints.objectStaticReadBarrierMethod;
Instruction rb =
Call.create2(CALL,
GetStatic.getClearResult(inst),

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Entrypoints.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Entrypoints.java 2009-09-18 08:44:24 UTC (rev 15783)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Entrypoints.java 2009-09-18 09:03:36 UTC (rev 15784)
@@ -273,9 +273,9 @@
public static final NormalMethod objectFieldReadBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "objectFieldRead", "(Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;I)Ljava/lang/Object;");

- public static final NormalMethod objectNonHeapWriteBarrierMethod =
+ public static final NormalMethod objectStaticWriteBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "objectStaticWrite", "(Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;I)V");
- public static final NormalMethod objectNonHeapReadBarrierMethod =
+ public static final NormalMethod objectStaticReadBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "objectStaticRead", "(Lorg/vmmagic/unboxed/Offset;I)Ljava/lang/Object;");

public static final NormalMethod modifyCheckMethod =

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Jikesrvm-commits mailing list
Jikesrvm-commits@...
https://lists.sourceforge.net/lists/listinfo/jikesrvm-commits

SF.net SVN: jikesrvm:[15783] rvmroot/trunk/rvm/src/org/jikesrvm/compilers/ baseline/ppc

2009-09-18T01:44:24Z

Revision: 15783
http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15783&view=rev
Author: steveb-oss
Date: 2009-09-18 08:44:24 +0000 (Fri, 18 Sep 2009)

Log Message:
-----------
Fix breakage of PPC r15782 (previous commit).

Modified Paths:
--------------
rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/Barriers.java
rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineCompilerImpl.java

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/Barriers.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/Barriers.java 2009-09-18 03:57:39 UTC (rev 15782)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/Barriers.java 2009-09-18 08:44:24 UTC (rev 15783)
@@ -34,7 +34,7 @@
// T2 already contains the offset of the field on entry
static void compilePutfieldBarrier(BaselineCompilerImpl comp, int locationMetadata) {
Assembler asm = comp.asm;
- asm.emitLAddrToc(S0, Entrypoints.referenceFieldWriteBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectFieldWriteBarrierMethod.getOffset());
asm.emitMTCTR(S0);
comp.peekAddr(T0, 1); // object base
asm.emitNullCheck(T0);
@@ -46,7 +46,7 @@
// on entry java stack contains ...|target_ref|ref_to_store|
static void compilePutfieldBarrierImm(BaselineCompilerImpl comp, Offset fieldOffset, int locationMetadata) {
Assembler asm = comp.asm;
- asm.emitLAddrToc(S0, Entrypoints.referenceFieldWriteBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectFieldWriteBarrierMethod.getOffset());
asm.emitMTCTR(S0);
comp.peekAddr(T0, 1); // object base
asm.emitNullCheck(T0);
@@ -60,7 +60,7 @@
// T1 already contains the offset of the field on entry
static void compilePutstaticBarrier(BaselineCompilerImpl comp, int locationMetadata) {
Assembler asm = comp.asm;
- asm.emitLAddrToc(S0, Entrypoints.referenceNonHeapWriteBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectNonHeapWriteBarrierMethod.getOffset());
asm.emitMTCTR(S0);
comp.peekAddr(T0, 0); // value to store
asm.emitLVAL(T2, locationMetadata);
@@ -70,7 +70,7 @@
// on entry java stack contains ...|ref_to_store|
static void compilePutstaticBarrierImm(BaselineCompilerImpl comp, Offset fieldOffset, int locationMetadata) {
Assembler asm = comp.asm;
- asm.emitLAddrToc(S0, Entrypoints.referenceNonHeapWriteBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectNonHeapWriteBarrierMethod.getOffset());
asm.emitMTCTR(S0);
asm.emitLVALAddr(T1, fieldOffset); // offset
comp.peekAddr(T0, 0); // value to store
@@ -81,7 +81,7 @@
// on entry T0, T1 already contain the appropriate values
static void compileArrayLoadBarrier(BaselineCompilerImpl comp) {
Assembler asm = comp.asm;
- asm.emitLAddrToc(S0, Entrypoints.referenceArrayReadBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectArrayReadBarrierMethod.getOffset());
asm.emitMTCTR(S0);
asm.emitBCCTRL(); // MemoryManager.arrayLoadReadBarrier(T0,T1)
}
@@ -90,7 +90,7 @@
// T1 already contains the offset of the field on entry
static void compileGetfieldBarrier(BaselineCompilerImpl comp, int locationMetadata) {
Assembler asm = comp.asm;
- asm.emitLAddrToc(S0, Entrypoints.referenceFieldReadBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectFieldReadBarrierMethod.getOffset());
asm.emitMTCTR(S0);
comp.peekAddr(T0, 0); // object base
asm.emitNullCheck(T0);
@@ -101,7 +101,7 @@
// on entry java stack contains ...|source_ref|
static void compileGetfieldBarrierImm(BaselineCompilerImpl comp, Offset fieldOffset, int locationMetadata) {
Assembler asm = comp.asm;
- asm.emitLAddrToc(S0, Entrypoints.referenceFieldReadBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectFieldReadBarrierMethod.getOffset());
asm.emitMTCTR(S0);
comp.peekAddr(T0, 0); // object base
asm.emitNullCheck(T0);
@@ -114,7 +114,7 @@
// T0 already contains the offset of the field on entry
static void compileGetstaticBarrier(BaselineCompilerImpl comp, int locationMetadata) {
Assembler asm = comp.asm;
- asm.emitLAddrToc(S0, Entrypoints.referenceNonHeapReadBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectNonHeapReadBarrierMethod.getOffset());
asm.emitMTCTR(S0);
asm.emitLVAL(T1, locationMetadata);
asm.emitBCCTRL(); // MemoryManager.getstaticReadBarrier(T0,T1)
@@ -123,7 +123,7 @@
// on entry java stack contains ...|
static void compileGetstaticBarrierImm(BaselineCompilerImpl comp, Offset fieldOffset, int locationMetadata) {
Assembler asm = comp.asm;
- asm.emitLAddrToc(S0, Entrypoints.referenceNonHeapReadBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectNonHeapReadBarrierMethod.getOffset());
asm.emitMTCTR(S0);
asm.emitLVALAddr(T0, fieldOffset); // offset
asm.emitLVAL(T1, locationMetadata);

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineCompilerImpl.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineCompilerImpl.java 2009-09-18 03:57:39 UTC (rev 15782)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineCompilerImpl.java 2009-09-18 08:44:24 UTC (rev 15783)
@@ -965,7 +965,7 @@
@Override
protected final void emit_aaload() {
genBoundsCheck();
- if (NEEDS_REFERENCE_ALOAD_BARRIER) {
+ if (NEEDS_OBJECT_ALOAD_BARRIER) {
Barriers.compileArrayLoadBarrier(this);
pushAddr(T0);
} else {
@@ -2470,7 +2470,7 @@
protected final void emit_unresolved_getstatic(FieldReference fieldRef) {
emitDynamicLinkingSequence(T0, fieldRef, true);
TypeReference fieldType = fieldRef.getFieldContentsType();
- if (NEEDS_REFERENCE_GETSTATIC_BARRIER && fieldType.isReferenceType()) {
+ if (NEEDS_OBJECT_GETSTATIC_BARRIER && fieldType.isReferenceType()) {
Barriers.compileGetstaticBarrier(this, fieldType.getId());
pushAddr(T0);
return;
@@ -2500,7 +2500,7 @@
RVMField field = fieldRef.peekResolvedField();
Offset fieldOffset = field.getOffset();
TypeReference fieldType = fieldRef.getFieldContentsType();
- if (NEEDS_REFERENCE_GETSTATIC_BARRIER && fieldType.isReferenceType() && !field.isUntraced()) {
+ if (NEEDS_OBJECT_GETSTATIC_BARRIER && fieldType.isReferenceType() && !field.isUntraced()) {
Barriers.compileGetstaticBarrierImm(this, fieldOffset, fieldType.getId());
pushAddr(T0);
return;
@@ -2528,7 +2528,7 @@
*/
protected final void emit_unresolved_putstatic(FieldReference fieldRef) {
emitDynamicLinkingSequence(T1, fieldRef, true);
- if (NEEDS_REFERENCE_PUTSTATIC_BARRIER && !fieldRef.getFieldContentsType().isPrimitiveType()) {
+ if (NEEDS_OBJECT_PUTSTATIC_BARRIER && !fieldRef.getFieldContentsType().isPrimitiveType()) {
Barriers.compilePutstaticBarrier(this, fieldRef.getId()); // NOTE: offset is in T0 from emitDynamicLinkingSequence
discardSlots(1);
return;
@@ -2557,7 +2557,7 @@
protected final void emit_resolved_putstatic(FieldReference fieldRef) {
RVMField field = fieldRef.peekResolvedField();
Offset fieldOffset = field.getOffset();
- if (NEEDS_REFERENCE_PUTSTATIC_BARRIER && !fieldRef.getFieldContentsType().isPrimitiveType() && !field.isUntraced()) {
+ if (NEEDS_OBJECT_PUTSTATIC_BARRIER && !fieldRef.getFieldContentsType().isPrimitiveType() && !field.isUntraced()) {
Barriers.compilePutstaticBarrierImm(this, fieldOffset, fieldRef.getId());
discardSlots(1);
return;
@@ -2587,7 +2587,7 @@
TypeReference fieldType = fieldRef.getFieldContentsType();
// T1 = field offset from emitDynamicLinkingSequence()
emitDynamicLinkingSequence(T1, fieldRef, true);
- if (NEEDS_REFERENCE_GETFIELD_BARRIER && fieldType.isReferenceType()) {
+ if (NEEDS_OBJECT_GETFIELD_BARRIER && fieldType.isReferenceType()) {
Barriers.compileGetfieldBarrier(this, fieldType.getId());
discardSlots(1);
pushAddr(T0);
@@ -2637,7 +2637,7 @@
RVMField field = fieldRef.peekResolvedField();
TypeReference fieldType = fieldRef.getFieldContentsType();
Offset fieldOffset = field.getOffset();
- if (NEEDS_REFERENCE_GETFIELD_BARRIER && fieldType.isReferenceType() && !field.isUntraced()) {
+ if (NEEDS_OBJECT_GETFIELD_BARRIER && fieldType.isReferenceType() && !field.isUntraced()) {
Barriers.compileGetfieldBarrierImm(this, fieldOffset, fieldType.getId());
discardSlots(1);
pushAddr(T0);
@@ -2688,7 +2688,7 @@
emitDynamicLinkingSequence(T2, fieldRef, true);
if (fieldType.isReferenceType()) {
// 32/64bit reference store
- if (NEEDS_REFERENCE_PUTFIELD_BARRIER) {
+ if (NEEDS_OBJECT_PUTFIELD_BARRIER) {
// NOTE: offset is in T2 from emitDynamicLinkingSequence
Barriers.compilePutfieldBarrier(this, fieldRef.getId());
discardSlots(2);
@@ -2742,7 +2742,7 @@
TypeReference fieldType = fieldRef.getFieldContentsType();
if (fieldType.isReferenceType()) {
// 32/64bit reference store
- if (NEEDS_REFERENCE_PUTFIELD_BARRIER && !field.isUntraced()) {
+ if (NEEDS_OBJECT_PUTFIELD_BARRIER && !field.isUntraced()) {
Barriers.compilePutfieldBarrierImm(this, fieldOffset, fieldRef.getId());
discardSlots(2);
} else {
@@ -3743,7 +3743,7 @@
* @param reg The register to hold the counter array.
*/
private void loadCounterArray(int reg) {
- if (NEEDS_REFERENCE_ALOAD_BARRIER) {
+ if (NEEDS_OBJECT_ALOAD_BARRIER) {
asm.emitLAddrToc(T0, Entrypoints.edgeCountersField.getOffset());
asm.emitLVAL(T1, getEdgeCounterIndex());
Barriers.compileArrayLoadBarrier(this);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Jikesrvm-commits mailing list
Jikesrvm-commits@...
https://lists.sourceforge.net/lists/listinfo/jikesrvm-commits

SF.net SVN: jikesrvm:[15782] rvmroot/trunk

2009-09-17T20:57:40Z

Revision: 15782
http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15782&view=rev
Author: steveb-oss
Date: 2009-09-18 03:57:39 +0000 (Fri, 18 Sep 2009)

Log Message:
-----------
Yet another minor refactoring toward RVM-845

Modified Paths:
--------------
rvmroot/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Barriers.java
rvmroot/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Barriers.java
rvmroot/trunk/MMTk/harness/src/org/mmtk/harness/Mutator.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/MutatorContext.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/PlanConstraints.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/Gen.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenCollector.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenConstraints.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenMutator.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/poisoned/PoisonedConstraints.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/poisoned/PoisonedMutator.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/RCBaseConstraints.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/RCBaseMutator.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceConstraints.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceMutator.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixConstraints.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixMutator.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/stickyms/StickyMSConstraints.java
rvmroot/trunk/MMTk/src/org/mmtk/plan/stickyms/StickyMSMutator.java
rvmroot/trunk/MMTk/src/org/mmtk/utility/heap/Map.java
rvmroot/trunk/MMTk/src/org/mmtk/vm/Barriers.java
rvmroot/trunk/rvm/src/org/jikesrvm/Services.java
rvmroot/trunk/rvm/src/org/jikesrvm/classloader/RVMArray.java
rvmroot/trunk/rvm/src/org/jikesrvm/classloader/RVMField.java
rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/Barriers.java
rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineCompilerImpl.java
rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ExpandRuntimeServices.java
rvmroot/trunk/rvm/src/org/jikesrvm/mm/mminterface/Barriers.java
rvmroot/trunk/rvm/src/org/jikesrvm/mm/mminterface/MemoryManager.java
rvmroot/trunk/rvm/src/org/jikesrvm/osr/ObjectHolder.java
rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Entrypoints.java
rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Statics.java
rvmroot/trunk/rvm/src/org/jikesrvm/scheduler/Synchronization.java

Modified: rvmroot/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Barriers.java
===================================================================
--- rvmroot/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Barriers.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Barriers.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -30,12 +30,25 @@
* @param mode The context in which the write is occurring
*/
@Override
- public void referenceWrite(ObjectReference ref, ObjectReference target,
- Word slot, Word unused, int mode) {
+ public void objectReferenceWrite(ObjectReference ref, ObjectReference target, Word slot, Word unused, int mode) {
slot.toAddress().store(target);
}

/**
+ * Perform the actual read of the read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param slot The address to be read from
+ * @param unused Unused
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ @Override
+ public ObjectReference objectReferenceRead(ObjectReference ref,Word slot, Word unused, int mode) {
+ return slot.toAddress().loadObjectReference();
+ }
+
+ /**
* Perform the actual write of the non-heap write barrier. This is
* used when the store is not to an object, but to a non-heap location
* such as statics or the stack.
@@ -46,8 +59,7 @@
* @param unusedB Opaque, VM-specific, meta-data identifying the slot
*/
@Override
- public void referenceWrite(Address slot, ObjectReference target,
- Word unusedA, Word unusedB) {
+ public void objectReferenceWrite(Address slot, ObjectReference target, Word unusedA, Word unusedB) {
slot.store(target);
}

@@ -63,8 +75,7 @@
* @return The value that was replaced by the write.
*/
@Override
- public ObjectReference referenceAtomicWrite(ObjectReference ref, ObjectReference target,
- Word slot, Word unused, int mode) {
+ public ObjectReference objectReferenceAtomicWrite(ObjectReference ref, ObjectReference target, Word slot, Word unused, int mode) {
ObjectReference old;
do {
old = slot.toAddress().prepareObjectReference();
@@ -84,25 +95,10 @@
* @return True if the compare and swap was successful
*/
@Override
- public boolean referenceTryCompareAndSwap(ObjectReference ref, ObjectReference old, ObjectReference target,
- Word slot, Word unused, int mode) {
+ public boolean objectReferenceTryCompareAndSwap(ObjectReference ref, ObjectReference old, ObjectReference target, Word slot, Word unused, int mode) {
return slot.toAddress().attempt(old, target);
}

- /**
- * Perform the actual read of the read barrier.
- *
- * @param ref The object that has the reference field
- * @param slot The address to be read from
- * @param unused Unused
- * @param mode The context in which the write is occurring
- * @return the read value
- */
- @Override
- public ObjectReference referenceRead(ObjectReference ref,
- Word slot, Word unused, int mode) {
- return slot.toAddress().loadObjectReference();
- }

/**
* Perform the actual write of the write barrier, writing the value as a raw Word.
@@ -114,8 +110,7 @@
* @param mode The context in which the write is occurring
*/
@Override
- public void wordWrite(ObjectReference ref, Word target,
- Word slot, Word unused, int mode) {
+ public void wordWrite(ObjectReference ref, Word target, Word slot, Word unused, int mode) {
slot.toAddress().store(target);
}

@@ -168,8 +163,7 @@
* @return the read value
*/
@Override
- public Word wordRead(ObjectReference ref,
- Word slot, Word unused, int mode) {
+ public Word wordRead(ObjectReference ref, Word slot, Word unused, int mode) {
return slot.toAddress().loadWord();
}

@@ -184,8 +178,7 @@
* @param value the new value for the element
*/
@Override
- public void referenceArrayStoreNoGCBarrier(Object [] dst, int index, Object value) {
+ public void objectArrayStoreNoGCBarrier(Object [] dst, int index, Object value) {
dst[index] = value;
}
-
}

Modified: rvmroot/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Barriers.java
===================================================================
--- rvmroot/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Barriers.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Barriers.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -31,25 +31,11 @@
* @param mode The context in which the write is occurring
*/
@Inline
- public final void referenceWrite(ObjectReference objref, ObjectReference target, Word offset, Word location, int mode) {
+ public final void objectReferenceWrite(ObjectReference objref, ObjectReference target, Word offset, Word location, int mode) {
Magic.setObjectAtOffset(objref.toObject(), offset.toOffset(), target.toObject(), location.toInt());
}

/**
- * Perform the actual write of the non-heap write barrier. This is
- * used when the store is not to an object, but to a non-heap location
- * such as statics or the stack.
- * @param target The value that the slot will be updated to
- * @param unusedA The offset from the ref
- * @param unusedB Unused
- * @param ref The object that has the reference field
- */
- @Inline
- public final void referenceWrite(Address slot, ObjectReference target, Word unusedA, Word unusedB) {
- slot.store(target);
- }
-
- /**
* Perform the actual read of the read barrier.
*
* @param objref The object that has the reference field
@@ -59,29 +45,22 @@
* @return the read value
*/
@Inline
- public final ObjectReference referenceRead(ObjectReference objref, Word offset, Word location, int mode) {
+ public final ObjectReference objectReferenceRead(ObjectReference objref, Word offset, Word location, int mode) {
return ObjectReference.fromObject(Magic.getObjectAtOffset(objref.toObject(), offset.toOffset(), location.toInt()));
}

/**
- * Sets an element of an object array without invoking any write
- * barrier. This method is called by the Map class to ensure
- * potentially-allocation-triggering write barriers do not occur in
- * allocation slow path code.
- *
- * @param dst the destination array
- * @param index the index of the element to set
- * @param value the new value for the element
+ * Perform the actual write of the non-heap write barrier. This is
+ * used when the store is not to an object, but to a non-heap location
+ * such as statics or the stack.
+ * @param target The value that the slot will be updated to
+ * @param unusedA The offset from the ref
+ * @param unusedB Unused
+ * @param ref The object that has the reference field
*/
- @UninterruptibleNoWarn
- public final void referenceArrayStoreNoGCBarrier(Object[] dst, int index, Object value) {
- if (org.jikesrvm.VM.runningVM) {
- Address base = ObjectReference.fromObject(dst).toAddress();
- Address slot = base.plus(Offset.fromIntZeroExtend(index << LOG_BYTES_IN_ADDRESS));
- VM.activePlan.global().storeObjectReference(slot, ObjectReference.fromObject(value));
- } else {
- dst[index] = value;
- }
+ @Inline
+ public final void objectReferenceWrite(Address slot, ObjectReference target, Word unusedA, Word unusedB) {
+ slot.store(target);
}

/**
@@ -96,7 +75,7 @@
* @return The value that was replaced by the write.
*/
@Inline
- public final ObjectReference referenceAtomicWrite(ObjectReference objref, ObjectReference target, Word offset, Word unused, int mode) {
+ public final ObjectReference objectReferenceAtomicWrite(ObjectReference objref, ObjectReference target, Word offset, Word unused, int mode) {
Object obj = objref.toObject();
Object newObject = target.toObject();
Object oldObject;
@@ -118,7 +97,7 @@
* @return True if the compare and swap was successful
*/
@Inline
- public final boolean referenceTryCompareAndSwap(ObjectReference objref, ObjectReference old, ObjectReference target, Word offset, Word unused, int mode) {
+ public final boolean objectReferenceTryCompareAndSwap(ObjectReference objref, ObjectReference old, ObjectReference target, Word offset, Word unused, int mode) {
Object oldValue;
do {
oldValue = Magic.prepareObject(objref, offset.toOffset());
@@ -199,4 +178,24 @@
return Magic.getWordAtOffset(ref.toObject(), offset.toOffset(), location.toInt());
}

+ /**
+ * Sets an element of an object array without invoking any write
+ * barrier. This method is called by the Map class to ensure
+ * potentially-allocation-triggering write barriers do not occur in
+ * allocation slow path code.
+ *
+ * @param dst the destination array
+ * @param index the index of the element to set
+ * @param value the new value for the element
+ */
+ @UninterruptibleNoWarn
+ public final void objectArrayStoreNoGCBarrier(Object[] dst, int index, Object value) {
+ if (org.jikesrvm.VM.runningVM) {
+ Address base = ObjectReference.fromObject(dst).toAddress();
+ Address slot = base.plus(Offset.fromIntZeroExtend(index << LOG_BYTES_IN_ADDRESS));
+ VM.activePlan.global().storeObjectReference(slot, ObjectReference.fromObject(value));
+ } else {
+ dst[index] = value;
+ }
+ }
}

Modified: rvmroot/trunk/MMTk/harness/src/org/mmtk/harness/Mutator.java
===================================================================
--- rvmroot/trunk/MMTk/harness/src/org/mmtk/harness/Mutator.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/MMTk/harness/src/org/mmtk/harness/Mutator.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -302,8 +302,8 @@
check(index < limit, "Index "+index+" out of bounds "+limit);

Address referenceSlot = ObjectModel.getRefSlot(object, index);
- if (ActivePlan.constraints.needsReferenceWriteBarrier()) {
- context.referenceWrite(object, referenceSlot, value, referenceSlot.toWord(), null, Plan.ARRAY_ELEMENT);
+ if (ActivePlan.constraints.needsObjectReferenceWriteBarrier()) {
+ context.objectReferenceWrite(object, referenceSlot, value, referenceSlot.toWord(), null, Plan.ARRAY_ELEMENT);
if (gcEveryWB) {
gc();
}
@@ -346,8 +346,8 @@

Address referenceSlot = ObjectModel.getRefSlot(object, index);
ObjectReference result;
- if (ActivePlan.constraints.needsReferenceReadBarrier()) {
- result = context.referenceRead(object, referenceSlot, null, null, Plan.INSTANCE_FIELD);
+ if (ActivePlan.constraints.needsObjectReferenceReadBarrier()) {
+ result = context.objectReferenceRead(object, referenceSlot, null, null, Plan.INSTANCE_FIELD);
} else {
result = referenceSlot.loadObjectReference();
}

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/MutatorContext.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/MutatorContext.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/MutatorContext.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -267,70 +267,57 @@
*/

/**
- * A new reference is about to be created. Take appropriate write
- * barrier actions.
+ * Read a reference type. In a concurrent collector this may
+ * involve adding the referent to the marking queue.
*
- * By default do nothing, override if appropriate.
- *
- * @param src The object into which the new reference will be stored
- * @param slot The address into which the new reference will be
- * stored.
- * @param tgt The target of the new reference
- * @param metaDataA A value that assists the host VM in creating a store
- * @param metaDataB A value that assists the host VM in creating a store
- * @param mode The context in which the store occurred
+ * @param referent The referent being read.
+ * @return The new referent.
*/
- public void referenceWrite(ObjectReference src, Address slot,
- ObjectReference tgt, Word metaDataA,
- Word metaDataB, int mode) {
- // Either: write barriers are used and this is overridden, or
- // write barriers are not used and this is never called
+ @Inline
+ public ObjectReference javaLangReferenceReadBarrier(ObjectReference referent) {
+ // Either: read barriers are used and this is overridden, or
+ // read barriers are not used and this is never called
if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+ return ObjectReference.nullReference();
}

/**
- * A new reference is about to be created in a location that is not
- * a regular heap object. Take appropriate write barrier actions.
+ * Write an object reference. Take appropriate write barrier actions.
*
* By default do nothing, override if appropriate.
*
+ * @param src The object into which the new reference will be stored
* @param slot The address into which the new reference will be
* stored.
* @param tgt The target of the new reference
* @param metaDataA A value that assists the host VM in creating a store
* @param metaDataB A value that assists the host VM in creating a store
+ * @param mode The context in which the store occurred
*/
- public void referenceNonHeapWrite(Address slot, ObjectReference tgt,
- Word metaDataA, Word metaDataB) {
+ public void objectReferenceWrite(ObjectReference src, Address slot, ObjectReference tgt, Word metaDataA, Word metaDataB, int mode) {
// Either: write barriers are used and this is overridden, or
// write barriers are not used and this is never called
if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
}

/**
- * Attempt to atomically exchange the value in the given slot
- * with the passed replacement value. If a new reference is
- * created, we must then take appropriate write barrier actions.
+ * Read an object reference. Take appropriate read barrier action, and
+ * return the value that was read. This is a substituting
+ * barrier. The call to this barrier takes the place of a load.
*
- * By default do nothing, override if appropriate.
- *
- * @param src The object into which the new reference will be stored
- * @param slot The address into which the new reference will be
- * stored.
- * @param old The old reference to be swapped out
- * @param tgt The target of the new reference
- * @param metaDataA A value that assists the host VM in creating a store
- * @param metaDataB A value that assists the host VM in creating a store
- * @param mode The context in which the store occurred
- * @return True if the swap was successful.
+ * @param src The object reference holding the field being read.
+ * @param slot The address of the slot being read.
+ * @param metaDataA A value that assists the host VM in creating a load
+ * @param metaDataB A value that assists the host VM in creating a load
+ * @param mode The context in which the load occurred
+ * @return The reference that was read.
*/
- public boolean referenceTryCompareAndSwap(ObjectReference src, Address slot,
- ObjectReference old, ObjectReference tgt, Word metaDataA,
- Word metaDataB, int mode) {
- // Either: write barriers are used and this is overridden, or
- // write barriers are not used and this is never called
+ @Inline
+ public ObjectReference objectReferenceRead(ObjectReference src, Address slot, Word metaDataA, Word metaDataB, int mode) {
+ // Either: read barriers are used and this is overridden, or
+ // read barriers are not used and this is never called
if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
- return false;
+ return ObjectReference.nullReference();
}

/**
@@ -351,44 +338,44 @@
* @return True if the update was performed by the barrier, false if
* left to the caller (always false in this case).
*/
- public boolean referenceBulkCopy(ObjectReference src, Offset srcOffset,
- ObjectReference dst, Offset dstOffset,
- int bytes) {
+ public boolean objectReferenceBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
// Either: write barriers are used and this is overridden, or
// write barriers are not used and this is never called
if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
return false;
}

+
/**
- * Read a reference type. In a concurrent collector this may
- * involve adding the referent to the marking queue.
+ * A new reference is about to be created in a location that is not
+ * a regular heap object. Take appropriate write barrier actions.
*
- * @param referent The referent being read.
- * @return The new referent.
+ * By default do nothing, override if appropriate.
+ *
+ * @param slot The address into which the new reference will be
+ * stored.
+ * @param tgt The target of the new reference
+ * @param metaDataA A value that assists the host VM in creating a store
+ * @param metaDataB A value that assists the host VM in creating a store
*/
- @Inline
- public ObjectReference javaLangReferenceReadBarrier(ObjectReference referent) {
- // Either: read barriers are used and this is overridden, or
- // read barriers are not used and this is never called
+ public void objectReferenceNonHeapWrite(Address slot, ObjectReference tgt, Word metaDataA, Word metaDataB) {
+ // Either: write barriers are used and this is overridden, or
+ // write barriers are not used and this is never called
if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
- return ObjectReference.nullReference();
}

/**
- * Read a reference. Take appropriate read barrier action, and
+ * Read an object reference. Take appropriate read barrier action, and
* return the value that was read. This is a substituting
* barrier. The call to this barrier takes the place of a load.
*
- * @param src The object reference holding the field being read.
* @param slot The address of the slot being read.
* @param metaDataA A value that assists the host VM in creating a load
* @param metaDataB A value that assists the host VM in creating a load
- * @param mode The context in which the load occurred
* @return The reference that was read.
*/
@Inline
- public ObjectReference referenceRead(ObjectReference src, Address slot, Word metaDataA, Word metaDataB, int mode) {
+ public ObjectReference objectReferenceNonHeapRead(Address slot, Word metaDataA, Word metaDataB) {
// Either: read barriers are used and this is overridden, or
// read barriers are not used and this is never called
if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
@@ -396,22 +383,33 @@
}

/**
- * Read a reference. Take appropriate read barrier action, and
- * return the value that was read. This is a substituting
- * barrier. The call to this barrier takes the place of a load.
+ * Attempt to atomically exchange the value in the given slot
+ * with the passed replacement value. If a new reference is
+ * created, we must then take appropriate write barrier actions.
*
- * @param slot The address of the slot being read.
- * @param metaDataA A value that assists the host VM in creating a load
- * @param metaDataB A value that assists the host VM in creating a load
- * @return The reference that was read.
+ * By default do nothing, override if appropriate.
+ *
+ * @param src The object into which the new reference will be stored
+ * @param slot The address into which the new reference will be
+ * stored.
+ * @param old The old reference to be swapped out
+ * @param tgt The target of the new reference
+ * @param metaDataA A value that assists the host VM in creating a store
+ * @param metaDataB A value that assists the host VM in creating a store
+ * @param mode The context in which the store occurred
+ * @return True if the swap was successful.
*/
- @Inline
- public ObjectReference referenceNonHeapRead(Address slot, Word metaDataA, Word metaDataB) {
- // Either: read barriers are used and this is overridden, or
- // read barriers are not used and this is never called
+ public boolean objectReferenceTryCompareAndSwap(ObjectReference src, Address slot, ObjectReference old, ObjectReference tgt, Word metaDataA, Word metaDataB, int mode) {
+ // Either: write barriers are used and this is overridden, or
+ // write barriers are not used and this is never called
if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
- return ObjectReference.nullReference();
+ return false;
}
+
+
+
+
+
/**
* Flush mutator context, in response to a requestMutatorFlush.
* Also called by the default implementation of deinitMutator.

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/PlanConstraints.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/PlanConstraints.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/PlanConstraints.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -25,17 +25,17 @@
/** @return True of this Plan requires read barriers on java.lang.reference types. */
public boolean needsJavaLangReferenceReadBarrier() { return false; }

- /** @return True if this Plan requires write barriers on reference types. */
- public boolean needsReferenceWriteBarrier() { return false; }
+ /** @return True if this Plan requires write barriers on object references. */
+ public boolean needsObjectReferenceWriteBarrier() { return false; }

- /** @return True of this Plan requires read barriers on reference types. */
- public boolean needsReferenceReadBarrier() { return false; }
+ /** @return True of this Plan requires read barriers on object references. */
+ public boolean needsObjectReferenceReadBarrier() { return false; }

- /** @return True if this Plan requires static write barriers on reference types. */
- public boolean needsReferenceStaticWriteBarrier() { return false;}
+ /** @return True if this Plan requires non-heap write barriers on object references. */
+ public boolean needsObjectReferenceNonHeapWriteBarrier() { return false;}

- /** @return True if this Plan requires static read barriers on reference types. */
- public boolean needsReferenceStaticReadBarrier() { return false; }
+ /** @return True if this Plan requires non-heap read barriers on object references. */
+ public boolean needsObjectReferenceNonHeapReadBarrier() { return false; }

/** @return True if this Plan requires linear scanning. */
public boolean needsLinearScan() { return org.mmtk.utility.Constants.SUPPORT_CARD_SCANNING;}

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/Gen.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/Gen.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/Gen.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -56,7 +56,7 @@
protected static final float MATURE_FRACTION = 0.5f; // est yield
private static final float WORST_CASE_COPY_EXPANSION = 1.5f; // worst case for addition of one word overhead due to address based hashing
public static final boolean IGNORE_REMSETS = false;
- public static final boolean USE_STATIC_WRITE_BARRIER = false;
+ public static final boolean USE_NON_HEAP_OBJECT_REFERENCE_WRITE_BARRIER = false;
public static final boolean USE_OBJECT_BARRIER_FOR_AASTORE = false; // choose between slot and object barriers
public static final boolean USE_OBJECT_BARRIER_FOR_PUTFIELD = false; // choose between slot and object barriers
public static final boolean USE_OBJECT_BARRIER = USE_OBJECT_BARRIER_FOR_AASTORE || USE_OBJECT_BARRIER_FOR_PUTFIELD;

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenCollector.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenCollector.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenCollector.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -95,7 +95,7 @@

if (phaseId == StopTheWorld.ROOTS) {
VM.scanning.computeGlobalRoots(getCurrentTrace());
- if (!Gen.USE_STATIC_WRITE_BARRIER || global().traceFullHeap()) {
+ if (!Gen.USE_NON_HEAP_OBJECT_REFERENCE_WRITE_BARRIER || global().traceFullHeap()) {
VM.scanning.computeStaticRoots(getCurrentTrace());
}
if (Plan.SCAN_BOOT_IMAGE && global().traceFullHeap()) {

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenConstraints.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenConstraints.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenConstraints.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -46,11 +46,11 @@

/** @return True if this plan requires a write barrier */
@Override
- public boolean needsReferenceWriteBarrier() { return true; }
+ public boolean needsObjectReferenceWriteBarrier() { return true; }

/** @return True if this plan requires a static barrier */
@Override
- public boolean needsReferenceStaticWriteBarrier() { return Gen.USE_STATIC_WRITE_BARRIER; }
+ public boolean needsObjectReferenceNonHeapWriteBarrier() { return Gen.USE_NON_HEAP_OBJECT_REFERENCE_WRITE_BARRIER; }

/** @return The specialized scan methods required */
@Override

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenMutator.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenMutator.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/GenMutator.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -175,11 +175,11 @@
* @param mode The mode of the store (eg putfield, putstatic etc)
*/
@Inline
- public final void referenceWrite(ObjectReference src, Address slot,
+ public final void objectReferenceWrite(ObjectReference src, Address slot,
ObjectReference tgt, Word metaDataA,
Word metaDataB, int mode) {
fastPath(src, slot, tgt, mode);
- VM.barriers.referenceWrite(src, tgt, metaDataA, metaDataB, mode);
+ VM.barriers.objectReferenceWrite(src, tgt, metaDataA, metaDataB, mode);
}

@@ -216,10 +216,10 @@
* @param metaDataB A value that assists the host VM in creating a store
*/
@Inline
- public final void referenceNonHeapWrite(Address slot, ObjectReference tgt,
+ public final void objectReferenceNonHeapWrite(Address slot, ObjectReference tgt,
Word metaDataA, Word metaDataB) {
fastPath(slot, tgt);
- VM.barriers.referenceWrite(slot, tgt, metaDataA, metaDataB);
+ VM.barriers.objectReferenceWrite(slot, tgt, metaDataA, metaDataB);
}

/**
@@ -242,9 +242,9 @@
* @return True if the swap was successful.
*/
@Inline
- public boolean referenceTryCompareAndSwap(ObjectReference src, Address slot, ObjectReference old, ObjectReference tgt,
+ public boolean objectReferenceTryCompareAndSwap(ObjectReference src, Address slot, ObjectReference old, ObjectReference tgt,
Word metaDataA, Word metaDataB, int mode) {
- boolean result = VM.barriers.referenceTryCompareAndSwap(src, old, tgt, metaDataA, metaDataB, mode);
+ boolean result = VM.barriers.objectReferenceTryCompareAndSwap(src, old, tgt, metaDataA, metaDataB, mode);
if (result)
fastPath(src, slot, tgt, mode);
return result;
@@ -272,7 +272,7 @@
* left to the caller (always false in this case).
*/
@Inline
- public final boolean referenceBulkCopy(ObjectReference src, Offset srcOffset,
+ public final boolean objectReferenceBulkCopy(ObjectReference src, Offset srcOffset,
ObjectReference dst, Offset dstOffset,
int bytes) {
// We can ignore when src is in old space, right?

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/poisoned/PoisonedConstraints.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/poisoned/PoisonedConstraints.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/poisoned/PoisonedConstraints.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -24,11 +24,11 @@
@Uninterruptible
public class PoisonedConstraints extends MSConstraints {
@Override
- public boolean needsReferenceWriteBarrier() { return true; }
+ public boolean needsObjectReferenceWriteBarrier() { return true; }
@Override
- public boolean needsReferenceReadBarrier() { return true; }
+ public boolean needsObjectReferenceReadBarrier() { return true; }
@Override
- public boolean needsReferenceStaticWriteBarrier() { return false; }
+ public boolean needsObjectReferenceNonHeapWriteBarrier() { return false; }
@Override
- public boolean needsReferenceStaticReadBarrier() { return false; }
+ public boolean needsObjectReferenceNonHeapReadBarrier() { return false; }
}

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/poisoned/PoisonedMutator.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/poisoned/PoisonedMutator.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/poisoned/PoisonedMutator.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -50,7 +50,7 @@
*/
@Inline
@Override
- public void referenceWrite(ObjectReference src, Address slot, ObjectReference tgt, Word metaDataA, Word metaDataB, int mode) {
+ public void objectReferenceWrite(ObjectReference src, Address slot, ObjectReference tgt, Word metaDataA, Word metaDataB, int mode) {
VM.barriers.wordWrite(src, Poisoned.poison(tgt), metaDataA, metaDataB, mode);
}

@@ -72,7 +72,7 @@
* @return True if the swap was successful.
*/
@Override
- public boolean referenceTryCompareAndSwap(ObjectReference src, Address slot, ObjectReference old, ObjectReference tgt,
+ public boolean objectReferenceTryCompareAndSwap(ObjectReference src, Address slot, ObjectReference old, ObjectReference tgt,
Word metaDataA, Word metaDataB, int mode) {
return VM.barriers.wordTryCompareAndSwap(src, Poisoned.poison(old), Poisoned.poison(tgt), metaDataA, metaDataB, mode);
}
@@ -96,7 +96,7 @@
* left to the caller (always false in this case).
*/
@Override
- public boolean referenceBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
+ public boolean objectReferenceBulkCopy(ObjectReference src, Offset srcOffset, ObjectReference dst, Offset dstOffset, int bytes) {
// TODO: Currently, read barriers implies that this is never used, perhaps
// we might want to use it sometime anyway?
if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
@@ -117,7 +117,7 @@
*/
@Inline
@Override
- public ObjectReference referenceRead(ObjectReference src, Address slot, Word metaDataA, Word metaDataB, int mode) {
+ public ObjectReference objectReferenceRead(ObjectReference src, Address slot, Word metaDataA, Word metaDataB, int mode) {
return Poisoned.depoison(VM.barriers.wordRead(src, metaDataA, metaDataB, mode));
}
}

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/RCBaseConstraints.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/RCBaseConstraints.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/RCBaseConstraints.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -30,7 +30,7 @@
@Override
public int gcHeaderWords() { return RCHeader.GC_HEADER_WORDS_REQUIRED; }
@Override
- public boolean needsReferenceWriteBarrier() { return true; }
+ public boolean needsObjectReferenceWriteBarrier() { return true; }
@Override
public int maxNonLOSDefaultAllocBytes() { return MAX_FREELIST_OBJECT_BYTES; }
}

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/RCBaseMutator.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/RCBaseMutator.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/RCBaseMutator.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -238,13 +238,13 @@
* @param mode The context in which the store occurred
*/
@Inline
- public void referenceWrite(ObjectReference src, Address slot,
+ public void objectReferenceWrite(ObjectReference src, Address slot,
ObjectReference tgt, Word metaDataA,
Word metaDataB, int mode) {
if (RCHeader.logRequired(src)) {
coalescingWriteBarrierSlow(src);
}
- VM.barriers.referenceWrite(src,tgt,metaDataA, metaDataB, mode);
+ VM.barriers.objectReferenceWrite(src,tgt,metaDataA, metaDataB, mode);
}

/**
@@ -265,13 +265,13 @@
* @return True if the swap was successful.
*/
@Inline
- public boolean referenceTryCompareAndSwap(ObjectReference src, Address slot,
+ public boolean objectReferenceTryCompareAndSwap(ObjectReference src, Address slot,
ObjectReference old, ObjectReference tgt, Word metaDataA,
Word metaDataB, int mode) {
if (RCHeader.logRequired(src)) {
coalescingWriteBarrierSlow(src);
}
- return VM.barriers.referenceTryCompareAndSwap(src,old,tgt,metaDataA,metaDataB,mode);
+ return VM.barriers.objectReferenceTryCompareAndSwap(src,old,tgt,metaDataA,metaDataB,mode);
}

/**
@@ -293,7 +293,7 @@
* left to the caller (always false in this case).
*/
@Inline
- public boolean referenceBulkCopy(ObjectReference src, Offset srcOffset,
+ public boolean objectReferenceBulkCopy(ObjectReference src, Offset srcOffset,
ObjectReference dst, Offset dstOffset, int bytes) {
if (RCHeader.logRequired(dst)) {
coalescingWriteBarrierSlow(dst);

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceConstraints.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceConstraints.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceConstraints.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -22,7 +22,7 @@
@Uninterruptible
public class GCTraceConstraints extends SSConstraints {
@Override
- public boolean needsReferenceWriteBarrier() { return true; }
+ public boolean needsObjectReferenceWriteBarrier() { return true; }
@Override
public boolean generateGCTrace() { return true; }
}

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceMutator.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceMutator.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceMutator.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -89,12 +89,12 @@
* @param mode The mode of the store (eg putfield, putstatic etc)
*/
@Inline
- public final void referenceWrite(ObjectReference src, Address slot,
+ public final void objectReferenceWrite(ObjectReference src, Address slot,
ObjectReference tgt, Word metaDataA,
Word metaDataB, int mode) {
TraceGenerator.processPointerUpdate(mode == INSTANCE_FIELD,
src, slot, tgt);
- VM.barriers.referenceWrite(src, tgt, metaDataA, metaDataB, mode);
+ VM.barriers.objectReferenceWrite(src, tgt, metaDataA, metaDataB, mode);
}

/**
@@ -115,10 +115,10 @@
* @return True if the swap was successful.
*/
@Inline
- public boolean referenceTryCompareAndSwap(ObjectReference src, Address slot,
+ public boolean objectReferenceTryCompareAndSwap(ObjectReference src, Address slot,
ObjectReference old, ObjectReference tgt, Word metaDataA,
Word metaDataB, int mode) {
- boolean result = VM.barriers.referenceTryCompareAndSwap(src, old, tgt, metaDataA, metaDataB, mode);
+ boolean result = VM.barriers.objectReferenceTryCompareAndSwap(src, old, tgt, metaDataA, metaDataB, mode);
if (result) {
TraceGenerator.processPointerUpdate(mode == INSTANCE_FIELD, src, slot, tgt);
}
@@ -143,7 +143,7 @@
* @return True if the update was performed by the barrier, false if
* left to the caller (always false in this case).
*/
- public boolean referenceBulkCopy(ObjectReference src, Offset srcOffset,
+ public boolean objectReferenceBulkCopy(ObjectReference src, Offset srcOffset,
ObjectReference dst, Offset dstOffset, int bytes) {
/* These names seem backwards, but are defined to be compatable with the
* previous writeBarrier method. */

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixConstraints.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixConstraints.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixConstraints.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -32,7 +32,7 @@

/** @return True if this plan requires a write barrier */
@Override
- public boolean needsReferenceWriteBarrier() { return true; }
+ public boolean needsObjectReferenceWriteBarrier() { return true; }

/** @return True if this Plan requires a header bit for object logging */
@Override

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixMutator.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixMutator.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixMutator.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -80,11 +80,11 @@
* @param mode The mode of the store (eg putfield, putstatic etc)
*/
@Inline
- public final void referenceWrite(ObjectReference src, Address slot,
+ public final void objectReferenceWrite(ObjectReference src, Address slot,
ObjectReference tgt, Word metaDataA, Word metaDataB, int mode) {
if (HeaderByte.isUnlogged(src))
logSource(src);
- VM.barriers.referenceWrite(src, tgt, metaDataA, metaDataB, mode);
+ VM.barriers.objectReferenceWrite(src, tgt, metaDataA, metaDataB, mode);
}

/**
@@ -109,7 +109,7 @@
* left to the caller (always false in this case).
*/
@Inline
- public final boolean referenceBulkCopy(ObjectReference src, Offset srcOffset,
+ public final boolean objectReferenceBulkCopy(ObjectReference src, Offset srcOffset,
ObjectReference dst, Offset dstOffset, int bytes) {
if (HeaderByte.isUnlogged(src))
logSource(src);

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/stickyms/StickyMSConstraints.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/stickyms/StickyMSConstraints.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/stickyms/StickyMSConstraints.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -32,7 +32,7 @@

/** @return True if this plan requires a write barrier */
@Override
- public boolean needsReferenceWriteBarrier() { return true; }
+ public boolean needsObjectReferenceWriteBarrier() { return true; }

/** @return True if this Plan requires a header bit for object logging */
@Override

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/stickyms/StickyMSMutator.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/stickyms/StickyMSMutator.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/stickyms/StickyMSMutator.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -81,11 +81,11 @@
* @param mode The mode of the store (eg putfield, putstatic etc)
*/
@Inline
- public final void referenceWrite(ObjectReference src, Address slot,
+ public final void objectReferenceWrite(ObjectReference src, Address slot,
ObjectReference tgt, Word metaDataA, Word metaDataB, int mode) {
if (HeaderByte.isUnlogged(src))
logSource(src);
- VM.barriers.referenceWrite(src, tgt, metaDataA, metaDataB, mode);
+ VM.barriers.objectReferenceWrite(src, tgt, metaDataA, metaDataB, mode);
}

/**
@@ -110,7 +110,7 @@
* left to the caller (always false in this case).
*/
@Inline
- public final boolean referenceBulkCopy(ObjectReference src, Offset srcOffset,
+ public final boolean objectReferenceBulkCopy(ObjectReference src, Offset srcOffset,
ObjectReference dst, Offset dstOffset, int bytes) {
if (HeaderByte.isUnlogged(src))
logSource(src);

Modified: rvmroot/trunk/MMTk/src/org/mmtk/utility/heap/Map.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/utility/heap/Map.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/MMTk/src/org/mmtk/utility/heap/Map.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -97,7 +97,7 @@
VM.assertions.fail("exiting");
}
descriptorMap[index] = descriptor;
- VM.barriers.referenceArrayStoreNoGCBarrier(spaceMap, index, space);
+ VM.barriers.objectArrayStoreNoGCBarrier(spaceMap, index, space);
e = e.plus(Space.BYTES_IN_CHUNK);
}
}
@@ -208,7 +208,7 @@
totalAvailableDiscontiguousChunks += chunks;
for (int offset = 0; offset < chunks; offset++) {
descriptorMap[chunk + offset] = 0;
- VM.barriers.referenceArrayStoreNoGCBarrier(spaceMap, chunk + offset, null);
+ VM.barriers.objectArrayStoreNoGCBarrier(spaceMap, chunk + offset, null);
linkageMap[chunk + offset] = 0;
}
return chunks;

Modified: rvmroot/trunk/MMTk/src/org/mmtk/vm/Barriers.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/vm/Barriers.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/MMTk/src/org/mmtk/vm/Barriers.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -18,7 +18,7 @@
@Uninterruptible
public abstract class Barriers {
/**
- * Perform the actual write of the write barrier.
+ * Perform the actual write of an object reference write barrier.
*
* @param ref The object that has the reference field
* @param target The value that the slot will be updated to
@@ -26,10 +26,20 @@
* @param metaDataB Opaque, VM-specific, meta-data identifying the slot
* @param mode The context in which the write is occurring
*/
- public abstract void referenceWrite(ObjectReference ref, ObjectReference target,
- Word metaDataA, Word metaDataB, int mode);
+ public abstract void objectReferenceWrite(ObjectReference ref, ObjectReference target, Word metaDataA, Word metaDataB, int mode);

/**
+ * Perform the actual read of the read barrier.
+ *
+ * @param ref The object that has the reference field
+ * @param metaDataA Opaque, VM-specific, meta-data identifying the slot
+ * @param metaDataB Opaque, VM-specific, meta-data identifying the slot
+ * @param mode The context in which the write is occurring
+ * @return the read value
+ */
+ public abstract ObjectReference objectReferenceRead(ObjectReference ref, Word metaDataA, Word metaDataB, int mode);
+
+ /**
* Perform the actual write of the non-heap write barrier. This is
* used when the store is not to an object, but to a non-heap location
* such as statics or the stack.
@@ -39,8 +49,7 @@
* @param metaDataA Opaque, VM-specific, meta-data identifying the slot
* @param metaDataB Opaque, VM-specific, meta-data identifying the slot
*/
- public abstract void referenceWrite(Address slot, ObjectReference target,
- Word metaDataA, Word metaDataB);
+ public abstract void objectReferenceWrite(Address slot, ObjectReference target, Word metaDataA, Word metaDataB);

/**
* Atomically write a reference field of an object or array and return
@@ -53,8 +62,7 @@
* @param mode The context in which the write is occurring
* @return The value that was replaced by the write.
*/
- public abstract ObjectReference referenceAtomicWrite(ObjectReference ref, ObjectReference target,
- Word metaDataA, Word metaDataB, int mode);
+ public abstract ObjectReference objectReferenceAtomicWrite(ObjectReference ref, ObjectReference target, Word metaDataA, Word metaDataB, int mode);

/**
* Attempt an atomic compare and exchange in a write barrier sequence.
@@ -67,23 +75,9 @@
* @param mode The context in which the write is occurring
* @return True if the compare and swap was successful
*/
- public abstract boolean referenceTryCompareAndSwap(ObjectReference ref, ObjectReference old, ObjectReference target,
- Word metaDataA, Word metaDataB, int mode);
+ public abstract boolean objectReferenceTryCompareAndSwap(ObjectReference ref, ObjectReference old, ObjectReference target, Word metaDataA, Word metaDataB, int mode);

/**
- * Perform the actual read of the read barrier.
- *
- * @param ref The object that has the reference field
- * @param metaDataA Opaque, VM-specific, meta-data identifying the slot
- * @param metaDataB Opaque, VM-specific, meta-data identifying the slot
- * @param mode The context in which the write is occurring
- * @return the read value
- */
- public abstract ObjectReference referenceRead(ObjectReference ref,
- Word metaDataA, Word metaDataB, int mode);
-
-
- /**
* Perform the actual write of the write barrier, writing the value as a raw Word.
*
* @param ref The object that has the reference field
@@ -92,8 +86,7 @@
* @param metaDataB Opaque, VM-specific, meta-data identifying the slot
* @param mode The context in which the write is occurring
*/
- public abstract void wordWrite(ObjectReference ref, Word target,
- Word metaDataA, Word metaDataB, int mode);
+ public abstract void wordWrite(ObjectReference ref, Word target, Word metaDataA, Word metaDataB, int mode);

/**
* Atomically write a reference field of an object or array and return
@@ -106,8 +99,7 @@
* @param mode The context in which the write is occurring
* @return The raw value that was replaced by the write.
*/
- public abstract Word wordAtomicWrite(ObjectReference ref, Word rawTarget,
- Word metaDataA, Word metaDataB, int mode);
+ public abstract Word wordAtomicWrite(ObjectReference ref, Word rawTarget, Word metaDataA, Word metaDataB, int mode);

/**
* Attempt an atomic compare and exchange in a write barrier sequence.
@@ -120,8 +112,7 @@
* @param mode The context in which the write is occurring
* @return True if the compare and swap was successful
*/
- public abstract boolean wordTryCompareAndSwap(ObjectReference ref, Word old, Word target,
- Word metaDataA, Word metaDataB, int mode);
+ public abstract boolean wordTryCompareAndSwap(ObjectReference ref, Word old, Word target, Word metaDataA, Word metaDataB, int mode);

/**
* Perform the actual read of the read barrier, returning the value as a raw Word.
@@ -132,8 +123,7 @@
* @param mode The context in which the write is occurring
* @return the read value
*/
- public abstract Word wordRead(ObjectReference ref,
- Word metaDataA, Word metaDataB, int mode);
+ public abstract Word wordRead(ObjectReference ref, Word metaDataA, Word metaDataB, int mode);

/**
* Sets an element of an object array without invoking any write
@@ -145,6 +135,5 @@
* @param index the index of the element to set
* @param value the new value for the element
*/
- public abstract void referenceArrayStoreNoGCBarrier(Object [] dst, int index, Object value);
-
+ public abstract void objectArrayStoreNoGCBarrier(Object [] dst, int index, Object value);
}

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/Services.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/Services.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/Services.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -337,8 +337,8 @@
@Inline
public static void setArrayUninterruptible(Object[] dst, int index, Object value) {
if (VM.runningVM) {
- if (Barriers.NEEDS_REFERENCE_ASTORE_BARRIER) {
- Barriers.referenceArrayWrite(dst, index, value);
+ if (Barriers.NEEDS_OBJECT_ASTORE_BARRIER) {
+ Barriers.objectArrayWrite(dst, index, value);
} else {
Magic.setObjectAtOffset(dst, Offset.fromIntZeroExtend(index << LOG_BYTES_IN_ADDRESS), value);
}

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/classloader/RVMArray.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/RVMArray.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/classloader/RVMArray.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -1025,9 +1025,9 @@
Offset dstOffset = Offset.fromIntZeroExtend(dstIdx << LOG_BYTES_IN_ADDRESS);
int bytes = len << LOG_BYTES_IN_ADDRESS;

- if (!NEEDS_REFERENCE_ALOAD_BARRIER && ((src != dst) || loToHi)) {
- if (!NEEDS_REFERENCE_ASTORE_BARRIER ||
- !Barriers.referenceBulkCopy(src, srcOffset, dst, dstOffset, bytes)) {
+ if (!NEEDS_OBJECT_ALOAD_BARRIER && ((src != dst) || loToHi)) {
+ if (!NEEDS_OBJECT_ASTORE_BARRIER ||
+ !Barriers.objectBulkCopy(src, srcOffset, dst, dstOffset, bytes)) {
Memory.alignedWordCopy(Magic.objectAsAddress(dst).plus(dstOffset),
Magic.objectAsAddress(src).plus(srcOffset),
bytes);
@@ -1046,13 +1046,13 @@
// perform the copy
while (len-- != 0) {
Object value;
- if (NEEDS_REFERENCE_GETFIELD_BARRIER) {
- value = Barriers.referenceArrayRead(src, srcOffset.toInt() >> LOG_BYTES_IN_ADDRESS);
+ if (NEEDS_OBJECT_GETFIELD_BARRIER) {
+ value = Barriers.objectArrayRead(src, srcOffset.toInt() >> LOG_BYTES_IN_ADDRESS);
} else {
value = Magic.getObjectAtOffset(src, srcOffset);
}
- if (NEEDS_REFERENCE_PUTFIELD_BARRIER) {
- Barriers.referenceArrayWrite(dst, dstOffset.toInt() >> LOG_BYTES_IN_ADDRESS, value);
+ if (NEEDS_OBJECT_PUTFIELD_BARRIER) {
+ Barriers.objectArrayWrite(dst, dstOffset.toInt() >> LOG_BYTES_IN_ADDRESS, value);
} else {
Magic.setObjectAtOffset(dst, dstOffset, value);
}

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/classloader/RVMField.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/RVMField.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/classloader/RVMField.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -295,14 +295,14 @@
*/
public Object getObjectValueUnchecked(Object obj) {
if (isStatic()) {
- if (NEEDS_REFERENCE_GETSTATIC_BARRIER && !isUntraced()) {
- return Barriers.referenceNonHeapRead(getOffset(), getId());
+ if (NEEDS_OBJECT_GETSTATIC_BARRIER && !isUntraced()) {
+ return Barriers.objectStaticRead(getOffset(), getId());
} else {
return Statics.getSlotContentsAsObject(getOffset());
}
} else {
- if (NEEDS_REFERENCE_GETFIELD_BARRIER && !isUntraced()) {
- return Barriers.referenceFieldRead(obj, getOffset(), getId());
+ if (NEEDS_OBJECT_GETFIELD_BARRIER && !isUntraced()) {
+ return Barriers.objectFieldRead(obj, getOffset(), getId());
} else {
return Magic.getObjectAtOffset(obj, getOffset());
}
@@ -390,14 +390,14 @@
*/
public void setObjectValueUnchecked(Object obj, Object ref) {
if (isStatic()) {
- if (NEEDS_REFERENCE_PUTSTATIC_BARRIER && !isUntraced()) {
- Barriers.referenceNonHeapWrite(ref, getOffset(), getId());
+ if (NEEDS_OBJECT_PUTSTATIC_BARRIER && !isUntraced()) {
+ Barriers.objectStaticWrite(ref, getOffset(), getId());
} else {
Statics.setSlotContents(getOffset(), ref);
}
} else {
- if (NEEDS_REFERENCE_PUTFIELD_BARRIER && !isUntraced()) {
- Barriers.referenceFieldWrite(obj, ref, getOffset(), getId());
+ if (NEEDS_OBJECT_PUTFIELD_BARRIER && !isUntraced()) {
+ Barriers.objectFieldWrite(obj, ref, getOffset(), getId());
} else {
Magic.setObjectAtOffset(obj, getOffset(), ref);
}

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/Barriers.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/Barriers.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/Barriers.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -52,7 +52,7 @@
asm.emitPUSH_Imm(locationMetadata);
BaselineCompilerImpl.genParameterRegisterLoad(asm, 4);
genNullCheck(asm, T0);
- asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.referenceFieldWriteBarrierMethod.getOffset()));
+ asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectFieldWriteBarrierMethod.getOffset()));
}

/**
@@ -69,7 +69,7 @@
asm.emitPUSH_Imm(locationMetadata);
BaselineCompilerImpl.genParameterRegisterLoad(asm, 4);
genNullCheck(asm, T0);
- asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.referenceFieldWriteBarrierMethod.getOffset()));
+ asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectFieldWriteBarrierMethod.getOffset()));
}

static void compilePutstaticBarrier(Assembler asm, GPR reg, int locationMetadata) {
@@ -78,7 +78,7 @@
asm.emitPUSH_Reg(reg); // offset
asm.emitPUSH_Imm(locationMetadata);
BaselineCompilerImpl.genParameterRegisterLoad(asm, 3);
- asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.referenceNonHeapWriteBarrierMethod.getOffset()));
+ asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectNonHeapWriteBarrierMethod.getOffset()));
}

static void compilePutstaticBarrierImm(Assembler asm, Offset fieldOffset, int locationMetadata) {
@@ -86,14 +86,14 @@
asm.emitPUSH_Imm(fieldOffset.toInt());
asm.emitPUSH_Imm(locationMetadata);
BaselineCompilerImpl.genParameterRegisterLoad(asm, 3);
- asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.referenceNonHeapWriteBarrierMethod.getOffset()));
+ asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectNonHeapWriteBarrierMethod.getOffset()));
}

static void compileArrayLoadBarrier(Assembler asm, boolean pushResult) {
// on entry java stack contains ...|target_array_ref|array_index|
// SP -> index, SP+4 -> target_ref
BaselineCompilerImpl.genParameterRegisterLoad(asm, 2);
- asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.referenceArrayReadBarrierMethod.getOffset()));
+ asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectArrayReadBarrierMethod.getOffset()));
if (pushResult) asm.emitPUSH_Reg(T0);
}

@@ -104,7 +104,7 @@
asm.emitPUSH_Imm(locationMetadata);
BaselineCompilerImpl.genParameterRegisterLoad(asm, 3);
genNullCheck(asm, T0);
- asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.referenceFieldReadBarrierMethod.getOffset()));
+ asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectFieldReadBarrierMethod.getOffset()));
asm.emitPUSH_Reg(T0);
}

@@ -113,7 +113,7 @@
asm.emitPUSH_Imm(locationMetadata);
BaselineCompilerImpl.genParameterRegisterLoad(asm, 3);
genNullCheck(asm, T0);
- asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.referenceFieldReadBarrierMethod.getOffset()));
+ asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectFieldReadBarrierMethod.getOffset()));
asm.emitPUSH_Reg(T0);
}

@@ -121,7 +121,7 @@
asm.emitPUSH_Reg(reg);
asm.emitPUSH_Imm(locationMetadata);
BaselineCompilerImpl.genParameterRegisterLoad(asm, 2);
- asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.referenceNonHeapReadBarrierMethod.getOffset()));
+ asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectNonHeapReadBarrierMethod.getOffset()));
asm.emitPUSH_Reg(T0);
}

@@ -129,7 +129,7 @@
asm.emitPUSH_Imm(fieldOffset.toInt());
asm.emitPUSH_Imm(locationMetadata);
BaselineCompilerImpl.genParameterRegisterLoad(asm, 2);
- asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.referenceNonHeapReadBarrierMethod.getOffset()));
+ asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectNonHeapReadBarrierMethod.getOffset()));
asm.emitPUSH_Reg(T0);
}

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineCompilerImpl.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineCompilerImpl.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineCompilerImpl.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -576,7 +576,7 @@
asm.emitPOP_Reg(T0); // T0 is array index
asm.emitPOP_Reg(T1); // T1 is array ref
genBoundsCheck(asm, T0, T1); // T0 is index, T1 is address of array
- if (NEEDS_REFERENCE_ALOAD_BARRIER) {
+ if (NEEDS_OBJECT_ALOAD_BARRIER) {
// rewind 2 args on stack
asm.emitPUSH_Reg(T1); // T1 is array ref
asm.emitPUSH_Reg(T0); // T0 is array index
@@ -2582,7 +2582,7 @@
@Override
protected final void emit_unresolved_getstatic(FieldReference fieldRef) {
emitDynamicLinkingSequence(asm, T0, fieldRef, true);
- if (NEEDS_REFERENCE_GETSTATIC_BARRIER && !fieldRef.getFieldContentsType().isPrimitiveType()) {
+ if (NEEDS_OBJECT_GETSTATIC_BARRIER && !fieldRef.getFieldContentsType().isPrimitiveType()) {
Barriers.compileGetstaticBarrier(asm, T0, fieldRef.getId());
return;
}
@@ -2616,7 +2616,7 @@
protected final void emit_resolved_getstatic(FieldReference fieldRef) {
RVMField field = fieldRef.peekResolvedField();
Offset fieldOffset = field.getOffset();
- if (NEEDS_REFERENCE_GETSTATIC_BARRIER && !fieldRef.getFieldContentsType().isPrimitiveType() && !field.isUntraced()) {
+ if (NEEDS_OBJECT_GETSTATIC_BARRIER && !fieldRef.getFieldContentsType().isPrimitiveType() && !field.isUntraced()) {
Barriers.compileGetstaticBarrierImm(asm, fieldOffset, fieldRef.getId());
return;
}
@@ -2648,7 +2648,7 @@
@Override
protected final void emit_unresolved_putstatic(FieldReference fieldRef) {
emitDynamicLinkingSequence(asm, T0, fieldRef, true);
- if (NEEDS_REFERENCE_PUTSTATIC_BARRIER && fieldRef.getFieldContentsType().isReferenceType()) {
+ if (NEEDS_OBJECT_PUTSTATIC_BARRIER && fieldRef.getFieldContentsType().isReferenceType()) {
Barriers.compilePutstaticBarrier(asm, T0, fieldRef.getId());
} else {
if (fieldRef.getSize() <= BYTES_IN_INT) { // field is one word
@@ -2681,7 +2681,7 @@
protected final void emit_resolved_putstatic(FieldReference fieldRef) {
RVMField field = fieldRef.peekResolvedField();
Offset fieldOffset = field.getOffset();
- if (NEEDS_REFERENCE_PUTSTATIC_BARRIER && field.isReferenceType() && !field.isUntraced()) {
+ if (NEEDS_OBJECT_PUTSTATIC_BARRIER && field.isReferenceType() && !field.isUntraced()) {
Barriers.compilePutstaticBarrierImm(asm, fieldOffset, fieldRef.getId());
} else {
if (field.getSize() <= BYTES_IN_INT) { // field is one word
@@ -2716,7 +2716,7 @@
emitDynamicLinkingSequence(asm, T0, fieldRef, true);
if (fieldType.isReferenceType()) {
// 32/64bit reference load
- if (NEEDS_REFERENCE_GETFIELD_BARRIER) {
+ if (NEEDS_OBJECT_GETFIELD_BARRIER) {
Barriers.compileGetfieldBarrier(asm, T0, fieldRef.getId());
} else {
asm.emitPOP_Reg(S0); // S0 is object reference
@@ -2785,7 +2785,7 @@
Offset fieldOffset = field.getOffset();
if (field.isReferenceType()) {
// 32/64bit reference load
- if (NEEDS_REFERENCE_GETFIELD_BARRIER && !field.isUntraced()) {
+ if (NEEDS_OBJECT_GETFIELD_BARRIER && !field.isUntraced()) {
Barriers.compileGetfieldBarrierImm(asm, fieldOffset, fieldRef.getId());
} else {
asm.emitPOP_Reg(T0); // T0 is object reference
@@ -2855,7 +2855,7 @@
emitDynamicLinkingSequence(asm, T0, fieldRef, true);
if (fieldType.isReferenceType()) {
// 32/64bit reference store
- if (NEEDS_REFERENCE_PUTFIELD_BARRIER) {
+ if (NEEDS_OBJECT_PUTFIELD_BARRIER) {
Barriers.compilePutfieldBarrier(asm, T0, fieldRef.getId());
} else {
asm.emitPOP_Reg(T1); // T1 is the value to be stored
@@ -2926,7 +2926,7 @@
Offset fieldOffset = field.getOffset();
if (field.isReferenceType()) {
// 32/64bit reference store
- if (NEEDS_REFERENCE_PUTFIELD_BARRIER && !field.isUntraced()) {
+ if (NEEDS_OBJECT_PUTFIELD_BARRIER && !field.isUntraced()) {
Barriers.compilePutfieldBarrierImm(asm, fieldOffset, fieldRef.getId());
} else {
asm.emitPOP_Reg(T0); // T0 is the value to be stored
@@ -3791,7 +3791,7 @@

if (!VM.runningTool && ((BaselineCompiledMethod) compiledMethod).hasCounterArray()) {
// use (nonvolatile) EBX to hold base of this method's counter array
- if (NEEDS_REFERENCE_ALOAD_BARRIER) {
+ if (NEEDS_OBJECT_ALOAD_BARRIER) {
asm.emitPUSH_Abs(Magic.getTocPointer().plus(Entrypoints.edgeCountersField.getOffset()));
asm.emitPUSH_Imm(getEdgeCounterIndex());
Barriers.compileArrayLoadBarrier(asm, false);

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ExpandRuntimeServices.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ExpandRuntimeServices.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ExpandRuntimeServices.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -372,8 +372,8 @@
break;

case REF_ASTORE_opcode: {
- if (NEEDS_REFERENCE_ASTORE_BARRIER) {
- RVMMethod target = Entrypoints.referenceArrayWriteBarrierMethod;
+ if (NEEDS_OBJECT_ASTORE_BARRIER) {
+ RVMMethod target = Entrypoints.objectArrayWriteBarrierMethod;
Instruction wb =
Call.create3(CALL,
null,
@@ -395,8 +395,8 @@
break;

case REF_ALOAD_opcode: {
- if (NEEDS_REFERENCE_ALOAD_BARRIER) {
- RVMMethod target = Entrypoints.referenceArrayReadBarrierMethod;
+ if (NEEDS_OBJECT_ALOAD_BARRIER) {
+ RVMMethod target = Entrypoints.objectArrayReadBarrierMethod;
Instruction rb =
Call.create2(CALL,
ALoad.getClearResult(inst),
@@ -415,13 +415,13 @@
break;

case PUTFIELD_opcode: {
- if (NEEDS_REFERENCE_PUTFIELD_BARRIER) {
+ if (NEEDS_OBJECT_PUTFIELD_BARRIER) {
LocationOperand loc = PutField.getLocation(inst);
FieldReference fieldRef = loc.getFieldRef();
if (!fieldRef.getFieldContentsType().isPrimitiveType()) {
RVMField field = fieldRef.peekResolvedField();
if (field == null || !field.isUntraced()) {
- RVMMethod target = Entrypoints.referenceFieldWriteBarrierMethod;
+ RVMMethod target = Entrypoints.objectFieldWriteBarrierMethod;
Instruction wb =
Call.create4(CALL,
null,
@@ -446,13 +446,13 @@
break;

case GETFIELD_opcode: {
- if (NEEDS_REFERENCE_GETFIELD_BARRIER) {
+ if (NEEDS_OBJECT_GETFIELD_BARRIER) {
LocationOperand loc = GetField.getLocation(inst);
FieldReference fieldRef = loc.getFieldRef();
if (GetField.getResult(inst).getType().isReferenceType()) {
RVMField field = fieldRef.peekResolvedField();
if (field == null || !field.isUntraced()) {
- RVMMethod target = Entrypoints.referenceFieldReadBarrierMethod;
+ RVMMethod target = Entrypoints.objectFieldReadBarrierMethod;
Instruction rb =
Call.create3(CALL,
GetField.getClearResult(inst),
@@ -474,11 +474,11 @@
break;

case PUTSTATIC_opcode: {
- if (NEEDS_REFERENCE_PUTSTATIC_BARRIER) {
+ if (NEEDS_OBJECT_PUTSTATIC_BARRIER) {
LocationOperand loc = PutStatic.getLocation(inst);
FieldReference field = loc.getFieldRef();
if (!field.getFieldContentsType().isPrimitiveType()) {
- RVMMethod target = Entrypoints.referenceNonHeapWriteBarrierMethod;
+ RVMMethod target = Entrypoints.objectNonHeapWriteBarrierMethod;
Instruction wb =
Call.create3(CALL,
null,
@@ -500,11 +500,11 @@
break;

case GETSTATIC_opcode: {
- if (NEEDS_REFERENCE_GETSTATIC_BARRIER) {
+ if (NEEDS_OBJECT_GETSTATIC_BARRIER) {
LocationOperand loc = GetStatic.getLocation(inst);
FieldReference field = loc.getFieldRef();
if (!field.getFieldContentsType().isPrimitiveType()) {
- RVMMethod target = Entrypoints.referenceNonHeapReadBarrierMethod;
+ RVMMethod target = Entrypoints.objectNonHeapReadBarrierMethod;
Instruction rb =
Call.create2(CALL,
GetStatic.getClearResult(inst),

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/mm/mminterface/Barriers.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/mm/mminterface/Barriers.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/mm/mminterface/Barriers.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -44,30 +44,20 @@
}

/** True if the garbage collector requires write barriers on reference putfield, arraystore or modifycheck */
- private static final boolean NEEDS_REFERENCE_GC_WRITE_BARRIER = Selected.Constraints.get().needsReferenceWriteBarrier();
+ private static final boolean NEEDS_OBJECT_GC_WRITE_BARRIER = Selected.Constraints.get().needsObjectReferenceWriteBarrier();
/** True if the VM requires write barriers on reference putfield */
- public static final boolean NEEDS_REFERENCE_PUTFIELD_BARRIER = NEEDS_REFERENCE_GC_WRITE_BARRIER;
+ public static final boolean NEEDS_OBJECT_PUTFIELD_BARRIER = NEEDS_OBJECT_GC_WRITE_BARRIER;
/** True if the VM requires write barriers on reference arraystore */
- public static final boolean NEEDS_REFERENCE_ASTORE_BARRIER = NEEDS_REFERENCE_GC_WRITE_BARRIER;
+ public static final boolean NEEDS_OBJECT_ASTORE_BARRIER = NEEDS_OBJECT_GC_WRITE_BARRIER;
/** True if the garbage collector requires read barriers on reference getfield or arrayload */
- private static final boolean NEEDS_REFERENCE_GC_READ_BARRIER = Selected.Constraints.get().needsReferenceReadBarrier();
+ private static final boolean NEEDS_OBJECT_GC_READ_BARRIER = Selected.Constraints.get().needsObjectReferenceReadBarrier();
/** True if the VM requires read barriers on reference getfield */
- public static final boolean NEEDS_REFERENCE_GETFIELD_BARRIER = NEEDS_REFERENCE_GC_READ_BARRIER;
+ public static final boolean NEEDS_OBJECT_GETFIELD_BARRIER = NEEDS_OBJECT_GC_READ_BARRIER;
/** True if the VM requires read barriers on reference arrayload */
- public static final boolean NEEDS_REFERENCE_ALOAD_BARRIER = NEEDS_REFERENCE_GC_READ_BARRIER;
+ public static final boolean NEEDS_OBJECT_ALOAD_BARRIER = NEEDS_OBJECT_GC_READ_BARRIER;

- /** True if the selected plan requires write barriers on reference putstatic */
- private static final boolean NEEDS_REFERENCE_GC_PUTSTATIC_BARRIER = Selected.Constraints.get().needsReferenceStaticWriteBarrier();
- /** True if the selected plan requires write barriers on reference putstatic */
- public static final boolean NEEDS_REFERENCE_PUTSTATIC_BARRIER = NEEDS_REFERENCE_GC_PUTSTATIC_BARRIER;
- /** True if the selected plan requires read barriers on reference getstatic */
- private static final boolean NEEDS_REFERENCE_GC_GETSTATIC_BARRIER = Selected.Constraints.get().needsReferenceStaticReadBarrier();
- /** True if the selected plan requires read barriers on reference getstatic */
- public static final boolean NEEDS_REFERENCE_GETSTATIC_BARRIER = NEEDS_REFERENCE_GC_GETSTATIC_BARRIER;
-
-
/**
- * Barrier for writes of references into fields of instances (ie putfield).
+ * Barrier for writes of objects into fields of instances (ie putfield).
*
* @param ref the object which is the subject of the putfield
* @param value the new value for the field
@@ -76,10 +66,10 @@
*/
@Inline
@Entrypoint
- public static void referenceFieldWrite(Object ref, Object value, Offset offset, int locationMetadata) {
- if (NEEDS_REFERENCE_GC_WRITE_BARRIER) {
+ public static void objectFieldWrite(Object ref, Object value, Offset offset, int locationMetadata) {
+ if (NEEDS_OBJECT_GC_WRITE_BARRIER) {
ObjectReference src = ObjectReference.fromObject(ref);
- Selected.Mutator.get().referenceWrite(src,
+ Selected.Mutator.get().objectReferenceWrite(src,
src.toAddress().plus(offset),
ObjectReference.fromObject(value),
offset.toWord(),
@@ -90,7 +80,7 @@
}

/**
- * Barrier for writes of references into arrays (ie astore).
+ * Barrier for writes of objects into arrays (ie astore).
*
* @param ref the array which is the subject of the astore
* @param index the index into the array where the new reference
@@ -100,11 +90,11 @@
*/
@Inline
@Entrypoint
- public static void referenceArrayWrite(Object ref, int index, Object value) {
- if (NEEDS_REFERENCE_GC_WRITE_BARRIER) {
+ public static void objectArrayWrite(Object ref, int index, Object value) {
+ if (NEEDS_OBJECT_GC_WRITE_BARRIER) {
ObjectReference array = ObjectReference.fromObject(ref);
Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
- Selected.Mutator.get().referenceWrite(array,
+ Selected.Mutator.get().objectReferenceWrite(array,
array.toAddress().plus(offset),
ObjectReference.fromObject(value),
offset.toWord(),
@@ -115,7 +105,7 @@
}

/**
- * Barrier for loads of references from fields of instances (ie getfield).
+ * Barrier for loads of objects from fields of instances (ie getfield).
*
* @param ref the object which is the subject of the getfield
* @param offset the offset of the field to be read
@@ -124,10 +114,10 @@
*/
@Inline
@Entrypoint
- public static Object referenceFieldRead(Object ref, Offset offset, int locationMetadata) {
- if (NEEDS_REFERENCE_GC_READ_BARRIER) {
+ public static Object objectFieldRead(Object ref, Offset offset, int locationMetadata) {
+ if (NEEDS_OBJECT_GC_READ_BARRIER) {
ObjectReference src = ObjectReference.fromObject(ref);
- return Selected.Mutator.get().referenceRead(src,
+ return Selected.Mutator.get().objectReferenceRead(src,
src.toAddress().plus(offset),
offset.toWord(),
Word.fromIntZeroExtend(locationMetadata),
@@ -138,7 +128,7 @@
}

/**
- * Barrier for loads of references from fields of arrays (ie aload).
+ * Barrier for loads of objects from fields of arrays (ie aload).
*
* @param ref the array containing the reference.
* @param index the index into the array were the reference resides.
@@ -146,11 +136,11 @@
*/
@Inline
@Entrypoint
- public static Object referenceArrayRead(Object ref, int index) {
- if (NEEDS_REFERENCE_GC_READ_BARRIER) {
+ public static Object objectArrayRead(Object ref, int index) {
+ if (NEEDS_OBJECT_GC_READ_BARRIER) {
ObjectReference array = ObjectReference.fromObject(ref);
Offset offset = Offset.fromIntZeroExtend(index << MemoryManagerConstants.LOG_BYTES_IN_ADDRESS);
- return Selected.Mutator.get().referenceRead(array,
+ return Selected.Mutator.get().objectReferenceRead(array,
array.toAddress().plus(offset),
offset.toWord(),
Word.zero(), // don't know metadata
@@ -161,7 +151,7 @@
}

/**
- * Barrier for a copy (i.e. in an array copy).
+ * Barrier for a bulk copy of objects (i.e. in an array copy).
*
* @param src The source object
* @param srcOffset The offset of the first source address, in
@@ -176,9 +166,9 @@
* left to the caller (always false in this case).
*/
@Inline
- public static boolean referenceBulkCopy(Object src, Offset srcOffset, Object tgt, Offset tgtOffset, int bytes) {
- if (NEEDS_REFERENCE_GC_WRITE_BARRIER || NEEDS_REFERENCE_GC_READ_BARRIER) {
- return Selected.Mutator.get().referenceBulkCopy(ObjectReference.fromObject(src),
+ public static boolean objectBulkCopy(Object src, Offset srcOffset, Object tgt, Offset tgtOffset, int bytes) {
+ if (NEEDS_OBJECT_GC_WRITE_BARRIER || NEEDS_OBJECT_GC_READ_BARRIER) {
+ return Selected.Mutator.get().objectReferenceBulkCopy(ObjectReference.fromObject(src),
srcOffset,
ObjectReference.fromObject(tgt),
tgtOffset,
@@ -188,48 +178,58 @@
return false;
}

+
+ /** True if the selected plan requires write barriers on reference putstatic */
+ private static final boolean NEEDS_OBJECT_GC_PUTSTATIC_BARRIER = Selected.Constraints.get().needsObjectReferenceNonHeapWriteBarrier();
+ /** True if the selected plan requires write barriers on reference putstatic */
+ public static final boolean NEEDS_OBJECT_PUTSTATIC_BARRIER = NEEDS_OBJECT_GC_PUTSTATIC_BARRIER;
+ /** True if the selected plan requires read barriers on reference getstatic */
+ private static final boolean NEEDS_OBJECT_GC_GETSTATIC_BARRIER = Selected.Constraints.get().needsObjectReferenceNonHeapReadBarrier();
+ /** True if the selected plan requires read barriers on reference getstatic */
+ public static final boolean NEEDS_OBJECT_GETSTATIC_BARRIER = NEEDS_OBJECT_GC_GETSTATIC_BARRIER;
+
/**
- * Barrier for loads of references from non-heap locations (ie getstatic)
+ * Barrier for writes of objects from statics (eg putstatic)
*
+ * @param value the new value to be stored
* @param offset the offset of the field to be modified
- * @param locationMetadata an int that encodes the source location being read
- * @return the value read from the field
+ * @param locationMetadata an int that encodes the source location being modified
*/
@Inline
@Entrypoint
- public static Object referenceNonHeapRead(Offset offset, int locationMetadata) {
- if (NEEDS_REFERENCE_GC_GETSTATIC_BARRIER) {
+ public static void objectStaticWrite(Object value, Offset offset, int locationMetadata) {
+ if (NEEDS_OBJECT_GC_PUTSTATIC_BARRIER) {
ObjectReference src = ObjectReference.fromObject(Magic.getJTOC());
- return Selected.Mutator.get().referenceNonHeapRead(
- src.toAddress().plus(offset),
+ Selected.Mutator.get().objectReferenceNonHeapWrite(src.toAddress().plus(offset),
+ ObjectReference.fromObject(value),
offset.toWord(),
- Word.fromIntZeroExtend(locationMetadata)).toObject();
+ Word.fromIntZeroExtend(locationMetadata));
} else if (VM.VERIFY_ASSERTIONS)
VM.assertions._assert(false);
- return null;
}

-
/**
- * Barrier for writes of references to non-heap locations (eg statics)
+ * Barrier for loads of objects from statics (ie getstatic)
*
- * @param value the new value to be stored
* @param offset the offset of the field to be modified
- * @param locationMetadata an int that encodes the source location being modified
+ * @param locationMetadata an int that encodes the source location being read
+ * @return the value read from the field
*/
@Inline
@Entrypoint
- public static void referenceNonHeapWrite(Object value, Offset offset, int locationMetadata) {
- if (NEEDS_REFERENCE_GC_PUTSTATIC_BARRIER) {
+ public static Object objectStaticRead(Offset offset, int locationMetadata) {
+ if (NEEDS_OBJECT_GC_GETSTATIC_BARRIER) {
ObjectReference src = ObjectReference.fromObject(Magic.getJTOC());
- Selected.Mutator.get().referenceNonHeapWrite(src.toAddress().plus(offset),
- ObjectReference.fromObject(value),
+ return Selected.Mutator.get().objectReferenceNonHeapRead(
+ src.toAddress().plus(offset),
offset.toWord(),
- Word.fromIntZeroExtend(locationMetadata));
+ Word.fromIntZeroExtend(locationMetadata)).toObject();
} else if (VM.VERIFY_ASSERTIONS)
VM.assertions._assert(false);
+ return null;
}

+
/**
* Barrier for conditional compare and exchange of reference fields.
*
@@ -239,10 +239,10 @@
* @param value the new value for the field
*/
@Inline
- public static boolean referenceTryCompareAndSwap(Object ref, Offset offset, Object old, Object value) {
- if (NEEDS_REFERENCE_GC_WRITE_BARRIER || NEEDS_REFERENCE_GC_READ_BARRIER) {
+ public static boolean objectTryCompareAndSwap(Object ref, Offset offset, Object old, Object value) {
+ if (NEEDS_OBJECT_GC_WRITE_BARRIER || NEEDS_OBJECT_GC_READ_BARRIER) {
ObjectReference src = ObjectReference.fromObject(ref);
- return Selected.Mutator.get().referenceTryCompareAndSwap(src,
+ return Selected.Mutator.get().objectReferenceTryCompareAndSwap(src,
src.toAddress().plus(offset),
ObjectReference.fromObject(old),
ObjectReference.fromObject(value),

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/mm/mminterface/MemoryManager.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/mm/mminterface/MemoryManager.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/mm/mminterface/MemoryManager.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -106,7 +106,7 @@
*/
@Interruptible
public static void init() {
- if (VM.VerifyAssertions) VM._assert(!Selected.Constraints.get().needsReferenceStaticReadBarrier());
+ if (VM.VerifyAssertions) VM._assert(!Selected.Constraints.get().needsObjectReferenceNonHeapReadBarrier());
CollectorThread.init();
org.jikesrvm.mm.mmtk.Collection.init();
}

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/osr/ObjectHolder.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/osr/ObjectHolder.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/osr/ObjectHolder.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -93,8 +93,8 @@
VM.sysWriteln("ObjectHolder cleanRefs");
}
/* refs[h] = null; */
- if (Barriers.NEEDS_REFERENCE_ASTORE_BARRIER) {
- Barriers.referenceArrayWrite(refs, h, null);
+ if (Barriers.NEEDS_OBJECT_ASTORE_BARRIER) {
+ Barriers.objectArrayWrite(refs, h, null);
} else {
Magic.setObjectAtOffset(refs, Offset.fromIntSignExtend(h << LOG_BYTES_IN_ADDRESS), null);
}

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Entrypoints.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Entrypoints.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Entrypoints.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -263,20 +263,21 @@
public static final RVMField synchronizedCounterField =
getField(org.jikesrvm.mm.mmtk.SynchronizedCounter.class, "count", int.class);

- public static final NormalMethod referenceArrayWriteBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "referenceArrayWrite", "(Ljava/lang/Object;ILjava/lang/Object;)V");
- public static final NormalMethod referenceFieldWriteBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "referenceFieldWrite", "(Ljava/lang/Object;Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;I)V");
- public static final NormalMethod referenceNonHeapWriteBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "referenceNonHeapWrite", "(Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;I)V");
+ public static final NormalMethod objectArrayWriteBarrierMethod =
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "objectArrayWrite", "(Ljava/lang/Object;ILjava/lang/Object;)V");
+ public static final NormalMethod objectFieldWriteBarrierMethod =
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "objectFieldWrite", "(Ljava/lang/Object;Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;I)V");

- public static final NormalMethod referenceArrayReadBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "referenceArrayRead", "(Ljava/lang/Object;I)Ljava/lang/Object;");
- public static final NormalMethod referenceFieldReadBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "referenceFieldRead", "(Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;I)Ljava/lang/Object;");
- public static final NormalMethod referenceNonHeapReadBarrierMethod =
- getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "referenceNonHeapRead", "(Lorg/vmmagic/unboxed/Offset;I)Ljava/lang/Object;");
+ public static final NormalMethod objectArrayReadBarrierMethod =
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "objectArrayRead", "(Ljava/lang/Object;I)Ljava/lang/Object;");
+ public static final NormalMethod objectFieldReadBarrierMethod =
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "objectFieldRead", "(Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;I)Ljava/lang/Object;");

+ public static final NormalMethod objectNonHeapWriteBarrierMethod =
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "objectStaticWrite", "(Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;I)V");
+ public static final NormalMethod objectNonHeapReadBarrierMethod =
+ getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "objectStaticRead", "(Lorg/vmmagic/unboxed/Offset;I)Ljava/lang/Object;");
+
public static final NormalMethod modifyCheckMethod =
getMethod(org.jikesrvm.mm.mminterface.MemoryManager.class, "modifyCheck", "(Ljava/lang/Object;)V");

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Statics.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Statics.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Statics.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -617,8 +617,8 @@
// happen as the fault would only ever occur when not running the
// VM. We suppress the warning as we know the error can't happen.

- if (VM.runningVM && Barriers.NEEDS_REFERENCE_PUTSTATIC_BARRIER) {
- Barriers.referenceNonHeapWrite(object, offset, 0);
+ if (VM.runningVM && Barriers.NEEDS_OBJECT_PUTSTATIC_BARRIER) {
+ Barriers.objectStaticWrite(object, offset, 0);
} else {
setSlotContents(offset, Magic.objectAsAddress(object).toWord());
}

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/scheduler/Synchronization.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/scheduler/Synchronization.java 2009-09-18 02:15:19 UTC (rev 15781)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/scheduler/Synchronization.java 2009-09-18 03:57:39 UTC (rev 15782)
@@ -93,8 +93,8 @@
*/
@Inline
public static boolean tryCompareAndSwap(Object base, Offset offset, Object testValue, Object newValue) {
- if (Barriers.NEEDS_REFERENCE_PUTFIELD_BARRIER) {
- return Barriers.referenceTryCompareAndSwap(base, offset, testValue, newValue);
+ if (Barriers.NEEDS_OBJECT_PUTFIELD_BARRIER) {
+ return Barriers.objectTryCompareAndSwap(base, offset, testValue, newValue);
} else {
Object oldValue;
do {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Jikesrvm-commits mailing list
Jikesrvm-commits@...
https://lists.sourceforge.net/lists/listinfo/jikesrvm-commits

SF.net SVN: jikesrvm:[15781] rvmroot/trunk/MMTk/src/org/mmtk/plan/ generational/Gen.java

2009-09-17T19:15:19Z

Revision: 15781
http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15781&view=rev
Author: steveb-oss
Date: 2009-09-18 02:15:19 +0000 (Fri, 18 Sep 2009)

Log Message:
-----------
Undo unintended change folded into r15772, which was supposed to be a semantic no-op

Modified Paths:
--------------
rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/Gen.java

Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/Gen.java
===================================================================
--- rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/Gen.java 2009-09-16 12:13:01 UTC (rev 15780)
+++ rvmroot/trunk/MMTk/src/org/mmtk/plan/generational/Gen.java 2009-09-18 02:15:19 UTC (rev 15781)
@@ -56,7 +56,7 @@
protected static final float MATURE_FRACTION = 0.5f; // est yield
private static final float WORST_CASE_COPY_EXPANSION = 1.5f; // worst case for addition of one word overhead due to address based hashing
public static final boolean IGNORE_REMSETS = false;
- public static final boolean USE_STATIC_WRITE_BARRIER = true;
+ public static final boolean USE_STATIC_WRITE_BARRIER = false;
public static final boolean USE_OBJECT_BARRIER_FOR_AASTORE = false; // choose between slot and object barriers
public static final boolean USE_OBJECT_BARRIER_FOR_PUTFIELD = false; // choose between slot and object barriers
public static final boolean USE_OBJECT_BARRIER = USE_OBJECT_BARRIER_FOR_AASTORE || USE_OBJECT_BARRIER_FOR_PUTFIELD;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Jikesrvm-commits mailing list
Jikesrvm-commits@...
https://lists.sourceforge.net/lists/listinfo/jikesrvm-commits