diff -bBr -I '$Id:' -I '\@version' -I '\@date' --exclude=CVS --exclude memoryManagers --exclude arch --exclude compilers original.src/vm/adaptive/utility/ValueOptions.dat rvm/src/vm/adaptive/utility/ValueOptions.dat
97a98,101
> V COMPILER_ADVICE_FILE String \"\"
> File containing advice about the methods that need to be Opt compiled
> 
> 
diff -bBr -I '$Id:' -I '\@version' -I '\@date' --exclude=CVS --exclude memoryManagers --exclude arch --exclude compilers original.src/vm/classLoader/VM_Array.java rvm/src/vm/classLoader/VM_Array.java
190a191,193
>     //-#if RVM_WITH_MARKING_COLLECT
>     this.alignment = BYTES_IN_ADDRESS;
>     //-#else
195a199
>     //-#endif
diff -bBr -I '$Id:' -I '\@version' -I '\@date' --exclude=CVS --exclude memoryManagers --exclude arch --exclude compilers original.src/vm/objectModel/default/VM_JavaHeaderConstants.java rvm/src/vm/objectModel/default/VM_JavaHeaderConstants.java
45a46,47
>     //-#elif RVM_WITH_MARKING_COLLECT
>     false;
diff -bBr -I '$Id:' -I '\@version' -I '\@date' --exclude=CVS --exclude memoryManagers --exclude arch --exclude compilers original.src/vm/objectModel/default/VM_JavaHeader.java rvm/src/vm/objectModel/default/VM_JavaHeader.java
95a96,114
>   //-#if RVM_WITH_MARKING_COLLECT
>   public static VM_Address getObjectHeadPointer(VM_Address ref, 
>                                                 boolean isScalar) 
>     throws VM_PragmaInline {
>     if (isScalar)
>       return ref;
>     else
>       return ref.add(ARRAY_HEADER_SIZE);      
>   }
> 
>   public static VM_Address getObjectEnd(VM_Address obj, boolean isScalar) 
>     throws VM_PragmaInline {
>     if (isScalar)
>       return obj.sub(BYTES_IN_ADDRESS);
>     else
>       return obj.sub(ARRAY_HEADER_SIZE);
>   }
>   //-#endif
>   
133a153,161
>   //-#if RVM_WITH_MARKING_COLLECT
>   /**
>    * Process the TIB field during copyingGC
>    */
>   public static void gcProcessTIB(boolean repeat, VM_Address ref) 
>     throws VM_PragmaInline {
>     MM_Interface.processPtrLocation(repeat, ref.add(TIB_OFFSET));
>   }
>   //-#else
139a168
>   //-#endif
diff -bBr -I '$Id:' -I '\@version' -I '\@date' --exclude=CVS --exclude memoryManagers --exclude arch --exclude compilers original.src/vm/objectModel/VM_ObjectModel.java rvm/src/vm/objectModel/VM_ObjectModel.java
61c61
<  *      The GCHeader should use buts 0..i, MiscHeader should use bits i..k.
---
>  *      The GCHeader should use bits 0..i, MiscHeader should use bits i..k.
132a133,137
>         //-#if RVM_WITH_MARKING_COLLECT
>         fieldOffset -= fieldSize;
>         field.setOffset(fieldOffset);
>         klass.increaseInstanceSize(fieldSize);
>         //-#else
160a166
>         //-#endif
172a179,190
>   //-#if RVM_WITH_MARKING_COLLECT
>   public static VM_Address getObjectHeadPointer(VM_Address ref, 
>                                                 boolean isScalar) 
>     throws VM_PragmaInline {
>     return VM_JavaHeader.getObjectHeadPointer(ref, isScalar);
>   }
>   public static VM_Address getObjectEnd(VM_Address obj, boolean isScalar) 
>     throws VM_PragmaInline {
>     return VM_JavaHeader.getObjectEnd(obj, isScalar);
>   }
>   //-#endif
>   
216a235,242
>   //-#if RVM_WITH_MARKING_COLLECT
>   /**
>    * Process the TIB field during copyingGC
>    */
>   public static void gcProcessTIB(boolean repeat, VM_Address ref) {
>     VM_JavaHeader.gcProcessTIB(repeat, ref);
>   }
>   //-#else
222a249
>   //-#endif
diff -bBr -I '$Id:' -I '\@version' -I '\@date' --exclude=CVS --exclude memoryManagers --exclude arch --exclude compilers original.src/vm/runtime/VM_BootRecord.java rvm/src/vm/runtime/VM_BootRecord.java
312a313,320
>   //-#if RVM_WITH_MARKING_COLLECT
>   public VM_Address sysReturnPagesIP;
>   public VM_Address sysQuitPageMgrIP;
>   public VM_Address sysGrowHeapIP;
>   public VM_Address sysPagingStartIP;
>   public VM_Address sysPagingEndIP;
>   //-#endif
> 
diff -bBr -I '$Id:' -I '\@version' -I '\@date' --exclude=CVS --exclude memoryManagers --exclude arch --exclude compilers original.src/vm/runtime/VM_Entrypoints.java rvm/src/vm/runtime/VM_Entrypoints.java
266a267,299
>   //-#if RVM_WITH_MARKING_COLLECT
>   ///////////////
>   // Entrypoints added by MHz for HC support
>   ///////////////
>   public static final VM_Field pageMgrDiscardableField = getField("Lorg/mmtk/utility/PageMgr;", "discardable", "Lcom/ibm/JikesRVM/VM_WordArray;");
>   public static final VM_Field pageMgrEvictedField = getField("Lorg/mmtk/utility/PageMgr;", "evicted", "Lcom/ibm/JikesRVM/VM_WordArray;");
>   public static final VM_Field pageMgrFootprintField = getField("Lorg/mmtk/utility/PageMgr;", "footprint", "I");
>   public static final VM_Field pageMgrTargetField = getField("Lorg/mmtk/utility/PageMgr;", "target", "I");
>   public static final VM_Field pageMgrSwapWordField = getField("Lorg/mmtk/utility/PageMgr;", "swapWord", "I");
>   public static final VM_Field pageMgrInUseField = getField("Lorg/mmtk/utility/PageMgr;", "inUse", "I");
>   public static final VM_Field markingLocalCellSizeField = getField("Lorg/mmtk/utility/MarkingFreeList;", "cellSize", "Lcom/ibm/JikesRVM/VM_ExtentArray;");
>   public static final VM_Field markingLocalSPHeaderSizeField = getField("Lorg/mmtk/utility/MarkingFreeList;", "spHeaderSize", "Lcom/ibm/JikesRVM/VM_OffsetArray;");
>   public static final VM_Field markingLocalCellsInSuperPageField = getField("Lorg/mmtk/utility/MarkingFreeList;", "cellsInSuperPage", "Lcom/ibm/JikesRVM/VM_ExtentArray;");
>   public static final VM_Field markingLocalScalarCurrentField = getField("Lorg/mmtk/utility/MarkingFreeList;", "scalarCurrentSuperPage", "Lcom/ibm/JikesRVM/VM_AddressArray;");
>   public static final VM_Field markingLocalArrayCurrentField = getField("Lorg/mmtk/utility/MarkingFreeList;", "arrayCurrentSuperPage", "Lcom/ibm/JikesRVM/VM_AddressArray;");
>   public static final VM_Field markingLocalScalarFreeListField = getField("Lorg/mmtk/utility/MarkingFreeList;", "scalarFreeList", "Lcom/ibm/JikesRVM/VM_AddressArray;");
>   public static final VM_Field markingLocalArrayFreeListField = getField("Lorg/mmtk/utility/MarkingFreeList;", "arrayFreeList", "Lcom/ibm/JikesRVM/VM_AddressArray;");
>   public static final VM_Field markingSpaceMarkStateField = getField("Lorg/mmtk/policy/ImmortalSpace;", "immortalMarkState", "Lcom/ibm/JikesRVM/VM_Word;");
>   public static final VM_Field planLOSField = getField("Lorg/mmtk/plan/Plan;", "los", "Lorg/mmtk/policy/PagingTreadmillLocal;");
>   public static final VM_Field planMSField = getField("Lorg/mmtk/plan/Plan;", "ms", "Lorg/mmtk/policy/MarkingLocal;");
>   public static final VM_Field planImmortalField = getField("Lorg/mmtk/plan/BasePlan;", "immortal", "Lorg/mmtk/policy/MarkingLocal;");
>   public static final VM_Field planFullHeapGCField = getField("Lorg/mmtk/plan/Plan;", "fullHeapGC", "Z");
>   public static final VM_Field pagingTreadmillLocalTreadmillField = getField("Lorg/mmtk/policy/PagingTreadmillLocal;", "treadmill", "Lorg/mmtk/utility/PagingTreadmill;");
>   public static final VM_Field pagingTreadmillFromSpaceField = getField("Lorg/mmtk/utility/PagingTreadmill;", "fromSpace", "Lorg/mmtk/utility/PagingDoublyLinkedList;");
>   public static final VM_Field pagingTreadmillToSpaceField = getField("Lorg/mmtk/utility/PagingTreadmill;", "toSpace", "Lorg/mmtk/utility/PagingDoublyLinkedList;");
>   public static final VM_Field pagingDoublyLinkedListHeadField = getField("Lorg/mmtk/utility/PagingDoublyLinkedList;", "head", "Lcom/ibm/JikesRVM/VM_Address;");
>   public static final VM_Field typeMMTypeField = getField("Lcom/ibm/JikesRVM/classloader/VM_Type;", "mmType", "Ljava/lang/Object;");
>   public static final VM_Field mmTypeIsReferenceArrayField = getField("Lorg/mmtk/utility/MMType;", "isReferenceArray", "Z");
>   public static final VM_Field mmTypeOffsetsField = getField("Lorg/mmtk/utility/MMType;", "offsets", "[I");  
>   public static final VM_Field mmTypeIsDelegatedField = getField("Lorg/mmtk/utility/MMType;", "isDelegated", "Z");
>   public static final VM_Field mmTypeArrayOffsetField = getField("Lorg/mmtk/utility/MMType;", "arrayOffset", "Lcom/ibm/JikesRVM/VM_Offset;");  
>   //-#endif
>   
diff -bBr -I '$Id:' -I '\@version' -I '\@date' --exclude=CVS --exclude memoryManagers --exclude arch --exclude compilers original.src/vm/runtime/VM_SysCall.java rvm/src/vm/runtime/VM_SysCall.java
38a39,45
>   //-#if RVM_WITH_MARKING_COLLECT
>   public static void sysReturnPages(int discardPgs) { }
>   public static void sysQuitPageMgr() {}
>   //-#endif
>   public static void sysPagingStart() {}
>   public static void sysPagingEnd() {}
> 
diff -bBr -I '$Id:' -I '\@version' -I '\@date' --exclude=CVS --exclude memoryManagers --exclude arch --exclude compilers original.src/vm/VM.java rvm/src/vm/VM.java
263a264,267
>     //-#if RVM_WITH_COMPILER_ADVICE
>     VM_CompilerAdvice.postBoot();
>     //-#endif
>