harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wjwashb...@apache.org
Subject svn commit: r433818 - /incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/
Date Wed, 23 Aug 2006 00:57:52 GMT
Author: wjwashburn
Date: Tue Aug 22 17:57:49 2006
New Revision: 433818

URL: http://svn.apache.org/viewvc?rev=433818&view=rev
Log:
Clean up of license banners and comments.  All the work is my original work and is donated
under Apache guidelines.


Modified:
    incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/ActivePlan.java
    incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Assert.java
    incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Barriers.java
    incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Collection.java
    incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Lock.java
    incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Memory.java
    incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/ObjectModel.java
    incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Options.java
    incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/ReferenceGlue.java
    incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Scanning.java
    incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedCollectorContext.java
    incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedMutatorContext.java
    incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedPlan.java
    incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SelectedPlanConstraints.java
    incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Statistics.java
    incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Strings.java
    incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SynchronizedCounter.java
    incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/TraceInterface.java

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/ActivePlan.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/ActivePlan.java?rev=433818&r1=433817&r2=433818&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/ActivePlan.java
(original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/ActivePlan.java
Tue Aug 22 17:57:49 2006
@@ -14,10 +14,6 @@
  *  limitations under the License.
  */
 
-/*
- * (C) Copyright Department of Computer Science,
- * Australian National University. 2004
- */
 package org.apache.HarmonyDRLVM.mm.mmtk;
 
 import org.mmtk.plan.Plan;

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=433818&r1=433817&r2=433818&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
Tue Aug 22 17:57:49 2006
@@ -14,12 +14,7 @@
  *  limitations under the License.
  */
 
-/*
- * (C) Copyright Department of Computer Science,
- * Australian National University. 2004
- *
- * (C) Copyright IBM Corp. 2001, 2003
- */
+
 package org.apache.HarmonyDRLVM.mm.mmtk;
 
 import org.mmtk.policy.Space;

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Barriers.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Barriers.java?rev=433818&r1=433817&r2=433818&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Barriers.java
(original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Barriers.java
Tue Aug 22 17:57:49 2006
@@ -14,12 +14,6 @@
  *  limitations under the License.
  */
 
-/*
- * (C) Copyright Department of Computer Science,
- * Australian National University. 2004
- *
- * (C) Copyright IBM Corp. 2001, 2003
- */
 package org.apache.HarmonyDRLVM.mm.mmtk;
 
 import org.vmmagic.unboxed.*;
@@ -44,8 +38,6 @@
     System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Barriers -- performWriteInBarrier
was called" );
     //VM.assertions._assert(false);
 
-    //wjw turn this on when we need it -----> Object obj = ref.toObject();
-    //wjw    VM_Magic.setObjectAtOffset(obj, offset, target.toObject(), locationMetadata);
 
   }
 
   /**
@@ -65,15 +57,6 @@
                                            ObjectReference target, Offset offset,
                                            int locationMetadata, int mode)
     throws InlinePragma { 
-     /*  wjw -- turn this on when we get to write barrier debug                         
-    Object obj = ref.toObject();
-    Object newObject = target.toObject();
-    Object oldObject;
-    do {
-      oldObject = VM_Magic.prepareObject(obj, offset);
-    } while (!VM_Magic.attemptObject(obj, offset, oldObject, newObject));
-    return ObjectReference.fromObject(oldObject); 
-    */
     System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Barriers -- performWriteInBarrierAtomic
was called" );
     //VM.assertions._assert(false);
     return ref;  // keep the compiler happy

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Collection.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Collection.java?rev=433818&r1=433817&r2=433818&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Collection.java
(original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Collection.java
Tue Aug 22 17:57:49 2006
@@ -14,12 +14,6 @@
  *  limitations under the License.
  */
 
-/*
- * (C) Copyright Department of Computer Science,
- * Australian National University. 2004
- *
- * (C) Copyright IBM Corp. 2001, 2003
- */
 package org.apache.HarmonyDRLVM.mm.mmtk;
 
 import org.mmtk.plan.Plan;
@@ -32,25 +26,6 @@
 import org.mmtk.utility.options.Options;
 import org.mmtk.vm.*;
 
-/*  wjw we will need some analog to the below imports later on, keep the below as a reference
-import com.ibm.JikesRVM.VM;
-import com.ibm.JikesRVM.VM_CompiledMethod;
-import com.ibm.JikesRVM.VM_CompiledMethods;
-import com.ibm.JikesRVM.VM_Constants;
-import com.ibm.JikesRVM.VM_Magic;
-import com.ibm.JikesRVM.VM_Processor;
-import com.ibm.JikesRVM.VM_Scheduler;
-import com.ibm.JikesRVM.VM_Thread;
-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 org.vmmagic.unboxed.*;
 import org.vmmagic.pragma.*;
 
@@ -95,36 +70,6 @@
       cc.collect();
   }
   
-    /* wjw -- toss all of triggerCollectionStatic()
-  public static final void triggerCollectionStatic(int why) throws InterruptiblePragma {
-    if (VM.VerifyAssertions) VM._assert((why >= 0) && (why < TRIGGER_REASONS));

-    Plan.collectionInitiated();
-
-    if (Options.verbose.getValue() >= 4) {
-      VM.sysWriteln("Entered VM_Interface.triggerCollection().  Stack:");
-      VM_Scheduler.dumpStack();
-    }
-    if (why == EXTERNAL_GC_TRIGGER) {
-      SelectedPlan.get().userTriggeredGC();
-      if (Options.verbose.getValue() == 1 || Options.verbose.getValue() == 2) 
-        VM.sysWrite("[Forced GC]");
-    }
-    if (Options.verbose.getValue() > 2) 
-      VM.sysWriteln("Collection triggered due to ", triggerReasons[why]);
-    Extent sizeBeforeGC = HeapGrowthManager.getCurrentHeapSize();
-    long start = VM_Time.cycles();
-    VM_CollectorThread.collect(VM_CollectorThread.handshake, why);
-    long end = VM_Time.cycles();
-    double gcTime = VM_Time.cyclesToMillis(end - start);
-    if (Options.verbose.getValue() > 2) VM.sysWriteln("Collection finished (ms): ", gcTime);
-
-    if (SelectedPlan.get().isLastGCFull() && 
-   sizeBeforeGC.EQ(HeapGrowthManager.getCurrentHeapSize()))
-      checkForExhaustion(why, false);
-    
-    Plan.checkForAsyncCollection();
-  }
-  */
 
   /**
    * Triggers a collection without allowing for a thread switch.  This is needed

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=433818&r1=433817&r2=433818&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
Tue Aug 22 17:57:49 2006
@@ -14,12 +14,6 @@
  *  limitations under the License.
  */
 
-/*
- * (C) Copyright Department of Computer Science,
- * Australian National University. 2004
- *
- * (C) Copyright IBM Corp. 2001, 2003
- */
 package org.apache.HarmonyDRLVM.mm.mmtk;
 
 import org.vmmagic.unboxed.*;

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=433818&r1=433817&r2=433818&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
Tue Aug 22 17:57:49 2006
@@ -14,12 +14,6 @@
  *  limitations under the License.
  */
 
-/*
- * (C) Copyright Department of Computer Science,
- * Australian National University. 2004
- *
- * (C) Copyright IBM Corp. 2001, 2003
- */
 package org.apache.HarmonyDRLVM.mm.mmtk;
 
 import org.mmtk.plan.Plan;
@@ -128,17 +122,7 @@
    */
   public final int mmap(Address start, int size) {
       //System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Memory.mmap() needs fixing");
-      /*
-    Address result = VM_Memory.mmap(start, Extent.fromIntZeroExtend(size),
-                                       VM_Memory.PROT_READ | VM_Memory.PROT_WRITE | VM_Memory.PROT_EXEC,

-                                       VM_Memory.MAP_PRIVATE | VM_Memory.MAP_FIXED | VM_Memory.MAP_ANONYMOUS);
-    if (result.EQ(start)) return 0;
-    if (result.GT(Address.fromIntZeroExtend(127))) {
-      VM.sysWrite("mmap with MAP_FIXED on ", start);
-      VM.sysWriteln(" returned some other address", result);
-      VM.sysFail("mmap with MAP_FIXED has unexpected behavior");
-    }
-    */
+  
     return 0;
   }
   
@@ -153,7 +137,7 @@
   public final boolean mprotect(Address start, int size) {
     System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Memory.mprotect() needs fixing, start
= " + Integer.toHexString(start.toInt())
      +   " size = " + size);
-    return false; //return VM_Memory.mprotect(start, Extent.fromIntZeroExtend(size), VM_Memory.PROT_NONE);
+    return false; 
   }
 
   /**
@@ -166,7 +150,7 @@
    */
   public final boolean munprotect(Address start, int size) {
     System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Memory.mprotect() needs fixing");
-    return false; //VM_Memory.mprotect(start, Extent.fromIntZeroExtend(size), VM_Memory.PROT_READ
| VM_Memory.PROT_WRITE | VM_Memory.PROT_EXEC);
+    return false; 
   }
 
   /**

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/ObjectModel.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/ObjectModel.java?rev=433818&r1=433817&r2=433818&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/ObjectModel.java
(original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/ObjectModel.java
Tue Aug 22 17:57:49 2006
@@ -14,12 +14,6 @@
  *  limitations under the License.
  */
 
