--- /dev/null	Fri Sep  9 14:16:36 2011
+++ new/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallJavaNode.java	Fri Sep  9 14:16:57 2011
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import java.io.PrintStream;
+import sun.jvm.hotspot.ci.ciMethod;
+import sun.jvm.hotspot.ci.ciObjectFactory;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class MachCallJavaNode extends MachCallNode {
+  static {
+    VM.registerVMInitializedObserver(new Observer() {
+        public void update(Observable o, Object data) {
+          initialize(VM.getVM().getTypeDataBase());
+        }
+      });
+  }
+
+  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+    Type type      = db.lookupType("MachCallJavaNode");
+    methodField = type.getAddressField("_method");
+    bciField = new CIntField(type.getCIntegerField("_bci"), 0);
+  }
+
+  private static AddressField methodField;
+  private static CIntField bciField;
+
+  public ciMethod method() {
+    return (ciMethod) ciObjectFactory.get(methodField.getValue(getAddress()));
+  }
+
+  public MachCallJavaNode(Address addr) {
+    super(addr);
+  }
+
+  public void dumpSpec(PrintStream st) {
+    ciMethod m = method();
+    if (m != null) {
+      m.printShortName(st);
+      st.print(" ");
+    }
+    super.dumpSpec(st);
+  }
+}