harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wjwashb...@apache.org
Subject svn commit: r430145 - in /incubator/harmony/enhanced/drlvm/trunk/vm/MMTk/ext/vm/HarmonyDRLVM/org/apache/HarmonyDRLVM/mm/mmtk: Barriers.java Lock.java Memory.java ObjectModel.java Options.java ReferenceGlue.java
Date Wed, 09 Aug 2006 20:57:20 GMT
Author: wjwashburn
Date: Wed Aug  9 13:57:19 2006
New Revision: 430145

URL: http://svn.apache.org/viewvc?rev=430145&view=rev
Log:
mods that allow NoGC allocate() to work

Modified:
    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/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

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=430145&r1=430144&r2=430145&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
Wed Aug  9 13:57:19 2006
@@ -40,7 +40,7 @@
                                            ObjectReference target, Offset offset, 
                                            int locationMetadata, int mode) 
     throws InlinePragma {
-    System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Barrier -- something was called (but
should not be)" );
+    System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Barriers -- performWriteInBarrier
was called (but should not be)" );
     //wjw turn this on when we need it -----> Object obj = ref.toObject();
     //wjw    VM_Magic.setObjectAtOffset(obj, offset, target.toObject(), locationMetadata);
 
   }
@@ -71,7 +71,7 @@
     } while (!VM_Magic.attemptObject(obj, offset, oldObject, newObject));
     return ObjectReference.fromObject(oldObject); 
     */
-    System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Barrier -- something was called (but
should not be)" );
+    System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Barriers -- performWriteInBarrierAtomic
was called (but should not be)" );
 
     return ref;  // keep the compiler happy
   }
@@ -90,7 +90,7 @@
     setArrayNoBarrierStatic(dst, index, value);
   }
   public static final void setArrayNoBarrierStatic(char [] dst, int index, char value) {
-      System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Barrier -- something was called
(but should not be)" );
+      System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Barriers.setArrayNoBarrier()" );
       dst[index] = value;
   }
 
@@ -106,7 +106,7 @@
     return getArrayNoBarrierStatic(src, index);
   }
   public static final char getArrayNoBarrierStatic(char [] src, int index) {
-      System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Barrier -- something was called
(but should not be)" );
+      System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Barriers.getArrayNoBarrier()" );
       return src[index];
   }
 
@@ -122,7 +122,7 @@
     return getArrayNoBarrierStatic(src, index);
   }
   public static final byte getArrayNoBarrierStatic(byte [] src, int index) {
-      System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Barrier -- something was called
(but should not be)" );
+      System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Barriers.getArrayNoBarrier()" );
       return src[index];
   }
 
@@ -135,7 +135,7 @@
    * @return the new value of element
    */
   public final int getArrayNoBarrier(int [] src, int index) {
-      System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Barrier -- something was called
(but should not be)" );
+      System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Barriers.getArrayNoBarrier()" );
       return src[index];
   }
 
@@ -148,7 +148,7 @@
    * @return the new value of element
    */
   public final Object getArrayNoBarrier(Object [] src, int index) {
-      System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Barrier -- something was called
(but should not be)" );
+      System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Barriers.getArrayNoBarrier()" );
       return src[index];
   }
   
@@ -165,7 +165,7 @@
     return getArrayNoBarrierStatic(src, index);
   }
   public static final byte[] getArrayNoBarrierStatic(byte[][] src, int index) {
-      System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Barrier -- something was called
(but should not be)" );
+      System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Barriers.getArrayNoBarrierStatic()"
);
       return src[index];
   }
 }

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=430145&r1=430144&r2=430145&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  9 13:57:19 2006
@@ -62,7 +62,7 @@
         System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Lock.acquire(): " + name);
       try 
       {
-          this.wait();
+          //this.wait();
       } 
       catch (Exception e) 
       { 
@@ -82,7 +82,7 @@
   public void release() 
   {
        System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Lock.release(): " + name);
-       this.notify();
+       //this.notify();
   }
 
 }

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=430145&r1=430144&r2=430145&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  9 13:57:19 2006
@@ -24,8 +24,10 @@
 
 import org.mmtk.plan.Plan;
 import org.mmtk.policy.ImmortalSpace;
+import org.mmtk.policy.Space;
 import org.mmtk.utility.Constants;
 
+import org.mmtk.vm.VM;
 import org.vmmagic.unboxed.*;
 import org.vmmagic.pragma.*;
 