-/*
- * (C) Copyright Department of Computer Science,
- * Australian National University. 2004
- *
- * (C) Copyright IBM Corp. 2001, 2003
- */
 package org.apache.HarmonyDRLVM.mm.mmtk;
 
 import org.mmtk.utility.scan.MMType;
@@ -30,15 +24,6 @@
 import org.vmmagic.pragma.*;
 import org.mmtk.vm.*;
 
-/**
- * $Id: ObjectModel.java,v 1.6 2006/06/19 06:08:15 steveb-oss Exp $ 
- *
- * @author Steve Blackburn
- * @author Perry Cheng
- *
- * @version $Revision: 1.6 $
- * @date $Date: 2006/06/19 06:08:15 $
- */
 public final class ObjectModel extends org.mmtk.vm.ObjectModel implements Constants, Uninterruptible
{
   /**
    * Copy an object using a plan's allocCopy to get space and install
@@ -71,64 +56,13 @@
 
  */
 
-/*
-    Object[] tib = VM_ObjectModel.getTIB(from);
-    VM_Type type = VM_Magic.objectAsType(tib[TIB_TYPE_INDEX]);
-    
-    if (type.isClassType())
-      return copyScalar(from, tib, type.asClass(), allocator);
-    else
-      return copyArray(from, tib, type.asArray(), allocator);
-  */
+
       System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.copy was called");
       VM.assertions._assert(false);
       return from;  //wjw -- keep the compiler happy for now
   }
 
-    /*
-  private ObjectReference copyScalar(ObjectReference from, Object[] tib,
-                                       VM_Class type, int allocator)
-    throws InlinePragma {
-    int bytes = VM_ObjectModel.bytesRequiredWhenCopied(from, type);
-    int align = VM_ObjectModel.getAlignment(type, from);
-    int offset = VM_ObjectModel.getOffsetForAlignment(type, from);
-    SelectedCollectorContext plan = SelectedCollectorContext.get();
-    allocator = plan.copyCheckAllocator(from, bytes, align, allocator);
-    Address region = MM_Interface.allocateSpace(plan, bytes, align, offset,
-                                                allocator, from);
-    Object toObj = VM_ObjectModel.moveObject(region, from, bytes, false, type);
-    ObjectReference to = ObjectReference.fromObject(toObj);
-    plan.postCopy(to, ObjectReference.fromObject(tib), bytes, allocator);
-    MMType mmType = (MMType) type.getMMType();
-    mmType.profileCopy(bytes);
-    return to;
-  }
-
-  private ObjectReference copyArray(ObjectReference from, Object[] tib,
-                                      VM_Array type, int allocator)
-    throws InlinePragma {
-    int elements = VM_Magic.getArrayLength(from);
-    int bytes = VM_ObjectModel.bytesRequiredWhenCopied(from, type, elements);
-    int align = VM_ObjectModel.getAlignment(type, from);
-    int offset = VM_ObjectModel.getOffsetForAlignment(type, from);
-    SelectedCollectorContext plan = SelectedCollectorContext.get();
-    allocator = plan.copyCheckAllocator(from, bytes, align, allocator);
-    Address region = MM_Interface.allocateSpace(plan, bytes, align, offset,
-                                                allocator, from);
-    Object toObj = VM_ObjectModel.moveObject(region, from, bytes, false, type);
-    ObjectReference to = ObjectReference.fromObject(toObj);
-    plan.postCopy(to, ObjectReference.fromObject(tib), bytes, allocator);
-    if (type == VM_Type.CodeArrayType) {
-      // sync all moved code arrays to get icache and dcache in sync
-      // immediately.
-      int dataSize = bytes - VM_ObjectModel.computeHeaderSize(VM_Magic.getObjectType(toObj));
-      VM_Memory.sync(to.toAddress(), dataSize);
-    }
-    MMType mmType = (MMType) type.getMMType();
-    mmType.profileCopy(bytes);
-    return to;
-  }
- */
+   
 
   /**
    * Copy an object to be pointer to by the to address. This is required 
@@ -144,33 +78,7 @@
    */
   public Address copyTo(ObjectReference from, ObjectReference to, Address region)
     throws InlinePragma {
-/*
-    Object[] tib = VM_ObjectModel.getTIB(from);
-    VM_Type type = VM_Magic.objectAsType(tib[TIB_TYPE_INDEX]);
-    int bytes;
-    
-    boolean copy = (from != to);
-    
-    if (copy) {
-      if (type.isClassType()) {
-        VM_Class classType = type.asClass();
-        bytes = VM_ObjectModel.bytesRequiredWhenCopied(from, classType);
-        VM_ObjectModel.moveObject(from, to, bytes, false, classType);
-      } else {
-      VM_Array arrayType = type.asArray();
-        int elements = VM_Magic.getArrayLength(from);
-        bytes = VM_ObjectModel.bytesRequiredWhenCopied(from, arrayType, elements);
-        VM_ObjectModel.moveObject(from, to, bytes, false, arrayType);
-      }
-    } else {
-      bytes = getCurrentSize(to);
-    }
-    
-    Address start = VM_ObjectModel.objectStartRef(to);
-    Allocator.fillAlignmentGap(region, start);
-    
-    return start.plus(bytes);
-*/
+
       System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.copyTo() was called");
       VM.assertions._assert(false);
       return Address.fromInt(0);
@@ -188,7 +96,7 @@
   public ObjectReference getReferenceWhenCopiedTo(ObjectReference from, Address to) {
     System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getReferenceWhenCopiedTo()
was called");
     VM.assertions._assert(false);
-    return from;  // keep the compiler happy -- xObjectReference.fromObject(VM_ObjectModel.getReferenceWhenCopiedTo(from,
to));
+    return from;  // keep the compiler happy -
   }
   
   /**
@@ -212,7 +120,7 @@
     //need to use drlvm's get_object_size_bytes()
     System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getSizeWhenCopied()
was called");
     VM.assertions._assert(false);
-    return 0;  // VM_ObjectModel.bytesRequiredWhenCopied(object);
+    return 0;  
   }
   
   /**
@@ -223,15 +131,6 @@
    */
   public int getAlignWhenCopied(ObjectReference object) {
 
-/*
-    Object[] tib = VM_ObjectModel.getTIB(object);
-    VM_Type type = VM_Magic.objectAsType(tib[TIB_TYPE_INDEX]);
-    if (type.isArrayType()) {
-      return VM_ObjectModel.getAlignment(type.asArray(), object);
-    } else {
-      return VM_ObjectModel.getAlignment(type.asClass(), object);
-    }
-*/
     System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getAlignWhenCopied()
was called");
     VM.assertions._assert(false);
     return 0;
@@ -244,15 +143,6 @@
    * @return The alignment offset required for a copy of <code>obj</code>
    */
   public int getAlignOffsetWhenCopied(ObjectReference object) {
-/*
-    Object[] tib = VM_ObjectModel.getTIB(object);
-    VM_Type type = VM_Magic.objectAsType(tib[TIB_TYPE_INDEX]);
-    if (type.isArrayType()) {
-      return VM_ObjectModel.getOffsetForAlignment(type.asArray(), object);
-    } else {
-      return VM_ObjectModel.getOffsetForAlignment(type.asClass(), object);
-    }
-    */
       System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getAlignOffsetWhenCopied()
was called");
       VM.assertions._assert(false);
       return 0;
@@ -268,7 +158,6 @@
       System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getCurrentSize()
was called");
       VM.assertions._assert(false);
       return 0;
-      // return VM_ObjectModel.bytesUsed(object);
   }
 
   /**
@@ -296,17 +185,15 @@
    * @return byte array with the type descriptor
    */
   public byte [] getTypeDescriptor(ObjectReference ref) {
-    //VM_Atom descriptor = VM_Magic.getObjectType(ref).getDescriptor();
     System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getTypeDescriptor()
was called");
     VM.assertions._assert(false);
-    return new byte[10]; // descriptor.toByteArray();
+    return new byte[10]; 
   }
 
   public int getArrayLength(ObjectReference object) 
     throws InlinePragma {
     System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getArrayLength()
was called");
     VM.assertions._assert(false);
-    //return VM_Magic.getArrayLength(object.toObject());
     return 0;
   }
   /**
@@ -318,7 +205,6 @@
   public boolean testAvailableBit(ObjectReference object, int idx) {
     System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.testAvailableBit()
was called");
     VM.assertions._assert(false);
-    //return VM_ObjectModel.testAvailableBit(object.toObject(), idx);
     return false;
   }
 
@@ -334,7 +220,6 @@
                                      boolean flag) {
     System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.setAvailableBit()
was called");
     VM.assertions._assert(false);
-    //VM_ObjectModel.setAvailableBit(object.toObject(), idx, flag);
     return;
   }
 
@@ -355,7 +240,6 @@
                                              Word oldVal, Word newVal) {
     System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.attemptAvailableBits()
was called");
     VM.assertions._assert(false);
-    //return VM_ObjectModel.attemptAvailableBits(object.toObject(), oldVal, newVal);
     return false;
   }
 
@@ -369,7 +253,6 @@
   public Word prepareAvailableBits(ObjectReference object) {
     System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.attemptAvailableBits()
was called");
     VM.assertions._assert(false);
-    //return VM_ObjectModel.prepareAvailableBits(object.toObject());
     return Word.fromInt(0);
   }
 
@@ -382,7 +265,6 @@
   public void writeAvailableBitsWord(ObjectReference object, Word val) {
     System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.attemptAvailableBits()
was called");
     VM.assertions._assert(false);
-    //VM_ObjectModel.writeAvailableBitsWord(object.toObject(), val);
     return;
   }
 
@@ -395,7 +277,6 @@
   public Word readAvailableBitsWord(ObjectReference object) {
       System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.readAvailableBitsWord()
was called");
       VM.assertions._assert(false);
-      //return VM_ObjectModel.readAvailableBitsWord(object);
       return Word.fromInt(0);
   }
 
@@ -411,7 +292,6 @@
   public Offset GC_HEADER_OFFSET() {
     System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.GC_HEADER_OFFSET()
was called");
     VM.assertions._assert(false);
-    //return VM_ObjectModel.GC_HEADER_OFFSET;
     return Offset.fromInt(0);
   }
 
@@ -425,7 +305,6 @@
     throws InlinePragma {
     System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.objectStartRef()
was called");
     VM.assertions._assert(false);
-    //return VM_ObjectModel.objectStartRef(object);
     return Address.fromInt(0);
   }
 
@@ -439,7 +318,6 @@
   public Address refToAddress(ObjectReference object) {
     System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.objectStartRef()
was called");
     VM.assertions._assert(false);
-    //return VM_ObjectModel.getPointerInMemoryRegion(object);
     return Address.fromInt(0);
   }
 
@@ -451,17 +329,6 @@
    * inherently acyclic
    */
   public boolean isAcyclic(ObjectReference typeRef) 
-/*
-    throws InlinePragma {
-    Object type;
-    Object[] tib = VM_Magic.addressAsObjectArray(typeRef.toAddress());
-    if (true) {  // necessary to avoid an odd compiler bug
-      type = VM_Magic.getObjectAtOffset(tib, Offset.fromIntZeroExtend(TIB_TYPE_INDEX));
-    } else {
-      type = tib[TIB_TYPE_INDEX];
-    }
-    return VM_Magic.objectAsType(type).isAcyclicReference();
-*/
   {
       System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.isAcyclic() was
called");
       VM.assertions._assert(false);
@@ -477,26 +344,6 @@
   public MMType getObjectType(ObjectReference object) 
     throws InlinePragma {
       System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getObjectType()
was called");
-    /*
-    Object obj = object.toObject();
-    Object[] tib = VM_ObjectModel.getTIB(obj);
-    if (VM.VerifyAssertions) {
-      if (tib == null || VM_ObjectModel.getObjectType(tib) != VM_Type.JavaLangObjectArrayType)
{
-        VM.sysWriteln("getObjectType: objRef = ", object.toAddress(), "   tib = ", VM_Magic.objectAsAddress(tib));
-        VM.sysWriteln("               tib's type is not Object[]");
-        VM._assert(false);
-      }
-    }
-    VM_Type vmType = VM_Magic.objectAsType(tib[TIB_TYPE_INDEX]);
-    if (VM.VerifyAssertions) {
-      if (vmType == null) {
-        VM.sysWriteln("getObjectType: null type for object = ", object);
-        VM._assert(false);
-      }
-    }
-    if (VM.VerifyAssertions) VM._assert(vmType.getMMType() != null);
-    return (MMType) vmType.getMMType();
-  */
     VM.assertions._assert(false);
     return new MMType(false, false, false, 0, null);
   }

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=433818&r1=433817&r2=433818&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
Tue Aug 22 17:57:49 2006
@@ -14,12 +14,6 @@
  *  limitations under the License.
  */
 
-/*
- * (C) Copyright Department of Computer Science,
- * Australian National University. 2004
- *
- * (C) Copyright IBM Corp. 2001, 2003
- */
 package org.apache.HarmonyDRLVM.mm.mmtk;
  
 import org.vmmagic.unboxed.Extent;
@@ -126,211 +120,7 @@
                   "\" must be specified as a name-value pair in the form of option=value");
       return false;
     }
