You can subscribe to this list here.
2005 |
Jan
|
Feb
(118) |
Mar
(82) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(59) |
Jun
(295) |
Jul
(92) |
Aug
(121) |
Sep
(111) |
Oct
(77) |
Nov
(163) |
Dec
(150) |
2007 |
Jan
(153) |
Feb
(163) |
Mar
(349) |
Apr
(223) |
May
(267) |
Jun
(450) |
Jul
(346) |
Aug
(230) |
Sep
(288) |
Oct
(123) |
Nov
(68) |
Dec
(34) |
2008 |
Jan
(13) |
Feb
(35) |
Mar
(92) |
Apr
(101) |
May
(168) |
Jun
(285) |
Jul
(198) |
Aug
(115) |
Sep
(77) |
Oct
(98) |
Nov
(81) |
Dec
(35) |
2009 |
Jan
(76) |
Feb
(234) |
Mar
(86) |
Apr
(41) |
May
(23) |
Jun
(17) |
Jul
(40) |
Aug
(16) |
Sep
(16) |
Oct
|
Nov
(8) |
Dec
(11) |
2010 |
Jan
(1) |
Feb
(4) |
Mar
(17) |
Apr
(4) |
May
(13) |
Jun
(24) |
Jul
(89) |
Aug
(21) |
Sep
(25) |
Oct
(19) |
Nov
(8) |
Dec
(1) |
2011 |
Jan
(3) |
Feb
(13) |
Mar
(9) |
Apr
(1) |
May
(6) |
Jun
(19) |
Jul
(51) |
Aug
(30) |
Sep
(3) |
Oct
|
Nov
|
Dec
(13) |
2012 |
Jan
(10) |
Feb
(11) |
Mar
|
Apr
(1) |
May
(3) |
Jun
(3) |
Jul
(9) |
Aug
(34) |
Sep
(5) |
Oct
(5) |
Nov
(8) |
Dec
(6) |
2013 |
Jan
(4) |
Feb
(14) |
Mar
(11) |
Apr
(8) |
May
(9) |
Jun
(6) |
Jul
(6) |
Aug
(11) |
Sep
(8) |
Oct
(22) |
Nov
(2) |
Dec
|
2014 |
Jan
(1) |
Feb
(6) |
Mar
(8) |
Apr
(4) |
May
(5) |
Jun
(4) |
Jul
(26) |
Aug
(22) |
Sep
(29) |
Oct
(42) |
Nov
(12) |
Dec
(7) |
2015 |
Jan
(13) |
Feb
(25) |
Mar
(81) |
Apr
(50) |
May
(37) |
Jun
(52) |
Jul
(65) |
Aug
(20) |
Sep
(20) |
Oct
(19) |
Nov
(7) |
Dec
(14) |
2016 |
Jan
(21) |
Feb
(18) |
Mar
(13) |
Apr
(16) |
May
(20) |
Jun
(7) |
Jul
(12) |
Aug
(7) |
Sep
(2) |
Oct
(11) |
Nov
(13) |
Dec
(12) |
2017 |
Jan
(5) |
Feb
(9) |
Mar
(3) |
Apr
(4) |
May
(15) |
Jun
(3) |
Jul
(4) |
Aug
(10) |
Sep
(3) |
Oct
(7) |
Nov
(4) |
Dec
(3) |
2018 |
Jan
(4) |
Feb
(4) |
Mar
(2) |
Apr
(4) |
May
(3) |
Jun
(12) |
Jul
(10) |
Aug
|
Sep
(9) |
Oct
(3) |
Nov
(9) |
Dec
(5) |
2019 |
Jan
(13) |
Feb
(11) |
Mar
(14) |
Apr
(10) |
May
(10) |
Jun
(4) |
Jul
(1) |
Aug
(2) |
Sep
(3) |
Oct
(2) |
Nov
(2) |
Dec
|
2020 |
Jan
|
Feb
(2) |
Mar
(3) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
2021 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
2022 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <dgr...@us...> - 2006-11-03 15:57:41
|
Revision: 10946 http://svn.sourceforge.net/jikesrvm/?rev=10946&view=rev Author: dgrove-oss Date: 2006-11-03 07:57:30 -0800 (Fri, 03 Nov 2006) Log Message: ----------- fix various javadoc errors introduced in RC refactor Modified Paths: -------------- rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/DecBuffer.java rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/RCBaseMutator.java rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/cd/TrialDeletionCollector.java rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/fullheap/RCMutator.java rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/generational/GenRCCollector.java rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/generational/GenRCMutator.java rvmroot/trunk/MMTk/src/org/mmtk/utility/deque/ObjectReferenceBuffer.java Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/DecBuffer.java =================================================================== --- rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/DecBuffer.java 2006-11-03 10:57:49 UTC (rev 10945) +++ rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/DecBuffer.java 2006-11-03 15:57:30 UTC (rev 10946) @@ -36,7 +36,7 @@ /** * Constructor * - * @param trace The shared deque that is used. + * @param queue The shared deque that is used. */ public DecBuffer(SharedDeque queue) { super("dec", queue); @@ -53,4 +53,4 @@ push(object); } } -} \ No newline at end of file +} Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/RCBaseMutator.java =================================================================== --- rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/RCBaseMutator.java 2006-11-03 10:57:49 UTC (rev 10945) +++ rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/RCBaseMutator.java 2006-11-03 15:57:30 UTC (rev 10946) @@ -39,9 +39,9 @@ * * @see RCBase * @see RCBaseCollector - * @see StopTheWorldMutator - * @see MutatorContext - * @see SimplePhase#delegatePhase + * @see org.mmtk.plan.StopTheWorldMutator + * @see org.mmtk.plan.MutatorContext + * @see org.mmtk.plan.SimplePhase#delegatePhase * * $Id$ * Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/cd/TrialDeletionCollector.java =================================================================== --- rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/cd/TrialDeletionCollector.java 2006-11-03 10:57:49 UTC (rev 10945) +++ rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/cd/TrialDeletionCollector.java 2006-11-03 15:57:30 UTC (rev 10946) @@ -215,9 +215,6 @@ * grey. This means "pretending" that the initial object is dead, * and thus applying temporary decrements to each of the object's * decendents. - * - * @param timeCap The time by which we must stop marking - * grey. */ private final void doMarkGreyPhase() { ObjectReference object = ObjectReference.nullReference(); @@ -377,4 +374,4 @@ private static final TrialDeletion global() throws InlinePragma { return (TrialDeletion)((RCBase)VM.activePlan.global()).cycleDetector(); } -} \ No newline at end of file +} Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/fullheap/RCMutator.java =================================================================== --- rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/fullheap/RCMutator.java 2006-11-03 10:57:49 UTC (rev 10945) +++ rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/fullheap/RCMutator.java 2006-11-03 15:57:30 UTC (rev 10946) @@ -29,7 +29,7 @@ * and per-mutator thread collection semantics (flushing and restoring * per-mutator allocator state).<p> * - * @see MC for an overview of the mark-compact algorithm.<p> + * @see org.mmtk.plan.markcompact.MC for an overview of the mark-compact algorithm.<p> * * FIXME The SegregatedFreeList class (and its decendents such as * MarkSweepLocal) does not properly separate mutator and collector @@ -39,9 +39,9 @@ * * @see RC * @see RCCollector - * @see StopTheWorldMutator - * @see MutatorContext - * @see SimplePhase#delegatePhase + * @see org.mmtk.plan.StopTheWorldMutator + * @see org.mmtk.plan.MutatorContext + * @see org.mmtk.plan.SimplePhase#delegatePhase * * $Id$ * Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/generational/GenRCCollector.java =================================================================== --- rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/generational/GenRCCollector.java 2006-11-03 10:57:49 UTC (rev 10945) +++ rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/generational/GenRCCollector.java 2006-11-03 15:57:30 UTC (rev 10946) @@ -40,9 +40,9 @@ * * @see GenRC * @see GenRCMutator - * @see StopTheWorldCollector - * @see CollectorContext - * @see SimplePhase#delegatePhase + * @see org.mmtk.plan.StopTheWorldCollector + * @see org.mmtk.plan.CollectorContext + * @see org.mmtk.plan.SimplePhase#delegatePhase * * $Id$ * Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/generational/GenRCMutator.java =================================================================== --- rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/generational/GenRCMutator.java 2006-11-03 10:57:49 UTC (rev 10945) +++ rvmroot/trunk/MMTk/src/org/mmtk/plan/refcount/generational/GenRCMutator.java 2006-11-03 15:57:30 UTC (rev 10946) @@ -38,12 +38,12 @@ * behaviors, so most of the collection logic in GenRCMutator should really * be per-collector thread, not per-mutator thread. * - * @see RCBaseMutator + * @see org.mmtk.plan.refcount.RCBaseMutator * @see GenRC * @see GenRCCollector - * @see StopTheWorldMutator - * @see MutatorContext - * @see SimplePhase#delegatePhase + * @see org.mmtk.plan.StopTheWorldMutator + * @see org.mmtk.plan.MutatorContext + * @see org.mmtk.plan.SimplePhase#delegatePhase * * $Id$ * @@ -105,9 +105,9 @@ * particular method will match against those spaces defined at this * level of the class hierarchy. Subclasses must deal with spaces * they define and refer to superclasses appropriately. This exists - * to support {@link org.mmtk.plan.CollectorContext#getOwnAllocator(Allocator)}. + * to support {@link org.mmtk.plan.MutatorContext#getOwnAllocator(Allocator)}. * - * @see org.mmtk.plan.CollectorContext#getOwnAllocator(Allocator) + * @see org.mmtk.plan.MutatorContext#getOwnAllocator(Allocator) * @param a An allocator * @return The space into which <code>a</code> is allocating, or * <code>null</code> if there is no space associated with @@ -121,9 +121,9 @@ /** * Return the allocator instance associated with a space * <code>space</code>, for this plan instance. This exists - * to support {@link org.mmtk.plan.CollectorContext#getOwnAllocator(Allocator)}. + * to support {@link org.mmtk.plan.MutatorContext#getOwnAllocator(Allocator)}. * - * @see org.mmtk.plan.CollectorContext#getOwnAllocator(Allocator) + * @see org.mmtk.plan.MutatorContext#getOwnAllocator(Allocator) * @param space The space for which the allocator instance is desired. * @return The allocator instance associated with this plan instance * which is allocating into <code>space</code>, or <code>null</code> Modified: rvmroot/trunk/MMTk/src/org/mmtk/utility/deque/ObjectReferenceBuffer.java =================================================================== --- rvmroot/trunk/MMTk/src/org/mmtk/utility/deque/ObjectReferenceBuffer.java 2006-11-03 10:57:49 UTC (rev 10945) +++ rvmroot/trunk/MMTk/src/org/mmtk/utility/deque/ObjectReferenceBuffer.java 2006-11-03 15:57:30 UTC (rev 10946) @@ -44,7 +44,7 @@ * Constructor * * @param name The name of the underlying deque. - * @param trace The shared deque that is used. + * @param queue The shared deque that is used. */ public ObjectReferenceBuffer(String name, SharedDeque queue) { values = new ObjectReferenceDeque(name, queue); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cap...@us...> - 2006-11-03 10:58:00
|
Revision: 10945 http://svn.sourceforge.net/jikesrvm/?rev=10945&view=rev Author: captain5050 Date: 2006-11-03 02:57:49 -0800 (Fri, 03 Nov 2006) Log Message: ----------- Make sure we pick up FileChannelImpl on Classpath 0.92+ Modified Paths: -------------- rvmroot/trunk/bin/jconfigure Modified: rvmroot/trunk/bin/jconfigure =================================================================== --- rvmroot/trunk/bin/jconfigure 2006-11-03 08:07:31 UTC (rev 10944) +++ rvmroot/trunk/bin/jconfigure 2006-11-03 10:57:49 UTC (rev 10945) @@ -3431,6 +3431,7 @@ java/io/FileDescriptor java/io/VMFile gnu/java/nio/channels/FileChannelImpl +gnu/java/nio/FileChannelImpl # Character conversion # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cap...@us...> - 2006-11-03 08:08:19
|
Revision: 10944 http://svn.sourceforge.net/jikesrvm/?rev=10944&view=rev Author: captain5050 Date: 2006-11-03 00:07:31 -0800 (Fri, 03 Nov 2006) Log Message: ----------- Patch #1570936. This patch refactors VM_Statics and removes the description array. We now know the description of a static from the bits packed into its constant pool entry. For GC static scanning we know the type as the reference and numeric values in the JTOC are sorted (refernces at increasing addresses from the middle, numerics decreasing). The patch also creates a 1-to-1 correlation between a VM_Type and its java.lang.Class wrapper. Modified Paths: -------------- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanStatics.java rvmroot/trunk/rvm/src/vm/VM.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_BytecodeTraverser.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/VM_Compiler.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/ir/conversions/lir2mir/OPT_NormalizeConstants.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_Compiler.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/ir/conversions/lir2mir/OPT_NormalizeConstants.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/VM_QuickCompiler.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Array.java rvmroot/trunk/rvm/src/vm/classLoader/VM_BytecodeStream.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Class.java rvmroot/trunk/rvm/src/vm/classLoader/VM_ClassLoader.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Member.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Method.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Primitive.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Type.java rvmroot/trunk/rvm/src/vm/classLoader/VM_TypeReference.java rvmroot/trunk/rvm/src/vm/compilers/baseline/GCMap/VM_BuildBB.java rvmroot/trunk/rvm/src/vm/compilers/baseline/GCMap/VM_BuildReferenceMaps.java rvmroot/trunk/rvm/src/vm/compilers/baseline/VM_CompilerFramework.java rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_CompiledMethod.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/bc2hir/OPT_BC2IR.java rvmroot/trunk/rvm/src/vm/compilers/quick/GCMap/VM_BuildQuickReferenceMaps.java rvmroot/trunk/rvm/src/vm/libSupport/java/lang/VMClassLoader.java rvmroot/trunk/rvm/src/vm/libSupport/java/lang/VMString.java rvmroot/trunk/rvm/src/vm/objectModel/VM_ObjectModel.java rvmroot/trunk/rvm/src/vm/objectModel/default/VM_JavaHeader.java rvmroot/trunk/rvm/src/vm/runtime/VM_Magic.java rvmroot/trunk/rvm/src/vm/runtime/VM_Statics.java rvmroot/trunk/tools/bootImageWriter/BootImage.java rvmroot/trunk/tools/bootImageWriter/BootImageWriter.java Modified: rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanStatics.java =================================================================== --- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanStatics.java 2006-11-02 20:42:56 UTC (rev 10943) +++ rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanStatics.java 2006-11-03 08:07:31 UTC (rev 10944) @@ -27,13 +27,14 @@ * $Id: ScanStatics.java,v 1.3 2006/06/05 04:30:57 steveb-oss Exp $ * * @author Perry Cheng + * @author Ian Rogers */ public final class ScanStatics implements Constants { - - /**************************************************************************** - * - * Class variables + /** + * Size in 32bits words of a JTOC slot (ie 32bit addresses = 1, + * 64bit addresses =2) */ + private final static int refSlotSize = VM_Statics.getReferenceSlotSize(); /** * Scan static variables (JTOC) for object references. Executed by @@ -42,31 +43,28 @@ */ public static void scanStatics(TraceLocal trace) throws UninterruptiblePragma, InlinePragma { + // The address of the statics table + // equivalent to VM_Statics.getSlots() + final Address slots = VM_Magic.getJTOC(); + // The number of collector threads + final int numberOfCollectors = VM_CollectorThread.numCollectors(); + // This thread as a collector + final VM_CollectorThread ct = VM_Magic.threadAsCollectorThread(VM_Thread.getCurrentThread()); + // The number of static references + final int numberOfReferences = VM_Statics.getNumberOfReferenceSlots(); + // The size to give each thread + final int chunkSize = numberOfReferences / numberOfCollectors; + // The number of this collector thread (1...n) + final int threadOrdinal = ct.getGCOrdinal(); - int numSlots = VM_Statics.getNumberOfSlots(); - Address slots = VM_Statics.getSlots(); - int chunkSize = 512; - int slot, start, end, stride; - int refSlotSize = VM_Statics.getReferenceSlotSize(); //reference slots are aligned - VM_CollectorThread ct; + // Start and end of statics region to be processed + final int start = (threadOrdinal == 1) ? 1 : (threadOrdinal - 1) * chunkSize; + final int end = (threadOrdinal == numberOfCollectors) ? numberOfReferences : threadOrdinal * chunkSize; - stride = chunkSize * VM_CollectorThread.numCollectors(); - ct = VM_Magic.threadAsCollectorThread(VM_Thread.getCurrentThread()); - start = (ct.getGCOrdinal() - 1) * chunkSize; - - while (start < numSlots) { - end = start + chunkSize; - if (end > numSlots) - end = numSlots; // doing last segment of JTOC - for (slot=start; slot<end; slot+=refSlotSize) { - if (VM_Statics.isReference(slot)) { - // slot contains a ref of some kind. call collector specific - // processPointerField, passing address of reference - // - trace.addRootLocation(slots.plus(VM_Statics.slotAsOffset(slot))); - } - } // end of for loop - start = start + stride; - } // end of while loop - } // scanStatics + // Process region + for (int slot=start; slot < end; slot+=refSlotSize) { + Offset slotOffset = Offset.fromIntSignExtend(slot << LOG_BYTES_IN_INT); + trace.addRootLocation(slots.plus(slotOffset)); + } + } } Modified: rvmroot/trunk/rvm/src/vm/VM.java =================================================================== --- rvmroot/trunk/rvm/src/vm/VM.java 2006-11-02 20:42:56 UTC (rev 10943) +++ rvmroot/trunk/rvm/src/vm/VM.java 2006-11-03 08:07:31 UTC (rev 10944) @@ -167,12 +167,6 @@ VM_QuickCompiler.initOptions(); //-#endif - // Create class objects for static synchronized methods in the bootimage. - // This must happen before any static synchronized methods of bootimage - // classes can be invoked. - if (verboseBoot >= 1) VM.sysWriteln("Creating class objects for static synchronized methods"); - createClassObjects(); - // Fetch arguments from program command line. // if (verboseBoot >= 1) VM.sysWriteln("Fetching command-line arguments"); @@ -476,20 +470,6 @@ } /** - * Create the java.lang.Class objects needed for static synchronized - * methods in the bootimage and/or string literals in the JTOC. - */ - private static void createClassObjects() throws InterruptiblePragma { - for (int i=0; i<classObjects.length; i++) { - if (verboseBoot >= 2) { - VM.sysWriteln(classObjects[i].toString()); - } - classObjects[i].getClassForType(); - VM_Statics.fixClassLiteral(classObjects[i]); - } - } - - /** * Run <clinit> method of specified class, if that class appears * in bootimage and actually has a clinit method (we are flexible to * allow one list of classes to work with different bootimages and Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_BytecodeTraverser.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_BytecodeTraverser.java 2006-11-02 20:42:56 UTC (rev 10943) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_BytecodeTraverser.java 2006-11-03 08:07:31 UTC (rev 10944) @@ -386,16 +386,16 @@ bytecodes.getConstantIndex():bytecodes.getWideConstantIndex(); byte tdesc = declaringClass.getLiteralDescription(cpoolidx); switch (tdesc) { - case VM_Statics.INT_LITERAL: + case VM_Class.CP_INT: S.push(IntTypeCode); break; - case VM_Statics.FLOAT_LITERAL: + case VM_Class.CP_FLOAT: S.push(FloatTypeCode); break; - case VM_Statics.STRING_LITERAL: + case VM_Class.CP_STRING: S.push(ClassTypeCode); break; - case VM_Statics.CLASS_LITERAL: + case VM_Class.CP_CLASS: S.push(ClassTypeCode); break; default: @@ -410,10 +410,10 @@ byte tdesc = declaringClass.getLiteralDescription(cpoolidx); S.push(VoidTypeCode); switch (tdesc) { - case VM_Statics.LONG_LITERAL: + case VM_Class.CP_LONG: S.push(LongTypeCode); break; - case VM_Statics.DOUBLE_LITERAL: + case VM_Class.CP_DOUBLE: S.push(DoubleTypeCode); break; default: Modified: rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/VM_Compiler.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/VM_Compiler.java 2006-11-02 20:42:56 UTC (rev 10943) +++ rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/VM_Compiler.java 2006-11-03 08:07:31 UTC (rev 10944) @@ -175,16 +175,18 @@ /** * Emit code to load a 32 bit constant * @param offset JTOC offset of the constant + * @param type the type of the constant */ - protected final void emit_ldc(Offset offset) { + protected final void emit_ldc(Offset offset, byte type) { asm.emitPUSH_RegDisp(JTOC, offset); } /** * Emit code to load a 64 bit constant * @param offset JTOC offset of the constant + * @param type the type of the constant */ - protected final void emit_ldc2(Offset offset) { + protected final void emit_ldc2(Offset offset, byte type) { asm.emitPUSH_RegDisp(JTOC, offset.plus(4)); // high 32 bits asm.emitPUSH_RegDisp(JTOC, offset); // low 32 bits } Modified: rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/ir/conversions/lir2mir/OPT_NormalizeConstants.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/ir/conversions/lir2mir/OPT_NormalizeConstants.java 2006-11-02 20:42:56 UTC (rev 10943) +++ rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/ir/conversions/lir2mir/OPT_NormalizeConstants.java 2006-11-03 08:07:31 UTC (rev 10944) @@ -69,7 +69,7 @@ OPT_Operand jtoc = ir.regpool.makeJTOCOp(ir,s); OPT_DoubleConstantOperand dc = (OPT_DoubleConstantOperand)use.copy(); if (dc.offset.isZero()) { - dc.offset = Offset.fromIntSignExtend(VM_Statics.findOrCreateDoubleLiteral(Double.doubleToLongBits(dc.value))); + dc.offset = Offset.fromIntSignExtend(VM_Statics.findOrCreateLongSizeLiteral(Double.doubleToLongBits(dc.value))); } s.insertBefore(Binary.create(MATERIALIZE_FP_CONSTANT, rop, jtoc, dc)); s.putOperand(idx, rop.copyD2U()); @@ -78,7 +78,7 @@ OPT_Operand jtoc = ir.regpool.makeJTOCOp(ir,s); OPT_FloatConstantOperand fc = (OPT_FloatConstantOperand)use.copy(); if (fc.offset.isZero()) { - fc.offset = Offset.fromIntSignExtend(VM_Statics.findOrCreateFloatLiteral(Float.floatToIntBits(fc.value))); + fc.offset = Offset.fromIntSignExtend(VM_Statics.findOrCreateIntSizeLiteral(Float.floatToIntBits(fc.value))); } s.insertBefore(Binary.create(MATERIALIZE_FP_CONSTANT, rop, jtoc, fc)); s.putOperand(idx, rop.copyD2U()); Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_Compiler.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_Compiler.java 2006-11-02 20:42:56 UTC (rev 10943) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_Compiler.java 2006-11-03 08:07:31 UTC (rev 10944) @@ -620,8 +620,9 @@ * Emit code to load a 32 bit constant * (which may be a reference and thus really 64 bits on 64 bit platform!) * @param offset JTOC offset of the constant + * @param type the type of the constant */ - protected final void emit_ldc(Offset offset) { + protected final void emit_ldc(Offset offset, byte type) { if (VM_Statics.isReference(VM_Statics.offsetAsSlot(offset))){ asm.emitLAddrToc(T0, offset); pushAddr(T0); @@ -634,8 +635,9 @@ /** * Emit code to load a 64 bit constant * @param offset JTOC offset of the constant + * @param type the type of the constant */ - protected final void emit_ldc2(Offset offset) { + protected final void emit_ldc2(Offset offset, byte type) { asm.emitLFDtoc(F0, offset, T0); pushDouble(F0); } Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/ir/conversions/lir2mir/OPT_NormalizeConstants.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/ir/conversions/lir2mir/OPT_NormalizeConstants.java 2006-11-02 20:42:56 UTC (rev 10943) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/ir/conversions/lir2mir/OPT_NormalizeConstants.java 2006-11-03 08:07:31 UTC (rev 10944) @@ -90,7 +90,7 @@ OPT_DoubleConstantOperand dc = (OPT_DoubleConstantOperand)use; Offset offset = dc.offset; if (offset.isZero()) { - offset = Offset.fromIntSignExtend(VM_Statics.findOrCreateDoubleLiteral(Double.doubleToLongBits(dc.value))); + offset = Offset.fromIntSignExtend(VM_Statics.findOrCreateLongSizeLiteral(Double.doubleToLongBits(dc.value))); } OPT_LocationOperand loc = new OPT_LocationOperand(offset); s.insertBefore(Load.create(DOUBLE_LOAD, rop, jtoc, asImmediateOrRegOffset(AC(offset), s, ir, true), loc)); @@ -101,7 +101,7 @@ OPT_FloatConstantOperand fc = (OPT_FloatConstantOperand)use; Offset offset = fc.offset; if (offset.isZero()) { - offset = Offset.fromIntSignExtend(VM_Statics.findOrCreateFloatLiteral(Float.floatToIntBits(fc.value))); + offset = Offset.fromIntSignExtend(VM_Statics.findOrCreateIntSizeLiteral(Float.floatToIntBits(fc.value))); } OPT_LocationOperand loc = new OPT_LocationOperand(offset); s.insertBefore(Load.create(FLOAT_LOAD, rop, jtoc, asImmediateOrRegOffset(AC(offset), s, ir, true), loc)); Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/VM_QuickCompiler.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/VM_QuickCompiler.java 2006-11-02 20:42:56 UTC (rev 10943) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/VM_QuickCompiler.java 2006-11-03 08:07:31 UTC (rev 10944) @@ -5088,20 +5088,20 @@ /** * Emit code to load a 32 bit constant * @param offset JTOC offset of the constant + * @param type the type of the constant */ - protected void emit_ldc(Offset offset) { + protected void emit_ldc(Offset offset, byte type) { if (unreachableBytecode) return; if (VM.BuildFor64Addr) { if (VM.VerifyAssertions) VM._assert(NOT_REACHED); } - byte slotDescription = VM_Statics.getSlotDescription(VM_Statics.offsetAsSlot(offset)); - switch (slotDescription) { - case VM_Statics.FLOAT_LITERAL: + switch (type) { + case VM_Class.CP_FLOAT: assignRegisters(0, FLOAT_TYPE); asm.emitLFStoc(sro0, offset, S0); break; - case VM_Statics.CLASS_LITERAL: - case VM_Statics.STRING_LITERAL: + case VM_Class.CP_CLASS: + case VM_Class.CP_STRING: assignRegisters(0, OBJECT_TYPE); asm.emitLAddrToc(sro0, offset); break; @@ -5116,8 +5116,9 @@ /** * Emit code to load a 64 bit constant * @param offset JTOC offset of the constant + * @param type the type of the constant */ - protected void emit_ldc2(Offset offset) { + protected void emit_ldc2(Offset offset, byte type) { if (unreachableBytecode) return; // XXX CJH TODO! if (VM.BuildFor64Addr) { @@ -5125,7 +5126,7 @@ } byte pushType; - if (VM_Statics.getSlotDescription(VM_Statics.offsetAsSlot(offset)) == VM_Statics.DOUBLE_LITERAL) + if (type == VM_Class.CP_DOUBLE) pushType = DOUBLE_TYPE; else pushType = LONG_TYPE; Modified: rvmroot/trunk/rvm/src/vm/classLoader/VM_Array.java =================================================================== --- rvmroot/trunk/rvm/src/vm/classLoader/VM_Array.java 2006-11-02 20:42:56 UTC (rev 10943) +++ rvmroot/trunk/rvm/src/vm/classLoader/VM_Array.java 2006-11-03 08:07:31 UTC (rev 10944) @@ -34,16 +34,28 @@ /* * We hold on to a number of commonly used arrays for easy access. */ - public static VM_Array BooleanArray; - public static VM_Array ByteArray; - public static VM_Array CharArray; - public static VM_Array ShortArray; - public static VM_Array IntArray; - public static VM_Array LongArray; - public static VM_Array FloatArray; - public static VM_Array DoubleArray; - public static VM_Array JavaLangObjectArray; + public static final VM_Array BooleanArray; + public static final VM_Array ByteArray; + public static final VM_Array CharArray; + public static final VM_Array ShortArray; + public static final VM_Array IntArray; + public static final VM_Array LongArray; + public static final VM_Array FloatArray; + public static final VM_Array DoubleArray; + public static final VM_Array JavaLangObjectArray; + static { + BooleanArray = (VM_Array)VM_TypeReference.BooleanArray.resolve(); + CharArray = (VM_Array)VM_TypeReference.CharArray.resolve(); + FloatArray = (VM_Array)VM_TypeReference.FloatArray.resolve(); + DoubleArray = (VM_Array)VM_TypeReference.DoubleArray.resolve(); + ByteArray = (VM_Array)VM_TypeReference.ByteArray.resolve(); + ShortArray = (VM_Array)VM_TypeReference.ShortArray.resolve(); + IntArray = (VM_Array)VM_TypeReference.IntArray.resolve(); + LongArray = (VM_Array)VM_TypeReference.LongArray.resolve(); + JavaLangObjectArray = (VM_Array)VM_TypeReference.JavaLangObjectArray.resolve(); + } + /** * The VM_Type object for elements of this array type. */ @@ -60,18 +72,63 @@ private final VM_Type innermostElementType; /** - * The TIB for this type - */ - private Object[] typeInformationBlock; - - /** * The desired alignment for instances of this type. * Cached rather than computed because this is a frequently * asked question */ private final int alignment; - + /** + * Reference Count GC: is this type acyclic? + */ + private final boolean acyclic; + + /** + * The TIB for this type, created when the array is resolved. + */ + private Object[] typeInformationBlock; + + /** + * current class-loading stage (loaded, resolved or initialized) + */ + private int state; + + /** + * Is this array type in the bootimage? + */ + private boolean inBootImage; + + /** + * At what offset is the thin lock word to be found in instances of + * objects of this type? A value of -1 indicates that the instances of + * this type do not have inline thin locks. + */ + private Offset thinLockOffset; + + /** + * The memory manager's notion of this type created after the + * resolving + */ + private Object mmType; + + /** + * Record the type information the memory manager holds about this + * type + * @param mmt the type to record + */ + public void setMMType(Object mmt) { + mmType = mmt; + } + + /** + * @return the type information the memory manager previously + * recorded about this type + */ + public Object getMMType() throws UninterruptiblePragma { + return mmType; + } + + /** * Name - something like "[I" or "[Ljava.lang.String;" */ public final String toString() { @@ -143,7 +200,8 @@ * @param numelts number of array elements in the instance * @return size in bytes */ - public final int getInstanceSize(int numelts) throws UninterruptiblePragma, InlinePragma { + public final int getInstanceSize(int numelts) throws UninterruptiblePragma, + InlinePragma { return VM_ObjectModel.computeArrayHeaderSize(this) + (numelts << getLogElementSize()); } @@ -190,20 +248,146 @@ return typeInformationBlock; } - //-------------------------------------------------------------------------------------------------// - // Load, Resolve, Instantiate, Initialize // - //-------------------------------------------------------------------------------------------------// + /** + * Does this slot in the TIB hold a TIB entry? + * @param slot the TIB slot + * @return true if this the array element TIB + */ + public boolean isTIBSlotTIB(int slot) { + if (VM.VerifyAssertions) checkTIBSlotIsAccessible(slot); + return slot == TIB_ARRAY_ELEMENT_TIB_INDEX; + } /** - * Create an instance of a VM_Array - * @param typeRef the canonical type reference for this type. - * @param elementType the VM_Type object for the array's elements. + * Does this slot in the TIB hold code? + * @param slot the TIB slot + * @return true if slot is one that holds a code array reference */ + public boolean isTIBSlotCode(int slot) { + if (VM.VerifyAssertions) checkTIBSlotIsAccessible(slot); + return slot >= TIB_FIRST_VIRTUAL_METHOD_INDEX; + } + + /** + * get number of superclasses to Object + * @return 1 + */ + public int getTypeDepth () throws UninterruptiblePragma { + return 1; + } + + /** + * Reference Count GC: Is a reference of this type contained in + * another object inherently acyclic (without cycles) ? + * @return true + */ + public boolean isAcyclicReference() throws UninterruptiblePragma { + return acyclic; + } + + /** + * Number of [ in descriptor for arrays; -1 for primitives; 0 for + * classes + */ + public int getDimensionality() throws UninterruptiblePragma { + return dimension; + } + + /** + * Resolution status. + */ + public boolean isResolved() throws UninterruptiblePragma { + return state >= CLASS_RESOLVED; + } + + /** + * Instantiation status. + */ + public final boolean isInstantiated() throws UninterruptiblePragma { + return state >= CLASS_INSTANTIATED; + } + + /** + * Initialization status. + */ + public final boolean isInitialized() throws UninterruptiblePragma { + return state == CLASS_INITIALIZED; + } + + /** + * Only intended to be used by the BootImageWriter + */ + public final void markAsBootImageClass() { + inBootImage = true; + } + + /** + * Is this class part of the virtual machine's boot image? + */ + public final boolean isInBootImage() throws UninterruptiblePragma { + return inBootImage; + } + + /** + * Get the offset in instances of this type assigned to the thin lock word. + * -1 if instances of this type do not have thin lock words. + */ + public final Offset getThinLockOffset() throws UninterruptiblePragma { + return thinLockOffset; + } + + /** + * Set the thin lock offset for instances of this type + */ + public final void setThinLockOffset(Offset offset) { + if (VM.VerifyAssertions) VM._assert (thinLockOffset.isMax()); + thinLockOffset = offset; + } + + /** + * Whether or not this is an instance of VM_Class? + * @return false + */ + public boolean isClassType() throws UninterruptiblePragma { + return false; + } + + /** + * Whether or not this is an instance of VM_Array? + * @return true + */ + public boolean isArrayType() throws UninterruptiblePragma { + return true; + } + + /** + * Whether or not this is a primitive type + * @return false + */ + public boolean isPrimitiveType() throws UninterruptiblePragma { + return false; + } + + /** + * @return whether or not this is a reference (ie non-primitive) type. + */ + public boolean isReferenceType() throws UninterruptiblePragma { + return true; + } + + /** + * Constructor + * @param typeRef + * @param elementType + * @param classForType + */ VM_Array(VM_TypeReference typeRef, VM_Type elementType) { - super(typeRef, null, null); - depth = 1; + super(typeRef, typeRef.getDimensionality(), null, null); this.elementType = elementType; this.logElementSize = computeLogElementSize(); + thinLockOffset = VM_ObjectModel.defaultThinLockOffset(); + depth = 1; + if (elementType.isArrayType()) { innermostElementType = elementType.asArray().getInnermostElementType(); } else { @@ -215,14 +399,15 @@ this.alignment = BYTES_IN_ADDRESS; } - acyclic = elementType.isAcyclicReference(); // RCGC: Array is acyclic if its references are acyclic + // RCGC: Array is acyclic if its references are acyclic + acyclic = elementType.isAcyclicReference(); state = CLASS_LOADED; + if (VM.verboseClassLoading) VM.sysWrite("[Loaded "+this.getDescriptor()+"]\n"); if (VM.verboseClassLoading) VM.sysWrite("[Loaded superclasses of "+this.getDescriptor()+"]\n"); } - /** * Resolve an array. * Also forces the resolution of the element type. @@ -308,19 +493,6 @@ return null; } - - static void init() { - BooleanArray = (VM_Array)VM_TypeReference.BooleanArray.resolve(); - CharArray = (VM_Array)VM_TypeReference.CharArray.resolve(); - FloatArray = (VM_Array)VM_TypeReference.FloatArray.resolve(); - DoubleArray = (VM_Array)VM_TypeReference.DoubleArray.resolve(); - ByteArray = (VM_Array)VM_TypeReference.ByteArray.resolve(); - ShortArray = (VM_Array)VM_TypeReference.ShortArray.resolve(); - IntArray = (VM_Array)VM_TypeReference.IntArray.resolve(); - LongArray = (VM_Array)VM_TypeReference.LongArray.resolve(); - JavaLangObjectArray = (VM_Array)VM_TypeReference.JavaLangObjectArray.resolve(); - } - //--------------------------------------------------------------------------------------------------// // Support for array copy // //--------------------------------------------------------------------------------------------------// Modified: rvmroot/trunk/rvm/src/vm/classLoader/VM_BytecodeStream.java =================================================================== --- rvmroot/trunk/rvm/src/vm/classLoader/VM_BytecodeStream.java 2006-11-02 20:42:56 UTC (rev 10943) +++ rvmroot/trunk/rvm/src/vm/classLoader/VM_BytecodeStream.java 2006-11-03 08:07:31 UTC (rev 10944) @@ -653,7 +653,7 @@ if (VM.VerifyAssertions) VM._assert((opcode == JBC_ldc || opcode == JBC_ldc_w) && getDeclaringClass().getLiteralDescription(index) == - VM_Statics.INT_LITERAL); + VM_Class.CP_INT); Offset offset = getDeclaringClass().getLiteralOffset(index) ; int val = VM_Statics.getSlotContentsAsInt(offset); return val; @@ -675,7 +675,7 @@ if (VM.VerifyAssertions) VM._assert(opcode == JBC_ldc2_w && getDeclaringClass().getLiteralDescription(index) == - VM_Statics.LONG_LITERAL); + VM_Class.CP_LONG); Offset offset = getDeclaringClass().getLiteralOffset(index); long val = VM_Statics.getSlotContentsAsLong(offset); return val; @@ -697,7 +697,7 @@ if (VM.VerifyAssertions) VM._assert((opcode == JBC_ldc || opcode == JBC_ldc_w) && getDeclaringClass().getLiteralDescription(index) == - VM_Statics.FLOAT_LITERAL); + VM_Class.CP_FLOAT); Offset offset = getDeclaringClass().getLiteralOffset(index); int val_raw = VM_Statics.getSlotContentsAsInt(offset); float val = Float.intBitsToFloat(val_raw); @@ -720,7 +720,7 @@ if (VM.VerifyAssertions) VM._assert(opcode == JBC_ldc2_w && getDeclaringClass().getLiteralDescription(index) == - VM_Statics.DOUBLE_LITERAL); + VM_Class.CP_DOUBLE); Offset offset = getDeclaringClass().getLiteralOffset(index) ; long val_raw = VM_Statics.getSlotContentsAsLong(offset); double val = Double.longBitsToDouble(val_raw); @@ -743,7 +743,7 @@ if (VM.VerifyAssertions) VM._assert((opcode == JBC_ldc || opcode == JBC_ldc_w) && getDeclaringClass().getLiteralDescription(index) == - VM_Statics.STRING_LITERAL); + VM_Class.CP_STRING); Offset offset = getDeclaringClass().getLiteralOffset(index); String val = (String) VM_Statics.getSlotContentsAsObject(offset); return val; Modified: rvmroot/trunk/rvm/src/vm/classLoader/VM_Class.java =================================================================== --- rvmroot/trunk/rvm/src/vm/classLoader/VM_Class.java 2006-11-02 20:42:56 UTC (rev 10943) +++ rvmroot/trunk/rvm/src/vm/classLoader/VM_Class.java 2006-11-03 08:07:31 UTC (rev 10944) @@ -48,27 +48,46 @@ /** Flag for for closed world testing */ public static boolean classLoadingDisabled = false; - // Canonical empty arrays - /** Canoical representation of no VM classes */ - private static final VM_Class[] emptyVMClass = new VM_Class[0]; - /** Canonical representation of no fields */ - private static final VM_Field[] emptyVMField = new VM_Field[0]; - /** Canonical representation of no methods */ - private static final VM_Method[] emptyVMMethod = new VM_Method[0]; + /** Constant pool entry for a UTF-8 encoded atom */ + public static final byte CP_UTF = 0; + /** Constant pool entry for int literal */ + public static final byte CP_INT = 1; + + /** Constant pool entry for long literal */ + public static final byte CP_LONG = 2; + + /** Constant pool entry for float literal */ + public static final byte CP_FLOAT = 3; + + /** Constant pool entry for double literal */ + public static final byte CP_DOUBLE = 4; + + /** Constant pool entry for string literal */ + public static final byte CP_STRING = 5; + + /** Constant pool entry for member (field or method) reference */ + public static final byte CP_MEMBER = 6; + + /** Constant pool entry for type reference or class literal */ + public static final byte CP_CLASS = 7; + /** - * Constant pool after class loading. The constant pool is indexed - * by various Java bytecodes, as well as other fields within the - * class file. The values of the integers held in the constant pool - * are either: + * The constant pool holds constants used by the class and the Java + * bytecodes in the methods associated with this class. This + * constant pool isn't that from the class file, instead it has been + * processed during class loading {@see #readClass}. The loaded + * class' constant pool has 3 bits of type information (such as + * {@see #CP_INT}), the rest of the int holds data as follows: * * <ul> - * <li>offsets of literals in the statics table</li> - * <li>type reference IDs. This constant pool location is also used - * for class literals, to distinguish class literals from other - * literals the type rederence IDs are -ve</li> - * <li>member (field or method) reference IDs</li> - * <li>atom (UTF8 encoded string) IDs</li> + * <li>utf: value is a UTF atom identifier</li> + * <li>int, long, float, double, string: value is an offset in the + * JTOC</li> + * <li>member: value is a member reference identifier</li> + * <li>class: value is a type reference identifier. NB this means + * that class literal bytecodes must first convert the identifier + * in to a JTOC offset.</li> * </ul> */ private final int[] constantPool; @@ -103,57 +122,50 @@ */ private final VM_Atom signature; /** - * Class initializer method, null if no method or method has been - * run + * Class initializer method, null if no method or if class is + * initialized (ie class initializer method has been run) */ private VM_Method classInitializerMethod; + /** + * current class-loading stage (loaded, resolved, instantiated, + * initializing or initialized) + */ + private int state; + // // The following are valid only when "state >= CLASS_RESOLVED". // // --- Field size and offset information --- // - // - /** - * fields shared by all instances of class - */ - private VM_Field[] staticFields; - /** - * fields distinct for each instance of class - */ - private VM_Field[] instanceFields; - /** - * total size of per-instance data, in bytes - */ - private int instanceSize; - /** - * offsets of reference-containing instance fields - */ - private int[] referenceOffsets; - /** - * offset of hole due to alignment, zero if none - */ - private int emptySlot = 0; - /** - * The desired alignment for instances of this type. - */ + + /** fields shared by all instances of class */ + private VM_Field[] staticFields; + + /** fields distinct for each instance of class */ + private VM_Field[] instanceFields; + + /** total size of per-instance data, in bytes */ + private int instanceSize; + + /** offsets of reference-containing instance fields */ + private int[] referenceOffsets; + + /** offset of hole due to alignment, zero if none */ + private int emptySlot; + + /** The desired alignment for instances of this type. */ private int alignment; + // --- Method-dispatching information --- // - // - // --- Method-dispatching information --- // - // - /** - * static methods of class - */ - private VM_Method[] staticMethods; - /** - * static methods of class - */ - private VM_Method[] constructorMethods; - /** - * virtual methods of class - */ + /** static methods of class */ + private VM_Method[] staticMethods; + + /** constructor methods of class */ + private VM_Method[] constructorMethods; + + /** virtual methods of class */ private VM_Method[] virtualMethods; /** @@ -162,14 +174,11 @@ */ private VM_Method finalizeMethod; - /** - * type and virtual method dispatch table for class - */ - private Object[] typeInformationBlock; + /** type and virtual method dispatch table for class */ + private Object[] typeInformationBlock; - // // --- Annotation support --- // - // + /** * If this class is an annotation interface, this is the class that * implements that interface and can be used to make instances of @@ -177,8 +186,34 @@ */ private VM_Class annotationClass; + // --- Memory manager supprt --- // /** + * Is this class type in the bootimage? Types in the boot image can + * be initialized prior to execution (therefore removing runtime + * resolution). + */ + private boolean inBootImage; + + /** + * At what offset is the thin lock word to be found in instances of + * objects of this type? A value of -1 indicates that the instances of + * this type do not have inline thin locks. + */ + private Offset thinLockOffset; + + /** Reference Count GC: is this type acyclic? */ + private boolean acyclic; + + /** + * The memory manager's notion of this type created after the + * resolving + */ + private Object mmType; + + // --- General purpose functions --- // + + /** * Name - something like "java.lang.String". */ public final String toString() { @@ -203,7 +238,8 @@ } /** - * If class is an annotation, get the class that implements it + * If class is an annotation (which means its actually an + * interface), get the class that implements it */ VM_Class getAnnotationClass() { if(VM.VerifyAssertions) VM._assert(this.isAnnotation()); @@ -290,7 +326,10 @@ ); } - + /** + * Get the modifiers associated with this class {@link + * VM_ClassLoaderConstants}. + */ public int getModifiers() { return modifiers & APPLICABLE_TO_CLASSES; } @@ -440,19 +479,62 @@ // Items are fetched by specifying their "constant pool index". // + private static int packCPEntry(byte type, int value) throws UninterruptiblePragma { + return (((int)type) << 29) | (value & 0x1fffffff); + } + + private static byte unpackCPType(int cpValue) throws UninterruptiblePragma { + return (byte)(cpValue >>> 29); + } + + private static int unpackSignedCPValue(int cpValue) throws UninterruptiblePragma { + return (cpValue << 3) >> 3; + } + + private static int unpackUnsignedCPValue(int cpValue) throws UninterruptiblePragma { + return cpValue & 0x1fffffff; + } + + private static boolean packedCPTypeIsClassType(int cpValue) throws UninterruptiblePragma { + return (cpValue & (7 << 29)) == (CP_CLASS << 29); + } + + private static int packTempCPEntry(int index1, int index2) throws UninterruptiblePragma { + return (index1 << 16) | (index2 & 0xffff); + } + + private static int unpackTempCPIndex1(int cpValue) throws UninterruptiblePragma { + return cpValue >>> 16; + } + + private static int unpackTempCPIndex2(int cpValue) throws UninterruptiblePragma { + return cpValue & 0xffff; + } + + static final int getLiteralSize(int constantPool[], int constantPoolIndex) { + int cpValue = constantPool[constantPoolIndex]; + switch(unpackCPType(cpValue)) { + case CP_INT: + case CP_FLOAT: + return BYTES_IN_INT; + case CP_LONG: + case CP_DOUBLE: + return BYTES_IN_LONG; + case CP_CLASS: + case CP_STRING: + return BYTES_IN_ADDRESS; + default: + VM._assert(NOT_REACHED); + return 0; + } + } + /** * Get offset of a literal constant, in bytes. * Offset is with respect to virtual machine's "table of contents" (jtoc). */ public final Offset getLiteralOffset(int constantPoolIndex) { - // jtoc slot number --> jtoc offset - int offset = constantPool[constantPoolIndex]; - if (offset >= 0) { - return Offset.fromIntSignExtend(offset); - } - else { - return Offset.fromIntSignExtend(VM_Statics.findOrCreateClassLiteral(offset)); - } + return getLiteralOffset(this.constantPool, constantPoolIndex); } @@ -461,22 +543,44 @@ * Offset is with respect to virtual machine's "table of contents" (jtoc). */ static final Offset getLiteralOffset(int constantPool[], int constantPoolIndex) { - // jtoc slot number --> jtoc offset - int offset = constantPool[constantPoolIndex]; - if (offset >= 0) { - return Offset.fromIntSignExtend(offset); + int cpValue = constantPool[constantPoolIndex]; + if (VM.VerifyAssertions) { + int value = unpackSignedCPValue(cpValue); + byte type = unpackCPType(cpValue); + switch (type) { + case CP_INT: + case CP_FLOAT: + case CP_LONG: + case CP_DOUBLE: + case CP_STRING: + return Offset.fromIntSignExtend(value); + case CP_CLASS: { + int typeId = unpackUnsignedCPValue(cpValue); + return Offset.fromIntSignExtend(VM_Statics.findOrCreateClassLiteral(typeId)); + } + default: + VM._assert(NOT_REACHED); + return Offset.fromIntSignExtend(0xebad0ff5); + } + } else { + if (packedCPTypeIsClassType(cpValue)) { + int typeId = unpackUnsignedCPValue(cpValue); + return Offset.fromIntSignExtend(VM_Statics.findOrCreateClassLiteral(typeId)); + } + else { + int value = unpackSignedCPValue(cpValue); + return Offset.fromIntSignExtend(value); + } } - else { - return Offset.fromIntSignExtend(VM_Statics.findOrCreateClassLiteral(offset)); - } } /** * Get description of a literal constant. */ public final byte getLiteralDescription(int constantPoolIndex) { - // jtoc slot number --> description - return VM_Statics.getSlotDescription(VM_Statics.offsetAsSlot(getLiteralOffset(constantPoolIndex))); + int cpValue = constantPool[constantPoolIndex]; + byte type = unpackCPType(cpValue); + return type; } /** @@ -484,7 +588,7 @@ * @return type that was referenced */ public final VM_TypeReference getTypeRef(int constantPoolIndex) throws UninterruptiblePragma { - return VM_TypeReference.getTypeRef(constantPool[constantPoolIndex]); + return getTypeRef(constantPool, constantPoolIndex); } /** @@ -492,42 +596,58 @@ * @return type that was referenced */ static VM_TypeReference getTypeRef(int constantPool[], int constantPoolIndex) throws UninterruptiblePragma { - return VM_TypeReference.getTypeRef(constantPool[constantPoolIndex]); + if (constantPoolIndex != 0) { + int cpValue = constantPool[constantPoolIndex]; + if(VM.VerifyAssertions) VM._assert(unpackCPType(cpValue) == CP_CLASS); + return VM_TypeReference.getTypeRef(unpackUnsignedCPValue(cpValue)); + } else { + return null; + } } /** * Get contents of a "methodRef" constant pool entry. */ public final VM_MethodReference getMethodRef(int constantPoolIndex) throws UninterruptiblePragma { - return (VM_MethodReference)VM_MemberReference.getMemberRef(constantPool[constantPoolIndex]); + return getMethodRef(constantPool, constantPoolIndex); } /** * Get contents of a "methodRef" constant pool entry. */ static VM_MethodReference getMethodRef(int constantPool[], int constantPoolIndex) throws UninterruptiblePragma { - return (VM_MethodReference)VM_MemberReference.getMemberRef(constantPool[constantPoolIndex]); + int cpValue = constantPool[constantPoolIndex]; + if(VM.VerifyAssertions) VM._assert(unpackCPType(cpValue) == CP_MEMBER); + return (VM_MethodReference) + VM_MemberReference.getMemberRef(unpackUnsignedCPValue(cpValue)); } /** * Get contents of a "fieldRef" constant pool entry. */ public final VM_FieldReference getFieldRef(int constantPoolIndex) throws UninterruptiblePragma { - return (VM_FieldReference)VM_MemberReference.getMemberRef(constantPool[constantPoolIndex]); + int cpValue = constantPool[constantPoolIndex]; + if(VM.VerifyAssertions) VM._assert(unpackCPType(cpValue) == CP_MEMBER); + return (VM_FieldReference) + VM_MemberReference.getMemberRef(unpackUnsignedCPValue(cpValue)); } /** * Get contents of a "utf" constant pool entry. */ final VM_Atom getUtf(int constantPoolIndex) throws UninterruptiblePragma { - return VM_Atom.getAtom(constantPool[constantPoolIndex]); + int cpValue = constantPool[constantPoolIndex]; + if(VM.VerifyAssertions) VM._assert(unpackCPType(cpValue) == CP_UTF); + return VM_Atom.getAtom(unpackUnsignedCPValue(cpValue)); } /** * Get contents of a "utf" from a constant pool entry. */ static VM_Atom getUtf(int constantPool[], int constantPoolIndex) throws UninterruptiblePragma { - return VM_Atom.getAtom(constantPool[constantPoolIndex]); + int cpValue = constantPool[constantPoolIndex]; + if(VM.VerifyAssertions) VM._assert(unpackCPType(cpValue) == CP_UTF); + return VM_Atom.getAtom(unpackUnsignedCPValue(cpValue)); } /** @@ -580,6 +700,23 @@ return false; } + /** + * Record the type information the memory manager holds about this + * type + * @param mmt the type to record + */ + public void setMMType(Object mmt) { + mmType = mmt; + } + + /** + * @return the type information the memory manager previously + * recorded about this type + */ + public Object getMMType() throws UninterruptiblePragma { + return mmType; + } + //--------------------------------------------------------------------// // The following are available after the class has been "resolved". // //--------------------------------------------------------------------// @@ -631,7 +768,7 @@ * Constructors (<init>) methods of this class. */ public final VM_Method[] getConstructorMethods() { - if (VM.VerifyAssertions) VM._assert(isResolved()); + if (VM.VerifyAssertions) VM._assert(isResolved(), "Error class " + this + " is not resolved but " + state); return constructorMethods; } @@ -685,6 +822,10 @@ return instanceSize; } + /** + * Total size, in bytes, of an instance of this class (including + * object header). Doesn't perform any verification. + */ public final int getInstanceSizeInternal() throws UninterruptiblePragma { return instanceSize; } @@ -710,18 +851,18 @@ * Offset of hole, due to alignment; * returns zero if none. */ - public final int getEmptySlot() { - return emptySlot; + public final Offset getEmptySlot() { + return Offset.fromIntSignExtend(emptySlot); } /** * Set the offset of a hole. */ - public final void setEmptySlot(int off) { + public final void setEmptySlot(Offset off) { if (VM.VerifyAssertions) { - VM._assert(off == 0 || emptySlot == 0); + VM._assert(off.isZero() || (emptySlot == 0)); } - emptySlot = off; + emptySlot = off.toInt(); } /** @@ -738,25 +879,6 @@ if (VM.VerifyAssertions) VM._assert(align >= alignment); alignment = align; } - - /** - * Find specified virtual method description. - * @param memberName method name - something like "foo" - * @param memberDescriptor method descriptor - something like "I" or "()I" - * @return method description (null --> not found) - */ - public final VM_Method findVirtualMethod(VM_Atom memberName, - VM_Atom memberDescriptor) { - if (VM.VerifyAssertions) VM._assert(isResolved()); - VM_Method methods[] = getVirtualMethods(); - for (int i = 0, n = methods.length; i < n; ++i) { - VM_Method method = methods[i]; - if (method.getName() == memberName && - method.getDescriptor() == memberDescriptor) - return method; - } - return null; - } /** * Find specified static method description. @@ -801,6 +923,26 @@ return typeInformationBlock; } + /** + * Does this slot in the TIB hold a TIB entry? + * @param slot the TIB slot + * @return false + */ + public boolean isTIBSlotTIB(int slot) { + if (VM.VerifyAssertions) checkTIBSlotIsAccessible(slot); + return false; + } + + /** + * Does this slot in the TIB hold code? + * @param slot the TIB slot + * @return true if slot is one that holds a code array reference + */ + public boolean isTIBSlotCode(int slot) { + if (VM.VerifyAssertions) checkTIBSlotIsAccessible(slot); + return slot >= TIB_FIRST_VIRTUAL_METHOD_INDEX; + } + //--------------------------------------------------------------------// // Miscellaneous queries. // //---------------------------------------------------------------------// @@ -878,7 +1020,7 @@ VM_Annotation runtimeVisibleAnnotations[], VM_Annotation runtimeInvisibleAnnotations[]) { - super(typeRef, runtimeVisibleAnnotations, runtimeInvisibleAnnotations); + super(typeRef, 0, runtimeVisibleAnnotations, runtimeInvisibleAnnotations); // final fields this.constantPool = constantPool; @@ -912,10 +1054,9 @@ VM_Callbacks.notifyClassLoaded(this); - if (VM.TraceClassLoading && VM.runningVM) VM.sysWrite("VM_Class: (end) load file " + - typeRef.getName() + "\n"); + if (VM.TraceClassLoading && VM.runningVM) VM.sysWriteln("VM_Class: (end) load file " + + typeRef.getName()); if (VM.verboseClassLoading) VM.sysWrite("[Loaded " + toString() + "]\n"); - } /** @@ -960,55 +1101,67 @@ // note: slot 0 is unused for (int i = 1; i <constantPool.length; i++) { - switch (tmpTags[i] = input.readByte()) { + tmpTags[i] = input.readByte(); + switch (tmpTags[i]) { case TAG_UTF: { byte utf[] = new byte[input.readUnsignedShort()]; input.readFully(utf); - constantPool[i] = VM_Atom.findOrCreateUtf8Atom(utf).getId(); - break; + int atomId = VM_Atom.findOrCreateUtf8Atom(utf).getId(); + constantPool[i] = packCPEntry(CP_UTF, atomId); + break; } - case TAG_UNUSED: if (VM.VerifyAssertions) VM._assert(NOT_REACHED); break; - - case TAG_INT: - constantPool[i] = VM_Statics.findOrCreateIntLiteral(input.readInt()); + + case TAG_INT: { + int literal = input.readInt(); + int offset = VM_Statics.findOrCreateIntSizeLiteral(literal); + constantPool[i] = packCPEntry(CP_INT, offset); break; - - case TAG_FLOAT: - constantPool[i] = VM_Statics.findOrCreateFloatLiteral(input.readInt()); + } + case TAG_FLOAT: { + int literal = input.readInt(); + int offset = VM_Statics.findOrCreateIntSizeLiteral(literal); + constantPool[i] = packCPEntry(CP_FLOAT, offset); break; - - case TAG_LONG: - constantPool[i++] = VM_Statics.findOrCreateLongLiteral(input.readLong()); + } + case TAG_LONG: { + long literal = input.readLong(); + int offset = VM_Statics.findOrCreateLongSizeLiteral(literal); + constantPool[i] = packCPEntry(CP_LONG, offset); + i++; break; - - case TAG_DOUBLE: - constantPool[i++] = VM_Statics.findOrCreateDoubleLiteral(input.readLong()); + } + case TAG_DOUBLE: { + long literal = input.readLong(); + int offset = VM_Statics.findOrCreateLongSizeLiteral(literal); + constantPool[i] = packCPEntry(CP_DOUBLE, offset); + i++; break; - + } case TAG_TYPEREF: constantPool[i] = input.readUnsignedShort(); break; - + case TAG_STRING: constantPool[i] = input.readUnsignedShort(); break; - + case TAG_FIELDREF: case TAG_METHODREF: case TAG_INTERFACE_METHODREF: { int classDescriptorIndex = input.readUnsignedShort(); int memberNameAndDescriptorIndex = input.readUnsignedShort(); - constantPool[i] = (classDescriptorIndex << BITS_IN_SHORT) | memberNameAndDescriptorIndex; + constantPool[i] = packTempCPEntry(classDescriptorIndex, + memberNameAndDescriptorIndex); break; } - + case TAG_MEMBERNAME_AND_DESCRIPTOR: { int memberNameIndex = input.readUnsignedShort(); int descriptorIndex = input.readUnsignedShort(); - constantPool[i] = (memberNameIndex << BITS_IN_SHORT) | descriptorIndex; + constantPool[i] = packTempCPEntry(memberNameIndex, descriptorIndex); break; } @@ -1031,12 +1184,16 @@ case TAG_TYPEREF: { // in: utf index VM_Atom typeName = getUtf(constantPool, constantPool[i]); - constantPool[i] = VM_TypeReference.findOrCreate(typeRef.getClassLoader(), typeName.descriptorFromClassName()).getId(); + int typeRefId = VM_TypeReference.findOrCreate(typeRef.getClassLoader(), + typeName.descriptorFromClassName()).getId(); + constantPool[i] = packCPEntry(CP_CLASS, typeRefId); break; } // out: type reference id case TAG_STRING: { // in: utf index - constantPool[i] = VM_Statics.findOrCreateStringLiteral(getUtf(constantPool, constantPool[i])); + VM_Atom literal = getUtf(constantPool, constantPool[i]); + int offset = VM_Statics.findOrCreateStringLiteral(literal); + constantPool[i] = packCPEntry(CP_STRING, offset); break; } // out: jtoc slot number } @@ -1059,17 +1216,18 @@ case TAG_METHODREF: case TAG_INTERFACE_METHODREF: { // in: classname+membername+memberdescriptor indices int bits = constantPool[i]; - int classNameIndex = (bits >> BITS_IN_SHORT) & 0xffff; - int memberNameAndDescriptorIndex = bits & 0xffff; + int classNameIndex = unpackTempCPIndex1(bits); + int memberNameAndDescriptorIndex = unpackTempCPIndex2(bits); int memberNameAndDescriptorBits = constantPool[memberNameAndDescriptorIndex]; - int memberNameIndex = (memberNameAndDescriptorBits >> BITS_IN_SHORT) & 0xffff; - int memberDescriptorIndex = (memberNameAndDescriptorBits ) & 0xffff; + int memberNameIndex = unpackTempCPIndex1(memberNameAndDescriptorBits); + int memberDescriptorIndex = unpackTempCPIndex2(memberNameAndDescriptorBits); VM_TypeReference tref = getTypeRef(constantPool, classNameIndex); VM_Atom memberName = getUtf(constantPool, memberNameIndex); VM_Atom memberDescriptor = getUtf(constantPool, memberDescriptorIndex); VM_MemberReference mr = VM_MemberReference.findOrCreate(tref, memberName, memberDescriptor); - constantPool[i] = mr.getId(); + int mrId = mr.getId(); + constantPool[i] = packCPEntry(CP_MEMBER, mrId); break; } // out: VM_MemberReference id } @@ -1191,9 +1349,16 @@ } else if (attName == VM_ClassLoader.enclosingMethodAttributeName) { int enclosingClassIndex = input.readUnsignedShort(); + enclosingClass = getTypeRef(constantPool, enclosingClassIndex); + int enclosingMethodIndex = input.readUnsignedShort(); - enclosingClass = getTypeRef(constantPool, enclosingClassIndex); - enclosingMethod = getMethodRef(constantPool, enclosingMethodIndex); + if (enclosingMethodIndex != 0) { + int memberNameIndex = constantPool[enclosingMethodIndex] >>> BITS_IN_SHORT; + int memberDescriptorIndex = constantPool[enclosingMethodIndex] & ((1 << BITS_IN_SHORT) - 1); + VM_Atom memberName = getUtf(constantPool, memberNameIndex); + VM_Atom memberDescriptor = getUtf(constantPool, memberDescriptorIndex); + enclosingMethod = VM_MemberReference.findOrCreate(enclosingClass, memberName, memberDescriptor).asMethodReference(); + } } else if (attName == VM_ClassLoader.signatureAttributeName) { signature = VM_Class.getUtf(constantPool, input.readUnsignedShort()); @@ -1252,6 +1417,7 @@ if (VM.VerifyAssertions) VM._assert(superClass == null); instanceSize = VM_ObjectModel.computeScalarHeaderSize(this); alignment = BYTES_IN_ADDRESS; + thinLockOffset = VM_ObjectModel.defaultThinLockOffset(); } else { if (VM.VerifyAssertions) VM._assert(superClass != null); depth = superClass.depth + 1; @@ -1402,21 +1568,19 @@ for (int i = 0, n = staticFields.length; i < n; ++i) { VM_Field field = staticFields[i]; VM_TypeReference fieldType = field.getType(); - byte slotType; if (fieldType.isReferenceType()) - slotType = VM_Statics.REFERENCE_FIELD; + field.setOffset(VM_Statics.allocateReferenceSlot()); else if (fieldType.getSize() == BYTES_IN_LONG) - slotType = VM_Statics.WIDE_NUMERIC_FIELD; + field.setOffset(VM_Statics.allocateNumericSlot(BYTES_IN_LONG)); else - slotType = VM_Statics.NUMERIC_FIELD; - field.offset = VM_Statics.allocateSlot(slotType); + field.setOffset(VM_Statics.allocateNumericSlot(BYTES_IN_INT)); // (SJF): Serialization nastily accesses even final private static // fields via pseudo-reflection! So, we must shove the // values of final static fields into the JTOC. Now // seems to be a good time. if (field.isFinal()) { - setFinalStaticJTOCEntry(field,Offset.fromIntSignExtend(field.offset)); + setFinalStaticJTOCEntry(field, field.getOffset()); } } @@ -1438,14 +1602,14 @@ for (int i = 0, j = 0, n = instanceFields.length; i < n; ++i) { VM_Field field = instanceFields[i]; if (field.getType().isReferenceType()) - referenceOffsets[j++] = field.offset; + referenceOffsets[j++] = field.getOffset().toInt(); } // Allocate space for <init> method pointers // for (int i = 0, n = constructorMethods.length; i < n; ++i) { VM_Method method = constructorMethods[i]; - method.offset = VM_Statics.allocateSlot(VM_Statics.METHOD); + method.setOffset(VM_Statics.allocateReferenceSlot()); } // Allocate space for static method pointers @@ -1453,9 +1617,9 @@ for (int i = 0, n = staticMethods.length; i < n; ++i) { VM_Method method = staticMethods[i]; if (method.isClassInitializer()) { - method.offset = 0xdeadbeef; // should never be used. + method.setOffset(Offset.fromIntZeroExtend(0xebad0ff5)); // should never be used. } else { - method.offset = VM_Statics.allocateSlot(VM_Statics.METHOD); + method.setOffset(VM_Statics.allocateReferenceSlot()); } } @@ -1480,7 +1644,7 @@ // (to be filled in by instantiate) for (int i = 0, n = virtualMethods.length; i < n; ++i) { VM_Method method = virtualMethods[i]; - method.offset = (TIB_FIRST_VIRTUAL_METHOD_INDEX + i) << LOG_BYTES_IN_ADDRESS; + method.setOffset(Offset.fromIntZeroExtend((TIB_FIRST_VIRTUAL_METHOD_INDEX + i) << LOG_BYTES_IN_ADDRESS)); } } @@ -1653,7 +1817,7 @@ * initial values. */ public final synchronized void initialize() - // Doesn't really need declaring. + // Doesn't really need declaring. throws ExceptionInInitializerError { if (isInitialized()) @@ -1756,9 +1920,9 @@ for (int i=0; i<declaredMethods.length; i++) { VM_Method m = declaredMethods[i]; if (m.isNative()) { - VM_NativeMethod nm = (VM_NativeMethod)m; - nm.unregisterNativeSymbol(); - m.replaceCompiledMethod(null); + VM_NativeMethod nm = (VM_NativeMethod)m; + nm.unregisterNativeSymbol(); + m.replaceCompiledMethod(null); } } } @@ -1992,14 +2156,14 @@ if(value != null) { if(value instanceof Integer) { constantPool[nextFreeConstantPoolSlot] = - VM_Statics.findOrCreateIntLiteral(((Integer)value).intValue()); + VM_Statics.findOrCreateIntSizeLiteral(((Integer)value).intValue()); defaultConstants[j] = nextFreeConstantPoolSlot; j++; nextFreeConstantPoolSlot++; } else if(value instanceof Boolean) { constantPool[nextFreeConstantPoolSlot] = - VM_Statics.findOrCreateIntLiteral(((Boolean)value).booleanValue() ? 1 : 0); + VM_Statics.findOrCreateIntSizeLiteral(((Boolean)value).booleanValue() ? 1 : 0); defaultConstants[j] = nextFreeConstantPoolSlot; j++; nextFreeConstantPoolSlot++; @@ -2048,4 +2212,103 @@ annotationClass.setResolvedType(klass); return klass; } + + /** + * Number of [ in descriptor for arrays; -1 for primitives; 0 for + * classes + * @return 0 + */ + public int getDimensionality() throws UninterruptiblePragma { + return 0; + } + + + /** + * Resolution status. + */ + public boolean isResolved() throws UninterruptiblePragma { + return state >= CLASS_RESOLVED; + } + + /** + * Instantiation status. + */ + public final boolean isInstantiated() throws UninterruptiblePragma { + return state >= CLASS_INSTANTIATED; + } + + /** + * Initialization status. + */ + public final boolean isInitialized() throws UninterruptiblePragma { + return state == CLASS_INITIALIZED; + } + + /** + * Only intended to be used by the BootImageWriter + */ + public final void markAsBootImageClass() { + inBootImage = true; + } + + /** + * Is this class part of the virtual m... [truncated message content] |
From: <dgr...@us...> - 2006-11-02 20:43:14
|
Revision: 10943 http://svn.sourceforge.net/jikesrvm/?rev=10943&view=rev Author: dgrove-oss Date: 2006-11-02 12:42:56 -0800 (Thu, 02 Nov 2006) Log Message: ----------- OPT_RegisterOperand.scratch should most definitely be a private field... Modified Paths: -------------- rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_RegisterOperand.java Modified: rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_RegisterOperand.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_RegisterOperand.java 2006-11-02 17:56:14 UTC (rev 10942) +++ rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_RegisterOperand.java 2006-11-02 20:42:56 UTC (rev 10943) @@ -141,7 +141,7 @@ * 16 bits can be used for other purposes. Note: if packing is * supported, the scratch word could be split. */ - public int scratch; + private int scratch; static private final int PARAMETER = 0x01000000; // the register operand is for a parameter static private final int NON_VOLATILE = 0x02000000; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cap...@us...> - 2006-11-02 17:56:19
|
Revision: 10942 http://svn.sourceforge.net/jikesrvm/?rev=10942&view=rev Author: captain5050 Date: 2006-11-02 09:56:14 -0800 (Thu, 02 Nov 2006) Log Message: ----------- Conditionalize stashing value in VmProcessor for none single virtual processors Modified Paths: -------------- rvmroot/trunk/tools/bootImageRunner/sys.C Modified: rvmroot/trunk/tools/bootImageRunner/sys.C =================================================================== --- rvmroot/trunk/tools/bootImageRunner/sys.C 2006-11-02 17:08:34 UTC (rev 10941) +++ rvmroot/trunk/tools/bootImageRunner/sys.C 2006-11-02 17:56:14 UTC (rev 10942) @@ -2072,8 +2072,10 @@ sysStashVmProcessorInPthread(VM_Address vmProcessor) { if (rvm_singleVirtualProcessor) { +#if defined(RVM_FOR_SINGLE_VIRTUAL_PROCESSOR) // We have only a single VM_Processor so remember it VmProcessor = vmProcessor; +#endif } else { //fprintf(SysErrorFile, "stashing vm processor = %d, self=%u\n", vmProcessor, pthread_self()); int rc = pthread_setspecific(VmProcessorKey, (void*) vmProcessor); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dgr...@us...> - 2006-11-02 17:08:39
|
Revision: 10941 http://svn.sourceforge.net/jikesrvm/?rev=10941&view=rev Author: dgrove-oss Date: 2006-11-02 09:08:34 -0800 (Thu, 02 Nov 2006) Log Message: ----------- revision 10706 added an additional parameter to VM_Runtime.newScalar and VM_Runtime.newArray to encode the allocation site. This parameter is evaluated at compile time, and therefore we have to allow one additional instruction in the non-inlined allocation sequence to account for setting up this parameter. Revision Links: -------------- http://svn.sourceforge.net/jikesrvm/?rev=10706&view=rev Modified Paths: -------------- rvmroot/trunk/testing/tests/gctest/InlineAllocation.java Modified: rvmroot/trunk/testing/tests/gctest/InlineAllocation.java =================================================================== --- rvmroot/trunk/testing/tests/gctest/InlineAllocation.java 2006-11-02 09:09:18 UTC (rev 10940) +++ rvmroot/trunk/testing/tests/gctest/InlineAllocation.java 2006-11-02 17:08:34 UTC (rev 10941) @@ -48,7 +48,7 @@ static int alloc3Limit = assertionSpace + (VM.BuildForIA32 ? 100 : 30); // large object //-#endif static int alloc2Limit = alloc1Limit + (VM.BuildForIA32 ? 8 : 2); // small array. Should be only the store of the length different than small object - static int alloc4Limit = (VM.BuildForIA32 ? 40 : 10); // unknown size object. Should not be inlined at all. + static int alloc4Limit = (VM.BuildForIA32 ? 40 : 11); // unknown size object. Should not be inlined at all. /** * A trivial method that should require the full prologue/epilogue This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cap...@us...> - 2006-11-02 09:09:22
|
Revision: 10940 http://svn.sourceforge.net/jikesrvm/?rev=10940&view=rev Author: captain5050 Date: 2006-11-02 01:09:18 -0800 (Thu, 02 Nov 2006) Log Message: ----------- Allocating literals here means we lose the potential to constant fold them. Rely upon OPT_NormalizeConstants to create any slots that are necessary. Modified Paths: -------------- rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/instrumentation/VM_CounterArrayManager.java Modified: rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/instrumentation/VM_CounterArrayManager.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/instrumentation/VM_CounterArrayManager.java 2006-11-02 08:52:01 UTC (rev 10939) +++ rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/instrumentation/VM_CounterArrayManager.java 2006-11-02 09:09:18 UTC (rev 10940) @@ -116,22 +116,13 @@ **/ public OPT_Instruction createEventCounterInstruction(int handle, int index, double incrementValue) { - - // Doubles are annoying. They are too big to fit into the - // instruction, so they must be loaded from the JTOC. That means - // we need to make sure the increment value is actually in the - // JTOC. - - long l = Double.doubleToLongBits(incrementValue); - Offset offset = Offset.fromIntSignExtend(VM_Statics.findOrCreateDoubleLiteral(l)); - // Now create the instruction to be returned. OPT_Instruction c = InstrumentedCounter.create(INSTRUMENTED_EVENT_COUNTER, new OPT_IntConstantOperand(handle), new OPT_IntConstantOperand(index), new OPT_DoubleConstantOperand(incrementValue, - offset)); + Offset.zero())); c.bcIndex = INSTRUMENTATION_BCI; return c; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cap...@us...> - 2006-11-02 08:52:11
|
Revision: 10939 http://svn.sourceforge.net/jikesrvm/?rev=10939&view=rev Author: captain5050 Date: 2006-11-02 00:52:01 -0800 (Thu, 02 Nov 2006) Log Message: ----------- Initialize uninitialized classes when they are created through the newInstance call Modified Paths: -------------- rvmroot/trunk/rvm/src/vm/libSupport/java/lang/Class.java Modified: rvmroot/trunk/rvm/src/vm/libSupport/java/lang/Class.java =================================================================== --- rvmroot/trunk/rvm/src/vm/libSupport/java/lang/Class.java 2006-11-02 08:48:57 UTC (rev 10938) +++ rvmroot/trunk/rvm/src/vm/libSupport/java/lang/Class.java 2006-11-02 08:52:01 UTC (rev 10939) @@ -599,7 +599,13 @@ if (cls.isAbstract() || cls.isInterface()) throw new InstantiationException(); - + + if (!cls.isInitialized()) { + cls.resolve(); + cls.instantiate(); + cls.initialize(); + } + // Find the defaultConstructor VM_Method defaultConstructor = null; VM_Method methods[] = type.asClass().getConstructorMethods(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cap...@us...> - 2006-11-02 08:49:03
|
Revision: 10938 http://svn.sourceforge.net/jikesrvm/?rev=10938&view=rev Author: captain5050 Date: 2006-11-02 00:48:57 -0800 (Thu, 02 Nov 2006) Log Message: ----------- Ensure writing of arrays of primordial classes used by xxx.valueOf caches in Classpath Modified Paths: -------------- rvmroot/trunk/bin/jconfigure Modified: rvmroot/trunk/bin/jconfigure =================================================================== --- rvmroot/trunk/bin/jconfigure 2006-11-02 08:25:10 UTC (rev 10937) +++ rvmroot/trunk/bin/jconfigure 2006-11-02 08:48:57 UTC (rev 10938) @@ -3716,6 +3716,10 @@ [[Ljava/lang/Object; [Ljava/lang/String; [Ljava/lang/Class; + [Ljava/lang/Byte; + [Ljava/lang/Character; + [Ljava/lang/Integer; + [Ljava/lang/Short; [Ljava/lang/reflect/Field; [Ljava/lang/reflect/Method; [Ljava/lang/reflect/Member; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cap...@us...> - 2006-11-02 08:25:16
|
Revision: 10937 http://svn.sourceforge.net/jikesrvm/?rev=10937&view=rev Author: captain5050 Date: 2006-11-02 00:25:10 -0800 (Thu, 02 Nov 2006) Log Message: ----------- Remove unsafe INT_REM -> INT_AND simplification Modified Paths: -------------- rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/OPT_Simplifier.java Modified: rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/OPT_Simplifier.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/OPT_Simplifier.java 2006-11-02 08:21:34 UTC (rev 10936) +++ rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/OPT_Simplifier.java 2006-11-02 08:25:10 UTC (rev 10937) @@ -863,13 +863,6 @@ IC(0)); return MOVE_FOLDED; } - // x % c == x & (c-1) if c is power of 2 - int power = PowerOf2(val2); - if (power != -1) { - Binary.mutate(s, INT_AND, GuardedBinary.getClearResult(s), - GuardedBinary.getClearVal1(s), IC(val2-1)); - return REDUCED; - } } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cap...@us...> - 2006-11-02 08:21:45
|
Revision: 10936 http://svn.sourceforge.net/jikesrvm/?rev=10936&view=rev Author: captain5050 Date: 2006-11-02 00:21:34 -0800 (Thu, 02 Nov 2006) Log Message: ----------- We need to record VmProcessor on single virtual processor configurations (e.g. PPC Linux). This feature is required for JNI on load support used in Classpath 0.92+ Modified Paths: -------------- rvmroot/trunk/tools/bootImageRunner/sys.C Modified: rvmroot/trunk/tools/bootImageRunner/sys.C =================================================================== --- rvmroot/trunk/tools/bootImageRunner/sys.C 2006-10-31 22:33:18 UTC (rev 10935) +++ rvmroot/trunk/tools/bootImageRunner/sys.C 2006-11-02 08:21:34 UTC (rev 10936) @@ -2072,7 +2072,8 @@ sysStashVmProcessorInPthread(VM_Address vmProcessor) { if (rvm_singleVirtualProcessor) { - // We have only a single VM_Processor, so there is nothing to do here. + // We have only a single VM_Processor so remember it + VmProcessor = vmProcessor; } else { //fprintf(SysErrorFile, "stashing vm processor = %d, self=%u\n", vmProcessor, pthread_self()); int rc = pthread_setspecific(VmProcessorKey, (void*) vmProcessor); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dgr...@us...> - 2006-10-31 22:33:26
|
Revision: 10935 http://svn.sourceforge.net/jikesrvm/?rev=10935&view=rev Author: dgrove-oss Date: 2006-10-31 14:33:18 -0800 (Tue, 31 Oct 2006) Log Message: ----------- defect 1584255 : Baseline/quick GC maps and class constants Java 5.0 extended ldc and ldc_w to allow a class constant (instance of java.lang.Class) to be loaded. The GC map code of baseline/quick compilers needs to understand this and treat it as we already treated string literals (reference, not primitive). Modified Paths: -------------- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_BytecodeTraverser.java rvmroot/trunk/rvm/src/vm/compilers/baseline/GCMap/VM_BuildBB.java rvmroot/trunk/rvm/src/vm/compilers/baseline/GCMap/VM_BuildReferenceMaps.java rvmroot/trunk/rvm/src/vm/compilers/quick/GCMap/VM_BuildQuickReferenceMaps.java Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_BytecodeTraverser.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_BytecodeTraverser.java 2006-10-31 18:57:37 UTC (rev 10934) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_BytecodeTraverser.java 2006-10-31 22:33:18 UTC (rev 10935) @@ -391,10 +391,13 @@ break; case VM_Statics.FLOAT_LITERAL: S.push(FloatTypeCode); - break; + break; case VM_Statics.STRING_LITERAL: S.push(ClassTypeCode); break; + case VM_Statics.CLASS_LITERAL: + S.push(ClassTypeCode); + break; default: if (VM.TraceOnStackReplacement) VM.sysWriteln("ldc unknown type "+tdesc); if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); Modified: rvmroot/trunk/rvm/src/vm/compilers/baseline/GCMap/VM_BuildBB.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/baseline/GCMap/VM_BuildBB.java 2006-10-31 18:57:37 UTC (rev 10934) +++ rvmroot/trunk/rvm/src/vm/compilers/baseline/GCMap/VM_BuildBB.java 2006-10-31 22:33:18 UTC (rev 10935) @@ -1222,6 +1222,7 @@ type = FLOAT_TYPE; break; case VM_Statics.STRING_LITERAL: + case VM_Statics.CLASS_LITERAL: type = OBJECT_TYPE; break; default: Modified: rvmroot/trunk/rvm/src/vm/compilers/baseline/GCMap/VM_BuildReferenceMaps.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/baseline/GCMap/VM_BuildReferenceMaps.java 2006-10-31 18:57:37 UTC (rev 10934) +++ rvmroot/trunk/rvm/src/vm/compilers/baseline/GCMap/VM_BuildReferenceMaps.java 2006-10-31 22:33:18 UTC (rev 10935) @@ -402,7 +402,8 @@ case JBC_ldc: { currBBStkTop++; int cpi = bcodes.getConstantIndex(); - if (bcodes.getConstantType(cpi) == VM_Statics.STRING_LITERAL) + int type = bcodes.getConstantType(cpi); + if (type == VM_Statics.STRING_LITERAL || type == VM_Statics.CLASS_LITERAL) currBBMap[currBBStkTop] = REFERENCE; else currBBMap[currBBStkTop] = NON_REFERENCE; @@ -411,7 +412,8 @@ case JBC_ldc_w: { currBBStkTop++; int cpi = bcodes.getWideConstantIndex(); - if (bcodes.getConstantType(cpi) == VM_Statics.STRING_LITERAL) + int type = bcodes.getConstantType(cpi); + if (type == VM_Statics.STRING_LITERAL || type == VM_Statics.CLASS_LITERAL) currBBMap[currBBStkTop] = REFERENCE; else currBBMap[currBBStkTop] = NON_REFERENCE; Modified: rvmroot/trunk/rvm/src/vm/compilers/quick/GCMap/VM_BuildQuickReferenceMaps.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/quick/GCMap/VM_BuildQuickReferenceMaps.java 2006-10-31 18:57:37 UTC (rev 10934) +++ rvmroot/trunk/rvm/src/vm/compilers/quick/GCMap/VM_BuildQuickReferenceMaps.java 2006-10-31 22:33:18 UTC (rev 10935) @@ -405,7 +405,8 @@ case JBC_ldc: { currBBStkTop++; int cpi = bcodes.getConstantIndex(); - if (bcodes.getConstantType(cpi) == VM_Statics.STRING_LITERAL) + int type = bcodes.getConstantType(cpi); + if (type == VM_Statics.STRING_LITERAL || type == VM_Statics.CLASS_LITERAL) currBBMap[currBBStkTop] = REFERENCE; else currBBMap[currBBStkTop] = NON_REFERENCE; @@ -414,7 +415,8 @@ case JBC_ldc_w: { currBBStkTop++; int cpi = bcodes.getWideConstantIndex(); - if (bcodes.getConstantType(cpi) == VM_Statics.STRING_LITERAL) + int type = bcodes.getConstantType(cpi); + if (type == VM_Statics.STRING_LITERAL || type == VM_Statics.CLASS_LITERAL) currBBMap[currBBStkTop] = REFERENCE; else currBBMap[currBBStkTop] = NON_REFERENCE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dgr...@us...> - 2006-10-31 18:57:41
|
Revision: 10934 http://svn.sourceforge.net/jikesrvm/?rev=10934&view=rev Author: dgrove-oss Date: 2006-10-31 10:57:37 -0800 (Tue, 31 Oct 2006) Log Message: ----------- defect 1588006: fix a few string constants that got mangled by commit 10930. Getting these strings wrong resulted in GC crashes because objects were not being properly allocated in the immortal space Modified Paths: -------------- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/MM_Interface.java rvmroot/trunk/rvm/src/vm/runtime/VM_Entrypoints.java Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/MM_Interface.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/MM_Interface.java 2006-10-31 03:54:51 UTC (rev 10933) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/MM_Interface.java 2006-10-31 18:57:37 UTC (rev 10934) @@ -538,8 +538,8 @@ } } if (isPrefix("Lorg/mmtk/", clsBA) || - isPrefix("Lcom/ibm/jikesrvm/mm/", clsBA) || - isPrefix("Lcom.ibm.jikesrvm.memorymanagers/mminterface/VM_GCMapIteratorGroup", clsBA)) { + isPrefix("Lcom/ibm/jikesrvm/mm/", clsBA) || + isPrefix("Lcom/ibm/jikesrvm/memorymanagers/mminterface/VM_GCMapIteratorGroup", clsBA)) { return Plan.ALLOC_IMMORTAL; } } @@ -566,8 +566,8 @@ allocator = Plan.ALLOC_GCSPY; } if (isPrefix("Lorg/mmtk/", typeBA) || - isPrefix("Lcom/ibm/jikesrvm/mm/", typeBA) || - isPrefix("Lcom.ibm.jikesrvm.memorymanagers/", typeBA) || + isPrefix("Lcom/ibm/jikesrvm/mm/", typeBA) || + isPrefix("Lcom/ibm/jikesrvm/memorymanagers/", typeBA) || isPrefix("Lcom/ibm/jikesrvm/VM_Processor;", typeBA) || isPrefix("Lcom/ibm/jikesrvm/jni/VM_JNIEnvironment;", typeBA)) allocator = Plan.ALLOC_IMMORTAL; Modified: rvmroot/trunk/rvm/src/vm/runtime/VM_Entrypoints.java =================================================================== --- rvmroot/trunk/rvm/src/vm/runtime/VM_Entrypoints.java 2006-10-31 03:54:51 UTC (rev 10933) +++ rvmroot/trunk/rvm/src/vm/runtime/VM_Entrypoints.java 2006-10-31 18:57:37 UTC (rev 10934) @@ -158,10 +158,10 @@ public static final VM_Field LQheadField = getField("Lorg/mmtk/utility/deque/LocalQueue;", "head","Lorg/vmmagic/unboxed/Address;"); public static final VM_Field SQBEField = getField("Lorg/mmtk/utility/deque/SharedDeque;", "bufsenqueued","I"); public static final VM_Field synchronizedCounterField = getField("Lcom/ibm/jikesrvm/mm/mmtk/SynchronizedCounter;", "count", "I"); - public static final VM_NormalMethod arrayStoreWriteBarrierMethod = getMethod("Lcom.ibm.jikesrvm.memorymanagers.mminterface/MM_Interface;", "arrayStoreWriteBarrier", "(Ljava/lang/Object;ILjava/lang/Object;)V"); - public static final VM_NormalMethod putfieldWriteBarrierMethod = getMethod("Lcom.ibm.jikesrvm.memorymanagers.mminterface/MM_Interface;", "putfieldWriteBarrier", "(Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;Ljava/lang/Object;I)V"); - public static final VM_NormalMethod putstaticWriteBarrierMethod = getMethod("Lcom.ibm.jikesrvm.memorymanagers.mminterface/MM_Interface;", "putstaticWriteBarrier", "(Lorg/vmmagic/unboxed/Offset;Ljava/lang/Object;)V"); - public static final VM_NormalMethod modifyCheckMethod = getMethod("Lcom.ibm.jikesrvm.memorymanagers.mminterface/MM_Interface;", "modifyCheck", "(Ljava/lang/Object;)V"); + public static final VM_NormalMethod arrayStoreWriteBarrierMethod = getMethod("Lcom/ibm/jikesrvm/memorymanagers/mminterface/MM_Interface;", "arrayStoreWriteBarrier", "(Ljava/lang/Object;ILjava/lang/Object;)V"); + public static final VM_NormalMethod putfieldWriteBarrierMethod = getMethod("Lcom/ibm/jikesrvm/memorymanagers/mminterface/MM_Interface;", "putfieldWriteBarrier", "(Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;Ljava/lang/Object;I)V"); + public static final VM_NormalMethod putstaticWriteBarrierMethod = getMethod("Lcom/ibm/jikesrvm/memorymanagers/mminterface/MM_Interface;", "putstaticWriteBarrier", "(Lorg/vmmagic/unboxed/Offset;Ljava/lang/Object;)V"); + public static final VM_NormalMethod modifyCheckMethod = getMethod("Lcom/ibm/jikesrvm/memorymanagers/mminterface/MM_Interface;", "modifyCheck", "(Ljava/lang/Object;)V"); public static final VM_Field registersIPField = getField("Lcom/ibm/jikesrvm/VM_Registers;", "ip", "Lorg/vmmagic/unboxed/Address;"); public static final VM_Field registersFPRsField = getField("Lcom/ibm/jikesrvm/VM_Registers;", "fprs", "[D"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dgr...@us...> - 2006-10-31 03:55:44
|
Revision: 10933 http://svn.sourceforge.net/jikesrvm/?rev=10933&view=rev Author: dgrove-oss Date: 2006-10-30 19:54:51 -0800 (Mon, 30 Oct 2006) Log Message: ----------- lowercase package names: OSR ===> osr Modified Paths: -------------- rvmroot/trunk/bin/jconfigure rvmroot/trunk/doc/userguide/componentOverview.tex rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_BytecodeTraverser.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_Constants.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_ExecStateExtractor.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_ExecutionState.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_ObjectHolder.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_VariableElement.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_EncodedOSRMap.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_LocalRegPair.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_MapIterator.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_MethodVariables.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_OsrPointConstructor.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_VariableMap.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_VariableMapElement.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_AConstNull.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_CheckCast.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_DoubleStore.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_FloatStore.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_Goto.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_IntStore.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_InvokeCompiledMethod.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_InvokeStatic.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadDoubleConst.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadFloatConst.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadIntConst.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadLongConst.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadRetAddrConst.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadWordConst.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LongStore.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_Nop.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_ParamInitEnd.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_Pop.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_RefStore.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/OSR_AdjustBCIndexes.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/OSR_PseudoBytecode.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/OSR_SpecialCompiler.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/threadControls/OSR_OnStackReplacementPlan.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/util/OSR_Profiler.java rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_BaselineExecStateExtractor.java rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_CodeInstaller.java rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_OptExecStateExtractor.java rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_PostThreadSwitch.java rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_TempRegisters.java rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_BaselineExecStateExtractor.java rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_CodeInstaller.java rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_OptExecStateExtractor.java rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_PostThreadSwitch.java rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_TempRegisters.java rvmroot/trunk/rvm/src/vm/compilers/baseline/VM_BaselineCompiler.java rvmroot/trunk/rvm/src/vm/compilers/baseline/VM_CompilerFramework.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/driver/OPT_OptimizationPlanner.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/OPT_MIRInfo.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/bc2hir/OPT_BC2IR.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/liveness/OPT_LiveAnalysis.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/regalloc/linearScan/OPT_LinearScan.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/vmInterface/services/VM_OptCompiledMethod.java rvmroot/trunk/rvm/src/vm/runtime/VM_Entrypoints.java rvmroot/trunk/rvm/src/vm/scheduler/VM_Scheduler.java rvmroot/trunk/rvm/src/vm/scheduler/VM_Thread.java Modified: rvmroot/trunk/bin/jconfigure =================================================================== --- rvmroot/trunk/bin/jconfigure 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/bin/jconfigure 2006-10-31 03:54:51 UTC (rev 10933) @@ -3255,7 +3255,7 @@ echo " \$FIND ./com/ibm/jikesrvm/opt -name '*.class'" fi if (( RVM_WITH_OSR )); then - echo " \$FIND ./com/ibm/jikesrvm/OSR -name '*.class'" + echo " \$FIND ./com/ibm/jikesrvm/osr -name '*.class'" fi echo " \$FIND ./com/ibm/jikesrvm/memorymanagers -name '*.class'" echo " \$FIND ../MMTk.classes/mmtk/org -name '*.class'|sed 's@^../MMTk.classes/mmtk/@.@' " Modified: rvmroot/trunk/doc/userguide/componentOverview.tex =================================================================== --- rvmroot/trunk/doc/userguide/componentOverview.tex 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/doc/userguide/componentOverview.tex 2006-10-31 03:54:51 UTC (rev 10933) @@ -80,7 +80,7 @@ %[ See Section~\Ref{} (page~\Pageref) for more details.]% {section:optdetails} -\item[\texttt{com.ibm.jikesrvm.OSR}] Classes related to On-Stack-Replacement. +\item[\texttt{com.ibm.jikesrvm.osr}] Classes related to On-Stack-Replacement. \item[\texttt{com.ibm.jikesrvm.quick}] Classes related to the \link{Quick Compiler}{section:quick}. Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_BytecodeTraverser.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_BytecodeTraverser.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_BytecodeTraverser.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.classloader.*; Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_Constants.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_Constants.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_Constants.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.VM_SizeConstants; /** * OSR_Constants defines constants used for on-stack-replacement mapping, Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_ExecStateExtractor.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_ExecStateExtractor.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_ExecStateExtractor.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.*; import java.io.*; Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_ExecutionState.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_ExecutionState.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_ExecutionState.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -15,7 +15,7 @@ * @author Feng Qian */ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.classloader.*; Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_ObjectHolder.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_ObjectHolder.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_ObjectHolder.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_VariableElement.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_VariableElement.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_VariableElement.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.*; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_EncodedOSRMap.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_EncodedOSRMap.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_EncodedOSRMap.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.classloader.*; Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_LocalRegPair.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_LocalRegPair.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_LocalRegPair.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.classloader.*; import com.ibm.jikesrvm.opt.ir.*; Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_MapIterator.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_MapIterator.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_MapIterator.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.*; /** Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_MethodVariables.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_MethodVariables.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_MethodVariables.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.classloader.*; import com.ibm.jikesrvm.opt.*; Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_OsrPointConstructor.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_OsrPointConstructor.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_OsrPointConstructor.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -304,7 +304,7 @@ int count = 0; for (int idx=0, size=typeCodes.length; idx < size; idx++) { - if (typeCodes[idx] != com.ibm.jikesrvm.OSR.OSR_Constants.VoidTypeCode) { + if (typeCodes[idx] != com.ibm.jikesrvm.osr.OSR_Constants.VoidTypeCode) { count++; } } Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_VariableMap.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_VariableMap.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_VariableMap.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.opt.ir.OPT_Instruction; import java.util.*; Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_VariableMapElement.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_VariableMapElement.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_VariableMapElement.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.opt.ir.*; Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_AConstNull.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_AConstNull.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_AConstNull.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; /** * aconst_null Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_CheckCast.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_CheckCast.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_CheckCast.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; /** * checkcast instruction * Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_DoubleStore.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_DoubleStore.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_DoubleStore.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; /** * BC_DoubleStore: dstore, dstore_<l> Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_FloatStore.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_FloatStore.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_FloatStore.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; /** * BC_FloatStore: fstore, fstore_<i> * Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_Goto.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_Goto.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_Goto.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; /** * goto instruction * Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_IntStore.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_IntStore.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_IntStore.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; /** * BC_IntStore : istore_<?>, istore * Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_InvokeCompiledMethod.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_InvokeCompiledMethod.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_InvokeCompiledMethod.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.classloader.*; Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_InvokeStatic.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_InvokeStatic.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_InvokeStatic.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.classloader.*; Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadDoubleConst.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadDoubleConst.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadDoubleConst.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; /** * BC_LoadDoubleConst: ldc2_w * Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadFloatConst.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadFloatConst.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadFloatConst.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; /** * BC_LoadFloatConst: ldc, ldc_w * Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadIntConst.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadIntConst.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadIntConst.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; /** * load an integer constant on the stack * Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadLongConst.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadLongConst.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadLongConst.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; /** * load a long constant on the stack * Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadRetAddrConst.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadRetAddrConst.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadRetAddrConst.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; /** * artificial instruction, load a PC on the stack. * Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadWordConst.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadWordConst.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadWordConst.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LongStore.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LongStore.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LongStore.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; /** * BC_LongStore: lstore, lstore_<n> * Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_Nop.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_Nop.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_Nop.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; /** * nop * Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_ParamInitEnd.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_ParamInitEnd.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_ParamInitEnd.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; /** * LocalInitEnd * Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_Pop.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_Pop.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_Pop.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; /** * pop * Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_RefStore.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_RefStore.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_RefStore.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; /** * BC_RefStore: astore, astore_<i> * Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/OSR_AdjustBCIndexes.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/OSR_AdjustBCIndexes.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/OSR_AdjustBCIndexes.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.opt.*; import com.ibm.jikesrvm.opt.ir.*; Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/OSR_PseudoBytecode.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/OSR_PseudoBytecode.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/OSR_PseudoBytecode.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.classloader.*; import com.ibm.jikesrvm.VM_SizeConstants; Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/OSR_SpecialCompiler.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/OSR_SpecialCompiler.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/OSR_SpecialCompiler.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.classloader.*; Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/threadControls/OSR_OnStackReplacementPlan.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/threadControls/OSR_OnStackReplacementPlan.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/threadControls/OSR_OnStackReplacementPlan.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -12,7 +12,7 @@ import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.opt.*; -import com.ibm.jikesrvm.OSR.*; +import com.ibm.jikesrvm.osr.*; import org.vmmagic.unboxed.Offset; /** * A OSR_ControllerOnStackReplacementPlan is scheduled by VM_ControllerThread, Modified: rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/util/OSR_Profiler.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/util/OSR_Profiler.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/util/OSR_Profiler.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.classloader.*; Modified: rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_BaselineExecStateExtractor.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_BaselineExecStateExtractor.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_BaselineExecStateExtractor.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.classloader.*; Modified: rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_CodeInstaller.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_CodeInstaller.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_CodeInstaller.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.classloader.*; Modified: rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_OptExecStateExtractor.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_OptExecStateExtractor.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_OptExecStateExtractor.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.classloader.*; Modified: rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_PostThreadSwitch.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_PostThreadSwitch.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_PostThreadSwitch.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_TempRegisters.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_TempRegisters.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_TempRegisters.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.*; Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_BaselineExecStateExtractor.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_BaselineExecStateExtractor.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_BaselineExecStateExtractor.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.classloader.*; Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_CodeInstaller.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_CodeInstaller.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_CodeInstaller.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.opt.*; Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_OptExecStateExtractor.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_OptExecStateExtractor.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_OptExecStateExtractor.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -7,7 +7,7 @@ * (C) Copyright IBM Corp 2002 */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.classloader.*; Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_PostThreadSwitch.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_PostThreadSwitch.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_PostThreadSwitch.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_TempRegisters.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_TempRegisters.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_TempRegisters.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.OSR; +package com.ibm.jikesrvm.osr; import com.ibm.jikesrvm.*; Modified: rvmroot/trunk/rvm/src/vm/compilers/baseline/VM_BaselineCompiler.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/baseline/VM_BaselineCompiler.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/compilers/baseline/VM_BaselineCompiler.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -13,7 +13,7 @@ import org.vmmagic.unboxed.Offset; //-#if RVM_WITH_OSR -import com.ibm.jikesrvm.OSR.*; +import com.ibm.jikesrvm.osr.*; //-#endif import com.ibm.jikesrvm.classloader.*; Modified: rvmroot/trunk/rvm/src/vm/compilers/baseline/VM_CompilerFramework.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/baseline/VM_CompilerFramework.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/compilers/baseline/VM_CompilerFramework.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm; //-#if RVM_WITH_OSR -import com.ibm.jikesrvm.OSR.*; +import com.ibm.jikesrvm.osr.*; //-#endif import com.ibm.jikesrvm.classloader.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/rvm/src/vm/compilers/optimizing/driver/OPT_OptimizationPlanner.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/optimizing/driver/OPT_OptimizationPlanner.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/compilers/optimizing/driver/OPT_OptimizationPlanner.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -13,7 +13,7 @@ import com.ibm.jikesrvm.opt.ir.*; import java.util.ArrayList; //-#if RVM_WITH_OSR -import com.ibm.jikesrvm.OSR.*; +import com.ibm.jikesrvm.osr.*; //-#endif /** Modified: rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/OPT_MIRInfo.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/OPT_MIRInfo.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/OPT_MIRInfo.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -12,7 +12,7 @@ import com.ibm.jikesrvm.opt.*; import com.ibm.jikesrvm.VM_CodeArray; //-#if RVM_WITH_OSR -import com.ibm.jikesrvm.OSR.*; +import com.ibm.jikesrvm.osr.*; //-#endif /** Modified: rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/bc2hir/OPT_BC2IR.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/bc2hir/OPT_BC2IR.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/bc2hir/OPT_BC2IR.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -15,7 +15,7 @@ import java.util.Enumeration; import java.util.NoSuchElementException; //-#if RVM_WITH_OSR -import com.ibm.jikesrvm.OSR.*; +import com.ibm.jikesrvm.osr.*; import com.ibm.jikesrvm.adaptive.*; import java.util.ArrayList; //-#endif Modified: rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/liveness/OPT_LiveAnalysis.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/liveness/OPT_LiveAnalysis.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/liveness/OPT_LiveAnalysis.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -14,7 +14,7 @@ import com.ibm.jikesrvm.opt.ir.*; import java.lang.reflect.Constructor; //-#if RVM_WITH_OSR -import com.ibm.jikesrvm.OSR.*; +import com.ibm.jikesrvm.osr.*; //-#endif import java.util.Stack; Modified: rvmroot/trunk/rvm/src/vm/compilers/optimizing/regalloc/linearScan/OPT_LinearScan.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/optimizing/regalloc/linearScan/OPT_LinearScan.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/compilers/optimizing/regalloc/linearScan/OPT_LinearScan.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -15,7 +15,7 @@ import java.util.*; import org.vmmagic.unboxed.*; //-#if RVM_WITH_OSR -import com.ibm.jikesrvm.OSR.*; +import com.ibm.jikesrvm.osr.*; //-#endif import java.lang.reflect.Constructor; Modified: rvmroot/trunk/rvm/src/vm/compilers/optimizing/vmInterface/services/VM_OptCompiledMethod.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/optimizing/vmInterface/services/VM_OptCompiledMethod.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/compilers/optimizing/vmInterface/services/VM_OptCompiledMethod.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -14,7 +14,7 @@ import com.ibm.jikesrvm.classloader.*; import com.ibm.jikesrvm.opt.ir.*; //-#if RVM_WITH_OSR -import com.ibm.jikesrvm.OSR.*; +import com.ibm.jikesrvm.osr.*; //-#endif import org.vmmagic.pragma.*; import org.vmmagic.unboxed.Offset; Modified: rvmroot/trunk/rvm/src/vm/runtime/VM_Entrypoints.java =================================================================== --- rvmroot/trunk/rvm/src/vm/runtime/VM_Entrypoints.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/runtime/VM_Entrypoints.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -249,8 +249,8 @@ //-#endif //-#if RVM_WITH_OSR - public static final VM_NormalMethod osrGetRefAtMethod = getMethod("Lcom/ibm/jikesrvm/OSR/OSR_ObjectHolder;", "getRefAt", "(II)Ljava/lang/Object;"); - public static final VM_NormalMethod osrCleanRefsMethod = getMethod("Lcom/ibm/jikesrvm/OSR/OSR_ObjectHolder;", "cleanRefs", "(I)V"); + public static final VM_NormalMethod osrGetRefAtMethod = getMethod("Lcom/ibm/jikesrvm/osr/OSR_ObjectHolder;", "getRefAt", "(II)Ljava/lang/Object;"); + public static final VM_NormalMethod osrCleanRefsMethod = getMethod("Lcom/ibm/jikesrvm/osr/OSR_ObjectHolder;", "cleanRefs", "(I)V"); //-#endif //-#if RVM_WITH_ADAPTIVE_SYSTEM Modified: rvmroot/trunk/rvm/src/vm/scheduler/VM_Scheduler.java =================================================================== --- rvmroot/trunk/rvm/src/vm/scheduler/VM_Scheduler.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/scheduler/VM_Scheduler.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -21,7 +21,7 @@ //-#endif //-#if RVM_WITH_OSR -import com.ibm.jikesrvm.OSR.OSR_ObjectHolder; +import com.ibm.jikesrvm.osr.OSR_ObjectHolder; //-#endif /** Modified: rvmroot/trunk/rvm/src/vm/scheduler/VM_Thread.java =================================================================== --- rvmroot/trunk/rvm/src/vm/scheduler/VM_Thread.java 2006-10-30 19:20:40 UTC (rev 10932) +++ rvmroot/trunk/rvm/src/vm/scheduler/VM_Thread.java 2006-10-31 03:54:51 UTC (rev 10933) @@ -32,8 +32,8 @@ //-#if RVM_WITH_OSR import com.ibm.jikesrvm.adaptive.OSR_OnStackReplacementTrigger; import com.ibm.jikesrvm.adaptive.OSR_OnStackReplacementEvent; -import com.ibm.jikesrvm.OSR.OSR_PostThreadSwitch; -import com.ibm.jikesrvm.OSR.OSR_ObjectHolder; +import com.ibm.jikesrvm.osr.OSR_PostThreadSwitch; +import com.ibm.jikesrvm.osr.OSR_ObjectHolder; import com.ibm.jikesrvm.adaptive.OSR_Listener; //-#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dgr...@us...> - 2006-10-30 19:21:43
|
Revision: 10932 http://svn.sourceforge.net/jikesrvm/?rev=10932&view=rev Author: dgrove-oss Date: 2006-10-30 11:20:40 -0800 (Mon, 30 Oct 2006) Log Message: ----------- lowercase package names: mmInterface ==> mminterface Modified Paths: -------------- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ActivePlan.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Assert.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Collection.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ObjectModel.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanBootImage.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanStatics.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanThread.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Scanning.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Statistics.java rvmroot/trunk/bin/jconfigure rvmroot/trunk/doc/userguide/MMTk.tex rvmroot/trunk/doc/userguide/componentOverview.tex rvmroot/trunk/doc/userguide/urls.tex rvmroot/trunk/rvm/src/vm/Dummy.java rvmroot/trunk/rvm/src/vm/VM.java rvmroot/trunk/rvm/src/vm/VM_Configuration.java rvmroot/trunk/rvm/src/vm/adaptive/controller/VM_RecompilationStrategy.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/GCMap/VM_BaselineGCMapIterator.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/VM_Compiler.java rvmroot/trunk/rvm/src/vm/arch/intel/jni/VM_JNIGCMapIterator.java rvmroot/trunk/rvm/src/vm/arch/intel/runtime/VM_CodeArray.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/GCMap/VM_BaselineGCMapIterator.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_Compiler.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_MachineCode.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/GCMap/VM_QuickGCMapIterator.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/VM_QuickCompiler.java rvmroot/trunk/rvm/src/vm/arch/powerPC/jni/VM_JNIGCMapIterator.java rvmroot/trunk/rvm/src/vm/arch/powerPC/jni/VM_JNIHelpers.java rvmroot/trunk/rvm/src/vm/arch/powerPC/runtime/VM_CodeArray.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Array.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Class.java rvmroot/trunk/rvm/src/vm/classLoader/VM_ClassLoader.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Field.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Primitive.java rvmroot/trunk/rvm/src/vm/classLoader/VM_TableBasedDynamicLinker.java rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_CompiledMethods.java rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_HardwareTrapGCMapIterator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/hir2lir/OPT_ConvertToLowLevelIR.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/hir2lir/OPT_ExpandRuntimeServices.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/mir2mc/OPT_ConvertMIRtoMC.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/vmInterface/services/VM_OptGenericGCMapIterator.java rvmroot/trunk/rvm/src/vm/jni/VM_JNIEnvironment.java rvmroot/trunk/rvm/src/vm/jni/VM_JNIFunctions.java rvmroot/trunk/rvm/src/vm/jni/VM_JNIGlobalRefTable.java rvmroot/trunk/rvm/src/vm/libSupport/java/lang/Class.java rvmroot/trunk/rvm/src/vm/libSupport/java/lang/VMRuntime.java rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/PhantomReference.java rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/SoftReference.java rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/WeakReference.java rvmroot/trunk/rvm/src/vm/libSupport/java/lang/reflect/Constructor.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/DebugUtil.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/MM_Constants.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/MM_Interface.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/Monitor.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedCollectorContext.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedMutatorContext.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedPlan.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedPlanConstraints.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SynchronizationBarrier.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_AllocatorHeader.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_CollectorThread.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_GCMapIterator.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_GCMapIteratorGroup.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_Handshake.java rvmroot/trunk/rvm/src/vm/objectModel/VM_MiscHeader.java rvmroot/trunk/rvm/src/vm/objectModel/VM_MiscHeaderConstants.java rvmroot/trunk/rvm/src/vm/objectModel/VM_ObjectModel.java rvmroot/trunk/rvm/src/vm/objectModel/default/VM_JavaHeader.java rvmroot/trunk/rvm/src/vm/objectModel/default/VM_JavaHeaderConstants.java rvmroot/trunk/rvm/src/vm/objectModel/lockNursery/VM_LockNursery.java rvmroot/trunk/rvm/src/vm/objectModel/lockNursery/VM_LockNurseryJavaHeader.java rvmroot/trunk/rvm/src/vm/objectModel/oneWordIndexTIB/VM_JavaHeader.java rvmroot/trunk/rvm/src/vm/objectModel/oneWordMaskTIB/VM_JavaHeader.java rvmroot/trunk/rvm/src/vm/objectModel/oneWordTIBPtr/VM_JavaHeader.java rvmroot/trunk/rvm/src/vm/runtime/VM_BootRecord.java rvmroot/trunk/rvm/src/vm/runtime/VM_Entrypoints.java rvmroot/trunk/rvm/src/vm/runtime/VM_Magic.java rvmroot/trunk/rvm/src/vm/runtime/VM_Runtime.java rvmroot/trunk/rvm/src/vm/scheduler/FinalizerThread.java rvmroot/trunk/rvm/src/vm/scheduler/MainThread.java rvmroot/trunk/rvm/src/vm/scheduler/VM_Processor.java rvmroot/trunk/rvm/src/vm/scheduler/VM_Scheduler.java rvmroot/trunk/rvm/src/vm/scheduler/VM_Thread.java rvmroot/trunk/rvm/src/vm/utility/VM_CommandLineArgs.java rvmroot/trunk/testing/tests/gctest/Exhaust.java rvmroot/trunk/tools/bootImageRunner/GenerateInterfaceDeclarations.java rvmroot/trunk/tools/bootImageWriter/BootImage.java rvmroot/trunk/tools/bootImageWriter/BootImageWriter.java Modified: rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ActivePlan.java =================================================================== --- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ActivePlan.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ActivePlan.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -14,10 +14,10 @@ import org.mmtk.plan.MutatorContext; import org.mmtk.plan.PlanConstraints; -import com.ibm.jikesrvm.memorymanagers.mmInterface.SelectedPlan; -import com.ibm.jikesrvm.memorymanagers.mmInterface.SelectedCollectorContext; -import com.ibm.jikesrvm.memorymanagers.mmInterface.SelectedMutatorContext; -import com.ibm.jikesrvm.memorymanagers.mmInterface.SelectedPlanConstraints; +import com.ibm.jikesrvm.memorymanagers.mminterface.SelectedPlan; +import com.ibm.jikesrvm.memorymanagers.mminterface.SelectedCollectorContext; +import com.ibm.jikesrvm.memorymanagers.mminterface.SelectedMutatorContext; +import com.ibm.jikesrvm.memorymanagers.mminterface.SelectedPlanConstraints; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Assert.java =================================================================== --- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Assert.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Assert.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -13,7 +13,7 @@ import org.mmtk.policy.Space; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import com.ibm.jikesrvm.VM; import com.ibm.jikesrvm.VM_Scheduler; Modified: rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Collection.java =================================================================== --- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Collection.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Collection.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -31,11 +31,11 @@ import com.ibm.jikesrvm.VM_Time; import com.ibm.jikesrvm.classloader.VM_Atom; import com.ibm.jikesrvm.classloader.VM_Method; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_CollectorThread; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; -import com.ibm.jikesrvm.memorymanagers.mmInterface.SelectedPlan; -import com.ibm.jikesrvm.memorymanagers.mmInterface.SelectedCollectorContext; -import com.ibm.jikesrvm.memorymanagers.mmInterface.SelectedMutatorContext; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_CollectorThread; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.SelectedPlan; +import com.ibm.jikesrvm.memorymanagers.mminterface.SelectedCollectorContext; +import com.ibm.jikesrvm.memorymanagers.mminterface.SelectedMutatorContext; import org.vmmagic.unboxed.*; import org.vmmagic.pragma.*; @@ -108,7 +108,7 @@ */ public static final void init() throws InterruptiblePragma { collectorThreadAtom = VM_Atom.findOrCreateAsciiAtom( - "Lcom/ibm/jikesrvm/memorymanagers/mmInterface/VM_CollectorThread;"); + "Lcom/ibm/jikesrvm/memorymanagers/mminterface/VM_CollectorThread;"); runAtom = VM_Atom.findOrCreateAsciiAtom("run"); } Modified: rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ObjectModel.java =================================================================== --- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ObjectModel.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ObjectModel.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -25,9 +25,9 @@ import com.ibm.jikesrvm.classloader.VM_Array; import com.ibm.jikesrvm.classloader.VM_Class; import com.ibm.jikesrvm.classloader.VM_Type; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; -import com.ibm.jikesrvm.memorymanagers.mmInterface.SelectedMutatorContext; -import com.ibm.jikesrvm.memorymanagers.mmInterface.SelectedCollectorContext; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.SelectedMutatorContext; +import com.ibm.jikesrvm.memorymanagers.mminterface.SelectedCollectorContext; import org.vmmagic.unboxed.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanBootImage.java =================================================================== --- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanBootImage.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanBootImage.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -20,7 +20,7 @@ import com.ibm.jikesrvm.VM_Magic; import com.ibm.jikesrvm.VM_Constants; import com.ibm.jikesrvm.VM_Thread; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_CollectorThread; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_CollectorThread; import org.vmmagic.unboxed.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanStatics.java =================================================================== --- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanStatics.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanStatics.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -16,7 +16,7 @@ import com.ibm.jikesrvm.VM_Magic; import com.ibm.jikesrvm.VM_Constants; import com.ibm.jikesrvm.VM_Thread; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_CollectorThread; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_CollectorThread; import org.vmmagic.unboxed.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanThread.java =================================================================== --- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanThread.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanThread.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -13,11 +13,11 @@ import org.mmtk.utility.deque.*; import org.mmtk.utility.Constants; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; -import com.ibm.jikesrvm.memorymanagers.mmInterface.DebugUtil; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_CollectorThread; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_GCMapIterator; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_GCMapIteratorGroup; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.DebugUtil; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_CollectorThread; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_GCMapIterator; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_GCMapIteratorGroup; import com.ibm.jikesrvm.classloader.*; import com.ibm.jikesrvm.VM; Modified: rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Scanning.java =================================================================== --- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Scanning.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Scanning.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -17,8 +17,8 @@ import org.mmtk.utility.deque.*; import org.mmtk.utility.Constants; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_CollectorThread; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_CollectorThread; import com.ibm.jikesrvm.VM; import com.ibm.jikesrvm.VM_Magic; import com.ibm.jikesrvm.VM_Scheduler; Modified: rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Statistics.java =================================================================== --- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Statistics.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Statistics.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -13,7 +13,7 @@ import org.mmtk.utility.Constants; import com.ibm.jikesrvm.VM_Time; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import org.vmmagic.unboxed.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/bin/jconfigure =================================================================== --- rvmroot/trunk/bin/jconfigure 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/bin/jconfigure 2006-10-30 19:20:40 UTC (rev 10932) @@ -3700,9 +3700,9 @@ [Lcom/ibm/jikesrvm/classloader/VM_MemberReference; [Lcom/ibm/jikesrvm/classloader/VM_Type; [Lcom/ibm/jikesrvm/classloader/VM_TypeReference; - [Lcom/ibm/jikesrvm/memorymanagers/mmInterface/VM_CollectorThread; - [Lcom/ibm/jikesrvm/memorymanagers/mmInterface/SelectedCollectorContext; - [Lcom/ibm/jikesrvm/memorymanagers/mmInterface/SelectedMutatorContext; + [Lcom/ibm/jikesrvm/memorymanagers/mminterface/VM_CollectorThread; + [Lcom/ibm/jikesrvm/memorymanagers/mminterface/SelectedCollectorContext; + [Lcom/ibm/jikesrvm/memorymanagers/mminterface/SelectedMutatorContext; [Lorg/mmtk/vm/SynchronizedCounter; [Lorg/mmtk/plan/Phase; [Lorg/mmtk/policy/Space; Modified: rvmroot/trunk/doc/userguide/MMTk.tex =================================================================== --- rvmroot/trunk/doc/userguide/MMTk.tex 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/doc/userguide/MMTk.tex 2006-10-30 19:20:40 UTC (rev 10932) @@ -7,7 +7,7 @@ made independent of Jikes RVM, and is now called MMTk. Much more work has been done on factoring out the VM-specific code into the packages \texttt{org.mmtk.vm} -and \texttt{com.ibm.jikesrvm.memorymanagers.mmInterface}}. +and \texttt{com.ibm.jikesrvm.memorymanagers.mminterface}}. From Jikes RVM 2.2.0 onward, JMTk (Java Memory management Toolkit) became the default memory management system for Jikes RVM.\@ @@ -22,8 +22,8 @@ In keeping with the goal of modularity and portability, as far as possible Jikes-RVM-specific code is factored out. Such VM-specific code resides in a separate package, -(\xlink{\texttt{\MMpackage\-.\mmInterface}}{\mmInterfacePackageURL}), -and can be found in the \texttt{\mmInterface} sub-directory. All other +(\xlink{\texttt{\MMpackage\-.\mminterface}}{\mmInterfacePackageURL}), +and can be found in the \texttt{\mminterface} sub-directory. All other code is part of the \xlink{\texttt{org.mmtk}}{\JMTkPackageURL} package. @@ -186,7 +186,7 @@ \subsection{\texttt{VMInterface}} \label{sssec:vminterface} -The \texttt{mmInterface} sub-directory provides the interface between +The \texttt{mminterface} sub-directory provides the interface between Jikes RVM and JMTk. The primary interface is provided by \xlink{\texttt{VM\-In\-ter\-face\-.java}}{\VMInterfaceURL}. Key VM-dependent mechanisms include: Modified: rvmroot/trunk/doc/userguide/componentOverview.tex =================================================================== --- rvmroot/trunk/doc/userguide/componentOverview.tex 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/doc/userguide/componentOverview.tex 2006-10-30 19:20:40 UTC (rev 10932) @@ -67,7 +67,7 @@ %% package org.mmtk.vm.gcspy; %% package org.mmtk.vm; -\item[\texttt{\MMpackage\-.\mmInterface{}}] Classes related to +\item[\texttt{\MMpackage\-.\mminterface{}}] Classes related to memory management that deal with the interface to the VM \item[\texttt{com.ibm.jikesrvm.opt}] Classes related to Modified: rvmroot/trunk/doc/userguide/urls.tex =================================================================== --- rvmroot/trunk/doc/userguide/urls.tex 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/doc/userguide/urls.tex 2006-10-30 19:20:40 UTC (rev 10932) @@ -143,10 +143,10 @@ \newcommand{\StopTheWorldGCURL}{{\JMTkJavadocURL}/StopTheWorldGC.html} \newcommand{\VMResourceURL}{{\JMTkJavadocURL}/VMResource.html} -% package com.ibm.jikesrvm.memorymanagers.mmInterface -\newcommand{\mmInterface}{m\-m\-In\-ter\-face} -\newcommand{\VMInterfaceJavadocURL}{{\MMJavadocURL}/\mmInterface} -\newcommand{\mmInterfacePackageURL}{{\VMInterfaceJavadocURL}/package-frame.html} +% package com.ibm.jikesrvm.memorymanagers.mminterface +\newcommand{\mminterface}{m\-m\-In\-ter\-face} +\newcommand{\VMInterfaceJavadocURL}{{\MMJavadocURL}/\mminterface} +\newcommand{\mminterfacePackageURL}{{\VMInterfaceJavadocURL}/package-frame.html} \newcommand{\ScanObjectURL}{{\VMInterfaceJavadocURL}/ScanObject.html} \newcommand{\ScanStaticsURL}{{\VMInterfaceJavadocURL}/ScanStatics.html} \newcommand{\ScanThreadURL}{{\VMInterfaceJavadocURL}/ScanThread.html} Modified: rvmroot/trunk/rvm/src/vm/Dummy.java =================================================================== --- rvmroot/trunk/rvm/src/vm/Dummy.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/Dummy.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -9,7 +9,7 @@ //$Id$ import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import org.vmmagic.unboxed.*; /** Modified: rvmroot/trunk/rvm/src/vm/VM.java =================================================================== --- rvmroot/trunk/rvm/src/vm/VM.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/VM.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm; import com.ibm.jikesrvm.classloader.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.*; import java.lang.ref.Reference; Modified: rvmroot/trunk/rvm/src/vm/VM_Configuration.java =================================================================== --- rvmroot/trunk/rvm/src/vm/VM_Configuration.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/VM_Configuration.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -9,7 +9,7 @@ //$Id$ package com.ibm.jikesrvm; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; /** * Flags that specify the configuration of our virtual machine. Modified: rvmroot/trunk/rvm/src/vm/adaptive/controller/VM_RecompilationStrategy.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/controller/VM_RecompilationStrategy.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/adaptive/controller/VM_RecompilationStrategy.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -16,7 +16,7 @@ import com.ibm.jikesrvm.VM; import com.ibm.jikesrvm.VM_RuntimeCompiler; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; /** * An abstract class providing the interface to the decision making Modified: rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/GCMap/VM_BaselineGCMapIterator.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/GCMap/VM_BaselineGCMapIterator.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/GCMap/VM_BaselineGCMapIterator.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm; import com.ibm.jikesrvm.classloader.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_GCMapIterator; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_GCMapIterator; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/VM_Compiler.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/VM_Compiler.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/VM_Compiler.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm; import com.ibm.jikesrvm.classloader.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import com.ibm.jikesrvm.jni.VM_JNICompiler; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/arch/intel/jni/VM_JNIGCMapIterator.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/intel/jni/VM_JNIGCMapIterator.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/arch/intel/jni/VM_JNIGCMapIterator.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm.jni; import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_GCMapIterator; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_GCMapIterator; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/arch/intel/runtime/VM_CodeArray.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/intel/runtime/VM_CodeArray.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/arch/intel/runtime/VM_CodeArray.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm; import org.vmmagic.pragma.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; /** * VM_CodeArray represents a code object (contiguous memory region containing code). Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/GCMap/VM_BaselineGCMapIterator.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/GCMap/VM_BaselineGCMapIterator.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/GCMap/VM_BaselineGCMapIterator.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -9,7 +9,7 @@ //$Id$ package com.ibm.jikesrvm; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_GCMapIterator; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_GCMapIterator; import com.ibm.jikesrvm.classloader.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_Compiler.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_Compiler.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_Compiler.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -9,7 +9,7 @@ //$Id$ package com.ibm.jikesrvm; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import com.ibm.jikesrvm.classloader.*; import com.ibm.jikesrvm.jni.*; Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_MachineCode.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_MachineCode.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_MachineCode.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -9,7 +9,7 @@ //$Id$ package com.ibm.jikesrvm; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import java.util.ArrayList; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/GCMap/VM_QuickGCMapIterator.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/GCMap/VM_QuickGCMapIterator.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/GCMap/VM_QuickGCMapIterator.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -11,7 +11,7 @@ import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_GCMapIterator; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_GCMapIterator; import com.ibm.jikesrvm.classloader.*; import org.vmmagic.unboxed.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/VM_QuickCompiler.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/VM_QuickCompiler.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/VM_QuickCompiler.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm.quick; import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import com.ibm.jikesrvm.jni.VM_JNICompiler; import com.ibm.jikesrvm.classloader.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/jni/VM_JNIGCMapIterator.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/jni/VM_JNIGCMapIterator.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/jni/VM_JNIGCMapIterator.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -9,7 +9,7 @@ //$Id$ package com.ibm.jikesrvm.jni; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_GCMapIterator; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_GCMapIterator; import com.ibm.jikesrvm.*; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/jni/VM_JNIHelpers.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/jni/VM_JNIHelpers.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/jni/VM_JNIHelpers.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm.jni; import java.lang.reflect.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.classloader.*; Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/runtime/VM_CodeArray.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/runtime/VM_CodeArray.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/runtime/VM_CodeArray.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm; import org.vmmagic.pragma.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; /** * VM_CodeArray represents a code object (contiguous memory region containing code). Modified: rvmroot/trunk/rvm/src/vm/classLoader/VM_Array.java =================================================================== --- rvmroot/trunk/rvm/src/vm/classLoader/VM_Array.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/classLoader/VM_Array.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm.classloader; import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.Offset; Modified: rvmroot/trunk/rvm/src/vm/classLoader/VM_Class.java =================================================================== --- rvmroot/trunk/rvm/src/vm/classLoader/VM_Class.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/classLoader/VM_Class.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -13,7 +13,7 @@ import java.lang.ClassFormatError; import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import java.io.DataInputStream; import java.io.FileNotFoundException; Modified: rvmroot/trunk/rvm/src/vm/classLoader/VM_ClassLoader.java =================================================================== --- rvmroot/trunk/rvm/src/vm/classLoader/VM_ClassLoader.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/classLoader/VM_ClassLoader.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -12,7 +12,7 @@ import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.VM; import com.ibm.jikesrvm.VM_Properties; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import java.util.StringTokenizer; import java.io.*; Modified: rvmroot/trunk/rvm/src/vm/classLoader/VM_Field.java =================================================================== --- rvmroot/trunk/rvm/src/vm/classLoader/VM_Field.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/classLoader/VM_Field.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -13,7 +13,7 @@ import org.vmmagic.pragma.*; import java.io.DataInputStream; import java.io.IOException; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; /** * A field of a java class. Modified: rvmroot/trunk/rvm/src/vm/classLoader/VM_Primitive.java =================================================================== --- rvmroot/trunk/rvm/src/vm/classLoader/VM_Primitive.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/classLoader/VM_Primitive.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm.classloader; import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import org.vmmagic.pragma.*; /** Modified: rvmroot/trunk/rvm/src/vm/classLoader/VM_TableBasedDynamicLinker.java =================================================================== --- rvmroot/trunk/rvm/src/vm/classLoader/VM_TableBasedDynamicLinker.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/classLoader/VM_TableBasedDynamicLinker.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm.classloader; import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; /** * Dynamic linking via indirection tables. <p> Modified: rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_CompiledMethods.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_CompiledMethods.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_CompiledMethods.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm; import com.ibm.jikesrvm.classloader.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; //-#if RVM_WITH_OPT_COMPILER import com.ibm.jikesrvm.opt.*; //-#endif Modified: rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_HardwareTrapGCMapIterator.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_HardwareTrapGCMapIterator.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_HardwareTrapGCMapIterator.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -9,7 +9,7 @@ //$Id$ package com.ibm.jikesrvm; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_GCMapIterator; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_GCMapIterator; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/hir2lir/OPT_ConvertToLowLevelIR.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/hir2lir/OPT_ConvertToLowLevelIR.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/hir2lir/OPT_ConvertToLowLevelIR.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -12,7 +12,7 @@ import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.classloader.*; import com.ibm.jikesrvm.opt.ir.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/hir2lir/OPT_ExpandRuntimeServices.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/hir2lir/OPT_ExpandRuntimeServices.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/hir2lir/OPT_ExpandRuntimeServices.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -12,7 +12,7 @@ import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.classloader.*; import com.ibm.jikesrvm.opt.ir.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import java.lang.reflect.Constructor; /** Modified: rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/mir2mc/OPT_ConvertMIRtoMC.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/mir2mc/OPT_ConvertMIRtoMC.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/mir2mc/OPT_ConvertMIRtoMC.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -12,7 +12,7 @@ import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.classloader.*; import com.ibm.jikesrvm.opt.ir.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; /** * Convert an IR object from MIR to final Machinecode Modified: rvmroot/trunk/rvm/src/vm/compilers/optimizing/vmInterface/services/VM_OptGenericGCMapIterator.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/optimizing/vmInterface/services/VM_OptGenericGCMapIterator.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/compilers/optimizing/vmInterface/services/VM_OptGenericGCMapIterator.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -10,8 +10,8 @@ package com.ibm.jikesrvm.opt; import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_GCMapIterator; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_GCMapIterator; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import org.vmmagic.unboxed.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/rvm/src/vm/jni/VM_JNIEnvironment.java =================================================================== --- rvmroot/trunk/rvm/src/vm/jni/VM_JNIEnvironment.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/jni/VM_JNIEnvironment.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm.jni; import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/jni/VM_JNIFunctions.java =================================================================== --- rvmroot/trunk/rvm/src/vm/jni/VM_JNIFunctions.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/jni/VM_JNIFunctions.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -11,7 +11,7 @@ package com.ibm.jikesrvm.jni; import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import com.ibm.jikesrvm.classloader.*; import java.io.UTFDataFormatException; Modified: rvmroot/trunk/rvm/src/vm/jni/VM_JNIGlobalRefTable.java =================================================================== --- rvmroot/trunk/rvm/src/vm/jni/VM_JNIGlobalRefTable.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/jni/VM_JNIGlobalRefTable.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -9,7 +9,7 @@ //$Id$ package com.ibm.jikesrvm.jni; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import com.ibm.jikesrvm.*; import java.lang.ref.WeakReference; Modified: rvmroot/trunk/rvm/src/vm/libSupport/java/lang/Class.java =================================================================== --- rvmroot/trunk/rvm/src/vm/libSupport/java/lang/Class.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/libSupport/java/lang/Class.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -41,7 +41,7 @@ import com.ibm.jikesrvm.VM_Reflection; import com.ibm.jikesrvm.VM_Runtime; import com.ibm.jikesrvm.VM_UnimplementedError; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import gnu.java.lang.reflect.ClassSignatureParser; Modified: rvmroot/trunk/rvm/src/vm/libSupport/java/lang/VMRuntime.java =================================================================== --- rvmroot/trunk/rvm/src/vm/libSupport/java/lang/VMRuntime.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/libSupport/java/lang/VMRuntime.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -14,7 +14,7 @@ import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.classloader.VM_ClassLoader; -import com.ibm.jikesrvm.memorymanagers.mmInterface.*; +import com.ibm.jikesrvm.memorymanagers.mminterface.*; import com.ibm.jikesrvm.VM_Configuration; import org.vmmagic.unboxed.Offset; Modified: rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/PhantomReference.java =================================================================== --- rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/PhantomReference.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/PhantomReference.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -9,7 +9,7 @@ //$Id$ package java.lang.ref; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; /** * Implementation of java.lang.ref.PhantomReference for JikesRVM. Modified: rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/SoftReference.java =================================================================== --- rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/SoftReference.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/SoftReference.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -9,7 +9,7 @@ //$Id$ package java.lang.ref; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; /** * Implementation of java.lang.ref.SoftReference for JikesRVM. Modified: rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/WeakReference.java =================================================================== --- rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/WeakReference.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/WeakReference.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -9,7 +9,7 @@ //$Id$ package java.lang.ref; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; /** * Implementation of java.lang.ref.WeakReference for JikesRVM. Modified: rvmroot/trunk/rvm/src/vm/libSupport/java/lang/reflect/Constructor.java =================================================================== --- rvmroot/trunk/rvm/src/vm/libSupport/java/lang/reflect/Constructor.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/libSupport/java/lang/reflect/Constructor.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -12,7 +12,7 @@ import com.ibm.jikesrvm.classloader.*; import com.ibm.jikesrvm.VM_Reflection; import com.ibm.jikesrvm.VM_Runtime; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import gnu.java.lang.ClassHelper; import gnu.java.lang.reflect.MethodSignatureParser; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/DebugUtil.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/DebugUtil.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/DebugUtil.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -9,7 +9,7 @@ * * $Id$ */ -package com.ibm.jikesrvm.memorymanagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mminterface; import org.mmtk.policy.Space; import org.mmtk.utility.heap.Mmapper; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/MM_Constants.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/MM_Constants.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/MM_Constants.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -9,7 +9,7 @@ */ //$Id$ -package com.ibm.jikesrvm.memorymanagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mminterface; import org.mmtk.utility.Constants; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/MM_Interface.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/MM_Interface.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/MM_Interface.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.memorymanagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mminterface; import java.util.Date; import java.lang.ref.SoftReference; @@ -539,7 +539,7 @@ } if (isPrefix("Lorg/mmtk/", clsBA) || isPrefix("Lcom/ibm/jikesrvm/mm/", clsBA) || - isPrefix("Lcom.ibm.jikesrvm.memorymanagers/mmInterface/VM_GCMapIteratorGroup", clsBA)) { + isPrefix("Lcom.ibm.jikesrvm.memorymanagers/mminterface/VM_GCMapIteratorGroup", clsBA)) { return Plan.ALLOC_IMMORTAL; } } Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/Monitor.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/Monitor.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/Monitor.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -7,7 +7,7 @@ * (C) Copyright Department of Computer Science, * Australian National University. 2002 */ -package com.ibm.jikesrvm.memorymanagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mminterface; import org.mmtk.utility.Constants; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedCollectorContext.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedCollectorContext.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedCollectorContext.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -8,7 +8,7 @@ * Australian National University. 2005 */ //$Id$ -package com.ibm.jikesrvm.memorymanagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mminterface; import com.ibm.jikesrvm.VM_Processor; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedMutatorContext.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedMutatorContext.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedMutatorContext.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -8,7 +8,7 @@ * Australian National University. 2005 */ //$Id$ -package com.ibm.jikesrvm.memorymanagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mminterface; import com.ibm.jikesrvm.VM_Processor; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedPlan.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedPlan.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedPlan.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -8,7 +8,7 @@ * Australian National University. 2005 */ //$Id$ -package com.ibm.jikesrvm.memorymanagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mminterface; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedPlanConstraints.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedPlanConstraints.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedPlanConstraints.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -8,7 +8,7 @@ * Australian National University. 2005 */ //$Id$ -package com.ibm.jikesrvm.memorymanagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mminterface; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SynchronizationBarrier.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SynchronizationBarrier.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SynchronizationBarrier.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.memorymanagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mminterface; import org.mmtk.utility.Barrier; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_AllocatorHeader.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_AllocatorHeader.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_AllocatorHeader.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.memorymanagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mminterface; import org.vmmagic.unboxed.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_CollectorThread.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_CollectorThread.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_CollectorThread.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.memorymanagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mminterface; import org.mmtk.plan.Plan; import org.mmtk.plan.CollectorContext; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_GCMapIterator.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_GCMapIterator.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_GCMapIterator.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.memorymanagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mminterface; import org.vmmagic.unboxed.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_GCMapIteratorGroup.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_GCMapIteratorGroup.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_GCMapIteratorGroup.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.memorymanagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mminterface; import com.ibm.jikesrvm.VM_Constants; import com.ibm.jikesrvm.VM_CompiledMethod; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_Handshake.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_Handshake.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_Handshake.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -7,7 +7,7 @@ * (C) Copyright IBM Corp. 2001, 2005 */ //$Id$ -package com.ibm.jikesrvm.memorymanagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mminterface; import com.ibm.jikesrvm.mm.mmtk.Lock; import com.ibm.jikesrvm.mm.mmtk.Collection; Modified: rvmroot/trunk/rvm/src/vm/objectModel/VM_MiscHeader.java =================================================================== --- rvmroot/trunk/rvm/src/vm/objectModel/VM_MiscHeader.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/objectModel/VM_MiscHeader.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -9,7 +9,7 @@ //$Id$ package com.ibm.jikesrvm; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_AllocatorHeader; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_AllocatorHeader; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/objectModel/VM_MiscHeaderConstants.java =================================================================== --- rvmroot/trunk/rvm/src/vm/objectModel/VM_MiscHeaderConstants.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/objectModel/VM_MiscHeaderConstants.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -9,7 +9,7 @@ //$Id$ package com.ibm.jikesrvm; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_AllocatorHeader; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_AllocatorHeader; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/objectModel/VM_ObjectModel.java =================================================================== --- rvmroot/trunk/rvm/src/vm/objectModel/VM_ObjectModel.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/objectModel/VM_ObjectModel.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm; import com.ibm.jikesrvm.classloader.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_AllocatorHeader; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_AllocatorHeader; //-#if RVM_WITH_OPT_COMPILER import com.ibm.jikesrvm.opt.ir.*; //-#endif Modified: rvmroot/trunk/rvm/src/vm/objectModel/default/VM_JavaHeader.java =================================================================== --- rvmroot/trunk/rvm/src/vm/objectModel/default/VM_JavaHeader.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/objectModel/default/VM_JavaHeader.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -10,9 +10,9 @@ package com.ibm.jikesrvm; import com.ibm.jikesrvm.classloader.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Constants; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_AllocatorHeader; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Constants; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_AllocatorHeader; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/objectModel/default/VM_JavaHeaderConstants.java =================================================================== --- rvmroot/trunk/rvm/src/vm/objectModel/default/VM_JavaHeaderConstants.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/objectModel/default/VM_JavaHeaderConstants.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -9,8 +9,8 @@ //$Id$ package com.ibm.jikesrvm; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_AllocatorHeader; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_AllocatorHeader; import org.vmmagic.unboxed.*; /** Modified: rvmroot/trunk/rvm/src/vm/objectModel/lockNursery/VM_LockNursery.java =================================================================== --- rvmroot/trunk/rvm/src/vm/objectModel/lockNursery/VM_LockNursery.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/objectModel/lockNursery/VM_LockNursery.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -9,7 +9,7 @@ //$Id$ package com.ibm.jikesrvm; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.Offset; Modified: rvmroot/trunk/rvm/src/vm/objectModel/lockNursery/VM_LockNurseryJavaHeader.java =================================================================== --- rvmroot/trunk/rvm/src/vm/objectModel/lockNursery/VM_LockNurseryJavaHeader.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/objectModel/lockNursery/VM_LockNurseryJavaHeader.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -10,8 +10,8 @@ package com.ibm.jikesrvm; import com.ibm.jikesrvm.classloader.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_AllocatorHeader; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_AllocatorHeader; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/objectModel/oneWordIndexTIB/VM_JavaHeader.java =================================================================== --- rvmroot/trunk/rvm/src/vm/objectModel/oneWordIndexTIB/VM_JavaHeader.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/objectModel/oneWordIndexTIB/VM_JavaHeader.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm; import com.ibm.jikesrvm.classloader.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_AllocatorHeader; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_AllocatorHeader; //-#if RVM_WITH_OPT_COMPILER import com.ibm.jikesrvm.opt.*; import com.ibm.jikesrvm.opt.ir.*; Modified: rvmroot/trunk/rvm/src/vm/objectModel/oneWordMaskTIB/VM_JavaHeader.java =================================================================== --- rvmroot/trunk/rvm/src/vm/objectModel/oneWordMaskTIB/VM_JavaHeader.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/objectModel/oneWordMaskTIB/VM_JavaHeader.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm; import com.ibm.jikesrvm.classloader.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_AllocatorHeader; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_AllocatorHeader; //-#if RVM_WITH_OPT_COMPILER import com.ibm.jikesrvm.opt.*; import com.ibm.jikesrvm.opt.ir.*; Modified: rvmroot/trunk/rvm/src/vm/objectModel/oneWordTIBPtr/VM_JavaHeader.java =================================================================== --- rvmroot/trunk/rvm/src/vm/objectModel/oneWordTIBPtr/VM_JavaHeader.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/objectModel/oneWordTIBPtr/VM_JavaHeader.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm; import com.ibm.jikesrvm.classloader.*; -import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_AllocatorHeader; +import com.ibm.jikesrvm.memorymanagers.mminterface.VM_AllocatorHeader; //-#if RVM_WITH_OPT_COMPILER import com.ibm.jikesrvm.opt.*; import com.ibm.jikesrvm.opt.ir.*; Modified: rvmroot/trunk/rvm/src/vm/runtime/VM_BootRecord.java =================================================================== --- rvmroot/trunk/rvm/src/vm/runtime/VM_BootRecord.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/runtime/VM_BootRecord.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -9,7 +9,7 @@ // $Id$ package com.ibm.jikesrvm; -import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mminterface.MM_Interface; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/runtime/VM_Entrypoints.java =================================================================== --- rvmroot/trunk/rvm/src/vm/runtime/VM_Entrypoints.java 2006-10-30 18:28:29 UTC (rev 10931) +++ rvmroot/trunk/rvm/src/vm/runtime/VM_Entrypoints.java 2006-10-30 19:20:40 UTC (rev 10932) @@ -158,10 +158,10 @@ public static final VM_Field LQheadField = getField("Lorg/mmtk/utility/deque/LocalQueue;", "head","Lorg/vmmagic/unboxed/Address;"); public static final VM_Field SQBEField = getField("Lorg/mmtk/utility/deque/SharedDeque;", "bufsenqueued","I"); public static ... [truncated message content] |
From: <dgr...@us...> - 2006-10-30 18:30:01
|
Revision: 10931 http://svn.sourceforge.net/jikesrvm/?rev=10931&view=rev Author: dgrove-oss Date: 2006-10-30 10:28:29 -0800 (Mon, 30 Oct 2006) Log Message: ----------- switch from RC5 to first full release of DaCapo benchmarks for nightly regression testing Modified Paths: -------------- rvmroot/trunk/testing/harness/Local.rules Modified: rvmroot/trunk/testing/harness/Local.rules =================================================================== --- rvmroot/trunk/testing/harness/Local.rules 2006-10-30 16:31:43 UTC (rev 10930) +++ rvmroot/trunk/testing/harness/Local.rules 2006-10-30 18:28:29 UTC (rev 10931) @@ -20,7 +20,7 @@ # Dacapo # Dacapo_HOME=$(BENCHMARK_ROOT)/dacapo -Dacapo_JARS=$(BENCHMARK_ROOT)/dacapo/dacapo-2006-10-RC5.jar +Dacapo_JARS=$(BENCHMARK_ROOT)/dacapo/dacapo-2006-10.jar # # JLex This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dgr...@us...> - 2006-10-30 16:32:49
|
Revision: 10930 http://svn.sourceforge.net/jikesrvm/?rev=10930&view=rev Author: dgrove-oss Date: 2006-10-30 08:31:43 -0800 (Mon, 30 Oct 2006) Log Message: ----------- lowercase package name: memoryManagers ==> memorymanagers Modified Paths: -------------- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ActivePlan.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Assert.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Collection.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ObjectModel.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanBootImage.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanStatics.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanThread.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Scanning.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Statistics.java rvmroot/trunk/bin/jconfigure rvmroot/trunk/doc/userguide/MMTk.tex rvmroot/trunk/doc/userguide/urls.tex rvmroot/trunk/rvm/src/vm/Dummy.java rvmroot/trunk/rvm/src/vm/VM.java rvmroot/trunk/rvm/src/vm/VM_Configuration.java rvmroot/trunk/rvm/src/vm/adaptive/controller/VM_RecompilationStrategy.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/GCMap/VM_BaselineGCMapIterator.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/VM_Compiler.java rvmroot/trunk/rvm/src/vm/arch/intel/jni/VM_JNIGCMapIterator.java rvmroot/trunk/rvm/src/vm/arch/intel/runtime/VM_CodeArray.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/GCMap/VM_BaselineGCMapIterator.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_Compiler.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_MachineCode.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/GCMap/VM_QuickGCMapIterator.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/VM_QuickCompiler.java rvmroot/trunk/rvm/src/vm/arch/powerPC/jni/VM_JNIGCMapIterator.java rvmroot/trunk/rvm/src/vm/arch/powerPC/jni/VM_JNIHelpers.java rvmroot/trunk/rvm/src/vm/arch/powerPC/runtime/VM_CodeArray.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Array.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Class.java rvmroot/trunk/rvm/src/vm/classLoader/VM_ClassLoader.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Field.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Primitive.java rvmroot/trunk/rvm/src/vm/classLoader/VM_TableBasedDynamicLinker.java rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_CompiledMethods.java rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_HardwareTrapGCMapIterator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/hir2lir/OPT_ConvertToLowLevelIR.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/hir2lir/OPT_ExpandRuntimeServices.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/mir2mc/OPT_ConvertMIRtoMC.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/vmInterface/services/VM_OptGenericGCMapIterator.java rvmroot/trunk/rvm/src/vm/jni/VM_JNIEnvironment.java rvmroot/trunk/rvm/src/vm/jni/VM_JNIFunctions.java rvmroot/trunk/rvm/src/vm/jni/VM_JNIGlobalRefTable.java rvmroot/trunk/rvm/src/vm/libSupport/java/lang/Class.java rvmroot/trunk/rvm/src/vm/libSupport/java/lang/VMRuntime.java rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/PhantomReference.java rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/SoftReference.java rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/WeakReference.java rvmroot/trunk/rvm/src/vm/libSupport/java/lang/reflect/Constructor.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/DebugUtil.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/MM_Constants.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/MM_Interface.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/Monitor.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedCollectorContext.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedMutatorContext.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedPlan.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedPlanConstraints.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SynchronizationBarrier.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_AllocatorHeader.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_CollectorThread.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_GCMapIterator.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_GCMapIteratorGroup.java rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_Handshake.java rvmroot/trunk/rvm/src/vm/objectModel/VM_MiscHeader.java rvmroot/trunk/rvm/src/vm/objectModel/VM_MiscHeaderConstants.java rvmroot/trunk/rvm/src/vm/objectModel/VM_ObjectModel.java rvmroot/trunk/rvm/src/vm/objectModel/default/VM_JavaHeader.java rvmroot/trunk/rvm/src/vm/objectModel/default/VM_JavaHeaderConstants.java rvmroot/trunk/rvm/src/vm/objectModel/lockNursery/VM_LockNursery.java rvmroot/trunk/rvm/src/vm/objectModel/lockNursery/VM_LockNurseryJavaHeader.java rvmroot/trunk/rvm/src/vm/objectModel/oneWordIndexTIB/VM_JavaHeader.java rvmroot/trunk/rvm/src/vm/objectModel/oneWordMaskTIB/VM_JavaHeader.java rvmroot/trunk/rvm/src/vm/objectModel/oneWordTIBPtr/VM_JavaHeader.java rvmroot/trunk/rvm/src/vm/runtime/VM_BootRecord.java rvmroot/trunk/rvm/src/vm/runtime/VM_Entrypoints.java rvmroot/trunk/rvm/src/vm/runtime/VM_Magic.java rvmroot/trunk/rvm/src/vm/runtime/VM_Runtime.java rvmroot/trunk/rvm/src/vm/scheduler/FinalizerThread.java rvmroot/trunk/rvm/src/vm/scheduler/MainThread.java rvmroot/trunk/rvm/src/vm/scheduler/VM_Processor.java rvmroot/trunk/rvm/src/vm/scheduler/VM_Scheduler.java rvmroot/trunk/rvm/src/vm/scheduler/VM_Thread.java rvmroot/trunk/rvm/src/vm/utility/VM_CommandLineArgs.java rvmroot/trunk/testing/tests/gctest/Exhaust.java rvmroot/trunk/tools/bootImageRunner/GenerateInterfaceDeclarations.java rvmroot/trunk/tools/bootImageRunner/sys.C rvmroot/trunk/tools/bootImageWriter/BootImage.java rvmroot/trunk/tools/bootImageWriter/BootImageWriter.java Modified: rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ActivePlan.java =================================================================== --- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ActivePlan.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ActivePlan.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -14,10 +14,10 @@ import org.mmtk.plan.MutatorContext; import org.mmtk.plan.PlanConstraints; -import com.ibm.jikesrvm.memoryManagers.mmInterface.SelectedPlan; -import com.ibm.jikesrvm.memoryManagers.mmInterface.SelectedCollectorContext; -import com.ibm.jikesrvm.memoryManagers.mmInterface.SelectedMutatorContext; -import com.ibm.jikesrvm.memoryManagers.mmInterface.SelectedPlanConstraints; +import com.ibm.jikesrvm.memorymanagers.mmInterface.SelectedPlan; +import com.ibm.jikesrvm.memorymanagers.mmInterface.SelectedCollectorContext; +import com.ibm.jikesrvm.memorymanagers.mmInterface.SelectedMutatorContext; +import com.ibm.jikesrvm.memorymanagers.mmInterface.SelectedPlanConstraints; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Assert.java =================================================================== --- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Assert.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Assert.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -13,7 +13,7 @@ import org.mmtk.policy.Space; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import com.ibm.jikesrvm.VM; import com.ibm.jikesrvm.VM_Scheduler; Modified: rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Collection.java =================================================================== --- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Collection.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Collection.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -31,11 +31,11 @@ import com.ibm.jikesrvm.VM_Time; import com.ibm.jikesrvm.classloader.VM_Atom; import com.ibm.jikesrvm.classloader.VM_Method; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_CollectorThread; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; -import com.ibm.jikesrvm.memoryManagers.mmInterface.SelectedPlan; -import com.ibm.jikesrvm.memoryManagers.mmInterface.SelectedCollectorContext; -import com.ibm.jikesrvm.memoryManagers.mmInterface.SelectedMutatorContext; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_CollectorThread; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.SelectedPlan; +import com.ibm.jikesrvm.memorymanagers.mmInterface.SelectedCollectorContext; +import com.ibm.jikesrvm.memorymanagers.mmInterface.SelectedMutatorContext; import org.vmmagic.unboxed.*; import org.vmmagic.pragma.*; @@ -108,7 +108,7 @@ */ public static final void init() throws InterruptiblePragma { collectorThreadAtom = VM_Atom.findOrCreateAsciiAtom( - "Lcom/ibm/jikesrvm/memoryManagers/mmInterface/VM_CollectorThread;"); + "Lcom/ibm/jikesrvm/memorymanagers/mmInterface/VM_CollectorThread;"); runAtom = VM_Atom.findOrCreateAsciiAtom("run"); } Modified: rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ObjectModel.java =================================================================== --- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ObjectModel.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ObjectModel.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -25,9 +25,9 @@ import com.ibm.jikesrvm.classloader.VM_Array; import com.ibm.jikesrvm.classloader.VM_Class; import com.ibm.jikesrvm.classloader.VM_Type; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; -import com.ibm.jikesrvm.memoryManagers.mmInterface.SelectedMutatorContext; -import com.ibm.jikesrvm.memoryManagers.mmInterface.SelectedCollectorContext; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.SelectedMutatorContext; +import com.ibm.jikesrvm.memorymanagers.mmInterface.SelectedCollectorContext; import org.vmmagic.unboxed.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanBootImage.java =================================================================== --- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanBootImage.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanBootImage.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -20,7 +20,7 @@ import com.ibm.jikesrvm.VM_Magic; import com.ibm.jikesrvm.VM_Constants; import com.ibm.jikesrvm.VM_Thread; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_CollectorThread; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_CollectorThread; import org.vmmagic.unboxed.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanStatics.java =================================================================== --- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanStatics.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanStatics.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -16,7 +16,7 @@ import com.ibm.jikesrvm.VM_Magic; import com.ibm.jikesrvm.VM_Constants; import com.ibm.jikesrvm.VM_Thread; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_CollectorThread; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_CollectorThread; import org.vmmagic.unboxed.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanThread.java =================================================================== --- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanThread.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanThread.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -13,11 +13,11 @@ import org.mmtk.utility.deque.*; import org.mmtk.utility.Constants; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; -import com.ibm.jikesrvm.memoryManagers.mmInterface.DebugUtil; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_CollectorThread; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_GCMapIterator; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_GCMapIteratorGroup; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.DebugUtil; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_CollectorThread; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_GCMapIterator; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_GCMapIteratorGroup; import com.ibm.jikesrvm.classloader.*; import com.ibm.jikesrvm.VM; Modified: rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Scanning.java =================================================================== --- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Scanning.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Scanning.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -17,8 +17,8 @@ import org.mmtk.utility.deque.*; import org.mmtk.utility.Constants; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_CollectorThread; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_CollectorThread; import com.ibm.jikesrvm.VM; import com.ibm.jikesrvm.VM_Magic; import com.ibm.jikesrvm.VM_Scheduler; Modified: rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Statistics.java =================================================================== --- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Statistics.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Statistics.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -13,7 +13,7 @@ import org.mmtk.utility.Constants; import com.ibm.jikesrvm.VM_Time; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import org.vmmagic.unboxed.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/bin/jconfigure =================================================================== --- rvmroot/trunk/bin/jconfigure 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/bin/jconfigure 2006-10-30 16:31:43 UTC (rev 10930) @@ -3257,7 +3257,7 @@ if (( RVM_WITH_OSR )); then echo " \$FIND ./com/ibm/jikesrvm/OSR -name '*.class'" fi - echo " \$FIND ./com/ibm/jikesrvm/memoryManagers -name '*.class'" + echo " \$FIND ./com/ibm/jikesrvm/memorymanagers -name '*.class'" echo " \$FIND ../MMTk.classes/mmtk/org -name '*.class'|sed 's@^../MMTk.classes/mmtk/@.@' " echo " \$FIND ./org/mmtk -name '*.class'" echo " \$FIND ./com/ibm/jikesrvm/mm/mmtk -name '*.class'" @@ -3700,9 +3700,9 @@ [Lcom/ibm/jikesrvm/classloader/VM_MemberReference; [Lcom/ibm/jikesrvm/classloader/VM_Type; [Lcom/ibm/jikesrvm/classloader/VM_TypeReference; - [Lcom/ibm/jikesrvm/memoryManagers/mmInterface/VM_CollectorThread; - [Lcom/ibm/jikesrvm/memoryManagers/mmInterface/SelectedCollectorContext; - [Lcom/ibm/jikesrvm/memoryManagers/mmInterface/SelectedMutatorContext; + [Lcom/ibm/jikesrvm/memorymanagers/mmInterface/VM_CollectorThread; + [Lcom/ibm/jikesrvm/memorymanagers/mmInterface/SelectedCollectorContext; + [Lcom/ibm/jikesrvm/memorymanagers/mmInterface/SelectedMutatorContext; [Lorg/mmtk/vm/SynchronizedCounter; [Lorg/mmtk/plan/Phase; [Lorg/mmtk/policy/Space; Modified: rvmroot/trunk/doc/userguide/MMTk.tex =================================================================== --- rvmroot/trunk/doc/userguide/MMTk.tex 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/doc/userguide/MMTk.tex 2006-10-30 16:31:43 UTC (rev 10930) @@ -7,7 +7,7 @@ made independent of Jikes RVM, and is now called MMTk. Much more work has been done on factoring out the VM-specific code into the packages \texttt{org.mmtk.vm} -and \texttt{com.ibm.jikesrvm.memoryManagers.mmInterface}}. +and \texttt{com.ibm.jikesrvm.memorymanagers.mmInterface}}. From Jikes RVM 2.2.0 onward, JMTk (Java Memory management Toolkit) became the default memory management system for Jikes RVM.\@ Modified: rvmroot/trunk/doc/userguide/urls.tex =================================================================== --- rvmroot/trunk/doc/userguide/urls.tex 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/doc/userguide/urls.tex 2006-10-30 16:31:43 UTC (rev 10930) @@ -118,11 +118,11 @@ \newcommand{\VMInterfaceInvocationURL}{{\ClassloaderJavadocURL}/VM\_InterfaceInvocation.html} \newcommand{\VMMethodURL}{{\ClassloaderJavadocURL}/VM\_Method.html} -% package com.ibm.jikesrvm.memoryManagers -\newcommand{\MMpackage}{\JikesRVMpackage{}.me\-mo\-ry\-Ma\-na\-gers} -\newcommand{\MMJavadocURL}{{\JikesRVMJavadocURL}/memoryManagers} +% package com.ibm.jikesrvm.memorymanagers +\newcommand{\MMpackage}{\JikesRVMpackage{}.me\-mo\-ry\-ma\-na\-gers} +\newcommand{\MMJavadocURL}{{\JikesRVMJavadocURL}/memorymanagers} -% package com.ibm.jikesrvm.memoryManagers.JMTk +% package com.ibm.jikesrvm.memorymanagers.JMTk \newcommand{\JMTkJavadocURL}{{\MMJavadocURL}/JMTk} \newcommand{\JMTkPackageURL}{{\JMTkJavadocURL}/package-frame.html} \newcommand{\AddressDequeURL}{{\JMTkJavadocURL}/AddressDeque.html} @@ -143,7 +143,7 @@ \newcommand{\StopTheWorldGCURL}{{\JMTkJavadocURL}/StopTheWorldGC.html} \newcommand{\VMResourceURL}{{\JMTkJavadocURL}/VMResource.html} -% package com.ibm.jikesrvm.memoryManagers.mmInterface +% package com.ibm.jikesrvm.memorymanagers.mmInterface \newcommand{\mmInterface}{m\-m\-In\-ter\-face} \newcommand{\VMInterfaceJavadocURL}{{\MMJavadocURL}/\mmInterface} \newcommand{\mmInterfacePackageURL}{{\VMInterfaceJavadocURL}/package-frame.html} Modified: rvmroot/trunk/rvm/src/vm/Dummy.java =================================================================== --- rvmroot/trunk/rvm/src/vm/Dummy.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/Dummy.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -9,7 +9,7 @@ //$Id$ import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import org.vmmagic.unboxed.*; /** Modified: rvmroot/trunk/rvm/src/vm/VM.java =================================================================== --- rvmroot/trunk/rvm/src/vm/VM.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/VM.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm; import com.ibm.jikesrvm.classloader.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.*; import java.lang.ref.Reference; Modified: rvmroot/trunk/rvm/src/vm/VM_Configuration.java =================================================================== --- rvmroot/trunk/rvm/src/vm/VM_Configuration.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/VM_Configuration.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -9,7 +9,7 @@ //$Id$ package com.ibm.jikesrvm; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; /** * Flags that specify the configuration of our virtual machine. Modified: rvmroot/trunk/rvm/src/vm/adaptive/controller/VM_RecompilationStrategy.java =================================================================== --- rvmroot/trunk/rvm/src/vm/adaptive/controller/VM_RecompilationStrategy.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/adaptive/controller/VM_RecompilationStrategy.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -16,7 +16,7 @@ import com.ibm.jikesrvm.VM; import com.ibm.jikesrvm.VM_RuntimeCompiler; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; /** * An abstract class providing the interface to the decision making Modified: rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/GCMap/VM_BaselineGCMapIterator.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/GCMap/VM_BaselineGCMapIterator.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/GCMap/VM_BaselineGCMapIterator.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm; import com.ibm.jikesrvm.classloader.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_GCMapIterator; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_GCMapIterator; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/VM_Compiler.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/VM_Compiler.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/VM_Compiler.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm; import com.ibm.jikesrvm.classloader.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import com.ibm.jikesrvm.jni.VM_JNICompiler; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/arch/intel/jni/VM_JNIGCMapIterator.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/intel/jni/VM_JNIGCMapIterator.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/arch/intel/jni/VM_JNIGCMapIterator.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm.jni; import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_GCMapIterator; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_GCMapIterator; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/arch/intel/runtime/VM_CodeArray.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/intel/runtime/VM_CodeArray.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/arch/intel/runtime/VM_CodeArray.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm; import org.vmmagic.pragma.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; /** * VM_CodeArray represents a code object (contiguous memory region containing code). Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/GCMap/VM_BaselineGCMapIterator.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/GCMap/VM_BaselineGCMapIterator.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/GCMap/VM_BaselineGCMapIterator.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -9,7 +9,7 @@ //$Id$ package com.ibm.jikesrvm; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_GCMapIterator; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_GCMapIterator; import com.ibm.jikesrvm.classloader.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_Compiler.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_Compiler.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_Compiler.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -9,7 +9,7 @@ //$Id$ package com.ibm.jikesrvm; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import com.ibm.jikesrvm.classloader.*; import com.ibm.jikesrvm.jni.*; Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_MachineCode.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_MachineCode.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_MachineCode.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -9,7 +9,7 @@ //$Id$ package com.ibm.jikesrvm; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import java.util.ArrayList; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/GCMap/VM_QuickGCMapIterator.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/GCMap/VM_QuickGCMapIterator.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/GCMap/VM_QuickGCMapIterator.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -11,7 +11,7 @@ import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_GCMapIterator; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_GCMapIterator; import com.ibm.jikesrvm.classloader.*; import org.vmmagic.unboxed.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/VM_QuickCompiler.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/VM_QuickCompiler.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/VM_QuickCompiler.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm.quick; import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import com.ibm.jikesrvm.jni.VM_JNICompiler; import com.ibm.jikesrvm.classloader.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/jni/VM_JNIGCMapIterator.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/jni/VM_JNIGCMapIterator.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/jni/VM_JNIGCMapIterator.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -9,7 +9,7 @@ //$Id$ package com.ibm.jikesrvm.jni; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_GCMapIterator; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_GCMapIterator; import com.ibm.jikesrvm.*; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/jni/VM_JNIHelpers.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/jni/VM_JNIHelpers.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/jni/VM_JNIHelpers.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm.jni; import java.lang.reflect.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.classloader.*; Modified: rvmroot/trunk/rvm/src/vm/arch/powerPC/runtime/VM_CodeArray.java =================================================================== --- rvmroot/trunk/rvm/src/vm/arch/powerPC/runtime/VM_CodeArray.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/arch/powerPC/runtime/VM_CodeArray.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm; import org.vmmagic.pragma.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; /** * VM_CodeArray represents a code object (contiguous memory region containing code). Modified: rvmroot/trunk/rvm/src/vm/classLoader/VM_Array.java =================================================================== --- rvmroot/trunk/rvm/src/vm/classLoader/VM_Array.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/classLoader/VM_Array.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm.classloader; import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.Offset; Modified: rvmroot/trunk/rvm/src/vm/classLoader/VM_Class.java =================================================================== --- rvmroot/trunk/rvm/src/vm/classLoader/VM_Class.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/classLoader/VM_Class.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -13,7 +13,7 @@ import java.lang.ClassFormatError; import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import java.io.DataInputStream; import java.io.FileNotFoundException; Modified: rvmroot/trunk/rvm/src/vm/classLoader/VM_ClassLoader.java =================================================================== --- rvmroot/trunk/rvm/src/vm/classLoader/VM_ClassLoader.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/classLoader/VM_ClassLoader.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -12,7 +12,7 @@ import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.VM; import com.ibm.jikesrvm.VM_Properties; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import java.util.StringTokenizer; import java.io.*; Modified: rvmroot/trunk/rvm/src/vm/classLoader/VM_Field.java =================================================================== --- rvmroot/trunk/rvm/src/vm/classLoader/VM_Field.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/classLoader/VM_Field.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -13,7 +13,7 @@ import org.vmmagic.pragma.*; import java.io.DataInputStream; import java.io.IOException; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; /** * A field of a java class. Modified: rvmroot/trunk/rvm/src/vm/classLoader/VM_Primitive.java =================================================================== --- rvmroot/trunk/rvm/src/vm/classLoader/VM_Primitive.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/classLoader/VM_Primitive.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm.classloader; import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import org.vmmagic.pragma.*; /** Modified: rvmroot/trunk/rvm/src/vm/classLoader/VM_TableBasedDynamicLinker.java =================================================================== --- rvmroot/trunk/rvm/src/vm/classLoader/VM_TableBasedDynamicLinker.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/classLoader/VM_TableBasedDynamicLinker.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm.classloader; import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; /** * Dynamic linking via indirection tables. <p> Modified: rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_CompiledMethods.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_CompiledMethods.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_CompiledMethods.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm; import com.ibm.jikesrvm.classloader.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; //-#if RVM_WITH_OPT_COMPILER import com.ibm.jikesrvm.opt.*; //-#endif Modified: rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_HardwareTrapGCMapIterator.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_HardwareTrapGCMapIterator.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_HardwareTrapGCMapIterator.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -9,7 +9,7 @@ //$Id$ package com.ibm.jikesrvm; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_GCMapIterator; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_GCMapIterator; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/hir2lir/OPT_ConvertToLowLevelIR.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/hir2lir/OPT_ConvertToLowLevelIR.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/hir2lir/OPT_ConvertToLowLevelIR.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -12,7 +12,7 @@ import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.classloader.*; import com.ibm.jikesrvm.opt.ir.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/hir2lir/OPT_ExpandRuntimeServices.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/hir2lir/OPT_ExpandRuntimeServices.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/hir2lir/OPT_ExpandRuntimeServices.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -12,7 +12,7 @@ import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.classloader.*; import com.ibm.jikesrvm.opt.ir.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import java.lang.reflect.Constructor; /** Modified: rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/mir2mc/OPT_ConvertMIRtoMC.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/mir2mc/OPT_ConvertMIRtoMC.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/mir2mc/OPT_ConvertMIRtoMC.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -12,7 +12,7 @@ import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.classloader.*; import com.ibm.jikesrvm.opt.ir.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; /** * Convert an IR object from MIR to final Machinecode Modified: rvmroot/trunk/rvm/src/vm/compilers/optimizing/vmInterface/services/VM_OptGenericGCMapIterator.java =================================================================== --- rvmroot/trunk/rvm/src/vm/compilers/optimizing/vmInterface/services/VM_OptGenericGCMapIterator.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/compilers/optimizing/vmInterface/services/VM_OptGenericGCMapIterator.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -10,8 +10,8 @@ package com.ibm.jikesrvm.opt; import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_GCMapIterator; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_GCMapIterator; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import org.vmmagic.unboxed.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/rvm/src/vm/jni/VM_JNIEnvironment.java =================================================================== --- rvmroot/trunk/rvm/src/vm/jni/VM_JNIEnvironment.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/jni/VM_JNIEnvironment.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm.jni; import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/jni/VM_JNIFunctions.java =================================================================== --- rvmroot/trunk/rvm/src/vm/jni/VM_JNIFunctions.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/jni/VM_JNIFunctions.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -11,7 +11,7 @@ package com.ibm.jikesrvm.jni; import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import com.ibm.jikesrvm.classloader.*; import java.io.UTFDataFormatException; Modified: rvmroot/trunk/rvm/src/vm/jni/VM_JNIGlobalRefTable.java =================================================================== --- rvmroot/trunk/rvm/src/vm/jni/VM_JNIGlobalRefTable.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/jni/VM_JNIGlobalRefTable.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -9,7 +9,7 @@ //$Id$ package com.ibm.jikesrvm.jni; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import com.ibm.jikesrvm.*; import java.lang.ref.WeakReference; Modified: rvmroot/trunk/rvm/src/vm/libSupport/java/lang/Class.java =================================================================== --- rvmroot/trunk/rvm/src/vm/libSupport/java/lang/Class.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/libSupport/java/lang/Class.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -41,7 +41,7 @@ import com.ibm.jikesrvm.VM_Reflection; import com.ibm.jikesrvm.VM_Runtime; import com.ibm.jikesrvm.VM_UnimplementedError; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import gnu.java.lang.reflect.ClassSignatureParser; Modified: rvmroot/trunk/rvm/src/vm/libSupport/java/lang/VMRuntime.java =================================================================== --- rvmroot/trunk/rvm/src/vm/libSupport/java/lang/VMRuntime.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/libSupport/java/lang/VMRuntime.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -14,7 +14,7 @@ import com.ibm.jikesrvm.*; import com.ibm.jikesrvm.classloader.VM_ClassLoader; -import com.ibm.jikesrvm.memoryManagers.mmInterface.*; +import com.ibm.jikesrvm.memorymanagers.mmInterface.*; import com.ibm.jikesrvm.VM_Configuration; import org.vmmagic.unboxed.Offset; Modified: rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/PhantomReference.java =================================================================== --- rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/PhantomReference.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/PhantomReference.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -9,7 +9,7 @@ //$Id$ package java.lang.ref; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; /** * Implementation of java.lang.ref.PhantomReference for JikesRVM. Modified: rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/SoftReference.java =================================================================== --- rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/SoftReference.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/SoftReference.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -9,7 +9,7 @@ //$Id$ package java.lang.ref; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; /** * Implementation of java.lang.ref.SoftReference for JikesRVM. Modified: rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/WeakReference.java =================================================================== --- rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/WeakReference.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/libSupport/java/lang/ref/WeakReference.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -9,7 +9,7 @@ //$Id$ package java.lang.ref; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; /** * Implementation of java.lang.ref.WeakReference for JikesRVM. Modified: rvmroot/trunk/rvm/src/vm/libSupport/java/lang/reflect/Constructor.java =================================================================== --- rvmroot/trunk/rvm/src/vm/libSupport/java/lang/reflect/Constructor.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/libSupport/java/lang/reflect/Constructor.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -12,7 +12,7 @@ import com.ibm.jikesrvm.classloader.*; import com.ibm.jikesrvm.VM_Reflection; import com.ibm.jikesrvm.VM_Runtime; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import gnu.java.lang.ClassHelper; import gnu.java.lang.reflect.MethodSignatureParser; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/DebugUtil.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/DebugUtil.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/DebugUtil.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -9,7 +9,7 @@ * * $Id$ */ -package com.ibm.jikesrvm.memoryManagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mmInterface; import org.mmtk.policy.Space; import org.mmtk.utility.heap.Mmapper; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/MM_Constants.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/MM_Constants.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/MM_Constants.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -9,7 +9,7 @@ */ //$Id$ -package com.ibm.jikesrvm.memoryManagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mmInterface; import org.mmtk.utility.Constants; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/MM_Interface.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/MM_Interface.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/MM_Interface.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.memoryManagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mmInterface; import java.util.Date; import java.lang.ref.SoftReference; @@ -539,7 +539,7 @@ } if (isPrefix("Lorg/mmtk/", clsBA) || isPrefix("Lcom/ibm/jikesrvm/mm/", clsBA) || - isPrefix("Lcom/ibm/jikesrvm/memoryManagers/mmInterface/VM_GCMapIteratorGroup", clsBA)) { + isPrefix("Lcom.ibm.jikesrvm.memorymanagers/mmInterface/VM_GCMapIteratorGroup", clsBA)) { return Plan.ALLOC_IMMORTAL; } } @@ -567,7 +567,7 @@ } if (isPrefix("Lorg/mmtk/", typeBA) || isPrefix("Lcom/ibm/jikesrvm/mm/", typeBA) || - isPrefix("Lcom/ibm/jikesrvm/memoryManagers/", typeBA) || + isPrefix("Lcom.ibm.jikesrvm.memorymanagers/", typeBA) || isPrefix("Lcom/ibm/jikesrvm/VM_Processor;", typeBA) || isPrefix("Lcom/ibm/jikesrvm/jni/VM_JNIEnvironment;", typeBA)) allocator = Plan.ALLOC_IMMORTAL; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/Monitor.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/Monitor.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/Monitor.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -7,7 +7,7 @@ * (C) Copyright Department of Computer Science, * Australian National University. 2002 */ -package com.ibm.jikesrvm.memoryManagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mmInterface; import org.mmtk.utility.Constants; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedCollectorContext.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedCollectorContext.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedCollectorContext.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -8,7 +8,7 @@ * Australian National University. 2005 */ //$Id$ -package com.ibm.jikesrvm.memoryManagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mmInterface; import com.ibm.jikesrvm.VM_Processor; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedMutatorContext.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedMutatorContext.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedMutatorContext.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -8,7 +8,7 @@ * Australian National University. 2005 */ //$Id$ -package com.ibm.jikesrvm.memoryManagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mmInterface; import com.ibm.jikesrvm.VM_Processor; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedPlan.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedPlan.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedPlan.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -8,7 +8,7 @@ * Australian National University. 2005 */ //$Id$ -package com.ibm.jikesrvm.memoryManagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mmInterface; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedPlanConstraints.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedPlanConstraints.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SelectedPlanConstraints.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -8,7 +8,7 @@ * Australian National University. 2005 */ //$Id$ -package com.ibm.jikesrvm.memoryManagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mmInterface; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SynchronizationBarrier.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SynchronizationBarrier.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/SynchronizationBarrier.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.memoryManagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mmInterface; import org.mmtk.utility.Barrier; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_AllocatorHeader.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_AllocatorHeader.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_AllocatorHeader.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.memoryManagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mmInterface; import org.vmmagic.unboxed.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_CollectorThread.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_CollectorThread.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_CollectorThread.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.memoryManagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mmInterface; import org.mmtk.plan.Plan; import org.mmtk.plan.CollectorContext; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_GCMapIterator.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_GCMapIterator.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_GCMapIterator.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.memoryManagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mmInterface; import org.vmmagic.unboxed.*; import org.vmmagic.pragma.*; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_GCMapIteratorGroup.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_GCMapIteratorGroup.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_GCMapIteratorGroup.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -8,7 +8,7 @@ */ //$Id$ -package com.ibm.jikesrvm.memoryManagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mmInterface; import com.ibm.jikesrvm.VM_Constants; import com.ibm.jikesrvm.VM_CompiledMethod; Modified: rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_Handshake.java =================================================================== --- rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_Handshake.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/memoryManagers/JMTk/vmInterface/VM_Handshake.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -7,7 +7,7 @@ * (C) Copyright IBM Corp. 2001, 2005 */ //$Id$ -package com.ibm.jikesrvm.memoryManagers.mmInterface; +package com.ibm.jikesrvm.memorymanagers.mmInterface; import com.ibm.jikesrvm.mm.mmtk.Lock; import com.ibm.jikesrvm.mm.mmtk.Collection; Modified: rvmroot/trunk/rvm/src/vm/objectModel/VM_MiscHeader.java =================================================================== --- rvmroot/trunk/rvm/src/vm/objectModel/VM_MiscHeader.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/objectModel/VM_MiscHeader.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -9,7 +9,7 @@ //$Id$ package com.ibm.jikesrvm; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_AllocatorHeader; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_AllocatorHeader; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/objectModel/VM_MiscHeaderConstants.java =================================================================== --- rvmroot/trunk/rvm/src/vm/objectModel/VM_MiscHeaderConstants.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/objectModel/VM_MiscHeaderConstants.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -9,7 +9,7 @@ //$Id$ package com.ibm.jikesrvm; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_AllocatorHeader; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_AllocatorHeader; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/objectModel/VM_ObjectModel.java =================================================================== --- rvmroot/trunk/rvm/src/vm/objectModel/VM_ObjectModel.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/objectModel/VM_ObjectModel.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm; import com.ibm.jikesrvm.classloader.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_AllocatorHeader; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_AllocatorHeader; //-#if RVM_WITH_OPT_COMPILER import com.ibm.jikesrvm.opt.ir.*; //-#endif Modified: rvmroot/trunk/rvm/src/vm/objectModel/default/VM_JavaHeader.java =================================================================== --- rvmroot/trunk/rvm/src/vm/objectModel/default/VM_JavaHeader.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/objectModel/default/VM_JavaHeader.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -10,9 +10,9 @@ package com.ibm.jikesrvm; import com.ibm.jikesrvm.classloader.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Constants; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_AllocatorHeader; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Constants; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_AllocatorHeader; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/objectModel/default/VM_JavaHeaderConstants.java =================================================================== --- rvmroot/trunk/rvm/src/vm/objectModel/default/VM_JavaHeaderConstants.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/objectModel/default/VM_JavaHeaderConstants.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -9,8 +9,8 @@ //$Id$ package com.ibm.jikesrvm; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_AllocatorHeader; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_AllocatorHeader; import org.vmmagic.unboxed.*; /** Modified: rvmroot/trunk/rvm/src/vm/objectModel/lockNursery/VM_LockNursery.java =================================================================== --- rvmroot/trunk/rvm/src/vm/objectModel/lockNursery/VM_LockNursery.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/objectModel/lockNursery/VM_LockNursery.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -9,7 +9,7 @@ //$Id$ package com.ibm.jikesrvm; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.Offset; Modified: rvmroot/trunk/rvm/src/vm/objectModel/lockNursery/VM_LockNurseryJavaHeader.java =================================================================== --- rvmroot/trunk/rvm/src/vm/objectModel/lockNursery/VM_LockNurseryJavaHeader.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/objectModel/lockNursery/VM_LockNurseryJavaHeader.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -10,8 +10,8 @@ package com.ibm.jikesrvm; import com.ibm.jikesrvm.classloader.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_AllocatorHeader; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_AllocatorHeader; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/objectModel/oneWordIndexTIB/VM_JavaHeader.java =================================================================== --- rvmroot/trunk/rvm/src/vm/objectModel/oneWordIndexTIB/VM_JavaHeader.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/objectModel/oneWordIndexTIB/VM_JavaHeader.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm; import com.ibm.jikesrvm.classloader.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_AllocatorHeader; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_AllocatorHeader; //-#if RVM_WITH_OPT_COMPILER import com.ibm.jikesrvm.opt.*; import com.ibm.jikesrvm.opt.ir.*; Modified: rvmroot/trunk/rvm/src/vm/objectModel/oneWordMaskTIB/VM_JavaHeader.java =================================================================== --- rvmroot/trunk/rvm/src/vm/objectModel/oneWordMaskTIB/VM_JavaHeader.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/objectModel/oneWordMaskTIB/VM_JavaHeader.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm; import com.ibm.jikesrvm.classloader.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_AllocatorHeader; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_AllocatorHeader; //-#if RVM_WITH_OPT_COMPILER import com.ibm.jikesrvm.opt.*; import com.ibm.jikesrvm.opt.ir.*; Modified: rvmroot/trunk/rvm/src/vm/objectModel/oneWordTIBPtr/VM_JavaHeader.java =================================================================== --- rvmroot/trunk/rvm/src/vm/objectModel/oneWordTIBPtr/VM_JavaHeader.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/objectModel/oneWordTIBPtr/VM_JavaHeader.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -10,7 +10,7 @@ package com.ibm.jikesrvm; import com.ibm.jikesrvm.classloader.*; -import com.ibm.jikesrvm.memoryManagers.mmInterface.VM_AllocatorHeader; +import com.ibm.jikesrvm.memorymanagers.mmInterface.VM_AllocatorHeader; //-#if RVM_WITH_OPT_COMPILER import com.ibm.jikesrvm.opt.*; import com.ibm.jikesrvm.opt.ir.*; Modified: rvmroot/trunk/rvm/src/vm/runtime/VM_BootRecord.java =================================================================== --- rvmroot/trunk/rvm/src/vm/runtime/VM_BootRecord.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/runtime/VM_BootRecord.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -9,7 +9,7 @@ // $Id$ package com.ibm.jikesrvm; -import com.ibm.jikesrvm.memoryManagers.mmInterface.MM_Interface; +import com.ibm.jikesrvm.memorymanagers.mmInterface.MM_Interface; import org.vmmagic.pragma.*; import org.vmmagic.unboxed.*; Modified: rvmroot/trunk/rvm/src/vm/runtime/VM_Entrypoints.java =================================================================== --- rvmroot/trunk/rvm/src/vm/runtime/VM_Entrypoints.java 2006-10-29 07:42:43 UTC (rev 10929) +++ rvmroot/trunk/rvm/src/vm/runtime/VM_Entrypoints.java 2006-10-30 16:31:43 UTC (rev 10930) @@ -158,10 +158,10 @@ public static final VM_Field LQheadField = getField("Lorg/mmtk/utility/deque/LocalQueue;", "head","Lorg/vmmagic/unboxed/Address;"); public static final VM_Field SQBEField = getField("Lorg/mmtk/utility/deque/SharedDeque;", "bufsenqueued","I"); public static final VM_Field synchronizedCounterField = getField("Lcom/ibm/jikesrvm/mm/mmtk/SynchronizedCounter;", "count", "I"); - public static final VM_NormalMethod arrayStoreWriteBarrierMethod = getMethod("Lcom/ibm/jikesrvm/memoryManagers.mmInterface/MM_Interface;", ... [truncated message content] |
From: <dfr...@us...> - 2006-10-29 07:42:57
|
Revision: 10929 http://svn.sourceforge.net/jikesrvm/?rev=10929&view=rev Author: dframpton-oss Date: 2006-10-29 00:42:43 -0700 (Sun, 29 Oct 2006) Log Message: ----------- Moved semispace rebind to be part of mutator release to cope with phase reordering. Modified Paths: -------------- rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/SSMutator.java Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/SSMutator.java =================================================================== --- rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/SSMutator.java 2006-10-28 22:58:38 UTC (rev 10928) +++ rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/SSMutator.java 2006-10-29 07:42:43 UTC (rev 10929) @@ -170,14 +170,14 @@ public void collectionPhase(int phaseId, boolean primary) throws InlinePragma { if (phaseId == SS.PREPARE_MUTATOR) { - // rebind the allocation bump pointer to the appropriate semispace. - ss.rebind(SS.toSpace()); super.collectionPhase(phaseId, primary); return; } if (phaseId == SS.RELEASE_MUTATOR) { super.collectionPhase(phaseId, primary); + // rebind the allocation bump pointer to the appropriate semispace. + ss.rebind(SS.toSpace()); return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dfr...@us...> - 2006-10-28 22:58:50
|
Revision: 10928 http://svn.sourceforge.net/jikesrvm/?rev=10928&view=rev Author: dframpton-oss Date: 2006-10-28 15:58:38 -0700 (Sat, 28 Oct 2006) Log Message: ----------- Swapped PREPARE and PREPARE_MUTATOR phase ordering. For current collectors this should not affect regressions, but I will keep an eye on it. For collectors that do more work in PREPARE this will ensure mutator contexts have been flushed as expected. Modified Paths: -------------- rvmroot/trunk/MMTk/src/org/mmtk/plan/StopTheWorld.java Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/StopTheWorld.java =================================================================== --- rvmroot/trunk/MMTk/src/org/mmtk/plan/StopTheWorld.java 2006-10-27 13:40:57 UTC (rev 10927) +++ rvmroot/trunk/MMTk/src/org/mmtk/plan/StopTheWorld.java 2006-10-28 22:58:38 UTC (rev 10928) @@ -107,8 +107,8 @@ * Perform the initial determination of liveness from the roots. */ protected static final int rootClosurePhase = new ComplexPhase("initial-closure", null, new int[] { + PREPARE_MUTATOR, PREPARE, - PREPARE_MUTATOR, PRECOPY, BOOTIMAGE_ROOTS, ROOTS, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dgr...@us...> - 2006-10-27 13:42:01
|
Revision: 10927 http://svn.sourceforge.net/jikesrvm/?rev=10927&view=rev Author: dgrove-oss Date: 2006-10-27 06:40:57 -0700 (Fri, 27 Oct 2006) Log Message: ----------- JikesRVM ==> jikesrvm Modified Paths: -------------- rvmroot/trunk/bin/headerExceptionsFilter.awk Modified: rvmroot/trunk/bin/headerExceptionsFilter.awk =================================================================== --- rvmroot/trunk/bin/headerExceptionsFilter.awk 2006-10-26 21:41:23 UTC (rev 10926) +++ rvmroot/trunk/bin/headerExceptionsFilter.awk 2006-10-27 13:40:57 UTC (rev 10927) @@ -47,7 +47,7 @@ # actually has the right headers, but utf8 characters break the checkers /\/testing\/harness\/tests\/utf8\/utf8test.java/ {next} -/\/tools\/bootImageRunner\/com_ibm_JikesRVM_VM_0005fProcess.h/ { next } +/\/tools\/bootImageRunner\/com_ibm_jikesrvm_VM_0005fProcess.h/ { next } /\/tools\/bootImageWriter\/rvm.security/ { next } /\/tools\/preprocessor\/testFancy.preprocessor/ { next } /\/tools\/preprocessor\/testSimple.preprocessor/ { next } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dgr...@us...> - 2006-10-26 21:41:31
|
Revision: 10926 http://svn.sourceforge.net/jikesrvm/?rev=10926&view=rev Author: dgrove-oss Date: 2006-10-26 14:41:23 -0700 (Thu, 26 Oct 2006) Log Message: ----------- fix typo Modified Paths: -------------- rvmroot/trunk/bin/headerExceptionsFilter.awk Modified: rvmroot/trunk/bin/headerExceptionsFilter.awk =================================================================== --- rvmroot/trunk/bin/headerExceptionsFilter.awk 2006-10-26 21:04:16 UTC (rev 10925) +++ rvmroot/trunk/bin/headerExceptionsFilter.awk 2006-10-26 21:41:23 UTC (rev 10926) @@ -42,7 +42,7 @@ /\/testing\/harness\/tests\/pseudojbb\/pseudojbb/ {next} /\/testing\/harness\/tests\/pseudojbb\/props/ {next} /\/testing\/harness\/tests\/mauve\/mauve-jikesrvm/ {next} -/\/testing\/tests\/javaagent\/MANIFSET.MF/ {next} +/\/testing\/tests\/javaagent\/MANIFEST.MF/ {next} # actually has the right headers, but utf8 characters break the checkers /\/testing\/harness\/tests\/utf8\/utf8test.java/ {next} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dgr...@us...> - 2006-10-26 21:26:43
|
Revision: 10925 http://svn.sourceforge.net/jikesrvm/?rev=10925&view=rev Author: dgrove-oss Date: 2006-10-26 14:04:16 -0700 (Thu, 26 Oct 2006) Log Message: ----------- com.ibm.JikesRVM ===> com.ibm.jikesrvm in preparation for aligning directory and package stucture Modified Paths: -------------- rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ActivePlan.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Assert.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Barriers.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Collection.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Factory.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Lock.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Memory.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ObjectModel.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Options.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ReferenceGlue.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanBootImage.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanStatics.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/ScanThread.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Scanning.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Statistics.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/Strings.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/SynchronizedCounter.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/TraceInterface.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/gcspy/ByteStream.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/gcspy/IntStream.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/gcspy/ServerInterpreter.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/gcspy/ServerSpace.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/gcspy/ShortStream.java rvmroot/trunk/MMTk/ext/vm/jikesrvm/com/ibm/jikesrvm/mm/mmtk/gcspy/Util.java rvmroot/trunk/MMTk/src/org/mmtk/utility/Conversions.java rvmroot/trunk/NEWS rvmroot/trunk/bin/jconfigure rvmroot/trunk/doc/userguide/MMTk.tex rvmroot/trunk/doc/userguide/callbacks.tex rvmroot/trunk/doc/userguide/codingstyle.tex rvmroot/trunk/doc/userguide/componentOverview.tex rvmroot/trunk/doc/userguide/urls.tex rvmroot/trunk/etc/skel/Skeleton.MMTk.java rvmroot/trunk/etc/skel/Skeleton.java rvmroot/trunk/rvm/src/vm/Dummy.java rvmroot/trunk/rvm/src/vm/HPM/HPM_counters.java rvmroot/trunk/rvm/src/vm/HPM/HPM_info.java rvmroot/trunk/rvm/src/vm/HPM/Java2HPM.C rvmroot/trunk/rvm/src/vm/HPM/Java2HPM.java rvmroot/trunk/rvm/src/vm/HPM/VM_HardwarePerformanceMonitor.java rvmroot/trunk/rvm/src/vm/HPM/VM_HardwarePerformanceMonitors.java rvmroot/trunk/rvm/src/vm/HPM/VM_TraceWriter.java rvmroot/trunk/rvm/src/vm/VM.java rvmroot/trunk/rvm/src/vm/VM_Configuration.java rvmroot/trunk/rvm/src/vm/VM_Constants.java rvmroot/trunk/rvm/src/vm/VM_HeapLayoutConstants.java rvmroot/trunk/rvm/src/vm/VM_Properties.java rvmroot/trunk/rvm/src/vm/VM_SizeConstants.java rvmroot/trunk/rvm/src/vm/adaptive/controller/VM_AINewHotEdgeEvent.java rvmroot/trunk/rvm/src/vm/adaptive/controller/VM_AdaptiveInlining.java rvmroot/trunk/rvm/src/vm/adaptive/controller/VM_AnalyticModel.java rvmroot/trunk/rvm/src/vm/adaptive/controller/VM_Controller.java rvmroot/trunk/rvm/src/vm/adaptive/controller/VM_ControllerInputEvent.java rvmroot/trunk/rvm/src/vm/adaptive/controller/VM_ControllerMemory.java rvmroot/trunk/rvm/src/vm/adaptive/controller/VM_ControllerPlan.java rvmroot/trunk/rvm/src/vm/adaptive/controller/VM_ControllerThread.java rvmroot/trunk/rvm/src/vm/adaptive/controller/VM_HotMethodEvent.java rvmroot/trunk/rvm/src/vm/adaptive/controller/VM_HotMethodRecompilationEvent.java rvmroot/trunk/rvm/src/vm/adaptive/controller/VM_MultiLevelAdaptiveModel.java rvmroot/trunk/rvm/src/vm/adaptive/controller/VM_RecompilationChoice.java rvmroot/trunk/rvm/src/vm/adaptive/controller/VM_RecompilationStrategy.java rvmroot/trunk/rvm/src/vm/adaptive/controller/VM_RecompileOptChoice.java rvmroot/trunk/rvm/src/vm/adaptive/database/VM_AOSDatabase.java rvmroot/trunk/rvm/src/vm/adaptive/database/callGraph/VM_CallSite.java rvmroot/trunk/rvm/src/vm/adaptive/database/callGraph/VM_PartialCallGraph.java rvmroot/trunk/rvm/src/vm/adaptive/database/callGraph/VM_WeightedCallTargets.java rvmroot/trunk/rvm/src/vm/adaptive/database/methodSamples/VM_MethodCountData.java rvmroot/trunk/rvm/src/vm/adaptive/database/methodSamples/VM_MethodCountSet.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_BytecodeTraverser.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_Constants.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_ExecStateExtractor.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_ExecutionState.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_ObjectHolder.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/executionState/OSR_VariableElement.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_EncodedOSRMap.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_LocalRegPair.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_MapIterator.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_MethodVariables.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_OsrPointConstructor.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_VariableMap.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/optCompilationWithOsr/OSR_VariableMapElement.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_AConstNull.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_CheckCast.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_DoubleStore.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_FloatStore.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_Goto.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_IntStore.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_InvokeCompiledMethod.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_InvokeStatic.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadDoubleConst.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadFloatConst.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadIntConst.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadLongConst.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadRetAddrConst.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LoadWordConst.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_LongStore.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_Nop.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_ParamInitEnd.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_Pop.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/BC_RefStore.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/OSR_AdjustBCIndexes.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/OSR_PseudoBytecode.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/specialCompilation/OSR_SpecialCompiler.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/threadControls/OSR_Listener.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/threadControls/OSR_OnStackReplacementEvent.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/threadControls/OSR_OnStackReplacementPlan.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/threadControls/OSR_OnStackReplacementTrigger.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/threadControls/OSR_OrganizerThread.java rvmroot/trunk/rvm/src/vm/adaptive/onStackReplacement/util/OSR_Profiler.java rvmroot/trunk/rvm/src/vm/adaptive/recompilation/VM_CompilationThread.java rvmroot/trunk/rvm/src/vm/adaptive/recompilation/VM_CompilerDNA.java rvmroot/trunk/rvm/src/vm/adaptive/recompilation/VM_InvocationCounts.java rvmroot/trunk/rvm/src/vm/adaptive/recompilation/VM_PreCompile.java rvmroot/trunk/rvm/src/vm/adaptive/recompilation/instrumentation/OPT_InsertInstructionCounters.java rvmroot/trunk/rvm/src/vm/adaptive/recompilation/instrumentation/OPT_InsertMethodInvocationCounter.java rvmroot/trunk/rvm/src/vm/adaptive/recompilation/instrumentation/OPT_InsertYieldpointCounters.java rvmroot/trunk/rvm/src/vm/adaptive/recompilation/instrumentation/OPT_InstrumentationSamplingFramework.java rvmroot/trunk/rvm/src/vm/adaptive/recompilation/instrumentation/OPT_LowerInstrumentation.java rvmroot/trunk/rvm/src/vm/adaptive/recompilation/instrumentation/VM_AOSInstrumentationPlan.java rvmroot/trunk/rvm/src/vm/adaptive/recompilation/instrumentation/VM_CounterBasedSampling.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/VM_Decayable.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/VM_Reportable.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/VM_RuntimeMeasurements.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/instrumentation/VM_CounterArrayManager.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/instrumentation/VM_CounterNameFunction.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/instrumentation/VM_Instrumentation.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/instrumentation/VM_ManagedCounterData.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/instrumentation/VM_MethodInvocationCounterData.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/instrumentation/VM_MethodNameFunction.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/instrumentation/VM_StringEventCounterData.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/instrumentation/VM_YieldpointCounterData.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/listeners/VM_CallDensityListener.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/listeners/VM_ContextListener.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/listeners/VM_EdgeListener.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/listeners/VM_Listener.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/listeners/VM_MethodListener.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/listeners/VM_NullListener.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/listeners/VM_YieldCounterListener.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/organizers/VM_AccumulatingMethodSampleOrganizer.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/organizers/VM_DecayOrganizer.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/organizers/VM_DynamicCallGraphOrganizer.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/organizers/VM_MethodSampleOrganizer.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/organizers/VM_MissingHotCallEdgeOrganizer.java rvmroot/trunk/rvm/src/vm/adaptive/runtimeMeasurements/organizers/VM_Organizer.java rvmroot/trunk/rvm/src/vm/adaptive/utility/VM_AOSGenerator.java rvmroot/trunk/rvm/src/vm/adaptive/utility/VM_AOSLogging.java rvmroot/trunk/rvm/src/vm/adaptive/utility/VM_AOSOptions.java rvmroot/trunk/rvm/src/vm/adaptive/utility/VM_AOSOptions.template rvmroot/trunk/rvm/src/vm/adaptive/utility/VM_BlockingPriorityQueue.java rvmroot/trunk/rvm/src/vm/adaptive/utility/VM_CompilerAdvice.java rvmroot/trunk/rvm/src/vm/adaptive/utility/VM_CompilerAdviceAttribute.java rvmroot/trunk/rvm/src/vm/adaptive/utility/VM_CompilerAdviceInfoReader.java rvmroot/trunk/rvm/src/vm/adaptive/utility/VM_DynamicCallAttribute.java rvmroot/trunk/rvm/src/vm/adaptive/utility/VM_DynamicCallFileInfoReader.java rvmroot/trunk/rvm/src/vm/adaptive/utility/VM_PriorityQueue.java rvmroot/trunk/rvm/src/vm/adaptive/utility/VM_UnResolvedCallSite.java rvmroot/trunk/rvm/src/vm/adaptive/utility/VM_UnResolvedWeightedCallTargets.java rvmroot/trunk/rvm/src/vm/arch/intel/VM_RegisterConstants.java rvmroot/trunk/rvm/src/vm/arch/intel/VM_Registers.java rvmroot/trunk/rvm/src/vm/arch/intel/VM_StackframeLayoutConstants.java rvmroot/trunk/rvm/src/vm/arch/intel/VM_TrapConstants.java rvmroot/trunk/rvm/src/vm/arch/intel/assembler/VM_Assembler.in rvmroot/trunk/rvm/src/vm/arch/intel/assembler/VM_AssemblerConstants.java rvmroot/trunk/rvm/src/vm/arch/intel/assembler/VM_Lister.java rvmroot/trunk/rvm/src/vm/arch/intel/assembler/VM_MachineCode.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/GCMap/VM_BaselineGCMapIterator.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/VM_BaselineConstants.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/VM_BaselineExceptionDeliverer.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/VM_Compiler.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/VM_MultianewarrayHelper.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/baseline/writeBarrier/VM_Barriers.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/OPT_GenerateMachineSpecificMagic.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/OPT_MIROptimizationPlanner.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/ir/conversions/lir2mir/OPT_BURS_Helpers.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/ir/conversions/lir2mir/OPT_ComplexLIR2MIRExpansion.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/ir/conversions/lir2mir/OPT_ConvertALUOperators.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/ir/conversions/lir2mir/OPT_NormalizeConstants.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/ir/conversions/mir2mc/GenerateAssembler.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/ir/conversions/mir2mc/Makefile rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/ir/conversions/mir2mc/OPT_AssemblerBase.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/ir/conversions/mir2mc/OPT_FinalMIRExpansion.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/ir/conversions/mir2mc/VM.fake rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/ir/conversions/mir2mc/VM_CodeArray.fake rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/ir/conversions/mir2mc/VM_Compiler.fake rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/ir/conversions/mir2mc/VM_Control.fake rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/ir/conversions/mir2mc/VM_Lister.fake rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/ir/conversions/mir2mc/VM_MachineCode.fake rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/ir/conversions/mir2mc/VM_Magic.fake rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/ir/instruction/OPT_RegisterPool.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/ir/instruction/operand/OPT_BURSManagedFPROperand.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/ir/instruction/operand/OPT_IA32ConditionOperand.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/regalloc/OPT_CallingConvention.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/regalloc/OPT_ExpandFPRStackConvention.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/regalloc/OPT_MIRSplitRanges.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/regalloc/OPT_PhysicalDefUse.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/regalloc/OPT_PhysicalRegisterConstants.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/regalloc/OPT_PhysicalRegisterSet.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/regalloc/OPT_PhysicalRegisterTools.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/regalloc/OPT_RegisterPreferences.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/regalloc/OPT_RegisterRestrictions.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/regalloc/OPT_StackManager.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/vmInterface/services/VM_OptExceptionDeliverer.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/vmInterface/services/VM_OptGCMapIterator.java rvmroot/trunk/rvm/src/vm/arch/intel/compilers/optimizing/vmInterface/services/VM_OptGCMapIteratorConstants.java rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_BaselineExecStateExtractor.java rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_CodeInstaller.java rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_OptExecStateExtractor.java rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_PostThreadSwitch.java rvmroot/trunk/rvm/src/vm/arch/intel/executionState/OSR_TempRegisters.java rvmroot/trunk/rvm/src/vm/arch/intel/jni/VM_JNICompiler.java rvmroot/trunk/rvm/src/vm/arch/intel/jni/VM_JNIGCMapIterator.java rvmroot/trunk/rvm/src/vm/arch/intel/jni/VM_JNIHelpers.java rvmroot/trunk/rvm/src/vm/arch/intel/runtime/VM_CodeArray.java rvmroot/trunk/rvm/src/vm/arch/intel/runtime/VM_DynamicLinkerHelper.java rvmroot/trunk/rvm/src/vm/arch/intel/runtime/VM_InterfaceMethodConflictResolver.java rvmroot/trunk/rvm/src/vm/arch/intel/runtime/VM_LazyCompilationTrampolineGenerator.java rvmroot/trunk/rvm/src/vm/arch/intel/runtime/VM_MachineReflection.java rvmroot/trunk/rvm/src/vm/arch/intel/runtime/VM_OutOfLineMachineCode.java rvmroot/trunk/rvm/src/vm/arch/intel/runtime/VM_ProcessorLocalState.java rvmroot/trunk/rvm/src/vm/arch/powerPC/VM_RegisterConstants.java rvmroot/trunk/rvm/src/vm/arch/powerPC/VM_Registers.java rvmroot/trunk/rvm/src/vm/arch/powerPC/VM_StackframeLayoutConstants.java rvmroot/trunk/rvm/src/vm/arch/powerPC/VM_TrapConstants.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/GCMap/VM_BaselineGCMapIterator.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_Assembler.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_AssemblerConstants.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_BaselineConstants.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_BaselineExceptionDeliverer.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_Compiler.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_MachineCode.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/VM_MultianewarrayHelper.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/baseline/writeBarrier/VM_Barriers.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/OPT_GenerateMachineSpecificMagic.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/OPT_MIROptimizationPlanner.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/ir/conversions/lir2mir/OPT_BURS_Helpers.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/ir/conversions/lir2mir/OPT_ComplexLIR2MIRExpansion.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/ir/conversions/lir2mir/OPT_ConvertALUOperators.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/ir/conversions/lir2mir/OPT_NormalizeConstants.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/ir/conversions/mir2mc/OPT_Assembler.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/ir/conversions/mir2mc/OPT_FinalMIRExpansion.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/ir/instruction/OPT_RegisterPool.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/ir/instruction/operand/OPT_PowerPCConditionOperand.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/ir/instruction/operand/OPT_PowerPCTrapOperand.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/regalloc/OPT_CallingConvention.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/regalloc/OPT_MIRSplitRanges.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/regalloc/OPT_PhysicalDefUse.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/regalloc/OPT_PhysicalRegisterConstants.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/regalloc/OPT_PhysicalRegisterSet.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/regalloc/OPT_PhysicalRegisterTools.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/regalloc/OPT_RegisterPreferences.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/regalloc/OPT_RegisterRestrictions.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/regalloc/OPT_StackManager.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/vmInterface/services/VM_OptExceptionDeliverer.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/vmInterface/services/VM_OptGCMapIterator.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/optimizing/vmInterface/services/VM_OptGCMapIteratorConstants.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/GCMap/VM_QuickGCMapIterator.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/VM_QuickCompiler.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/VM_QuickConstants.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/VM_QuickExceptionDeliverer.java rvmroot/trunk/rvm/src/vm/arch/powerPC/compilers/quick/writeBarrier/VM_QuickBarriers.java rvmroot/trunk/rvm/src/vm/arch/powerPC/disassembler/PPC_Disassembler.java rvmroot/trunk/rvm/src/vm/arch/powerPC/disassembler/opcodeXX.java rvmroot/trunk/rvm/src/vm/arch/powerPC/disassembler/opcode_tab.java rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_BaselineExecStateExtractor.java rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_CodeInstaller.java rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_OptExecStateExtractor.java rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_PostThreadSwitch.java rvmroot/trunk/rvm/src/vm/arch/powerPC/executionState/OSR_TempRegisters.java rvmroot/trunk/rvm/src/vm/arch/powerPC/jni/VM_JNICompiler.java rvmroot/trunk/rvm/src/vm/arch/powerPC/jni/VM_JNIConstants.java rvmroot/trunk/rvm/src/vm/arch/powerPC/jni/VM_JNIGCMapIterator.java rvmroot/trunk/rvm/src/vm/arch/powerPC/jni/VM_JNIHelpers.java rvmroot/trunk/rvm/src/vm/arch/powerPC/jni/VM_JNIStackframeLayoutConstants.java rvmroot/trunk/rvm/src/vm/arch/powerPC/runtime/VM_CodeArray.java rvmroot/trunk/rvm/src/vm/arch/powerPC/runtime/VM_DynamicLinkerHelper.java rvmroot/trunk/rvm/src/vm/arch/powerPC/runtime/VM_InterfaceMethodConflictResolver.java rvmroot/trunk/rvm/src/vm/arch/powerPC/runtime/VM_LazyCompilationTrampolineGenerator.java rvmroot/trunk/rvm/src/vm/arch/powerPC/runtime/VM_MachineReflection.java rvmroot/trunk/rvm/src/vm/arch/powerPC/runtime/VM_OutOfLineMachineCode.java rvmroot/trunk/rvm/src/vm/arch/powerPC/runtime/VM_ProcessorLocalState.java rvmroot/trunk/rvm/src/vm/classLoader/ApplicationClassLoader.java rvmroot/trunk/rvm/src/vm/classLoader/VM_AbstractMethod.java rvmroot/trunk/rvm/src/vm/classLoader/VM_AnnotatedElement.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Annotation.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Array.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Atom.java rvmroot/trunk/rvm/src/vm/classLoader/VM_BootstrapClassLoader.java rvmroot/trunk/rvm/src/vm/classLoader/VM_BytecodeConstants.java rvmroot/trunk/rvm/src/vm/classLoader/VM_BytecodeStream.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Class.java rvmroot/trunk/rvm/src/vm/classLoader/VM_ClassLoader.java rvmroot/trunk/rvm/src/vm/classLoader/VM_ClassLoaderConstants.java rvmroot/trunk/rvm/src/vm/classLoader/VM_DynamicTypeCheck.java rvmroot/trunk/rvm/src/vm/classLoader/VM_ExceptionHandlerMap.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Field.java rvmroot/trunk/rvm/src/vm/classLoader/VM_FieldReference.java rvmroot/trunk/rvm/src/vm/classLoader/VM_FieldVector.java rvmroot/trunk/rvm/src/vm/classLoader/VM_InterfaceInvocation.java rvmroot/trunk/rvm/src/vm/classLoader/VM_InterfaceMethodSignature.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Member.java rvmroot/trunk/rvm/src/vm/classLoader/VM_MemberReference.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Method.java rvmroot/trunk/rvm/src/vm/classLoader/VM_MethodReference.java rvmroot/trunk/rvm/src/vm/classLoader/VM_MethodVector.java rvmroot/trunk/rvm/src/vm/classLoader/VM_NativeMethod.java rvmroot/trunk/rvm/src/vm/classLoader/VM_NormalMethod.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Primitive.java rvmroot/trunk/rvm/src/vm/classLoader/VM_TableBasedDynamicLinker.java rvmroot/trunk/rvm/src/vm/classLoader/VM_Type.java rvmroot/trunk/rvm/src/vm/classLoader/VM_TypeDescriptorParsing.java rvmroot/trunk/rvm/src/vm/classLoader/VM_TypeReference.java rvmroot/trunk/rvm/src/vm/classLoader/VM_TypeReferenceVector.java rvmroot/trunk/rvm/src/vm/classLoader/VM_UTF8Convert.java rvmroot/trunk/rvm/src/vm/compilers/baseline/GCMap/VM_BBConstants.java rvmroot/trunk/rvm/src/vm/compilers/baseline/GCMap/VM_BasicBlock.java rvmroot/trunk/rvm/src/vm/compilers/baseline/GCMap/VM_BasicBlockFactory.java rvmroot/trunk/rvm/src/vm/compilers/baseline/GCMap/VM_BuildBB.java rvmroot/trunk/rvm/src/vm/compilers/baseline/GCMap/VM_BuildReferenceMaps.java rvmroot/trunk/rvm/src/vm/compilers/baseline/GCMap/VM_JSRInfo.java rvmroot/trunk/rvm/src/vm/compilers/baseline/GCMap/VM_JSRSubroutineInfo.java rvmroot/trunk/rvm/src/vm/compilers/baseline/GCMap/VM_PendingRETInfo.java rvmroot/trunk/rvm/src/vm/compilers/baseline/GCMap/VM_ReferenceMaps.java rvmroot/trunk/rvm/src/vm/compilers/baseline/GCMap/VM_UnusualMaps.java rvmroot/trunk/rvm/src/vm/compilers/baseline/VM_BaselineCompiledMethod.java rvmroot/trunk/rvm/src/vm/compilers/baseline/VM_BaselineCompiler.java rvmroot/trunk/rvm/src/vm/compilers/baseline/VM_BaselineExceptionTable.java rvmroot/trunk/rvm/src/vm/compilers/baseline/VM_BaselineOptions.template rvmroot/trunk/rvm/src/vm/compilers/baseline/VM_CompilerFramework.java rvmroot/trunk/rvm/src/vm/compilers/baseline/VM_ForwardReference.java rvmroot/trunk/rvm/src/vm/compilers/baseline/profiling/VM_BranchProfile.java rvmroot/trunk/rvm/src/vm/compilers/baseline/profiling/VM_BranchProfiles.java rvmroot/trunk/rvm/src/vm/compilers/baseline/profiling/VM_ConditionalBranchProfile.java rvmroot/trunk/rvm/src/vm/compilers/baseline/profiling/VM_EdgeCounts.java rvmroot/trunk/rvm/src/vm/compilers/baseline/profiling/VM_SwitchBranchProfile.java rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_CodeFinder.java rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_CompiledMethod.java rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_CompiledMethods.java rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_ExceptionTable.java rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_HardwareTrapCompiledMethod.java rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_HardwareTrapGCMapIterator.java rvmroot/trunk/rvm/src/vm/compilers/compiledCode/VM_RecompilationManager.java rvmroot/trunk/rvm/src/vm/compilers/harness/bootImage/VM_BootImageCompiler.java rvmroot/trunk/rvm/src/vm/compilers/harness/bootImage/baseline/VM_BaselineBootImageCompiler.java rvmroot/trunk/rvm/src/vm/compilers/harness/bootImage/optimizing/VM_OptimizingBootImageCompiler.java rvmroot/trunk/rvm/src/vm/compilers/harness/bootImage/quick/VM_QuickBootImageCompiler.java rvmroot/trunk/rvm/src/vm/compilers/harness/runtime/VM_RuntimeCompiler.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/driver/OPT_CompilationPlan.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/driver/OPT_Compiler.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/driver/OPT_CompilerPhase.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/driver/OPT_Constants.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/driver/OPT_IRPrinter.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/driver/OPT_InstrumentationPlan.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/driver/OPT_OptimizationPlanAtomicElement.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/driver/OPT_OptimizationPlanCompositeElement.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/driver/OPT_OptimizationPlanElement.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/driver/OPT_OptimizationPlanner.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/driver/OPT_Options.template rvmroot/trunk/rvm/src/vm/compilers/optimizing/driver/OptDummy.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/driver/ValueOptions.dat rvmroot/trunk/rvm/src/vm/compilers/optimizing/instrumentation/OPT_InstrumentedEventCounterManager.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/OPT_HIRInfo.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/OPT_IR.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/OPT_LIRInfo.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/OPT_MIRInfo.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/cfg/OPT_BasicBlock.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/cfg/OPT_ControlFlowGraph.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/cfg/OPT_ExceptionHandlerBasicBlock.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/cfg/OPT_ExceptionHandlerBasicBlockBag.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/cfg/OPT_InlineSequence.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/cfg/OPT_WeightedBranchTargets.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/bc2hir/OPT_BC2IR.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/bc2hir/OPT_ConvertBCtoHIR.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/bc2hir/OPT_GenerateMagic.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/bc2hir/OPT_GenerationContext.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/bc2hir/OPT_IRGenOptions.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/hir2lir/OPT_ConvertHIRtoLIR.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/hir2lir/OPT_ConvertToLowLevelIR.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/hir2lir/OPT_DynamicTypeCheckExpansion.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/hir2lir/OPT_ExpandRuntimeServices.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/lir2mir/OPT_BURS.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/lir2mir/OPT_BURS_Common_Helpers.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/lir2mir/OPT_BURS_IntConstantTreeNode.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/lir2mir/OPT_BURS_MemOp_Helpers.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/lir2mir/OPT_BURS_TreeNode.template rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/lir2mir/OPT_ConvertLIRtoMIR.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/lir2mir/OPT_MinimalBURS.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/lir2mir/OPT_NormalBURS.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/lir2mir/OPT_SplitBasicBlock.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/conversions/mir2mc/OPT_ConvertMIRtoMC.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/gcmap/OPT_GCIRMap.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/gcmap/OPT_GCIRMapElement.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/gcmap/OPT_GCIRMapEnumerator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/gcmap/OPT_RegSpillListElement.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/gcmap/OPT_RegSpillListEnumerator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/Makefile rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/OPT_AbstractRegisterPool.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/OPT_GenericRegisterPool.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/OPT_Instruction.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/OPT_Operator.template rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/OPT_OperatorNames.template rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/OPT_Operators.template rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/OPT_Register.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_AddressConstantOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_BasicBlockOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_BranchOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_BranchProfileOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_ClassConstantOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_ConditionOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_ConstantOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_DoubleConstantOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_FloatConstantOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_InlinedOsrTypeInfoOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_IntConstantOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_LocationOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_LongConstantOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_MemoryOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_MethodOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_NullConstantOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_Operand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_OperandEnumeration.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_OsrTypeInfoOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_RegisterOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_RegisterOperandEnumeration.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_StackLocationOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_StringConstantOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_TrapCodeOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_TrueGuardOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_TypeOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/instruction/operand/OPT_UnreachableOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/util/OPT_BasicBlockEnumeration.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/util/OPT_CompilationState.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/util/OPT_EmptyBasicBlockEnumeration.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/util/OPT_EmptyInstructionEnumeration.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/util/OPT_IREnumeration.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/util/OPT_IRTools.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/ir/util/OPT_InstructionEnumeration.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/OPT_AdjustBranchProbabilities.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/OPT_BranchOptimizationDriver.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/OPT_BranchOptimizations.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/OPT_CFGTransformations.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/OPT_Diamond.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/OPT_EstimateBlockFrequencies.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/OPT_LoopUnrolling.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/OPT_MIRBranchOptimizations.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/OPT_ReorderingPhase.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/OPT_StaticSplitting.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/OPT_TailRecursionElimination.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/OPT_YieldPoints.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/dominators/OPT_BuildLST.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/dominators/OPT_DominanceFrontier.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/dominators/OPT_DominatorInfo.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/dominators/OPT_DominatorTree.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/dominators/OPT_DominatorTreeNode.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/dominators/OPT_DominatorTreePhase.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/dominators/OPT_Dominators.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/dominators/OPT_DominatorsPhase.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/dominators/OPT_LSTGraph.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/dominators/OPT_LSTNode.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/dominators/OPT_LTDominatorInfo.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/dominators/OPT_LTDominators.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/control/dominators/OPT_PostDominatorsPhase.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/coalesce/OPT_Coalesce.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/coalesce/OPT_CoalesceMoves.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/liveRangeSplitting/OPT_LiveRangeSplitting.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/liveRangeSplitting/OPT_MutateSplits.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/liveness/OPT_LiveAnalysis.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/liveness/OPT_LiveInterval.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/liveness/OPT_LiveIntervalElement.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/liveness/OPT_LiveIntervalEnumeration.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/liveness/OPT_LiveSet.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/liveness/OPT_LiveSetElement.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/liveness/OPT_LiveSetEnumerator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/simpleSSA/OPT_DefUse.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/simpleSSA/OPT_Simple.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/simpleSSA/escape/OPT_AggregateReplacer.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/simpleSSA/escape/OPT_EscapeTransformations.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/simpleSSA/escape/OPT_FI_EscapeSummary.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/simpleSSA/escape/OPT_ObjectReplacer.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/simpleSSA/escape/OPT_ShortArrayReplacer.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/simpleSSA/escape/OPT_SimpleEscape.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/simpleSSA/escape/OPT_UnsyncReplacer.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/builder/OPT_EnterSSA.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/builder/OPT_HeapOperand.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/builder/OPT_HeapVariable.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/builder/OPT_LeaveSSA.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/builder/OPT_PiNodes.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/builder/OPT_SSA.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/builder/OPT_SSADictionary.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/builder/OPT_SSAOptions.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/builder/OPT_SSATuneUp.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/codePlacement/OPT_GCP.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/codePlacement/OPT_GlobalCSE.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/codePlacement/OPT_LICM.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/expressionFolding/OPT_ExpressionFolding.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/gvn/OPT_GVCongruenceClass.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/gvn/OPT_GlobalValueNumber.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/gvn/OPT_GlobalValueNumberState.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/gvn/OPT_ValueGraph.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/gvn/OPT_ValueGraphEdge.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/gvn/OPT_ValueGraphParamLabel.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/gvn/OPT_ValueGraphVertex.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/gvn/OPT_ValueNumberPair.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/gvn/indexEquivalence/OPT_UniformlyGeneratedGVN.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/loadElimination/OPT_IndexPropagation.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/loadElimination/OPT_IndexPropagationSystem.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/loadElimination/OPT_LoadElimination.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/loopAnalysis/OPT_AnnotatedLSTGraph.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/loopAnalysis/OPT_AnnotatedLSTNode.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/loopAnalysis/OPT_LoopAnalysis.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/loopAnalysis/OPT_LoopVersioning.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/global/ssa/redundantBranchElimination/OPT_RedundantBranchElimination.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/ipa/inlining/OPT_CallSite.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/ipa/inlining/OPT_DefaultInlineOracle.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/ipa/inlining/OPT_InlineDecision.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/ipa/inlining/OPT_InlineOracle.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/ipa/inlining/OPT_InlineTools.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/ipa/inlining/OPT_Inliner.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/ipa/specialization/OPT_InvokeeThreadLocalContext.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/ipa/specialization/OPT_SpecializationContext.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/ipa/specialization/OPT_SpecializationDatabase.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/ipa/specialization/OPT_SpecializedMethod.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/ipa/specialization/OPT_SpecializedMethodPool.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/ipa/summaries/OPT_ClassLoadingDependencyManager.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/ipa/summaries/OPT_ClassSummary.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/ipa/summaries/OPT_FieldAnalysis.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/ipa/summaries/OPT_FieldDatabase.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/ipa/summaries/OPT_InterfaceHierarchy.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/ipa/summaries/OPT_InvalidationDatabase.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/ipa/summaries/OPT_MethodSummary.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/ipa/summaries/OPT_SummaryDatabase.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/OPT_BranchSimplifier.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/OPT_IRSummary.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/OPT_LocalCSE.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/OPT_LocalCastOptimization.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/OPT_LocalConstantProp.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/OPT_LocalCopyProp.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/OPT_NullCheckCombining.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/OPT_Simplifier.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/depGraph/OPT_DepGraph.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/depGraph/OPT_DepGraphConstants.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/depGraph/OPT_DepGraphEdge.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/depGraph/OPT_DepGraphNode.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/depGraph/OPT_DepGraphStats.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/instructionScheduler/OPT_DefaultPriority.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/instructionScheduler/OPT_ListPriority.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/instructionScheduler/OPT_OperatorClass.template rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/instructionScheduler/OPT_PrePassScheduler.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/instructionScheduler/OPT_Priority.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/instructionScheduler/OPT_ResourceMap.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/instructionScheduler/OPT_ResourceReservation.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/instructionScheduler/OPT_Scheduler.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/optimizations/local/instructionScheduler/OPT_SchedulingInfo.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/regalloc/linearScan/OPT_LinearScan.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/regalloc/linearScan/OPT_RegisterAllocator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/regalloc/linearScan/OPT_ScratchMap.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/regalloc/util/OPT_BlockCountSpillCost.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/regalloc/util/OPT_BrainDeadSpillCost.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/regalloc/util/OPT_CoalesceGraph.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/regalloc/util/OPT_ExpandCallingConvention.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/regalloc/util/OPT_GenericPhysicalRegisterSet.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/regalloc/util/OPT_GenericPhysicalRegisterTools.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/regalloc/util/OPT_GenericRegisterPreferences.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/regalloc/util/OPT_GenericRegisterRestrictions.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/regalloc/util/OPT_GenericStackManager.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/regalloc/util/OPT_PrologueEpilogueCreator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/regalloc/util/OPT_RegisterAllocatorState.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/regalloc/util/OPT_SimpleSpillCost.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/regalloc/util/OPT_SpillCostEstimator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/OPT_Bits.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/dataflowUtil/OPT_DF_AbstractCell.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/dataflowUtil/OPT_DF_Edge.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/dataflowUtil/OPT_DF_Equation.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/dataflowUtil/OPT_DF_Graph.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/dataflowUtil/OPT_DF_LatticeCell.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/dataflowUtil/OPT_DF_Operator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/dataflowUtil/OPT_DF_Solution.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/dataflowUtil/OPT_DF_System.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/dataflowUtil/OPT_Solvable.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/exception/OPT_MagicNotImplementedException.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/exception/OPT_OperationNotImplementedException.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/exception/OPT_OptimizingCompilerException.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_BreadthFirstEnumerator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_CallSiteTree.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_CallSiteTreeNode.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_DFS.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_DFSenumerateByFinish.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_DepthFirstEnumerator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_EdgelessGraph.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_EdgelessGraphNode.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_FilteredDFSenumerateByFinish.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_Graph.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_GraphEdge.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_GraphEdgeFilter.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_GraphElement.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_GraphNode.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_GraphNodeEnumeration.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_GraphUtilities.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_ReverseDFS.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_ReverseDFSenumerateByFinish.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_ReverseFilteredDFSenumerateByFinish.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_SCC.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_SCC_Engine.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_SCC_Enumeration.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_SCC_Graph.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_SCC_Vertex.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_SortedGraphIterator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_SortedGraphNode.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_SpaceEffGraph.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_SpaceEffGraphEdge.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_SpaceEffGraphEdgeList.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_SpaceEffGraphEdgeListHeader.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_SpaceEffGraphNode.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_SpaceEffGraphNodeList.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_SpaceEffGraphNodeListHeader.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_TopSort.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_TopSortInterface.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_Tree.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_TreeBottomUpEnumerator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_TreeNode.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_TreeNodeChildrenEnumerator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/OPT_TreeTopDownEnumerator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/vis/OPT_VisEdge.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/vis/OPT_VisGraph.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/vis/OPT_VisNode.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/vis/dot/OPT_Dot.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/vis/dot/OPT_DotConstants.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/vis/dot/OPT_DotEdge.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/vis/dot/OPT_DotGraph.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/vis/dot/OPT_DotNode.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/vis/dot/OPT_DotUtils.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/vis/vcg/OPT_VCG.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/vis/vcg/OPT_VCGConstants.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/vis/vcg/OPT_VCGEdge.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/vis/vcg/OPT_VCGGraph.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/graph/vis/vcg/OPT_VCGNode.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/list/OPT_DoublyLinkedList.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/list/OPT_DoublyLinkedListElement.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/list/OPT_LinkedList.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/list/OPT_LinkedListElement.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/list/OPT_LinkedListEnumerator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/list/OPT_LinkedListObjectElement.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/list/OPT_LinkedListObjectEnumerator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/list/OPT_Queue.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/set/OPT_BitSet.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/set/OPT_BitSetMapping.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/set/OPT_BitVector.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/set/OPT_CompoundEnumerator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/set/OPT_EmptyEnumerator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/set/OPT_EmptyIterator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/set/OPT_EmptySet.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/set/OPT_EnumerationIterator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/set/OPT_FilterEnumerator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/set/OPT_FilterIterator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/set/OPT_IteratorEnumerator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/set/OPT_LinkedListSet.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/set/OPT_Pair.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/set/OPT_ReverseEnumerator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/set/OPT_SingletonIterator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/set/OPT_SingletonSet.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/set/OPT_SmallStack.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/util/set/OPT_Stack.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/vmInterface/classLoader/OPT_ClassLoaderProxy.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/vmInterface/classLoader/OPT_StaticFieldReader.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/vmInterface/services/VM_OptCompiledMethod.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/vmInterface/services/VM_OptEncodedCallSiteTree.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/vmInterface/services/VM_OptExceptionTable.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/vmInterface/services/VM_OptGCMap.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/vmInterface/services/VM_OptGenericGCMapIterator.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/vmInterface/services/VM_OptLinker.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/vmInterface/services/VM_OptMachineCodeMap.java rvmroot/trunk/rvm/src/vm/compilers/optimizing/vmInterface/services/VM_OptSaveVolatile.java rvmroot/trunk/rvm/src/vm/compilers/quick/GCMap/VM_BuildQuickReferenceMaps.java rvmroot/trunk/rvm/src/vm/compilers/quick/GCMap/VM_QuickReferenceMaps.java rvmroot/trunk/rvm/src/vm/compilers/quick/GCMap/VM_QuickUnusualMaps.java rvmroot/trunk/rvm/src/vm/compilers/quick/VM_QuickCompiledMethod.java rvmroot/trunk/rvm/src/vm/compilers/quick/VM_QuickExceptionTable.java rvmroot/trunk/rvm/src/vm/compilers/quick/VM_QuickOptions.template rvmroot/trunk/rvm/src/vm/compilers/quick/util/VM_QuickCompilerException.java rvmroot/trunk/rvm/src/vm/jni/BuildJNIFunctionTable.java rvmroot/trunk/rvm/src/v... [truncated message content] |
From: <cap...@us...> - 2006-10-26 20:44:38
|
Revision: 10924 http://svn.sourceforge.net/jikesrvm/?rev=10924&view=rev Author: captain5050 Date: 2006-10-26 13:44:33 -0700 (Thu, 26 Oct 2006) Log Message: ----------- Revise for Java 1.5 Modified Paths: -------------- rvmroot/trunk/rvm/src/vm/libSupport/gnu/classpath/VMSystemProperties.java Modified: rvmroot/trunk/rvm/src/vm/libSupport/gnu/classpath/VMSystemProperties.java =================================================================== --- rvmroot/trunk/rvm/src/vm/libSupport/gnu/classpath/VMSystemProperties.java 2006-10-26 04:39:51 UTC (rev 10923) +++ rvmroot/trunk/rvm/src/vm/libSupport/gnu/classpath/VMSystemProperties.java 2006-10-26 20:44:33 UTC (rev 10924) @@ -37,37 +37,33 @@ * */ public static void preInit(Properties p) { - p.put("java.version", "1.4.2"); /* This is a lie, of course -- we don't - really support all 1.4 features, such + p.put("java.version", "1.5.0"); /* This is a lie, of course -- we don't + really support all 1.5 features, such as assertions. However, it is a necessary lie, since Eclipse 3.0 explicitly tests java.version and insists upon at least 1.4.1 to run. */ p.put("java.vendor", "Jikes RVM Project"); p.put("java.vm.vendor", "Jikes RVM Project"); - p.put("java.vendor.url", "http://oss.software.ibm.com"); + p.put("java.vendor.url", "http://jikesrvm.sourceforge.net"); p.put("java.specification.name", "Java Platform API Specification"); p.put("java.specification.vendor", "Sun Microsystems Inc."); - p.put("java.specification.version", "1.4"); + p.put("java.specification.version", "1.5"); p.put("java.vm.specification.name", "Java Virtual Machine Specification"); p.put("java.vm.specification.vendor", "Sun Microsystems Inc."); p.put("java.vm.specification.version", "1.0"); - /* 48.0 brings us through Java version 1.4. Java 1.5 bumps the class file - format up to 49.0. The changes for version 49.0 are described at - <http://java.sun.com/docs/books/vmspec/2nd-edition/jvms-proposed-changes.html>; - I don't have a reference to version 49.0 handy (yet). - --augart, 13 Sept 2004 */ - p.put("java.class.version", "48.0"); + /* 49.0 brings us through Java version 1.5. */ + p.put("java.class.version", "49.0"); p.put("file.separator", "/"); p.put("path.separator", ":"); p.put("line.separator", "\n"); p.put("java.compiler", "JikesRVM"); - p.put("java.vm.version", "1.4.2"); + p.put("java.vm.version", "1.5.0"); p.put("java.vm.name", "JikesRVM"); p.put("file.encoding", "8859_1"); p.put("java.io.tmpdir", "/tmp"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dfr...@us...> - 2006-10-26 04:40:05
|
Revision: 10923 http://svn.sourceforge.net/jikesrvm/?rev=10923&view=rev Author: dframpton-oss Date: 2006-10-25 21:39:51 -0700 (Wed, 25 Oct 2006) Log Message: ----------- Patch 1514837 GC Tracing patch (Matthew Hertz) Modified Paths: -------------- rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTrace.java rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceCollector.java rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceMutator.java rvmroot/trunk/MMTk/src/org/mmtk/utility/TraceGenerator.java rvmroot/trunk/MMTk/src/org/mmtk/utility/deque/TraceBuffer.java Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTrace.java =================================================================== --- rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTrace.java 2006-10-24 04:24:12 UTC (rev 10922) +++ rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTrace.java 2006-10-26 04:39:51 UTC (rev 10923) @@ -96,11 +96,11 @@ */ /* Spaces */ - public static final RawPageSpace traceSpace = new RawPageSpace("trace", DEFAULT_POLL_FREQUENCY, META_DATA_MB); - + public static final RawPageSpace traceSpace = new RawPageSpace("trace", DEFAULT_POLL_FREQUENCY, META_DATA_MB<<2); public static final int TRACE = traceSpace.getDescriptor(); /* GC state */ + public static boolean lastGCWasTracing = false; // True when previous GC was for tracing public static boolean traceInducedGC = false; // True if trace triggered GC public static boolean deathScan = false; public static boolean finalDead = false; @@ -190,6 +190,9 @@ */ public void collectionPhase(int phaseId) { + if (phaseId == PREPARE) { + lastGCWasTracing = traceInducedGC; + } if (phaseId == RELEASE) { if (traceInducedGC) { /* Clean up following a trace-induced scan */ @@ -223,7 +226,7 @@ * their failure to return memory isn't cause for concern. */ public boolean isLastGCFull() { - return !traceInducedGC; + return !lastGCWasTracing; } /** Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceCollector.java =================================================================== --- rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceCollector.java 2006-10-24 04:24:12 UTC (rev 10922) +++ rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceCollector.java 2006-10-26 04:39:51 UTC (rev 10923) @@ -78,11 +78,6 @@ * @param primary perform any single-threaded local activities. */ public void collectionPhase(int phaseId, boolean primary) { - if (phaseId == SS.PREPARE) { - super.collectionPhase(phaseId, primary); - return; - } - if (phaseId == GCTrace.START_CLOSURE) { inducedTrace.startTrace(); return; @@ -106,12 +101,10 @@ ((phaseId != StopTheWorld.SOFT_REFS) && (phaseId != StopTheWorld.WEAK_REFS) && (phaseId != StopTheWorld.PHANTOM_REFS) && - (phaseId != StopTheWorld.FORWARD_REFS) && - (phaseId != StopTheWorld.FORWARD_FINALIZABLE) && - (phaseId != StopTheWorld.FINALIZABLE))) { + (phaseId != StopTheWorld.FINALIZABLE) && + (phaseId != SS.PREPARE))) { // Delegate up. super.collectionPhase(phaseId, primary); - return; } } Modified: rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceMutator.java =================================================================== --- rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceMutator.java 2006-10-24 04:24:12 UTC (rev 10922) +++ rvmroot/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceMutator.java 2006-10-26 04:39:51 UTC (rev 10923) @@ -14,6 +14,7 @@ import org.mmtk.plan.semispace.SSMutator; import org.mmtk.plan.semispace.*; +import org.mmtk.plan.*; import org.mmtk.utility.TraceGenerator; import org.mmtk.vm.VM; @@ -153,15 +154,11 @@ * @param primary perform any single-threaded local activities. */ public void collectionPhase(int phaseId, boolean primary) { - if (phaseId == SS.PREPARE_MUTATOR) { - if (!GCTrace.traceInducedGC) { - // rebind the semispace bump pointer to the appropriate semispace. - ss.rebind(SS.toSpace()); - } + if (!GCTrace.traceInducedGC || + (phaseId != StopTheWorld.PREPARE_MUTATOR) && + (phaseId != StopTheWorld.RELEASE_MUTATOR)) { + // Delegate up. super.collectionPhase(phaseId, primary); - return; } - - super.collectionPhase(phaseId, primary); } } Modified: rvmroot/trunk/MMTk/src/org/mmtk/utility/TraceGenerator.java =================================================================== --- rvmroot/trunk/MMTk/src/org/mmtk/utility/TraceGenerator.java 2006-10-24 04:24:12 UTC (rev 10922) +++ rvmroot/trunk/MMTk/src/org/mmtk/utility/TraceGenerator.java 2006-10-26 04:39:51 UTC (rev 10923) @@ -226,9 +226,6 @@ public static final void traceAlloc(boolean isImmortal, ObjectReference ref, ObjectReference typeRef, int bytes) throws LogicallyUninterruptiblePragma, NoInlinePragma { - /* Assert that this isn't the result of tracing */ - if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(!traceBusy); - boolean gcAllowed = VM.traceInterface.gcEnabled() && Plan.isInitialized() && !Plan.gcInProgress(); /* Test if it is time/possible for an exact allocation. */ @@ -242,6 +239,24 @@ } /* Add the allocation into the trace. */ traceBusy = true; + /* When legally permissible, add the record to the trace buffer */ + if (MERLIN_ANALYSIS) { + Address fp = (TraceBuffer.OMIT_ALLOCS) ? Address.zero() : VM.traceInterface.skipOwnFramesAndDump(typeRef); + + if (isImmortal && allocType.EQ(TRACE_EXACT_ALLOC)) + trace.push(TRACE_EXACT_IMMORTAL_ALLOC); + else if (isImmortal) + trace.push(TRACE_IMMORTAL_ALLOC); + else + trace.push(allocType); + trace.push(VM.traceInterface.getOID(ref)); + trace.push(Word.fromInt(bytes - VM.traceInterface.getHeaderSize())); + trace.push(fp.toWord()); + trace.push(Word.fromInt(0 /* VM_Magic.getThreadId() */)); + trace.push(TRACE_TIB_SET); + trace.push(VM.traceInterface.getOID(ref)); + trace.push(VM.traceInterface.getOID(typeRef)); + } /* Perform the necessary work for death times. */ if (allocType.EQ(TRACE_EXACT_ALLOC)) { if (MERLIN_ANALYSIS) { @@ -253,25 +268,27 @@ lastGC = VM.traceInterface.getOID(ref); } } - Address fp = VM.traceInterface.skipOwnFramesAndDump(typeRef); - if (isImmortal && allocType.EQ(TRACE_EXACT_ALLOC)) - trace.push(TRACE_EXACT_IMMORTAL_ALLOC); - else if (isImmortal) - trace.push(TRACE_IMMORTAL_ALLOC); - else - trace.push(allocType); - trace.push(VM.traceInterface.getOID(ref)); - trace.push(Word.fromInt(bytes - VM.traceInterface.getHeaderSize())); - trace.push(fp.toWord()); - trace.push(Word.fromInt(0 /* VM_Magic.getThreadId() */)); - trace.push(TRACE_TIB_SET); - trace.push(VM.traceInterface.getOID(ref)); - trace.push(VM.traceInterface.getOID(typeRef)); + /* Add the allocation record to the buffer if we have not yet done so. */ + if (!MERLIN_ANALYSIS) { + Address fp = (TraceBuffer.OMIT_ALLOCS) ? Address.zero() : VM.traceInterface.skipOwnFramesAndDump(typeRef); + if (isImmortal && allocType.EQ(TRACE_EXACT_ALLOC)) + trace.push(TRACE_EXACT_IMMORTAL_ALLOC); + else if (isImmortal) + trace.push(TRACE_IMMORTAL_ALLOC); + else + trace.push(allocType); + trace.push(VM.traceInterface.getOID(ref)); + trace.push(Word.fromInt(bytes - VM.traceInterface.getHeaderSize())); + trace.push(fp.toWord()); + trace.push(Word.fromInt(0 /* VM_Magic.getThreadId() */)); + trace.push(TRACE_TIB_SET); + trace.push(VM.traceInterface.getOID(ref)); + trace.push(VM.traceInterface.getOID(typeRef)); + } trace.process(); traceBusy = false; } - /*********************************************************************** * * Merlin lifetime analysis methods @@ -300,7 +317,8 @@ } } /* Sort the objects on the worklist by their timestamp */ - worklist.sort(); + if (!worklist.isEmpty()) + worklist.sort(); /* Now compute the death times. */ computeTransitiveClosure(); } @@ -372,23 +390,24 @@ * as the latest reaching death time to an object. */ private static final void computeTransitiveClosure() { - /* The latest time an object can die. */ - agePropagate = Word.max(); - if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(!worklist.isEmpty()); - /* Process through the entire buffer. */ - ObjectReference ref = worklist.pop(); - while (!ref.isNull()) { - Word currentAge = VM.traceInterface.getDeathTime(ref); - /* This is a cheap and simple test to process objects only once. */ - if (currentAge.LE(agePropagate)) { - /* Set the "new" dead age. */ - agePropagate = currentAge; - /* Scan the object, pushing the survivors */ - Scan.scanObject(getTraceLocal(), ref); - } - /* Get the next object to process */ - ref = worklist.pop(); - } + if (!worklist.isEmpty()) { + /* The latest time an object can die. */ + agePropagate = Word.max(); + /* Process through the entire buffer. */ + ObjectReference ref = worklist.pop(); + while (!ref.isNull()) { + Word currentAge = VM.traceInterface.getDeathTime(ref); + /* This is a cheap and simple test to process objects only once. */ + if (currentAge.LE(agePropagate)) { + /* Set the "new" dead age. */ + agePropagate = currentAge; + /* Scan the object, pushing the survivors */ + Scan.scanObject(getTraceLocal(), ref); + } + /* Get the next object to process */ + ref = worklist.pop(); + } + } } private static final TraceLocal getTraceLocal() { Modified: rvmroot/trunk/MMTk/src/org/mmtk/utility/deque/TraceBuffer.java =================================================================== --- rvmroot/trunk/MMTk/src/org/mmtk/utility/deque/TraceBuffer.java 2006-10-24 04:24:12 UTC (rev 10922) +++ rvmroot/trunk/MMTk/src/org/mmtk/utility/deque/TraceBuffer.java 2006-10-26 04:39:51 UTC (rev 10923) @@ -48,6 +48,18 @@ private static final Word TRACE_STATIC_TARGET = Word.fromInt(17); private static final Word TRACE_BOOT_ALLOC_SIZE = Word.fromInt(18); + /* + * Debugging and trace reducing constants + */ + public static final boolean OMIT_ALLOCS=false; + public static final boolean OMIT_UPDATES=false; + public static final boolean OMIT_BOOTALLOCS=false; + public static final boolean OMIT_UNREACHABLES=false; + public static final boolean OMIT_OTHERS=false; + public static final boolean OMIT_OUTPUT=OMIT_ALLOCS && OMIT_UPDATES && + OMIT_OTHERS; + + /*********************************************************************** * * Instance fields @@ -86,9 +98,10 @@ public final void process() { Word traceState = TRACE_NEW_RECORD; int entriesNotFlushed = 0; + boolean loggedRecord = false; /* First we must flush any remaining data */ - Log.writeln(); - + if (!OMIT_OUTPUT) Log.writeln(); + /* Process through the entire buffer. */ while (checkDequeue(1)) { /* For speed and efficiency, we will actually process the data buffer by @@ -97,92 +110,130 @@ head = head.minus(BYTES_IN_ADDRESS); Word val = head.loadWord(); if (traceState.EQ(TRACE_NEW_RECORD)) { + loggedRecord = false; if (val.EQ(TRACE_GCSTART)) { - Log.write('G'); - Log.write('C'); - Log.writeln('B', true); + if (!OMIT_OTHERS) { + Log.write('G'); + Log.write('C'); + Log.writeln('B', true); + } } else if (val.EQ(TRACE_GCEND)) { - Log.write('G'); - Log.write('C'); - Log.writeln('E', true); + if (!OMIT_OTHERS) { + Log.write('G'); + Log.write('C'); + Log.writeln('E', true); + } } else { traceState = val; } } else { if (traceState.EQ(TRACE_EXACT_ALLOC) || traceState.EQ(TRACE_ALLOC)) { - Log.write((traceState.EQ(TRACE_EXACT_ALLOC)) ? 'A' : 'a'); - Log.write(' '); - Log.write(val); + if (!OMIT_ALLOCS) { + Log.write( (traceState.EQ(TRACE_EXACT_ALLOC)) ? 'A' : 'a'); + Log.write(' '); + Log.write(val); + loggedRecord = true; + } traceState = TRACE_ALLOC_SIZE; } else if (traceState.EQ(TRACE_EXACT_IMMORTAL_ALLOC) || traceState.EQ(TRACE_IMMORTAL_ALLOC)) { - Log.write((traceState.EQ(TRACE_EXACT_IMMORTAL_ALLOC)) ? 'I' : 'i'); - Log.write(' '); - Log.write(val); + if (!OMIT_ALLOCS) { + Log.write( (traceState.EQ(TRACE_EXACT_IMMORTAL_ALLOC)) ? 'I' : 'i'); + Log.write(' '); + Log.write(val); + loggedRecord = true; + } traceState = TRACE_ALLOC_SIZE; } else if (traceState.EQ(TRACE_BOOT_ALLOC)) { - Log.write('B'); - Log.write(' '); - Log.write(val); + if (!OMIT_BOOTALLOCS) { + Log.write('B'); + Log.write(' '); + Log.write(val); + loggedRecord = true; + } traceState = TRACE_BOOT_ALLOC_SIZE; } else if (traceState.EQ(TRACE_DEATH)) { - Log.write('D'); - Log.write(' '); - Log.write(val); + if (!OMIT_UNREACHABLES) { + Log.write('D'); + Log.write(' '); + Log.write(val); + loggedRecord = true; + } traceState = TRACE_DEATH_TIME; } else if (traceState.EQ(TRACE_BOOT_ALLOC_SIZE)) { - Log.write(val); + if (!OMIT_BOOTALLOCS) + Log.write(val); traceState = TRACE_NEW_RECORD; } else if (traceState.EQ(TRACE_ALLOC_SIZE)) { - Log.write(val); + if (!OMIT_ALLOCS) + Log.write(val); traceState = TRACE_ALLOC_FP; } else if (traceState.EQ(TRACE_ALLOC_FP)) { - Log.write(val); + if (!OMIT_ALLOCS) + Log.write(val); traceState = TRACE_ALLOC_THREAD; } else if (traceState.EQ(TRACE_ALLOC_THREAD)) { - Log.write(val); + if (!OMIT_ALLOCS) + Log.write(val); traceState = TRACE_NEW_RECORD; } else if (traceState.EQ(TRACE_TIB_SET)) { - Log.write('T'); - Log.write(' '); - Log.write(val); + if (!OMIT_UPDATES) { + Log.write('T'); + Log.write(' '); + Log.write(val); + loggedRecord = true; + } traceState = TRACE_TIB_VALUE; } else if (traceState.EQ(TRACE_STATIC_SET)) { - Log.write('S'); - Log.write(' '); - Log.write(val); + if (!OMIT_UPDATES) { + Log.write('S'); + Log.write(' '); + Log.write(val); + loggedRecord = true; + } traceState = TRACE_STATIC_TARGET; } else if (traceState.EQ(TRACE_TIB_VALUE) || - traceState.EQ(TRACE_DEATH_TIME) || traceState.EQ(TRACE_STATIC_TARGET)) { - Log.write(val); + if (!OMIT_UPDATES) + Log.write(val); traceState = TRACE_NEW_RECORD; + } else if (traceState.EQ(TRACE_DEATH_TIME)) { + if (!OMIT_UNREACHABLES) + Log.write(val); + traceState = TRACE_NEW_RECORD; } else if (traceState.EQ(TRACE_FIELD_SET) || traceState.EQ(TRACE_ARRAY_SET)) { - Log.write('U'); - Log.write(' '); - Log.write(val); + if (!OMIT_UPDATES) { + Log.write('U'); + Log.write(' '); + Log.write(val); + loggedRecord = true; + } traceState = TRACE_FIELD_SLOT; } else if (traceState.EQ(TRACE_FIELD_TARGET) || traceState.EQ(TRACE_ARRAY_TARGET)) { - Log.write(val); + if (!OMIT_UPDATES) + Log.write(val); traceState = TRACE_NEW_RECORD; } else if (traceState.EQ(TRACE_FIELD_SLOT) || traceState.EQ(TRACE_ARRAY_ELEMENT)) { - Log.write(val); + if (!OMIT_UPDATES) + Log.write(val); traceState = TRACE_FIELD_TARGET; - } else + } else { VM.assertions.fail("Cannot understand directive!\n"); - if (traceState.EQ(TRACE_NEW_RECORD)) { + } + if (traceState.EQ(TRACE_NEW_RECORD) && loggedRecord) { entriesNotFlushed++; Log.writeln(); - } else { - Log.write(' '); + } else if (loggedRecord) { + Log.write(' '); } } if (entriesNotFlushed == 10) { - Log.flush(); + if (!OMIT_OUTPUT) + Log.flush(); entriesNotFlushed = 0; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dgr...@us...> - 2006-10-24 04:24:18
|
Revision: 10922 http://svn.sourceforge.net/jikesrvm/?rev=10922&view=rev Author: dgrove-oss Date: 2006-10-23 21:24:12 -0700 (Mon, 23 Oct 2006) Log Message: ----------- proper path to manifest file Modified Paths: -------------- rvmroot/trunk/bin/headerExceptionsFilter.awk Modified: rvmroot/trunk/bin/headerExceptionsFilter.awk =================================================================== --- rvmroot/trunk/bin/headerExceptionsFilter.awk 2006-10-20 19:34:09 UTC (rev 10921) +++ rvmroot/trunk/bin/headerExceptionsFilter.awk 2006-10-24 04:24:12 UTC (rev 10922) @@ -42,7 +42,7 @@ /\/testing\/harness\/tests\/pseudojbb\/pseudojbb/ {next} /\/testing\/harness\/tests\/pseudojbb\/props/ {next} /\/testing\/harness\/tests\/mauve\/mauve-jikesrvm/ {next} -/\/testing\/harness\/tests\/javaagent\/MANIFSET.MF/ {next} +/\/testing\/tests\/javaagent\/MANIFSET.MF/ {next} # actually has the right headers, but utf8 characters break the checkers /\/testing\/harness\/tests\/utf8\/utf8test.java/ {next} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |