hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java

rev 611 : Merge

*** 1,7 ****
  /*
!  * Copyright 2002-2006 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright 2002-2008 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 1075,1086 ****
        buf.append(omvIterator.iterate(oms, "Oop:", false));
  
        oms = new OopMapStream(map, OopMapValue.OopTypes.VALUE_VALUE);
        buf.append(omvIterator.iterate(oms, "Value:", false));
  
!       oms = new OopMapStream(map, OopMapValue.OopTypes.DEAD_VALUE);
!       buf.append(omvIterator.iterate(oms, "Dead:", false));
  
        oms = new OopMapStream(map, OopMapValue.OopTypes.CALLEE_SAVED_VALUE);
        buf.append(omvIterator.iterate(oms, "Callee saved:",  true));
      
        oms = new OopMapStream(map, OopMapValue.OopTypes.DERIVED_OOP_VALUE);
--- 1075,1086 ----
        buf.append(omvIterator.iterate(oms, "Oop:", false));
  
        oms = new OopMapStream(map, OopMapValue.OopTypes.VALUE_VALUE);
        buf.append(omvIterator.iterate(oms, "Value:", false));
  
!       oms = new OopMapStream(map, OopMapValue.OopTypes.NARROWOOP_VALUE);
!       buf.append(omvIterator.iterate(oms, "Oop:", false));
  
        oms = new OopMapStream(map, OopMapValue.OopTypes.CALLEE_SAVED_VALUE);
        buf.append(omvIterator.iterate(oms, "Callee saved:",  true));
      
        oms = new OopMapStream(map, OopMapValue.OopTypes.DERIVED_OOP_VALUE);
*** 1133,1142 ****
--- 1133,1144 ----
           buf.append(", ");
           if (type == Location.Type.NORMAL) {
              buf.append("normal");
           } else if (type == Location.Type.OOP) {
              buf.append("oop");
+          } else if (type == Location.Type.NARROWOOP) {
+             buf.append("narrowoop");
           } else if (type == Location.Type.INT_IN_LONG) {
              buf.append("int");
           } else if (type == Location.Type.LNG) {
              buf.append("long");
           } else if (type == Location.Type.FLOAT_IN_DBL) {