-/*
-    String name = arg.substring(0,split);
-    String value = arg.substring(split+1);
-
-    Option o = Option.getOption(name); 
-
-    if (o == null) return false;
-
-    switch (o.getType()) {
-      case Option.BOOLEAN_OPTION:
-        if (value.equals("true")) {
-          ((BooleanOption)o).setValue(true);
-          return true;
-        } else if (value.equals("false")) {
-          ((BooleanOption)o).setValue(false);
-          return true;
-        }
-        return false;
-      case Option.INT_OPTION:
-        int ival = VM_CommandLineArgs.primitiveParseInt(value);
-        ((IntOption)o).setValue(ival);
-        return true;
-      case Option.FLOAT_OPTION:
-        float fval = VM_CommandLineArgs.primitiveParseFloat(value);
-        ((FloatOption)o).setValue(fval);
-        return true;
-      case Option.STRING_OPTION:
-        ((StringOption)o).setValue(value);
-        return true;
-      case Option.ENUM_OPTION:
-        ((EnumOption)o).setValue(value);
-        return true;
-      case Option.PAGES_OPTION:
-        long pval = VM_CommandLineArgs.parseMemorySize(
-          o.getName(),
-          ":gc:" + o.getKey() + "=",
-          "b",
-          1,
-          ":gc:" + o.getKey() + "=" + value,
-          value);
-        if (pval < 0) return false;
-        ((PagesOption)o).setBytes(Extent.fromIntSignExtend((int)pval));
-        return true;
-      case Option.MICROSECONDS_OPTION:
-        int mval = VM_CommandLineArgs.primitiveParseInt(value);
-        ((MicrosecondsOption)o).setMicroseconds(mval);
-        return true;
-    }
 
-    // None of the above tests matched, so this wasn't an option
-    */
     return false;
   }
