diff -r 173d83d9c9d7 -r 12e9215f3daa hotspot/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MemoryInstruction.java
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MemoryInstruction.java	Thu Sep 27 11:24:19 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2003, 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.asm.x86;
-
-import sun.jvm.hotspot.asm.*;
-
-public abstract class X86MemoryInstruction extends X86Instruction
-             implements MemoryInstruction {
-   final protected Address address;
-   final protected X86Register register;
-   final protected int dataType;
-   final protected String description;
-
-   public X86MemoryInstruction(String name, Address address, X86Register register, int dataType, int size, int prefixes) {
-      super(name, size, prefixes);
-      this.address = address;
-      this.register = register;
-      this.dataType = dataType;
-      description = initDescription();
-   }
-
-   protected String initDescription() {
-      StringBuffer buf = new StringBuffer();
-      buf.append(getPrefixString());
-      buf.append(getName());
-      buf.append(spaces);
-      buf.append(register.toString());
-      buf.append(comma);
-      buf.append(address.toString());
-      return buf.toString();
-   }
-
-   public String asString(long currentPc, SymbolFinder symFinder) {
-      return description;
-   }
-
-   public int getDataType() {
-      return dataType;
-   }
-
-   public boolean isConditional() {
-      return false;
-   }
-}