You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by nd...@apache.org on 2006/08/17 04:51:38 UTC
svn commit: r432124 - in /incubator/harmony/enhanced/drlvm/trunk/vm: MMTk/
MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/ launcher/src/
Author: ndbeyer
Date: Wed Aug 16 19:51:37 2006
New Revision: 432124
URL: http://svn.apache.org/viewvc?rev=432124&view=rev
Log:
Set svn:eol-style = native for vm/launcher and vm/mmtk
Modified:
incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/build.xml (contents, props changed)
incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/ActivePlan.java (props changed)
incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Assert.java (contents, props changed)
incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Barriers.java (props changed)
incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Collection.java (props changed)
incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Lock.java (contents, props changed)
incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Memory.java (contents, props changed)
incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/ObjectModel.java (props changed)
incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Options.java (contents, props changed)
incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/ReferenceGlue.java (contents, props changed)
incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Scanning.java (props changed)
incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedCollectorContext.java (contents, props changed)
incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedMutatorContext.java (contents, props changed)
incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedPlan.java (contents, props changed)
incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedPlanConstraints.java (contents, props changed)
incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Statistics.java (props changed)
incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Strings.java (contents, props changed)
incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SynchronizedCounter.java (props changed)
incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/TraceInterface.java (props changed)
incubator/harmony/enhanced/drlvm/trunk/vm/launcher/src/main.cpp (props changed)
Modified: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/build.xml?rev=432124&r1=432123&r2=432124&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/build.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/build.xml Wed Aug 16 19:51:37 2006
@@ -1,78 +1,78 @@
-<!--
- * Ant build file for MMTk
- *
- * - jar compiles from source and creates the jar file.
- * $Date: 2006/07/08 01:51:44 $
- * $Id: build.xml,v 1.19 2006/07/08 01:51:44 steveb Exp $
--->
-
-<project name="MMTk" default="jar" basedir=".">
- <description>MMTk</description>
-
- <property name="src" location="src"/>
- <property name="src.vm.stub" location="ext/vmmagic/stub"/>
- <property name="src.gcspy.stub" location="ext/vm/stub"/>
- <property name="ext.vm.HarmonyDRLVM" location="ext/vm/HarmonyDRLVM"/>
- <property name="doc" location="doc"/>
- <property name="extsrc" location="ext"/>
- <property name="build" location="build"/>
-
- <!-- =================================
- target: initialize
- ================================= -->
- <target name="init">
- <!-- Create the time stamp -->
- <tstamp/>
- <!-- Create the build directory structure used by compile -->
- <mkdir dir="${build}"/>
- </target>
-
- <!-- =================================
- target: clean
- ================================= -->
- <target name="clean" description="clean up">
- <delete dir="${build}"/>
- <delete>
- <fileset dir="${src}" includes="**/*.class"/>
- <fileset dir="${src.vm.stub}" includes="**/*.class"/>
- <fileset dir="${src.gcspy.stub}" includes="**/*.class"/>
- <fileset dir="${src}" includes="**/*.class"/>
- <fileset dir="${ext.vm.HarmonyDRLVM}" includes="**/*.class"/>
- <fileset dir="." includes="mmtk.jar, *.class"/>
- </delete>
- </target>
-
- <!-- =================================
- target: compile all sources
- ================================= -->
- <target name="compile" depends="init" description="compile the MMTk sources" >
- <!-- Compile the java code from ${src} into ${build} -->
- <javac srcdir="${src.vm.stub}" destdir="${build}" classpath="junit-4.1.jar"/>
- <javac srcdir="${src.gcspy.stub}" destdir="${build}" sourcepath="${vmstubsrc}:${src}" classpath="junit-4.1.jar"/>
- <javac srcdir="${src}" destdir="${build}" sourcepath="${vmstubsrc}" classpath="junit-4.1.jar"/>
- <javac srcdir="${ext.vm.HarmonyDRLVM}" destdir="${build}" sourcepath="${vmstubsrc}" classpath="junit-4.1.jar"/>
- </target>
-
- <!-- =================================
- target: copy the sources, doc & licenses
- ================================= -->
- <target name="sources" depends="init" description="copy the sources" >
- <copy todir="${build}">
- <fileset dir="." includes="src/**"/>
- <fileset dir="." includes="ext/**"/>
- <fileset dir="." includes="doc/**"/>
- <fileset file="LICENSE"/>
- <fileset file="build.xml"/>
- </copy>
- </target>
-
- <!-- =================================
- target: jar
- ================================= -->
- <target name="jar" depends="compile,init,sources" description="generate the jar file" >
- <!-- Put everything in ${build} into the mmtk-${DSTAMP}.jar file -->
- <jar jarfile="mmtk.jar" basedir="${build}" index="true" />
- <javac srcdir="." destdir="." includes="test.java" classpath="mmtk.jar"/>
- </target>
-
-</project>
+<!--
+ * Ant build file for MMTk
+ *
+ * - jar compiles from source and creates the jar file.
+ * $Date: 2006/07/08 01:51:44 $
+ * $Id: build.xml,v 1.19 2006/07/08 01:51:44 steveb Exp $
+-->
+
+<project name="MMTk" default="jar" basedir=".">
+ <description>MMTk</description>
+
+ <property name="src" location="src"/>
+ <property name="src.vm.stub" location="ext/vmmagic/stub"/>
+ <property name="src.gcspy.stub" location="ext/vm/stub"/>
+ <property name="ext.vm.HarmonyDRLVM" location="ext/vm/HarmonyDRLVM"/>
+ <property name="doc" location="doc"/>
+ <property name="extsrc" location="ext"/>
+ <property name="build" location="build"/>
+
+ <!-- =================================
+ target: initialize
+ ================================= -->
+ <target name="init">
+ <!-- Create the time stamp -->
+ <tstamp/>
+ <!-- Create the build directory structure used by compile -->
+ <mkdir dir="${build}"/>
+ </target>
+
+ <!-- =================================
+ target: clean
+ ================================= -->
+ <target name="clean" description="clean up">
+ <delete dir="${build}"/>
+ <delete>
+ <fileset dir="${src}" includes="**/*.class"/>
+ <fileset dir="${src.vm.stub}" includes="**/*.class"/>
+ <fileset dir="${src.gcspy.stub}" includes="**/*.class"/>
+ <fileset dir="${src}" includes="**/*.class"/>
+ <fileset dir="${ext.vm.HarmonyDRLVM}" includes="**/*.class"/>
+ <fileset dir="." includes="mmtk.jar, *.class"/>
+ </delete>
+ </target>
+
+ <!-- =================================
+ target: compile all sources
+ ================================= -->
+ <target name="compile" depends="init" description="compile the MMTk sources" >
+ <!-- Compile the java code from ${src} into ${build} -->
+ <javac srcdir="${src.vm.stub}" destdir="${build}" classpath="junit-4.1.jar"/>
+ <javac srcdir="${src.gcspy.stub}" destdir="${build}" sourcepath="${vmstubsrc}:${src}" classpath="junit-4.1.jar"/>
+ <javac srcdir="${src}" destdir="${build}" sourcepath="${vmstubsrc}" classpath="junit-4.1.jar"/>
+ <javac srcdir="${ext.vm.HarmonyDRLVM}" destdir="${build}" sourcepath="${vmstubsrc}" classpath="junit-4.1.jar"/>
+ </target>
+
+ <!-- =================================
+ target: copy the sources, doc & licenses
+ ================================= -->
+ <target name="sources" depends="init" description="copy the sources" >
+ <copy todir="${build}">
+ <fileset dir="." includes="src/**"/>
+ <fileset dir="." includes="ext/**"/>
+ <fileset dir="." includes="doc/**"/>
+ <fileset file="LICENSE"/>
+ <fileset file="build.xml"/>
+ </copy>
+ </target>
+
+ <!-- =================================
+ target: jar
+ ================================= -->
+ <target name="jar" depends="compile,init,sources" description="generate the jar file" >
+ <!-- Put everything in ${build} into the mmtk-${DSTAMP}.jar file -->
+ <jar jarfile="mmtk.jar" basedir="${build}" index="true" />
+ <javac srcdir="." destdir="." includes="test.java" classpath="mmtk.jar"/>
+ </target>
+
+</project>
Propchange: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/ActivePlan.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Assert.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Assert.java?rev=432124&r1=432123&r2=432124&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Assert.java (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Assert.java Wed Aug 16 19:51:37 2006
@@ -67,9 +67,9 @@
*
* @param cond the condition to be checked
*/
- public final void _assert(boolean cond) throws InlinePragma
+ public final void _assert(boolean cond) throws InlinePragma
{
- if (cond == false)
+ if (cond == false)
{
System.out.println("****** org.apache.HarmonyDRLVM.mm.mmtk.Assert._assert() ******");
Object obj = new Object();
Propchange: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Assert.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Barriers.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Collection.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Lock.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Lock.java?rev=432124&r1=432123&r2=432124&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Lock.java (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Lock.java Wed Aug 16 19:51:37 2006
@@ -60,11 +60,11 @@
public void acquire() {
System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Lock.acquire(): " + name);
- try
+ try
{
//this.wait();
- }
- catch (Exception e)
+ }
+ catch (Exception e)
{
System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Lock.acquire() has a problem: " + e);
}
Propchange: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Lock.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Memory.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Memory.java?rev=432124&r1=432123&r2=432124&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Memory.java (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Memory.java Wed Aug 16 19:51:37 2006
@@ -39,7 +39,7 @@
static protected byte [] immortalPinnedScratchObject; //wjw -- ugly hack, make it static so that it is always enumerated
static protected int dangerousPointerToStartOfScratchArea;
static protected int dangerousPointerToEndOfScratchArea;
- static
+ static
{
immortalPinnedScratchObject = new byte[PHONY_JAVA_HEAP_SIZE];
ObjectReference or = ObjectReference.fromObject(immortalPinnedScratchObject);
@@ -65,7 +65,7 @@
System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Memory.getHeapEndConstant() = " + Integer.toHexString(heapEnd.toInt()) );
return heapEnd;
}
- protected final Address getAvailableStartConstant()
+ protected final Address getAvailableStartConstant()
{
Address availableStart = Address.fromInt(dangerousPointerToStartOfScratchArea);
System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Memory.getAvailableStartConstant() = " + Integer.toHexString(availableStart.toInt()) );
@@ -85,35 +85,35 @@
protected final int getMaxBytesPaddingConstant() { return 8; }
protected final int getAlignmentValueConstant() { return 0x01020304;}
- private static int BOOT_SEGMENT_MB = (0x800000>>LOG_BYTES_IN_MBYTE);
+ private static int BOOT_SEGMENT_MB = (0x800000>>LOG_BYTES_IN_MBYTE);
- public final ImmortalSpace getVMSpace() throws InterruptiblePragma
+ public final ImmortalSpace getVMSpace() throws InterruptiblePragma
{
- ImmortalSpace bootSpace = new ImmortalSpace("boot", Plan.DEFAULT_POLL_FREQUENCY,
+ ImmortalSpace bootSpace = new ImmortalSpace("boot", Plan.DEFAULT_POLL_FREQUENCY,
BOOT_SEGMENT_MB, false);
System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Memory.getVMSpace(), bootSpace = " + bootSpace);
return bootSpace;
}
- public final void globalPrepareVMSpace()
+ public final void globalPrepareVMSpace()
{
System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Memory.globalPrepareVMSpace() needs fixing");
}
- public final void collectorPrepareVMSpace()
+ public final void collectorPrepareVMSpace()
{
System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Memory.collectorPrepareVMSpace() needs fixing");
}
- public final void collectorReleaseVMSpace()
+ public final void collectorReleaseVMSpace()
{
System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Memory.collectorReleaseVMSpace() needs fixing");
}
- public final void globalReleaseVMSpace()
+ public final void globalReleaseVMSpace()
{
System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Memory.gobalReleaseVMSpace() needs fixing");
}
- public final void setHeapRange(int id, Address start, Address end)
+ public final void setHeapRange(int id, Address start, Address end)
{
System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Memory.setHeapRange() id = " + id +
" start = " + Integer.toHexString(start.toInt()) +
@@ -177,7 +177,7 @@
public final void zero(Address start, Extent len) {
byte zeroByte = 0;
int numberOfBytes = len.toInt();
- for(int xx=0; xx < numberOfBytes; xx++)
+ for(int xx=0; xx < numberOfBytes; xx++)
{
start.store(zeroByte);
start.plus(1);
@@ -191,7 +191,7 @@
*/
public final void zeroPages(Address start, int len) {
int zeroInt = 0;
- for(int xx=0; xx < len; len+=4)
+ for(int xx=0; xx < len; len+=4)
{
start.store(zeroInt);
start.plus(4);
@@ -213,7 +213,7 @@
Address low = start.minus(beforeBytes);
Address hi = start.plus(afterBytes);
System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Memory.dumpMemory() called -------------------------");
- while (low.NE(hi) )
+ while (low.NE(hi) )
{
byte b1 = low.loadByte();
System.out.print(b1 + " ");
Propchange: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Memory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/ObjectModel.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Options.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Options.java?rev=432124&r1=432123&r2=432124&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Options.java (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Options.java Wed Aug 16 19:51:37 2006
@@ -71,11 +71,11 @@
message);
Object obj = new Object();
obj = null;
- try
+ try
{
obj.wait(); // this should cause a system exit
- }
- catch (Exception e)
+ }
+ catch (Exception e)
{
System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Options.fail has bugs");
}
Propchange: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Options.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/ReferenceGlue.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/ReferenceGlue.java?rev=432124&r1=432123&r2=432124&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/ReferenceGlue.java (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/ReferenceGlue.java Wed Aug 16 19:51:37 2006
@@ -34,107 +34,107 @@
import java.lang.ref.PhantomReference;
-/**
- * This class manages SoftReferences, WeakReferences, and
- * PhantomReferences.
- */
-public final class ReferenceGlue extends org.mmtk.vm.ReferenceGlue implements Uninterruptible
-{
-
- /**
- * Scan through the list of references with the specified semantics.
- * @param semantics the number representing the semantics
- * @param True if it is safe to only scan new references.
- */
- public void scanReferences(int semantics, boolean nursery)
- {
- System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ReferenceGlue.scanReferences() was called");
- }
-
- /**
- * Scan through all references and forward. Only called when references
- * are objects.
- */
- public void forwardReferences()
- {
- System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ReferenceGlue.forwardReferences() was called");
- }
-
- /**
- * Put this Reference object on its ReferenceQueue (if it has one)
- * when its referent is no longer sufficiently reachable. The
- * definition of "reachable" is defined by the semantics of the
- * particular subclass of Reference. The implementation of this
- * routine is determined by the the implementation of
- * java.lang.ref.ReferenceQueue in GNU classpath. It is in this
- * class rather than the public Reference class to ensure that Jikes
- * has a safe way of enqueueing the object, one that cannot be
- * overridden by the application program.
- *
- * @see java.lang.ref.ReferenceQueue
- * @param addr the address of the Reference object
- * @param onlyOnce <code>true</code> if the reference has ever
- * been enqueued previously it will not be enqueued
- * @return <code>true</code> if the reference was enqueued
- */
- public boolean enqueueReference(Address addr, boolean onlyOnce)
- {
- System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ReferenceGlue.enqueueReference() was called");
- return false;
- }
-
- /***********************************************************************
- *
- * Reference object field accesors
- */
-
- /**
- * Get the referent from a reference. For Java the reference
- * is a Reference object.
- * @param addr the address of the reference
- * @return the referent address
- */
- public ObjectReference getReferent(Address addr)
- {
- System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ReferenceGlue.getReferent() was called");
- return ObjectReference.nullReference();
- }
-
- /**
- * Set the referent in a reference. For Java the reference is
- * a Reference object.
- * @param addr the address of the reference
- * @param referent the referent address
- */
- public void setReferent(Address addr, ObjectReference referent)
- {
- System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ReferenceGlue.setReferent() was called");
- }
-
- /**
- * @return <code>true</code> if the references are implemented as heap
- * objects (rather than in a table, for example). In this context
- * references are soft, weak or phantom references.
- *
- * This must be implemented by subclasses, but is never called by MMTk users.
- */
- protected boolean getReferencesAreObjects()
- {
- //System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ReferenceGlue.getReferencesAreObjects() was called");
- return false;
- }
-
- /**
- * NOTE: This method should not be called by anything other than the
- * reflective mechanisms in org.mmtk.vm.VM, and is not implemented by
- * subclasses.
- *
- * This hack exists only to allow us to declare getVerifyAssertions() as
- * a protected method.
- */
- static boolean referencesAreObjectsTrapdoor(ReferenceGlue a)
- {
- return a.getReferencesAreObjects();
- }
-
-}
+/**
+ * This class manages SoftReferences, WeakReferences, and
+ * PhantomReferences.
+ */
+public final class ReferenceGlue extends org.mmtk.vm.ReferenceGlue implements Uninterruptible
+{
+
+ /**
+ * Scan through the list of references with the specified semantics.
+ * @param semantics the number representing the semantics
+ * @param True if it is safe to only scan new references.
+ */
+ public void scanReferences(int semantics, boolean nursery)
+ {
+ System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ReferenceGlue.scanReferences() was called");
+ }
+
+ /**
+ * Scan through all references and forward. Only called when references
+ * are objects.
+ */
+ public void forwardReferences()
+ {
+ System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ReferenceGlue.forwardReferences() was called");
+ }
+
+ /**
+ * Put this Reference object on its ReferenceQueue (if it has one)
+ * when its referent is no longer sufficiently reachable. The
+ * definition of "reachable" is defined by the semantics of the
+ * particular subclass of Reference. The implementation of this
+ * routine is determined by the the implementation of
+ * java.lang.ref.ReferenceQueue in GNU classpath. It is in this
+ * class rather than the public Reference class to ensure that Jikes
+ * has a safe way of enqueueing the object, one that cannot be
+ * overridden by the application program.
+ *
+ * @see java.lang.ref.ReferenceQueue
+ * @param addr the address of the Reference object
+ * @param onlyOnce <code>true</code> if the reference has ever
+ * been enqueued previously it will not be enqueued
+ * @return <code>true</code> if the reference was enqueued
+ */
+ public boolean enqueueReference(Address addr, boolean onlyOnce)
+ {
+ System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ReferenceGlue.enqueueReference() was called");
+ return false;
+ }
+
+ /***********************************************************************
+ *
+ * Reference object field accesors
+ */
+
+ /**
+ * Get the referent from a reference. For Java the reference
+ * is a Reference object.
+ * @param addr the address of the reference
+ * @return the referent address
+ */
+ public ObjectReference getReferent(Address addr)
+ {
+ System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ReferenceGlue.getReferent() was called");
+ return ObjectReference.nullReference();
+ }
+
+ /**
+ * Set the referent in a reference. For Java the reference is
+ * a Reference object.
+ * @param addr the address of the reference
+ * @param referent the referent address
+ */
+ public void setReferent(Address addr, ObjectReference referent)
+ {
+ System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ReferenceGlue.setReferent() was called");
+ }
+
+ /**
+ * @return <code>true</code> if the references are implemented as heap
+ * objects (rather than in a table, for example). In this context
+ * references are soft, weak or phantom references.
+ *
+ * This must be implemented by subclasses, but is never called by MMTk users.
+ */
+ protected boolean getReferencesAreObjects()
+ {
+ //System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ReferenceGlue.getReferencesAreObjects() was called");
+ return false;
+ }
+
+ /**
+ * NOTE: This method should not be called by anything other than the
+ * reflective mechanisms in org.mmtk.vm.VM, and is not implemented by
+ * subclasses.
+ *
+ * This hack exists only to allow us to declare getVerifyAssertions() as
+ * a protected method.
+ */
+ static boolean referencesAreObjectsTrapdoor(ReferenceGlue a)
+ {
+ return a.getReferencesAreObjects();
+ }
+
+}
Propchange: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/ReferenceGlue.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Scanning.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedCollectorContext.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedCollectorContext.java?rev=432124&r1=432123&r2=432124&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedCollectorContext.java (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedCollectorContext.java Wed Aug 16 19:51:37 2006
@@ -13,26 +13,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-/*
- * (C) Copyright Department of Computer Science,
- * Australian National University. 2005
- */
-
-package org.apache.HarmonyDRLVM.mm.mmtk;
-
-import org.mmtk.plan.nogc.*;
-import org.vmmagic.pragma.*;
-
-public final class SelectedCollectorContext implements
- Uninterruptible {
-
- public static final NoGCCollector singleton = new NoGCCollector();
-
- /**
- * Return the instance of the SelectedPlan
- */
- public static final NoGCCollector get() throws InlinePragma {
- return singleton;
- }
-}
+
+/*
+ * (C) Copyright Department of Computer Science,
+ * Australian National University. 2005
+ */
+
+package org.apache.HarmonyDRLVM.mm.mmtk;
+
+import org.mmtk.plan.nogc.*;
+import org.vmmagic.pragma.*;
+
+public final class SelectedCollectorContext implements
+ Uninterruptible {
+
+ public static final NoGCCollector singleton = new NoGCCollector();
+
+ /**
+ * Return the instance of the SelectedPlan
+ */
+ public static final NoGCCollector get() throws InlinePragma {
+ return singleton;
+ }
+}
Propchange: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedCollectorContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedMutatorContext.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedMutatorContext.java?rev=432124&r1=432123&r2=432124&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedMutatorContext.java (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedMutatorContext.java Wed Aug 16 19:51:37 2006
@@ -13,26 +13,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-/*
- * (C) Copyright Department of Computer Science,
- * Australian National University. 2005
- */
-
-package org.apache.HarmonyDRLVM.mm.mmtk;
-
-import org.mmtk.plan.nogc.*;
-import org.vmmagic.pragma.*;
-
-public final class SelectedMutatorContext
- implements Uninterruptible {
-
- public static final NoGCMutator singleton = new NoGCMutator();
-
- /**
- * Return the instance of the SelectedPlan
- */
- public static final NoGCMutator get() throws InlinePragma {
- return singleton;
- }
-}
+
+/*
+ * (C) Copyright Department of Computer Science,
+ * Australian National University. 2005
+ */
+
+package org.apache.HarmonyDRLVM.mm.mmtk;
+
+import org.mmtk.plan.nogc.*;
+import org.vmmagic.pragma.*;
+
+public final class SelectedMutatorContext
+ implements Uninterruptible {
+
+ public static final NoGCMutator singleton = new NoGCMutator();
+
+ /**
+ * Return the instance of the SelectedPlan
+ */
+ public static final NoGCMutator get() throws InlinePragma {
+ return singleton;
+ }
+}
Propchange: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedMutatorContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedPlan.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedPlan.java?rev=432124&r1=432123&r2=432124&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedPlan.java (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedPlan.java Wed Aug 16 19:51:37 2006
@@ -17,19 +17,19 @@
/*
* (C) Copyright Department of Computer Science,
* Australian National University. 2004
- */
-
-package org.apache.HarmonyDRLVM.mm.mmtk;
-
-import org.mmtk.plan.nogc.*;
-import org.vmmagic.pragma.*;
-
-public final class SelectedPlan extends NoGC
- implements Uninterruptible {
-
- public static final SelectedPlan singleton = new SelectedPlan();
-
- public static final SelectedPlan get() throws InlinePragma {
- return singleton;
- }
-}
+ */
+
+package org.apache.HarmonyDRLVM.mm.mmtk;
+
+import org.mmtk.plan.nogc.*;
+import org.vmmagic.pragma.*;
+
+public final class SelectedPlan extends NoGC
+ implements Uninterruptible {
+
+ public static final SelectedPlan singleton = new SelectedPlan();
+
+ public static final SelectedPlan get() throws InlinePragma {
+ return singleton;
+ }
+}
Propchange: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedPlan.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedPlanConstraints.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedPlanConstraints.java?rev=432124&r1=432123&r2=432124&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedPlanConstraints.java (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedPlanConstraints.java Wed Aug 16 19:51:37 2006
@@ -13,29 +13,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-/*
- * (C) Copyright Department of Computer Science,
- * Australian National University. 2005
- */
-
-package org.apache.HarmonyDRLVM.mm.mmtk;
-
-import org.mmtk.plan.nogc.*;
-import org.vmmagic.pragma.*;
-
-/**
- * This class extends the selected MMTk constraints class.
- */
-public final class SelectedPlanConstraints extends NoGCConstraints
- implements Uninterruptible {
-
- public static final SelectedPlanConstraints singleton = new SelectedPlanConstraints();
-
- /**
- * Return the instance of the SelectedPlan
- */
- public static final SelectedPlanConstraints get() throws InlinePragma {
- return singleton;
- }
-}
+
+/*
+ * (C) Copyright Department of Computer Science,
+ * Australian National University. 2005
+ */
+
+package org.apache.HarmonyDRLVM.mm.mmtk;
+
+import org.mmtk.plan.nogc.*;
+import org.vmmagic.pragma.*;
+
+/**
+ * This class extends the selected MMTk constraints class.
+ */
+public final class SelectedPlanConstraints extends NoGCConstraints
+ implements Uninterruptible {
+
+ public static final SelectedPlanConstraints singleton = new SelectedPlanConstraints();
+
+ /**
+ * Return the instance of the SelectedPlan
+ */
+ public static final SelectedPlanConstraints get() throws InlinePragma {
+ return singleton;
+ }
+}
Propchange: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedPlanConstraints.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Statistics.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Strings.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Strings.java?rev=432124&r1=432123&r2=432124&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Strings.java (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Strings.java Wed Aug 16 19:51:37 2006
@@ -34,7 +34,7 @@
* @param len number of characters in message
*/
public final void write(char [] c, int len) {
- for (int xx=0; xx < c.length; xx++)
+ for (int xx=0; xx < c.length; xx++)
{
System.out.print(c[xx]);
}
@@ -48,7 +48,7 @@
* @param len number of characters in message
*/
public final void writeThreadId(char [] c, int len) {
- for (int xx=0; xx < c.length; xx++)
+ for (int xx=0; xx < c.length; xx++)
{
System.out.print(c[xx]);
}
Propchange: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Strings.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SynchronizedCounter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/TraceInterface.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/vm/launcher/src/main.cpp
------------------------------------------------------------------------------
svn:eol-style = native