-
-  /**
-   * Print a short description of every option
-   */
-
-    /*
-  public static void printHelp() {
-
-    VM.sysWriteln("Commands");
-    VM.sysWriteln("-X:gc[:help]\t\t\tPrint brief description of GC arguments");
-    VM.sysWriteln("-X:gc:printOptions\t\tPrint the current values of GC options");
-    VM.sysWriteln();
-
-    //Begin generated help messages
-    VM.sysWriteln("Boolean Options (-X:gc:<option>=true or -X:gc:<option>=false)");
-    VM.sysWriteln("Option                                 Description");
-
-    Option o = Option.getFirst();
-    while (o != null) {
-      if (o.getType() == Option.BOOLEAN_OPTION) {
-        String key = o.getKey();
-        VM.sysWrite(key);
-        for (int c = key.length(); c<39;c++) {
-          VM.sysWrite(" ");
-        }
-        VM.sysWriteln(o.getDescription()); 
-      }
-      o = o.getNext();
-    }
-
-    VM.sysWriteln("\nValue Options (-X:gc:<option>=<value>)");
-    VM.sysWriteln("Option                         Type    Description");
-    
-    o = Option.getFirst();
-    while (o != null) {
-      if (o.getType() != Option.BOOLEAN_OPTION &&
-          o.getType() != Option.ENUM_OPTION) {
-        String key = o.getKey();
-        VM.sysWrite(key);
-        for (int c = key.length(); c<31;c++) {
-          VM.sysWrite(" ");
-        }
-        switch (o.getType()) {
-          case Option.INT_OPTION:          VM.sysWrite("int     "); break;
-          case Option.FLOAT_OPTION:        VM.sysWrite("float   "); break;
-          case Option.MICROSECONDS_OPTION: VM.sysWrite("usec    "); break;
-          case Option.PAGES_OPTION:        VM.sysWrite("bytes   "); break;
-          case Option.STRING_OPTION:       VM.sysWrite("string  "); break;
-        }
-        VM.sysWriteln(o.getDescription()); 
-      }
-      o = o.getNext();
-    }
-
-    VM.sysWriteln("\nSelection Options (set option to one of an enumeration of possible values)");
-
-    o = Option.getFirst();
-    while (o != null) {
-      if (o.getType() == Option.ENUM_OPTION) { 
-        VM.sysWrite("\t\t");
-        VM.sysWriteln(o.getDescription());
-        String key = o.getKey();
-        VM.sysWrite(key);
-        for (int c = key.length(); c<31;c++) {
-          VM.sysWrite(" ");
-        }
-        String[] vals = ((EnumOption)o).getValues();
-        for(int j=0; j<vals.length; j++) {
-          VM.sysWrite(vals[j]);
-          VM.sysWrite(" ");
-        }
-        VM.sysWriteln();
-      }
-      o = o.getNext();
-    }
-
-    VM.sysExit(VM.EXIT_STATUS_PRINTED_HELP_MESSAGE);
-  }    
-*/
-
-
-  /**
-   * Print out the option values
-   */
-
-/*
-  public static void printOptions() {
-    VM.sysWriteln("Current value of GC options");
-
-    Option o = Option.getFirst();
-    while (o != null) {
-      if (o.getType() == Option.BOOLEAN_OPTION) {
-        String key = o.getKey();
-        VM.sysWrite("\t");
-        VM.sysWrite(key);
-        for (int c = key.length(); c<31;c++) {
-          VM.sysWrite(" ");
-        }
-        VM.sysWrite(" = ");
-        VM.sysWriteln(((BooleanOption)o).getValue());
-      }
-      o = o.getNext();
-    }
-
-    o = Option.getFirst();
-    while (o != null) {
-      if (o.getType() != Option.BOOLEAN_OPTION &&
-          o.getType() != Option.ENUM_OPTION) {
-        String key = o.getKey();
-        VM.sysWrite("\t");
-        VM.sysWrite(key);
-        for (int c = key.length(); c<31;c++) {
-          VM.sysWrite(" ");
-        }
-        VM.sysWrite(" = ");
-        switch (o.getType()) {
-          case Option.INT_OPTION:
-            VM.sysWriteln(((IntOption)o).getValue()); 
-            break;
-          case Option.FLOAT_OPTION:
-            VM.sysWriteln(((FloatOption)o).getValue()); 
-            break;
-          case Option.MICROSECONDS_OPTION:
-            VM.sysWrite(((MicrosecondsOption)o).getMicroseconds()); 
-            VM.sysWriteln(" usec");
-            break;
-          case Option.PAGES_OPTION:
-            VM.sysWrite(((PagesOption)o).getBytes());
-            VM.sysWriteln(" bytes");
-            break;
-          case Option.STRING_OPTION:
-            VM.sysWriteln(((StringOption)o).getValue()); 
-            break;
-        }
-      }
-      o = o.getNext();
-    }
-
-    o = Option.getFirst();
-    while (o != null) {
-      if (o.getType() == Option.ENUM_OPTION) {
-        String key = o.getKey();
-        VM.sysWrite("\t");
-        VM.sysWrite(key);
-        for (int c = key.length(); c<31;c++) {
-          VM.sysWrite(" ");
-        }
-        VM.sysWrite(" = ");
-        VM.sysWriteln(((EnumOption)o).getValueString());
-      }
-      o = o.getNext();
-    }
-  } 
-*/
 }

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=433818&r1=433817&r2=433818&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
Tue Aug 22 17:57:49 2006
@@ -14,13 +14,6 @@
  *  limitations under the License.
  */
 
