hotspot/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicTypeDataBase.java

rev 611 : Merge

*** 1,7 ****
  /*
!  * Copyright 2000-2004 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 2000-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.
*** 25,34 ****
--- 25,35 ----
  package sun.jvm.hotspot.types.basic;
  
  import java.util.*;
  import sun.jvm.hotspot.debugger.*;
  import sun.jvm.hotspot.types.*;
+ import sun.jvm.hotspot.runtime.VM;
  
  /** <P> This is a basic implementation of the TypeDataBase interface.
      It allows an external type database builder to add types to be
      consumed by a client through the Type interfaces. It has no
      knowledge of symbol lookup; for example, the builder is
*** 144,154 ****
    public long getAddressSize() {
      return machDesc.getAddressSize();
    }
  
    public long getOopSize() {
!     return machDesc.getOopSize();
    }
  
    public boolean addressTypeIsEqualToType(Address addr, Type type) {
      if (addr == null) {
        return false;
--- 145,155 ----
    public long getAddressSize() {
      return machDesc.getAddressSize();
    }
  
    public long getOopSize() {
!     return VM.getVM().getOopSize();
    }
  
    public boolean addressTypeIsEqualToType(Address addr, Type type) {
      if (addr == null) {
        return false;