@@ -33,31 +35,64 @@
 public class Memory extends org.mmtk.vm.Memory
   implements Constants, Uninterruptible {
 
-    protected final Address getHeapStartConstant() { return Address.fromInt(0x100); } //BOOT_IMAGE_DATA_START
-    protected final Address getHeapEndConstant() { return Address.fromInt(0xFFff0000); }
 //MAXIMUM_MAPPABLE
+    static protected int PHONY_JAVA_HEAP_SIZE = 1024 * 1024 * 256;
+    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 
+    {
+        immortalPinnedScratchObject = new byte[PHONY_JAVA_HEAP_SIZE];
+        ObjectReference or = ObjectReference.fromObject(immortalPinnedScratchObject);
+        Address addr = or.toAddress();
+        addr = addr.plus(Space.BYTES_IN_CHUNK + 16);  // add 16 to skip over the object's
header area
+        dangerousPointerToStartOfScratchArea = addr.toWord().rshl(Space.LOG_BYTES_IN_CHUNK).lsh(Space.LOG_BYTES_IN_CHUNK).toInt();
+
+        addr = or.toAddress();
+        addr = addr.plus(PHONY_JAVA_HEAP_SIZE);
+        dangerousPointerToEndOfScratchArea = addr.toInt();
+        dangerousPointerToEndOfScratchArea = addr.toWord().rshl(Space.LOG_BYTES_IN_CHUNK).lsh(Space.LOG_BYTES_IN_CHUNK).toInt();
+    }
+ 
+    protected final Address getHeapStartConstant() // toss { return Address.fromInt(0x100);
} //BOOT_IMAGE_DATA_START
+    {
+        Address heapStart = Address.fromInt(dangerousPointerToStartOfScratchArea);
+        System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Memory.getHeapStartConstant()
= " + Integer.toHexString(heapStart.toInt()) );
+        return heapStart;
+    }
+    protected final Address getHeapEndConstant() // toss { return Address.fromInt(0xFFff0000);
}  //MAXIMUM_MAPPABLE
+    {
+        Address heapEnd = Address.fromInt(dangerousPointerToEndOfScratchArea);
+        System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Memory.getHeapEndConstant() =
" + Integer.toHexString(heapEnd.toInt()) );
+        return heapEnd;
+    }
     protected final Address getAvailableStartConstant() 
     { 
-        System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Memory.getAvailableStartConstant(),
needs fixing now");
-        return Address.fromInt(0); //BOOT_IMAGE_CODE_END
+        Address availableStart = Address.fromInt(dangerousPointerToStartOfScratchArea);
+        System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Memory.getAvailableStartConstant()
= " + Integer.toHexString(availableStart.toInt()) );
+        return availableStart;
     }
     protected final Address getAvailableEndConstant() 
-    { 
-        System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Memory.getAvailableEndConstant(),
needs fixing now");      
-        return Address.fromInt(0); //MAXIMUM_MAPPABLE;
+    {      
+        Address availableEnd = Address.fromInt(dangerousPointerToEndOfScratchArea);
+        System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Memory.getAvailableEndConstant()
= " + Integer.toHexString(availableEnd.toInt() )); 
+        return availableEnd;
     }
   protected final byte getLogBytesInAddressConstant() { return 2; }
   protected final byte getLogBytesInWordConstant() { return 2; }
   protected final byte getLogBytesInPageConstant() { return 12; }
-  protected final byte getLogMinAlignmentConstant() { return 3;}
+  protected final byte getLogMinAlignmentConstant() { return 2;}
   protected final byte getMaxAlignmentShiftConstant() { return 3; } //wjw -- I dont have
a clue
   protected final int getMaxBytesPaddingConstant() { return 8; } 
   protected final int getAlignmentValueConstant() { return 0x01020304;}
  
+  private static int BOOT_SEGMENT_MB = (0x800000>>LOG_BYTES_IN_MBYTE);
 
     public final ImmortalSpace getVMSpace() throws InterruptiblePragma
     {
-        System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Memory.globalPrepareVMSpace()
needs fixing");
-        return null;
+        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() 
@@ -80,7 +115,9 @@
     }
     public final void setHeapRange(int id, Address start, Address end) 
     {
-        System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Memory.setHeapRange() needs fixing");
+        System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Memory.setHeapRange() id = "
+ id + 
+            " start = " + Integer.toHexString(start.toInt()) + 
+            " end = " + Integer.toHexString(end.toInt())                );
     }
  /**
    * Maps an area of virtual memory.
@@ -90,7 +127,7 @@
    * @return 0 if successful, otherwise the system errno
    */
   public final int mmap(Address start, int size) {
-      System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Memory.mmap() needs fixing");
+      //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,

@@ -102,7 +139,7 @@
       VM.sysFail("mmap with MAP_FIXED has unexpected behavior");
     }
     */
-    return 99;
+    return 0;
   }
   
   /**

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=430145&r1=430144&r2=430145&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
Wed Aug  9 13:57:19 2006
@@ -79,7 +79,7 @@
     else
       return copyArray(from, tib, type.asArray(), allocator);
   */
-      System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.copy was called");
+      System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.copy was called");
       return from;  //wjw -- keep the compiler happy for now
   }
 
@@ -169,7 +169,7 @@
     
     return start.plus(bytes);
 */
-      System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.copyTo() was called");
+      System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.copyTo() was called");
       return Address.fromInt(0);
   }
 
@@ -183,7 +183,7 @@
    * @return The resulting reference.
    */
   public ObjectReference getReferenceWhenCopiedTo(ObjectReference from, Address to) {
-    System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getReferenceWhenCopiedTo()
was called");
+    System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getReferenceWhenCopiedTo()
was called");
     return from;  // keep the compiler happy -- xObjectReference.fromObject(VM_ObjectModel.getReferenceWhenCopiedTo(from,
to));
   }
   
@@ -193,7 +193,7 @@
    * @param object The objecty.
    */
   public Address getObjectEndAddress(ObjectReference object) {
-    System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getObjectEndAddress()
was called");
+    System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getObjectEndAddress()
was called");
     return Address.fromInt(0);  // keep the compiler happy
   }
   
@@ -205,7 +205,7 @@
    */
   public int getSizeWhenCopied(ObjectReference object) {
     //need to use drlvm's get_object_size_bytes()
-    System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getSizeWhenCopied() was
called");
+    System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getSizeWhenCopied()
was called");
     return 0;  // VM_ObjectModel.bytesRequiredWhenCopied(object);
   }
   
@@ -226,7 +226,7 @@
       return VM_ObjectModel.getAlignment(type.asClass(), object);
     }
 */
-    System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getAlignWhenCopied()
was called");
+    System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getAlignWhenCopied()
was called");
     return 0;
   }
   
@@ -246,7 +246,7 @@
       return VM_ObjectModel.getOffsetForAlignment(type.asClass(), object);
     }
     */
-      System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getAlignOffsetWhenCopied()
was called");
+      System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getAlignOffsetWhenCopied()
was called");
       return 0;
   }
   
@@ -257,7 +257,7 @@
    * @return The size of <code>obj</code>
    */
   public int getCurrentSize(ObjectReference object) {
-      System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getCurrentSize() was
called");
+      System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getCurrentSize()
was called");
       return 0;
       // return VM_ObjectModel.bytesUsed(object);
   }
@@ -266,7 +266,7 @@
    * Return the next object in the heap under contiguous allocation
    */
   public ObjectReference getNextObject(ObjectReference object) {
-    System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getNextObject() was called");
+    System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getNextObject() was
called");
     return ObjectReference.fromObject(null);
   }
 
@@ -274,7 +274,7 @@
    * Return an object reference from knowledge of the low order word
    */
   public ObjectReference getObjectFromStartAddress(Address start) {
-    System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getObjectFromStartAddress()
was called");
+    System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getObjectFromStartAddress()
was called");
     return ObjectReference.fromObject(null);
   }
   
@@ -286,13 +286,13 @@
    */
   public byte [] getTypeDescriptor(ObjectReference ref) {
     //VM_Atom descriptor = VM_Magic.getObjectType(ref).getDescriptor();
-    System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getTypeDescriptor() was
called");
+    System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getTypeDescriptor()
was called");
     return new byte[10]; // descriptor.toByteArray();
   }
 
   public int getArrayLength(ObjectReference object) 
     throws InlinePragma {
-    System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getArrayLength() was
called");
+    System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getArrayLength()
was called");
     //return VM_Magic.getArrayLength(object.toObject());
     return 0;
   }
@@ -303,7 +303,7 @@
    * @param idx the index of the bit
    */
   public boolean testAvailableBit(ObjectReference object, int idx) {
-    System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.testAvailableBit() was
called");
+    System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.testAvailableBit()
was called");
     //return VM_ObjectModel.testAvailableBit(object.toObject(), idx);
     return false;
   }
