*** old/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpot.java	Fri Sep  9 14:15:47 2011
--- new/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpot.java	Fri Sep  9 14:15:47 2011

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2001, 2011, Oracle and/or its affiliates. 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.

*** 32,42 ****
--- 32,42 ----
  import javax.swing.*;
  import javax.swing.filechooser.*;
  import sun.jvm.hotspot.debugger.*;
  import sun.jvm.hotspot.debugger.cdbg.*;
  import sun.jvm.hotspot.debugger.posix.*;
! import sun.jvm.hotspot.debugger.win32.*;
! import sun.jvm.hotspot.debugger.windbg.*;
  import sun.jvm.hotspot.livejvm.*;
  import sun.jvm.hotspot.memory.*;
  import sun.jvm.hotspot.oops.*;
  import sun.jvm.hotspot.runtime.*;
  import sun.jvm.hotspot.ui.*;

*** 602,612 ****
--- 602,612 ----
        if (os.equals("win32")) {
          if (!cpu.equals("x86")) {
            throw new DebuggerException("Unsupported CPU \"" + cpu + "\" for Windows");
          }
  
!         localDebugger = new Win32DebuggerLocal(new MachineDescriptionIntelX86(), true);
!         localDebugger = new WindbgDebuggerLocal(new MachineDescriptionIntelX86(), true);
        } else if (os.equals("linux")) {
          if (!cpu.equals("x86")) {
            throw new DebuggerException("Unsupported CPU \"" + cpu + "\" for Linux");
          }