# HG changeset patch
# User acorn
# Date 1238365145 14400
# Node ID d142f1feeed50352ff3f4b56427a60e732c04305
# Parent  9ab385cb0c42997e16a7761ebcd25c90560a2714# Parent  f30ba3b3659955263850246b29aadb59408cab2f
Merge

diff -r 9ab385cb0c42 -r d142f1feeed5 agent/src/share/classes/sun/jvm/hotspot/HotSpotTypeDataBase.java
--- a/agent/src/share/classes/sun/jvm/hotspot/HotSpotTypeDataBase.java	Fri Mar 27 16:58:30 2009 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/HotSpotTypeDataBase.java	Sun Mar 29 18:19:05 2009 -0400
@@ -306,8 +306,6 @@
 
       entryAddr = entryAddr.addOffsetTo(intConstantEntryArrayStride);
     } while (nameAddr != null);
-      String symbol = "heapOopSize"; // global int constant and value is initialized at runtime.
-      addIntConstant(symbol, (int)lookupInProcess(symbol).getCIntegerAt(0, 4, false));
   }
 
   private void readVMLongConstants() {
diff -r 9ab385cb0c42 -r d142f1feeed5 agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java
--- a/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java	Fri Mar 27 16:58:30 2009 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java	Sun Mar 29 18:19:05 2009 -0400
@@ -342,12 +342,14 @@
       throw new RuntimeException("Attempt to initialize VM twice");
     }
     soleInstance = new VM(db, debugger, debugger.getMachineDescription().isBigEndian());
-    debugger.putHeapConst(soleInstance.getHeapOopSize(), Universe.getNarrowOopBase(),
-                          Universe.getNarrowOopShift());
+
     for (Iterator iter = vmInitializedObservers.iterator(); iter.hasNext(); ) {
       ((Observer) iter.next()).update(null, null);
     }
 
+    debugger.putHeapConst(soleInstance.getHeapOopSize(), Universe.getNarrowOopBase(),
+                          Universe.getNarrowOopShift());
+
   }
 
   /** This is used by the debugging system */
diff -r 9ab385cb0c42 -r d142f1feeed5 src/share/vm/runtime/vmStructs.cpp
--- a/src/share/vm/runtime/vmStructs.cpp	Fri Mar 27 16:58:30 2009 -0700
+++ b/src/share/vm/runtime/vmStructs.cpp	Sun Mar 29 18:19:05 2009 -0400
@@ -1320,6 +1320,7 @@
   /****************/                                                      \
                                                                           \
   declare_constant(oopSize)                                               \
+  declare_constant(heapOopSize)                                           \
   declare_constant(LogBytesPerWord)                                       \
   declare_constant(BytesPerLong)                                          \
                                                                           \