@@ -318,7 +318,7 @@
    */
   public void setAvailableBit(ObjectReference object, int idx,
                                      boolean flag) {
-    System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.setAvailableBit() was
called");
+    System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.setAvailableBit()
was called");
     //VM_ObjectModel.setAvailableBit(object.toObject(), idx, flag);
     return;
   }
@@ -338,7 +338,7 @@
    */
   public boolean attemptAvailableBits(ObjectReference object,
                                              Word oldVal, Word newVal) {
-    System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.attemptAvailableBits()
was called");
+    System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.attemptAvailableBits()
was called");
     //return VM_ObjectModel.attemptAvailableBits(object.toObject(), oldVal, newVal);
     return false;
   }
@@ -351,7 +351,7 @@
    * @return the value of the bits
    */
   public Word prepareAvailableBits(ObjectReference object) {
-    System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.attemptAvailableBits()
was called");
+    System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.attemptAvailableBits()
was called");
     //return VM_ObjectModel.prepareAvailableBits(object.toObject());
     return Word.fromInt(0);
   }
@@ -363,7 +363,7 @@
    * @param val the new value of the bits
    */
   public void writeAvailableBitsWord(ObjectReference object, Word val) {
-    System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.attemptAvailableBits()
was called");
+    System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.attemptAvailableBits()
was called");
     //VM_ObjectModel.writeAvailableBitsWord(object.toObject(), val);
     return;
   }
@@ -375,7 +375,7 @@
    * @return the value of the bits
    */
   public Word readAvailableBitsWord(ObjectReference object) {
-      System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.readAvailableBitsWord()
was called");
+      System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.readAvailableBitsWord()
was called");
       //return VM_ObjectModel.readAvailableBitsWord(object);
       return Word.fromInt(0);
   }
@@ -390,7 +390,7 @@
    */
   /* AJG: Should this be a variable rather than method? */
   public Offset GC_HEADER_OFFSET() {
-    System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.GC_HEADER_OFFSET() was
called");
+    System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.GC_HEADER_OFFSET()
was called");
     //return VM_ObjectModel.GC_HEADER_OFFSET;
     return Offset.fromInt(0);
   }
@@ -403,7 +403,7 @@
    */
   public Address objectStartRef(ObjectReference object)
     throws InlinePragma {
-    System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.objectStartRef() was
called");
+    System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.objectStartRef()
was called");
     //return VM_ObjectModel.objectStartRef(object);
     return Address.fromInt(0);
   }
@@ -416,7 +416,7 @@
    * @return an address inside the object
    */
   public Address refToAddress(ObjectReference object) {
-    System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.objectStartRef() was
called");
+    System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.objectStartRef()
was called");
     //return VM_ObjectModel.getPointerInMemoryRegion(object);
     return Address.fromInt(0);
   }
@@ -441,7 +441,7 @@
     return VM_Magic.objectAsType(type).isAcyclicReference();
 */
   {
-      System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.isAcyclic() was called");
+      System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.isAcyclic() was
called");
       return false;
   }
 
@@ -453,7 +453,7 @@
    */
   public MMType getObjectType(ObjectReference object) 
     throws InlinePragma {
-      System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getObjectType() was
called");
+      System.out.println("wjw org.apache.HarmonyDRLVM.mm.mmtk.ObjectModel.getObjectType()
was called");
     /*
     Object obj = object.toObject();
     Object[] tib = VM_ObjectModel.getTIB(obj);

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=430145&r1=430144&r2=430145&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  9 13:57:19 2006
@@ -56,7 +56,7 @@
       key += name.substring(old, space);
     } while (true);
     */
-    System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.getKey() was called");
+    System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.Options.getKey(String) " + name);
     return null;
   }
 

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=430145&r1=430144&r2=430145&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  9 13:57:19 2006
@@ -36,10 +36,7 @@
 
 /**
  * This class manages SoftReferences, WeakReferences, and
- * PhantomReferences. 
- * 
- * @author Chris Hoffmann
- * @modified Andrew Gray
+ * PhantomReferences.
  */
 public final class ReferenceGlue extends org.mmtk.vm.ReferenceGlue implements Uninterruptible

 {
@@ -123,7 +120,7 @@
      */
     protected boolean getReferencesAreObjects()
     {
-        System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ReferenceGlue.getReferencesAreObjects()
was called");
+        //System.out.println("org.apache.HarmonyDRLVM.mm.mmtk.ReferenceGlue.getReferencesAreObjects()
was called");
         return false;
     }
   



Mime
View raw message