-/*
- * (C) Copyright Department of Computer Science,
- * Australian National University. 2004
- *
- * (C) Copyright IBM Corp. 2001, 2003
- */
-
 package org.apache.HarmonyDRLVM.mm.mmtk;
  
 import org.mmtk.utility.ReferenceProcessor;

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Scanning.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Scanning.java?rev=433818&r1=433817&r2=433818&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Scanning.java
(original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Scanning.java
Tue Aug 22 17:57:49 2006
@@ -14,13 +14,6 @@
  *  limitations under the License.
  */
 
-/*
- * (C) Copyright Department of Computer Science,
- * Australian National University. 2004
- *
- * (C) Copyright IBM Corp. 2001, 2003
- */
-
 package org.apache.HarmonyDRLVM.mm.mmtk;
  
 
@@ -154,26 +147,6 @@
    * @param trace The trace object to use to report root locations.
    */
   public final void computeAllRoots(TraceLocal trace) {
-    //boolean processCodeLocations = MM_Interface.MOVES_OBJECTS;
-     /* scan statics */
-    //ScanStatics.scanStatics(trace);
- 
-    /* scan all threads */
-    /* 
-     * while (true) {
-      int threadIndex = threadCounter.increment();
-      if (threadIndex > VM_Scheduler.threadHighWatermark) break;
-      
-      VM_Thread thread = VM_Scheduler.threads[threadIndex];
-      if (thread == null) continue;
-      
-      /* scan the thread (stack etc.) */
-      //ScanThread.scanThread(thread, trace, processCodeLocations);
-
-      /* identify this thread as a root */
-      //trace.addRootLocation(VM_Magic.objectAsAddress(VM_Scheduler.threads).plus(threadIndex<<LOG_BYTES_IN_ADDRESS));
-    //}
-    //VM_CollectorThread.gcBarrier.rendezvous(4200);
     //System.out.println("*****************************org.apache.HarmonyDRLVM.mm.mmtk.Scanning.computeAllRoots()
was called TraceLocal = "  + trace);
     /////////////////VM.assertions._assert(false);
       return;

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=433818&r1=433817&r2=433818&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
Tue Aug 22 17:57:49 2006
@@ -14,11 +14,6 @@
  *  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.*;

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=433818&r1=433817&r2=433818&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
Tue Aug 22 17:57:49 2006
@@ -14,11 +14,6 @@
  *  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.*;

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=433818&r1=433817&r2=433818&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
Tue Aug 22 17:57:49 2006
@@ -14,11 +14,6 @@
  *  limitations under the License.
  */
 
-/*
- * (C) Copyright Department of Computer Science,
- * Australian National University. 2004
- */
-
 package org.apache.HarmonyDRLVM.mm.mmtk;
 
 import org.mmtk.plan.nogc.*;

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=433818&r1=433817&r2=433818&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
Tue Aug 22 17:57:49 2006
@@ -14,11 +14,6 @@
  *  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.*;

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Statistics.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Statistics.java?rev=433818&r1=433817&r2=433818&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Statistics.java
(original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/Statistics.java
Tue Aug 22 17:57:49 2006
@@ -14,13 +14,6 @@
  *  limitations under the License.
  */
 
-/*
- * (C) Copyright Department of Computer Science,
- * Australian National University. 2004
- *
- * (C) Copyright IBM Corp. 2001, 2003
- */
-
 package org.apache.HarmonyDRLVM.mm.mmtk;
 
 import org.mmtk.utility.Constants;

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=433818&r1=433817&r2=433818&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
Tue Aug 22 17:57:49 2006
@@ -14,13 +14,6 @@
  *  limitations under the License.
  */
 
-/*
- * (C) Copyright Department of Computer Science,
- * Australian National University. 2004
- *
- * (C) Copyright IBM Corp. 2001, 2003
- */
-
 package org.apache.HarmonyDRLVM.mm.mmtk;
 
 import org.vmmagic.unboxed.*;

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SynchronizedCounter.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SynchronizedCounter.java?rev=433818&r1=433817&r2=433818&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SynchronizedCounter.java
(original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/SynchronizedCounter.java
Tue Aug 22 17:57:49 2006
@@ -14,13 +14,6 @@
  *  limitations under the License.
  */
 
-/*
- * (C) Copyright Department of Computer Science,
- * Australian National University. 2004
- *
- * (C) Copyright IBM Corp. 2001, 2003
- */
-
 package org.apache.HarmonyDRLVM.mm.mmtk;
 
 import org.vmmagic.pragma.*;
@@ -39,23 +32,11 @@
   private static Offset offset = Offset.max();
 
   public static void boot() {
-    //offset = VM_Entrypoints.synchronizedCounterField.getOffset();
-      //System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.SynchronizedCounter.boot() --
fix VM_Entrypoints...");
   }
 
   private int count = 0;
 
   public int reset() {
-    //    int offset = VM_Interface.synchronizedCounterOffset;
-    /* int oldValue = count;
-    int actualOldValue = VM_Synchronization.fetchAndAdd(this, offset, -oldValue);
-    if (actualOldValue != oldValue) {
-      VM.sysWriteln("oldValue = ", oldValue);
-      VM.sysWriteln("actualOldValue = ", actualOldValue);
-      VM.sysFail("Concurrent use of SynchronizedCounter.reset");
-    }
-    return oldValue;
-    */
     int oldValue = count;  // unsynchronized access for now, single thread operation only
     count = 0;
     //System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.SynchronizedCounter.reset() oldValue
= " + oldValue);
@@ -68,11 +49,6 @@
   // Returns the value before the add
   //
   public int increment() {
-    //if (VM.VerifyAssertions) VM._assert(!offset.isMax());
-    //return VM_Synchronization.fetchAndAdd(this, offset, 1);
-      //VM.assertions._assert(false);
-    //return 0;
-
     int oldValue = count;
     count++;
       //if (count == 1)

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/TraceInterface.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/TraceInterface.java?rev=433818&r1=433817&r2=433818&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/TraceInterface.java
(original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk/TraceInterface.java
Tue Aug 22 17:57:49 2006
@@ -14,13 +14,6 @@
  *  limitations under the License.
  */
 
-/*
- * (C) Copyright Department of Computer Science,
- * Australian National University. 2004
- *
- * (C) Copyright IBM Corp. 2001, 2003
- */
-
 package org.apache.HarmonyDRLVM.mm.mmtk;
 
 import org.mmtk.utility.Constants;
@@ -30,12 +23,6 @@
 /**
  * Class that supports scanning Objects or Arrays for references
  * during tracing, handling those references, and computing death times
- * 
- * $Id: TraceInterface.java,v 1.3 2006/06/05 04:30:57 steveb-oss Exp $
- * 
- * @author <a href="http://www-ali.cs.umass.edu/~hertz">Matthew Hertz</a>
- * @version $Revision: 1.3 $
- * @date $Date: 2006/06/05 04:30:57 $
  */
 public final class TraceInterface extends org.mmtk.vm.TraceInterface implements Uninterruptible
{
 
@@ -46,23 +33,6 @@
   private static byte allocCallMethods[][];
 
   static {
-    /* Build the list of "own methods" */
-      /*
-    allocCallMethods = new byte[13][];
-    allocCallMethods[0] = "postAlloc".getBytes();
-    allocCallMethods[1] = "traceAlloc".getBytes();
-    allocCallMethods[2] = "allocateScalar".getBytes();
-    allocCallMethods[3] = "allocateArray".getBytes();
-    allocCallMethods[4] = "clone".getBytes();
-    allocCallMethods[5] = "alloc".getBytes();
-    allocCallMethods[6] = "buildMultiDimensionalArray".getBytes();
-    allocCallMethods[7] = "resolvedNewScalar".getBytes();
-    allocCallMethods[8] = "resolvedNewArray".getBytes();
-    allocCallMethods[9] = "unresolvedNewScalar".getBytes();
-    allocCallMethods[10] = "unresolvedNewArray".getBytes();
-    allocCallMethods[11] = "cloneScalar".getBytes();
-    allocCallMethods[12] = "cloneArray".getBytes();
-    */
   }
 
   /***********************************************************************



Mime
View raw message