Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/.hgtags	Thu Jul 11 12:59:03 2013 -0400
     1.2 +++ b/.hgtags	Mon Jul 15 11:07:03 2013 +0100
     1.3 @@ -351,3 +351,10 @@
     1.4  3c78a14da19d26d6937af5f98b97e2a21c653b04 hs25-b36
     1.5  1beed1f6f9edefe47ba8ed1355fbd3e7606b8288 jdk8-b94
     1.6  69689078dff8b21e6df30870464f5d736eebdf72 hs25-b37
     1.7 +5d65c078cd0ac455aa5e58a09844c7acce54b487 jdk8-b95
     1.8 +2cc5a9d1ba66dfdff578918b393c727bd9450210 hs25-b38
     1.9 +e6a4b8c71fa6f225bd989a34de2d0d0a656a8be8 jdk8-b96
    1.10 +2b9380b0bf0b649f40704735773e8956c2d88ba0 hs25-b39
    1.11 +d197d377ab2e016d024e8c86cb06a57bd7eae590 jdk8-b97
    1.12 +c9dd82da51ed34a28f7c6b3245163ee962e94572 hs25-b40
    1.13 +30b5b75c42ac5174b640fbef8aa87527668e8400 jdk8-b98

     2.1 --- a/agent/src/share/classes/sun/jvm/hotspot/CLHSDB.java	Thu Jul 11 12:59:03 2013 -0400
     2.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/CLHSDB.java	Mon Jul 15 11:07:03 2013 +0100
     2.3 @@ -31,13 +31,19 @@
     2.4  import java.util.*;
     2.5  
     2.6  public class CLHSDB {
     2.7 +
     2.8 +    public CLHSDB(JVMDebugger d) {
     2.9 +        jvmDebugger = d;
    2.10 +    }
    2.11 +
    2.12      public static void main(String[] args) {
    2.13          new CLHSDB(args).run();
    2.14      }
    2.15  
    2.16 -    private void run() {
    2.17 -        // At this point, if pidText != null we are supposed to attach to it.
    2.18 -        // Else, if execPath != null, it is the path of a jdk/bin/java
    2.19 +    public void run() {
    2.20 +        // If jvmDebugger is already set, we have been given a JVMDebugger.
    2.21 +        // Otherwise, if pidText != null we are supposed to attach to it.
    2.22 +        // Finally, if execPath != null, it is the path of a jdk/bin/java
    2.23          // and coreFilename is the pathname of a core file we are
    2.24          // supposed to attach to.
    2.25  
    2.26 @@ -49,7 +55,9 @@
    2.27                  }
    2.28              });
    2.29  
    2.30 -        if (pidText != null) {
    2.31 +        if (jvmDebugger != null) {
    2.32 +            attachDebugger(jvmDebugger);
    2.33 +        } else if (pidText != null) {
    2.34              attachDebugger(pidText);
    2.35          } else if (execPath != null) {
    2.36              attachDebugger(execPath, coreFilename);
    2.37 @@ -96,6 +104,7 @@
    2.38      // Internals only below this point
    2.39      //
    2.40      private HotSpotAgent agent;
    2.41 +    private JVMDebugger jvmDebugger;
    2.42      private boolean      attached;
    2.43      // These had to be made data members because they are referenced in inner classes.
    2.44      private String pidText;
    2.45 @@ -120,7 +129,7 @@
    2.46          case (1):
    2.47              if (args[0].equals("help") || args[0].equals("-help")) {
    2.48                  doUsage();
    2.49 -                System.exit(0);
    2.50 +                return;
    2.51              }
    2.52              // If all numbers, it is a PID to attach to
    2.53              // Else, it is a pathname to a .../bin/java for a core file.
    2.54 @@ -142,10 +151,15 @@
    2.55          default:
    2.56              System.out.println("HSDB Error: Too many options specified");
    2.57              doUsage();
    2.58 -            System.exit(1);
    2.59 +            return;
    2.60          }
    2.61      }
    2.62  
    2.63 +    private void attachDebugger(JVMDebugger d) {
    2.64 +        agent.attach(d);
    2.65 +        attached = true;
    2.66 +     }
    2.67 +
    2.68      /** NOTE we are in a different thread here than either the main
    2.69          thread or the Swing/AWT event handler thread, so we must be very
    2.70          careful when creating or removing widgets */

     3.1 --- a/agent/src/share/classes/sun/jvm/hotspot/CommandProcessor.java	Thu Jul 11 12:59:03 2013 -0400
     3.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/CommandProcessor.java	Mon Jul 15 11:07:03 2013 +0100
     3.3 @@ -101,6 +101,9 @@
     3.4  import sun.jvm.hotspot.utilities.soql.JSJavaScriptEngine;
     3.5  
     3.6  public class CommandProcessor {
     3.7 +
     3.8 +    volatile boolean quit;
     3.9 +
    3.10      public abstract static class DebuggerInterface {
    3.11          public abstract HotSpotAgent getAgent();
    3.12          public abstract boolean isAttached();
    3.13 @@ -1135,7 +1138,7 @@
    3.14                      usage();
    3.15                  } else {
    3.16                      debugger.detach();
    3.17 -                    System.exit(0);
    3.18 +                    quit = true;
    3.19                  }
    3.20              }
    3.21          },
    3.22 @@ -1714,7 +1717,7 @@
    3.23                          }
    3.24                          protected void quit() {
    3.25                              debugger.detach();
    3.26 -                            System.exit(0);
    3.27 +                            quit = true;
    3.28                          }
    3.29                          protected BufferedReader getInputReader() {
    3.30                              return in;
    3.31 @@ -1781,7 +1784,7 @@
    3.32  
    3.33      public void run(boolean prompt) {
    3.34          // Process interactive commands.
    3.35 -        while (true) {
    3.36 +        while (!quit) {
    3.37              if (prompt) printPrompt();
    3.38              String ln = null;
    3.39              try {

     4.1 --- a/agent/src/share/classes/sun/jvm/hotspot/HSDB.java	Thu Jul 11 12:59:03 2013 -0400
     4.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/HSDB.java	Mon Jul 15 11:07:03 2013 +0100
     4.3 @@ -59,8 +59,11 @@
     4.4    // Internals only below this point
     4.5    //
     4.6    private HotSpotAgent agent;
     4.7 +  private JVMDebugger jvmDebugger;
     4.8    private JDesktopPane desktop;
     4.9    private boolean      attached;
    4.10 +  private boolean      argError;
    4.11 +  private JFrame frame;
    4.12    /** List <JMenuItem> */
    4.13    private java.util.List attachMenuItems;
    4.14    /** List <JMenuItem> */
    4.15 @@ -85,6 +88,11 @@
    4.16      System.out.println("           path-to-corefile:        Debug this corefile.  The default is 'core'");
    4.17      System.out.println("        If no arguments are specified, you can select what to do from the GUI.\n");
    4.18      HotSpotAgent.showUsage();
    4.19 +    argError = true;
    4.20 +  }
    4.21 +
    4.22 +  public HSDB(JVMDebugger d) {
    4.23 +    jvmDebugger = d;
    4.24    }
    4.25  
    4.26    private HSDB(String[] args) {
    4.27 @@ -95,7 +103,6 @@
    4.28      case (1):
    4.29        if (args[0].equals("help") || args[0].equals("-help")) {
    4.30          doUsage();
    4.31 -        System.exit(0);
    4.32        }
    4.33        // If all numbers, it is a PID to attach to
    4.34        // Else, it is a pathname to a .../bin/java for a core file.
    4.35 @@ -117,24 +124,29 @@
    4.36      default:
    4.37        System.out.println("HSDB Error: Too many options specified");
    4.38        doUsage();
    4.39 -      System.exit(1);
    4.40      }
    4.41    }
    4.42  
    4.43 -  private void run() {
    4.44 -    // At this point, if pidText != null we are supposed to attach to it.
    4.45 -    // Else, if execPath != null, it is the path of a jdk/bin/java
    4.46 -    // and coreFilename is the pathname of a core file we are
    4.47 -    // supposed to attach to.
    4.48 +  // close this tool without calling System.exit
    4.49 +  protected void closeUI() {
    4.50 +      workerThread.shutdown();
    4.51 +      frame.dispose();
    4.52 +  }
    4.53 +
    4.54 +  public void run() {
    4.55 +    // Don't start the UI if there were bad arguments.
    4.56 +    if (argError) {
    4.57 +        return;
    4.58 +    }
    4.59  
    4.60      agent = new HotSpotAgent();
    4.61      workerThread = new WorkerThread();
    4.62      attachMenuItems = new java.util.ArrayList();
    4.63      detachMenuItems = new java.util.ArrayList();
    4.64  
    4.65 -    JFrame frame = new JFrame("HSDB - HotSpot Debugger");
    4.66 +    frame = new JFrame("HSDB - HotSpot Debugger");
    4.67      frame.setSize(800, 600);
    4.68 -    frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
    4.69 +    frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
    4.70  
    4.71      JMenuBar menuBar = new JMenuBar();
    4.72  
    4.73 @@ -197,7 +209,7 @@
    4.74      item = createMenuItem("Exit",
    4.75                              new ActionListener() {
    4.76                                  public void actionPerformed(ActionEvent e) {
    4.77 -                                  System.exit(0);
    4.78 +                                  closeUI();
    4.79                                  }
    4.80                                });
    4.81      item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, ActionEvent.ALT_MASK));
    4.82 @@ -406,7 +418,15 @@
    4.83          }
    4.84        });
    4.85  
    4.86 -    if (pidText != null) {
    4.87 +    // If jvmDebugger is already set, we have been given a JVMDebugger.
    4.88 +    // Otherwise, if pidText != null we are supposed to attach to it.
    4.89 +    // Finally, if execPath != null, it is the path of a jdk/bin/java
    4.90 +    // and coreFilename is the pathname of a core file we are
    4.91 +    // supposed to attach to.
    4.92 +
    4.93 +    if (jvmDebugger != null) {
    4.94 +      attach(jvmDebugger);
    4.95 +    } else if (pidText != null) {
    4.96        attach(pidText);
    4.97      } else if (execPath != null) {
    4.98        attach(execPath, coreFilename);
    4.99 @@ -1113,6 +1133,12 @@
   4.100        });
   4.101    }
   4.102  
   4.103 +  // Attach to existing JVMDebugger, which should be already attached to a core/process.
   4.104 +  private void attach(JVMDebugger d) {
   4.105 +    attached = true;
   4.106 +    showThreadsDialog();
   4.107 +  }
   4.108 +
   4.109    /** NOTE we are in a different thread here than either the main
   4.110        thread or the Swing/AWT event handler thread, so we must be very
   4.111        careful when creating or removing widgets */

     5.1 --- a/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java	Thu Jul 11 12:59:03 2013 -0400
     5.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java	Mon Jul 15 11:07:03 2013 +0100
     5.3 @@ -25,6 +25,8 @@
     5.4  package sun.jvm.hotspot;
     5.5  
     5.6  import java.rmi.RemoteException;
     5.7 +import java.lang.reflect.Constructor;
     5.8 +import java.lang.reflect.InvocationTargetException;
     5.9  
    5.10  import sun.jvm.hotspot.debugger.Debugger;
    5.11  import sun.jvm.hotspot.debugger.DebuggerException;
    5.12 @@ -63,7 +65,6 @@
    5.13  
    5.14      private String os;
    5.15      private String cpu;
    5.16 -    private String fileSep;
    5.17  
    5.18      // The system can work in several ways:
    5.19      //  - Attaching to local process
    5.20 @@ -155,6 +156,14 @@
    5.21          go();
    5.22      }
    5.23  
    5.24 +    /** This uses a JVMDebugger that is already attached to the core or process */
    5.25 +    public synchronized void attach(JVMDebugger d)
    5.26 +    throws DebuggerException {
    5.27 +        debugger = d;
    5.28 +        isServer = false;
    5.29 +        go();
    5.30 +    }
    5.31 +
    5.32      /** This attaches to a "debug server" on a remote machine; this
    5.33        remote server has already attached to a process or opened a
    5.34        core file and is waiting for RMI calls on the Debugger object to
    5.35 @@ -303,28 +312,37 @@
    5.36              // server, but not client attaching to server)
    5.37              //
    5.38  
    5.39 -            try {
    5.40 -                os  = PlatformInfo.getOS();
    5.41 -                cpu = PlatformInfo.getCPU();
    5.42 -            }
    5.43 -            catch (UnsupportedPlatformException e) {
    5.44 -                throw new DebuggerException(e);
    5.45 -            }
    5.46 -            fileSep = System.getProperty("file.separator");
    5.47 +            // Handle existing or alternate JVMDebugger:
    5.48 +            // these will set os, cpu independently of our PlatformInfo implementation.
    5.49 +            String alternateDebugger = System.getProperty("sa.altDebugger");
    5.50 +            if (debugger != null) {
    5.51 +                setupDebuggerExisting();
    5.52  
    5.53 -            if (os.equals("solaris")) {
    5.54 -                setupDebuggerSolaris();
    5.55 -            } else if (os.equals("win32")) {
    5.56 -                setupDebuggerWin32();
    5.57 -            } else if (os.equals("linux")) {
    5.58 -                setupDebuggerLinux();
    5.59 -            } else if (os.equals("bsd")) {
    5.60 -                setupDebuggerBsd();
    5.61 -            } else if (os.equals("darwin")) {
    5.62 -                setupDebuggerDarwin();
    5.63 +            } else if (alternateDebugger != null) {
    5.64 +                setupDebuggerAlternate(alternateDebugger);
    5.65 +
    5.66              } else {
    5.67 -                // Add support for more operating systems here
    5.68 -                throw new DebuggerException("Operating system " + os + " not yet supported");
    5.69 +                // Otherwise, os, cpu are those of our current platform:
    5.70 +                try {
    5.71 +                    os  = PlatformInfo.getOS();
    5.72 +                    cpu = PlatformInfo.getCPU();
    5.73 +                } catch (UnsupportedPlatformException e) {
    5.74 +                   throw new DebuggerException(e);
    5.75 +                }
    5.76 +                if (os.equals("solaris")) {
    5.77 +                    setupDebuggerSolaris();
    5.78 +                } else if (os.equals("win32")) {
    5.79 +                    setupDebuggerWin32();
    5.80 +                } else if (os.equals("linux")) {
    5.81 +                    setupDebuggerLinux();
    5.82 +                } else if (os.equals("bsd")) {
    5.83 +                    setupDebuggerBsd();
    5.84 +                } else if (os.equals("darwin")) {
    5.85 +                    setupDebuggerDarwin();
    5.86 +                } else {
    5.87 +                    // Add support for more operating systems here
    5.88 +                    throw new DebuggerException("Operating system " + os + " not yet supported");
    5.89 +                }
    5.90              }
    5.91  
    5.92              if (isServer) {
    5.93 @@ -423,6 +441,41 @@
    5.94      // OS-specific debugger setup/connect routines
    5.95      //
    5.96  
    5.97 +    // Use the existing JVMDebugger, as passed to our constructor.
    5.98 +    // Retrieve os and cpu from that debugger, not the current platform.
    5.99 +    private void setupDebuggerExisting() {
   5.100 +
   5.101 +        os = debugger.getOS();
   5.102 +        cpu = debugger.getCPU();
   5.103 +        setupJVMLibNames(os);
   5.104 +        machDesc = debugger.getMachineDescription();
   5.105 +    }
   5.106 +
   5.107 +    // Given a classname, load an alternate implementation of JVMDebugger.
   5.108 +    private void setupDebuggerAlternate(String alternateName) {
   5.109 +
   5.110 +        try {
   5.111 +            Class c = Class.forName(alternateName);
   5.112 +            Constructor cons = c.getConstructor();
   5.113 +            debugger = (JVMDebugger) cons.newInstance();
   5.114 +            attachDebugger();
   5.115 +            setupDebuggerExisting();
   5.116 +
   5.117 +        } catch (ClassNotFoundException cnfe) {
   5.118 +            throw new DebuggerException("Cannot find alternate SA Debugger: '" + alternateName + "'");
   5.119 +        } catch (NoSuchMethodException nsme) {
   5.120 +            throw new DebuggerException("Alternate SA Debugger: '" + alternateName + "' has missing constructor.");
   5.121 +        } catch (InstantiationException ie) {
   5.122 +            throw new DebuggerException("Alternate SA Debugger: '" + alternateName + "' fails to initialise: ", ie);
   5.123 +        } catch (IllegalAccessException iae) {
   5.124 +            throw new DebuggerException("Alternate SA Debugger: '" + alternateName + "' fails to initialise: ", iae);
   5.125 +        } catch (InvocationTargetException iae) {
   5.126 +            throw new DebuggerException("Alternate SA Debugger: '" + alternateName + "' fails to initialise: ", iae);
   5.127 +        }
   5.128 +
   5.129 +        System.err.println("Loaded alternate HotSpot SA Debugger: " + alternateName);
   5.130 +    }
   5.131 +
   5.132      //
   5.133      // Solaris
   5.134      //
   5.135 @@ -466,6 +519,11 @@
   5.136          debugger = new RemoteDebuggerClient(remote);
   5.137          machDesc = ((RemoteDebuggerClient) debugger).getMachineDescription();
   5.138          os = debugger.getOS();
   5.139 +        setupJVMLibNames(os);
   5.140 +        cpu = debugger.getCPU();
   5.141 +    }
   5.142 +
   5.143 +    private void setupJVMLibNames(String os) {
   5.144          if (os.equals("solaris")) {
   5.145              setupJVMLibNamesSolaris();
   5.146          } else if (os.equals("win32")) {
   5.147 @@ -479,8 +537,6 @@
   5.148          } else {
   5.149              throw new RuntimeException("Unknown OS type");
   5.150          }
   5.151 -
   5.152 -        cpu = debugger.getCPU();
   5.153      }
   5.154  
   5.155      private void setupJVMLibNamesSolaris() {

     6.1 --- a/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxAddress.java	Thu Jul 11 12:59:03 2013 -0400
     6.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxAddress.java	Mon Jul 15 11:07:03 2013 +0100
     6.3 @@ -26,11 +26,11 @@
     6.4  
     6.5  import sun.jvm.hotspot.debugger.*;
     6.6  
     6.7 -class LinuxAddress implements Address {
     6.8 +public class LinuxAddress implements Address {
     6.9      protected LinuxDebugger debugger;
    6.10      protected long addr;
    6.11  
    6.12 -    LinuxAddress(LinuxDebugger debugger, long addr) {
    6.13 +    public LinuxAddress(LinuxDebugger debugger, long addr) {
    6.14          this.debugger = debugger;
    6.15          this.addr = addr;
    6.16      }

     7.1 --- a/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxOopHandle.java	Thu Jul 11 12:59:03 2013 -0400
     7.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxOopHandle.java	Mon Jul 15 11:07:03 2013 +0100
     7.3 @@ -26,8 +26,8 @@
     7.4  
     7.5  import sun.jvm.hotspot.debugger.*;
     7.6  
     7.7 -class LinuxOopHandle extends LinuxAddress implements OopHandle {
     7.8 -  LinuxOopHandle(LinuxDebugger debugger, long addr) {
     7.9 +public class LinuxOopHandle extends LinuxAddress implements OopHandle {
    7.10 +  public LinuxOopHandle(LinuxDebugger debugger, long addr) {
    7.11      super(debugger, addr);
    7.12    }
    7.13  

     8.1 --- a/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java	Thu Jul 11 12:59:03 2013 -0400
     8.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java	Mon Jul 15 11:07:03 2013 +0100
     8.3 @@ -246,7 +246,7 @@
     8.4       }
     8.5    }
     8.6  
     8.7 -  private static final boolean disableDerivedPrinterTableCheck;
     8.8 +  private static final boolean disableDerivedPointerTableCheck;
     8.9    private static final Properties saProps;
    8.10  
    8.11    static {
    8.12 @@ -256,12 +256,12 @@
    8.13         url = VM.class.getClassLoader().getResource("sa.properties");
    8.14         saProps.load(new BufferedInputStream(url.openStream()));
    8.15       } catch (Exception e) {
    8.16 -       throw new RuntimeException("Unable to load properties  " +
    8.17 +       System.err.println("Unable to load properties  " +
    8.18                                    (url == null ? "null" : url.toString()) +
    8.19                                    ": " + e.getMessage());
    8.20       }
    8.21  
    8.22 -     disableDerivedPrinterTableCheck = System.getProperty("sun.jvm.hotspot.runtime.VM.disableDerivedPointerTableCheck") != null;
    8.23 +     disableDerivedPointerTableCheck = System.getProperty("sun.jvm.hotspot.runtime.VM.disableDerivedPointerTableCheck") != null;
    8.24    }
    8.25  
    8.26    private VM(TypeDataBase db, JVMDebugger debugger, boolean isBigEndian) {
    8.27 @@ -371,7 +371,8 @@
    8.28    /** This is used by the debugging system */
    8.29    public static void initialize(TypeDataBase db, JVMDebugger debugger) {
    8.30      if (soleInstance != null) {
    8.31 -      throw new RuntimeException("Attempt to initialize VM twice");
    8.32 +      // Using multiple SA Tool classes in the same process creates a call here.
    8.33 +      return;
    8.34      }
    8.35      soleInstance = new VM(db, debugger, debugger.getMachineDescription().isBigEndian());
    8.36  
    8.37 @@ -683,7 +684,7 @@
    8.38  
    8.39    /** Returns true if C2 derived pointer table should be used, false otherwise */
    8.40    public boolean useDerivedPointerTable() {
    8.41 -    return !disableDerivedPrinterTableCheck;
    8.42 +    return !disableDerivedPointerTableCheck;
    8.43    }
    8.44  
    8.45    /** Returns the code cache; should not be used if is core build */

     9.1 --- a/agent/src/share/classes/sun/jvm/hotspot/tools/ClassLoaderStats.java	Thu Jul 11 12:59:03 2013 -0400
     9.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/tools/ClassLoaderStats.java	Mon Jul 15 11:07:03 2013 +0100
     9.3 @@ -41,6 +41,14 @@
     9.4  public class ClassLoaderStats extends Tool {
     9.5     boolean verbose = true;
     9.6  
     9.7 +   public ClassLoaderStats() {
     9.8 +      super();
     9.9 +   }
    9.10 +
    9.11 +   public ClassLoaderStats(JVMDebugger d) {
    9.12 +      super(d);
    9.13 +   }
    9.14 +
    9.15     public static void main(String[] args) {
    9.16        ClassLoaderStats cls = new ClassLoaderStats();
    9.17        cls.start(args);

    10.1 --- a/agent/src/share/classes/sun/jvm/hotspot/tools/FinalizerInfo.java	Thu Jul 11 12:59:03 2013 -0400
    10.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/tools/FinalizerInfo.java	Mon Jul 15 11:07:03 2013 +0100
    10.3 @@ -24,6 +24,7 @@
    10.4  
    10.5  package sun.jvm.hotspot.tools;
    10.6  
    10.7 +import sun.jvm.hotspot.debugger.JVMDebugger;
    10.8  import sun.jvm.hotspot.tools.*;
    10.9  
   10.10  import sun.jvm.hotspot.oops.*;
   10.11 @@ -42,6 +43,15 @@
   10.12   * summary of these objects in the form of a histogram.
   10.13   */
   10.14  public class FinalizerInfo extends Tool {
   10.15 +
   10.16 +    public FinalizerInfo() {
   10.17 +        super();
   10.18 +    }
   10.19 +
   10.20 +    public FinalizerInfo(JVMDebugger d) {
   10.21 +        super(d);
   10.22 +    }
   10.23 +
   10.24      public static void main(String[] args) {
   10.25          FinalizerInfo finfo = new FinalizerInfo();
   10.26          finfo.start(args);

    11.1 --- a/agent/src/share/classes/sun/jvm/hotspot/tools/FlagDumper.java	Thu Jul 11 12:59:03 2013 -0400
    11.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/tools/FlagDumper.java	Mon Jul 15 11:07:03 2013 +0100
    11.3 @@ -25,10 +25,19 @@
    11.4  package sun.jvm.hotspot.tools;
    11.5  
    11.6  import java.io.PrintStream;
    11.7 +import sun.jvm.hotspot.debugger.JVMDebugger;
    11.8  import sun.jvm.hotspot.runtime.*;
    11.9  
   11.10  public class FlagDumper extends Tool {
   11.11  
   11.12 +    public FlagDumper() {
   11.13 +        super();
   11.14 +    }
   11.15 +
   11.16 +    public FlagDumper(JVMDebugger d) {
   11.17 +        super(d);
   11.18 +    }
   11.19 +
   11.20     public void run() {
   11.21        VM.Flag[] flags = VM.getVM().getCommandLineFlags();
   11.22        PrintStream out = System.out;

    12.1 --- a/agent/src/share/classes/sun/jvm/hotspot/tools/HeapDumper.java	Thu Jul 11 12:59:03 2013 -0400
    12.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/tools/HeapDumper.java	Mon Jul 15 11:07:03 2013 +0100
    12.3 @@ -25,6 +25,7 @@
    12.4  package sun.jvm.hotspot.tools;
    12.5  
    12.6  import sun.jvm.hotspot.utilities.HeapHprofBinWriter;
    12.7 +import sun.jvm.hotspot.debugger.JVMDebugger;
    12.8  import java.io.IOException;
    12.9  
   12.10  /*
   12.11 @@ -42,6 +43,11 @@
   12.12          this.dumpFile = dumpFile;
   12.13      }
   12.14  
   12.15 +    public HeapDumper(String dumpFile, JVMDebugger d) {
   12.16 +        super(d);
   12.17 +        this.dumpFile = dumpFile;
   12.18 +    }
   12.19 +
   12.20      protected void printFlagsUsage() {
   12.21          System.out.println("    <no option>\tto dump heap to " +
   12.22              DEFAULT_DUMP_FILE);

    13.1 --- a/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java	Thu Jul 11 12:59:03 2013 -0400
    13.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java	Mon Jul 15 11:07:03 2013 +0100
    13.3 @@ -29,12 +29,21 @@
    13.4  import sun.jvm.hotspot.gc_implementation.g1.*;
    13.5  import sun.jvm.hotspot.gc_implementation.parallelScavenge.*;
    13.6  import sun.jvm.hotspot.gc_implementation.shared.*;
    13.7 +import sun.jvm.hotspot.debugger.JVMDebugger;
    13.8  import sun.jvm.hotspot.memory.*;
    13.9  import sun.jvm.hotspot.oops.*;
   13.10  import sun.jvm.hotspot.runtime.*;
   13.11  
   13.12  public class HeapSummary extends Tool {
   13.13  
   13.14 +   public HeapSummary() {
   13.15 +      super();
   13.16 +   }
   13.17 +
   13.18 +   public HeapSummary(JVMDebugger d) {
   13.19 +      super(d);
   13.20 +   }
   13.21 +
   13.22     public static void main(String[] args) {
   13.23        HeapSummary hs = new HeapSummary();
   13.24        hs.start(args);

    14.1 --- a/agent/src/share/classes/sun/jvm/hotspot/tools/JInfo.java	Thu Jul 11 12:59:03 2013 -0400
    14.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/tools/JInfo.java	Mon Jul 15 11:07:03 2013 +0100
    14.3 @@ -25,12 +25,21 @@
    14.4  package sun.jvm.hotspot.tools;
    14.5  
    14.6  import sun.jvm.hotspot.runtime.*;
    14.7 +import sun.jvm.hotspot.debugger.JVMDebugger;
    14.8  
    14.9  public class JInfo extends Tool {
   14.10 +    public JInfo() {
   14.11 +        super();
   14.12 +    }
   14.13 +
   14.14      public JInfo(int m) {
   14.15          mode = m;
   14.16      }
   14.17  
   14.18 +    public JInfo(JVMDebugger d) {
   14.19 +        super(d);
   14.20 +    }
   14.21 +
   14.22      protected boolean needsJavaPrefix() {
   14.23          return false;
   14.24      }

    15.1 --- a/agent/src/share/classes/sun/jvm/hotspot/tools/JMap.java	Thu Jul 11 12:59:03 2013 -0400
    15.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/tools/JMap.java	Mon Jul 15 11:07:03 2013 +0100
    15.3 @@ -25,6 +25,7 @@
    15.4  package sun.jvm.hotspot.tools;
    15.5  
    15.6  import java.io.*;
    15.7 +import sun.jvm.hotspot.debugger.JVMDebugger;
    15.8  import sun.jvm.hotspot.utilities.*;
    15.9  
   15.10  public class JMap extends Tool {
   15.11 @@ -36,6 +37,10 @@
   15.12          this(MODE_PMAP);
   15.13      }
   15.14  
   15.15 +    public JMap(JVMDebugger d) {
   15.16 +        super(d);
   15.17 +    }
   15.18 +
   15.19      protected boolean needsJavaPrefix() {
   15.20          return false;
   15.21      }

    16.1 --- a/agent/src/share/classes/sun/jvm/hotspot/tools/JSnap.java	Thu Jul 11 12:59:03 2013 -0400
    16.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/tools/JSnap.java	Mon Jul 15 11:07:03 2013 +0100
    16.3 @@ -25,9 +25,19 @@
    16.4  package sun.jvm.hotspot.tools;
    16.5  
    16.6  import java.io.*;
    16.7 +import sun.jvm.hotspot.debugger.JVMDebugger;
    16.8  import sun.jvm.hotspot.runtime.*;
    16.9  
   16.10  public class JSnap extends Tool {
   16.11 +
   16.12 +    public JSnap() {
   16.13 +        super();
   16.14 +    }
   16.15 +
   16.16 +    public JSnap(JVMDebugger d) {
   16.17 +        super(d);
   16.18 +    }
   16.19 +
   16.20      public void run() {
   16.21          final PrintStream out = System.out;
   16.22          if (PerfMemory.initialized()) {

    17.1 --- a/agent/src/share/classes/sun/jvm/hotspot/tools/JStack.java	Thu Jul 11 12:59:03 2013 -0400
    17.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/tools/JStack.java	Mon Jul 15 11:07:03 2013 +0100
    17.3 @@ -24,6 +24,8 @@
    17.4  
    17.5  package sun.jvm.hotspot.tools;
    17.6  
    17.7 +import sun.jvm.hotspot.debugger.JVMDebugger;
    17.8 +
    17.9  public class JStack extends Tool {
   17.10      public JStack(boolean mixedMode, boolean concurrentLocks) {
   17.11          this.mixedMode = mixedMode;
   17.12 @@ -34,6 +36,10 @@
   17.13          this(true, true);
   17.14      }
   17.15  
   17.16 +    public JStack(JVMDebugger d) {
   17.17 +        super(d);
   17.18 +    }
   17.19 +
   17.20      protected boolean needsJavaPrefix() {
   17.21          return false;
   17.22      }

    18.1 --- a/agent/src/share/classes/sun/jvm/hotspot/tools/ObjectHistogram.java	Thu Jul 11 12:59:03 2013 -0400
    18.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/tools/ObjectHistogram.java	Mon Jul 15 11:07:03 2013 +0100
    18.3 @@ -33,6 +33,14 @@
    18.4      an object histogram from a remote or crashed VM. */
    18.5  public class ObjectHistogram extends Tool {
    18.6  
    18.7 +    public ObjectHistogram() {
    18.8 +       super();
    18.9 +    }
   18.10 +
   18.11 +    public ObjectHistogram(JVMDebugger d) {
   18.12 +       super(d);
   18.13 +    }
   18.14 +
   18.15     public void run() {
   18.16        run(System.out, System.err);
   18.17     }

    19.1 --- a/agent/src/share/classes/sun/jvm/hotspot/tools/PMap.java	Thu Jul 11 12:59:03 2013 -0400
    19.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/tools/PMap.java	Mon Jul 15 11:07:03 2013 +0100
    19.3 @@ -31,6 +31,15 @@
    19.4  import sun.jvm.hotspot.runtime.*;
    19.5  
    19.6  public class PMap extends Tool {
    19.7 +
    19.8 +   public PMap() {
    19.9 +       super();
   19.10 +   }
   19.11 +
   19.12 +   public PMap(JVMDebugger d) {
   19.13 +       super(d);
   19.14 +   }
   19.15 +
   19.16     public void run() {
   19.17        run(System.out);
   19.18     }

    20.1 --- a/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java	Thu Jul 11 12:59:03 2013 -0400
    20.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java	Mon Jul 15 11:07:03 2013 +0100
    20.3 @@ -45,6 +45,10 @@
    20.4        this(true, true);
    20.5     }
    20.6  
    20.7 +   public PStack(JVMDebugger d) {
    20.8 +      super(d);
    20.9 +   }
   20.10 +
   20.11     public void run() {
   20.12        run(System.out);
   20.13     }

    21.1 --- a/agent/src/share/classes/sun/jvm/hotspot/tools/StackTrace.java	Thu Jul 11 12:59:03 2013 -0400
    21.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/tools/StackTrace.java	Mon Jul 15 11:07:03 2013 +0100
    21.3 @@ -45,6 +45,16 @@
    21.4          run(System.out);
    21.5      }
    21.6  
    21.7 +    public StackTrace(JVMDebugger d) {
    21.8 +        super(d);
    21.9 +    }
   21.10 +
   21.11 +    public StackTrace(JVMDebugger d, boolean v, boolean concurrentLocks) {
   21.12 +        super(d);
   21.13 +        this.verbose = v;
   21.14 +        this.concurrentLocks = concurrentLocks;
   21.15 +    }
   21.16 +
   21.17      public void run(java.io.PrintStream tty) {
   21.18          // Ready to go with the database...
   21.19          try {

    22.1 --- a/agent/src/share/classes/sun/jvm/hotspot/tools/SysPropsDumper.java	Thu Jul 11 12:59:03 2013 -0400
    22.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/tools/SysPropsDumper.java	Mon Jul 15 11:07:03 2013 +0100
    22.3 @@ -27,10 +27,19 @@
    22.4  import java.io.PrintStream;
    22.5  import java.util.*;
    22.6  
    22.7 +import sun.jvm.hotspot.debugger.JVMDebugger;
    22.8  import sun.jvm.hotspot.runtime.*;
    22.9  
   22.10  public class SysPropsDumper extends Tool {
   22.11  
   22.12 +   public SysPropsDumper() {
   22.13 +      super();
   22.14 +   }
   22.15 +
   22.16 +   public SysPropsDumper(JVMDebugger d) {
   22.17 +      super(d);
   22.18 +   }
   22.19 +
   22.20     public void run() {
   22.21        Properties sysProps = VM.getVM().getSystemProperties();
   22.22        PrintStream out = System.out;

    23.1 --- a/agent/src/share/classes/sun/jvm/hotspot/tools/Tool.java	Thu Jul 11 12:59:03 2013 -0400
    23.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/tools/Tool.java	Mon Jul 15 11:07:03 2013 +0100
    23.3 @@ -35,6 +35,7 @@
    23.4  
    23.5  public abstract class Tool implements Runnable {
    23.6     private HotSpotAgent agent;
    23.7 +   private JVMDebugger jvmDebugger;
    23.8     private int debugeeType;
    23.9  
   23.10     // debugeeType is one of constants below
   23.11 @@ -42,6 +43,13 @@
   23.12     protected static final int DEBUGEE_CORE   = 1;
   23.13     protected static final int DEBUGEE_REMOTE = 2;
   23.14  
   23.15 +   public Tool() {
   23.16 +   }
   23.17 +
   23.18 +   public Tool(JVMDebugger d) {
   23.19 +      jvmDebugger = d;
   23.20 +   }
   23.21 +
   23.22     public String getName() {
   23.23        return getClass().getName();
   23.24     }
   23.25 @@ -90,7 +98,6 @@
   23.26  
   23.27     protected void usage() {
   23.28        printUsage();
   23.29 -      System.exit(1);
   23.30     }
   23.31  
   23.32     /*
   23.33 @@ -106,13 +113,13 @@
   23.34     protected void stop() {
   23.35        if (agent != null) {
   23.36           agent.detach();
   23.37 -         System.exit(0);
   23.38        }
   23.39     }
   23.40  
   23.41     protected void start(String[] args) {
   23.42        if ((args.length < 1) || (args.length > 2)) {
   23.43           usage();
   23.44 +         return;
   23.45        }
   23.46  
   23.47        // Attempt to handle -h or -help or some invalid flag
   23.48 @@ -185,13 +192,31 @@
   23.49          }
   23.50          if (e.getMessage() != null) {
   23.51            err.print(e.getMessage());
   23.52 +          e.printStackTrace();
   23.53          }
   23.54          err.println();
   23.55 -        System.exit(1);
   23.56 +        return;
   23.57        }
   23.58  
   23.59        err.println("Debugger attached successfully.");
   23.60 +      startInternal();
   23.61 +   }
   23.62  
   23.63 +   // When using an existing JVMDebugger.
   23.64 +   public void start() {
   23.65 +
   23.66 +      if (jvmDebugger == null) {
   23.67 +         throw new RuntimeException("Tool.start() called with no JVMDebugger set.");
   23.68 +      }
   23.69 +      agent = new HotSpotAgent();
   23.70 +      agent.attach(jvmDebugger);
   23.71 +      startInternal();
   23.72 +   }
   23.73 +
   23.74 +   // Remains of the start mechanism, common to both start methods.
   23.75 +   private void startInternal() {
   23.76 +
   23.77 +      PrintStream err = System.err;
   23.78        VM vm = VM.getVM();
   23.79        if (vm.isCore()) {
   23.80          err.println("Core build detected.");

    24.1 --- a/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java	Thu Jul 11 12:59:03 2013 -0400
    24.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java	Mon Jul 15 11:07:03 2013 +0100
    24.3 @@ -25,6 +25,7 @@
    24.4  package sun.jvm.hotspot.tools.jcore;
    24.5  
    24.6  import java.io.*;
    24.7 +import java.lang.reflect.Constructor;
    24.8  import java.util.jar.JarOutputStream;
    24.9  import java.util.jar.JarEntry;
   24.10  import java.util.jar.Manifest;
   24.11 @@ -38,6 +39,16 @@
   24.12      private ClassFilter classFilter;
   24.13      private String      outputDirectory;
   24.14      private JarOutputStream jarStream;
   24.15 +    private String      pkgList;
   24.16 +
   24.17 +    public ClassDump() {
   24.18 +        super();
   24.19 +    }
   24.20 +
   24.21 +    public ClassDump(JVMDebugger d, String pkgList) {
   24.22 +        super(d);
   24.23 +        this.pkgList = pkgList;
   24.24 +    }
   24.25  
   24.26      public void setClassFilter(ClassFilter cf) {
   24.27          classFilter = cf;
   24.28 @@ -63,6 +74,25 @@
   24.29      public void run() {
   24.30          // Ready to go with the database...
   24.31          try {
   24.32 +            // The name of the filter always comes from a System property.
   24.33 +            // If we have a pkgList, pass it, otherwise let the filter read
   24.34 +            // its own System property for the list of classes.
   24.35 +            String filterClassName = System.getProperty("sun.jvm.hotspot.tools.jcore.filter",
   24.36 +                                                        "sun.jvm.hotspot.tools.jcore.PackageNameFilter");
   24.37 +            try {
   24.38 +                Class filterClass = Class.forName(filterClassName);
   24.39 +                if (pkgList == null) {
   24.40 +                    classFilter = (ClassFilter) filterClass.newInstance();
   24.41 +                } else {
   24.42 +                    Constructor con = filterClass.getConstructor(String.class);
   24.43 +                    classFilter = (ClassFilter) con.newInstance(pkgList);
   24.44 +                }
   24.45 +            } catch(Exception exp) {
   24.46 +                System.err.println("Warning: Can not create class filter!");
   24.47 +            }
   24.48 +
   24.49 +            String outputDirectory = System.getProperty("sun.jvm.hotspot.tools.jcore.outputDir", ".");
   24.50 +            setOutputDirectory(outputDirectory);
   24.51  
   24.52              // walk through the system dictionary
   24.53              SystemDictionary dict = VM.getVM().getSystemDictionary();
   24.54 @@ -139,26 +169,8 @@
   24.55      }
   24.56  
   24.57      public static void main(String[] args) {
   24.58 -        // load class filters
   24.59 -        ClassFilter classFilter = null;
   24.60 -        String filterClassName = System.getProperty("sun.jvm.hotspot.tools.jcore.filter");
   24.61 -        if (filterClassName != null) {
   24.62 -            try {
   24.63 -                Class filterClass = Class.forName(filterClassName);
   24.64 -                classFilter = (ClassFilter) filterClass.newInstance();
   24.65 -            } catch(Exception exp) {
   24.66 -                System.err.println("Warning: Can not create class filter!");
   24.67 -            }
   24.68 -        }
   24.69 -
   24.70 -        String outputDirectory = System.getProperty("sun.jvm.hotspot.tools.jcore.outputDir");
   24.71 -        if (outputDirectory == null)
   24.72 -            outputDirectory = ".";
   24.73 -
   24.74  
   24.75          ClassDump cd = new ClassDump();
   24.76 -        cd.setClassFilter(classFilter);
   24.77 -        cd.setOutputDirectory(outputDirectory);
   24.78          cd.start(args);
   24.79          cd.stop();
   24.80      }

    25.1 --- a/agent/src/share/classes/sun/jvm/hotspot/tools/soql/JSDB.java	Thu Jul 11 12:59:03 2013 -0400
    25.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/tools/soql/JSDB.java	Mon Jul 15 11:07:03 2013 +0100
    25.3 @@ -24,12 +24,22 @@
    25.4  
    25.5  package sun.jvm.hotspot.tools.soql;
    25.6  
    25.7 +import sun.jvm.hotspot.debugger.JVMDebugger;
    25.8  import sun.jvm.hotspot.tools.*;
    25.9  import sun.jvm.hotspot.utilities.*;
   25.10  import sun.jvm.hotspot.utilities.soql.*;
   25.11  
   25.12  /** This is command line JavaScript debugger console */
   25.13  public class JSDB extends Tool {
   25.14 +
   25.15 +    public JSDB() {
   25.16 +        super();
   25.17 +    }
   25.18 +
   25.19 +    public JSDB(JVMDebugger d) {
   25.20 +        super(d);
   25.21 +    }
   25.22 +
   25.23      public static void main(String[] args) {
   25.24          JSDB jsdb = new JSDB();
   25.25          jsdb.start(args);

    26.1 --- a/agent/src/share/classes/sun/jvm/hotspot/tools/soql/SOQL.java	Thu Jul 11 12:59:03 2013 -0400
    26.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/tools/soql/SOQL.java	Mon Jul 15 11:07:03 2013 +0100
    26.3 @@ -44,6 +44,14 @@
    26.4        soql.stop();
    26.5     }
    26.6  
    26.7 +   public SOQL() {
    26.8 +      super();
    26.9 +   }
   26.10 +
   26.11 +   public SOQL(JVMDebugger d) {
   26.12 +      super(d);
   26.13 +   }
   26.14 +
   26.15     protected SOQLEngine soqlEngine;
   26.16     protected BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
   26.17     protected PrintStream out       = System.out;

    27.1 --- a/make/bsd/makefiles/build_vm_def.sh	Thu Jul 11 12:59:03 2013 -0400
    27.2 +++ b/make/bsd/makefiles/build_vm_def.sh	Mon Jul 15 11:07:03 2013 +0100
    27.3 @@ -7,6 +7,6 @@
    27.4  NM=nm
    27.5  fi
    27.6  
    27.7 -$NM --defined-only $* | awk '
    27.8 -   { if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 ";" }
    27.9 +$NM -Uj $* | awk '
   27.10 +   { if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 }
   27.11     '

    28.1 --- a/make/bsd/makefiles/gcc.make	Thu Jul 11 12:59:03 2013 -0400
    28.2 +++ b/make/bsd/makefiles/gcc.make	Mon Jul 15 11:07:03 2013 +0100
    28.3 @@ -1,5 +1,5 @@
    28.4  #
    28.5 -# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
    28.6 +# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
    28.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    28.8  #
    28.9  # This code is free software; you can redistribute it and/or modify it
   28.10 @@ -368,8 +368,8 @@
   28.11    # Standard linker flags
   28.12    LFLAGS +=
   28.13  
   28.14 -  # Darwin doesn't use ELF and doesn't support version scripts
   28.15 -  LDNOMAP = true
   28.16 +  # The apple linker has its own variant of mapfiles/version-scripts
   28.17 +  MAPFLAG = -Xlinker -exported_symbols_list -Xlinker FILENAME
   28.18  
   28.19    # Use $(SONAMEFLAG:SONAME=soname) to specify the intrinsic name of a shared obj
   28.20    SONAMEFLAG =

    29.1 --- a/make/bsd/makefiles/mapfile-vers-debug	Thu Jul 11 12:59:03 2013 -0400
    29.2 +++ b/make/bsd/makefiles/mapfile-vers-debug	Mon Jul 15 11:07:03 2013 +0100
    29.3 @@ -1,7 +1,3 @@
    29.4 -#
    29.5 -# @(#)mapfile-vers-debug        1.18 07/10/25 16:47:35
    29.6 -#
    29.7 -
    29.8  #
    29.9  # Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
   29.10  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   29.11 @@ -23,273 +19,244 @@
   29.12  # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   29.13  # or visit www.oracle.com if you need additional information or have any
   29.14  # questions.
   29.15 -#  
   29.16  #
   29.17 +#
   29.18 +# Only used for OSX/Darwin builds
   29.19  
   29.20  # Define public interface.
   29.21 +                # _JNI
   29.22 +                _JNI_CreateJavaVM
   29.23 +                _JNI_GetCreatedJavaVMs
   29.24 +                _JNI_GetDefaultJavaVMInitArgs
   29.25  
   29.26 -SUNWprivate_1.1 {
   29.27 -        global:
   29.28 -                # JNI
   29.29 -                JNI_CreateJavaVM;
   29.30 -                JNI_GetCreatedJavaVMs;
   29.31 -                JNI_GetDefaultJavaVMInitArgs;
   29.32 +                # _JVM
   29.33 +                _JVM_Accept
   29.34 +                _JVM_ActiveProcessorCount
   29.35 +                _JVM_AllocateNewArray
   29.36 +                _JVM_AllocateNewObject
   29.37 +                _JVM_ArrayCopy
   29.38 +                _JVM_AssertionStatusDirectives
   29.39 +                _JVM_Available
   29.40 +                _JVM_Bind
   29.41 +                _JVM_ClassDepth
   29.42 +                _JVM_ClassLoaderDepth
   29.43 +                _JVM_Clone
   29.44 +                _JVM_Close
   29.45 +                _JVM_CX8Field
   29.46 +                _JVM_CompileClass
   29.47 +                _JVM_CompileClasses
   29.48 +                _JVM_CompilerCommand
   29.49 +                _JVM_Connect
   29.50 +                _JVM_ConstantPoolGetClassAt
   29.51 +                _JVM_ConstantPoolGetClassAtIfLoaded
   29.52 +                _JVM_ConstantPoolGetDoubleAt
   29.53 +                _JVM_ConstantPoolGetFieldAt
   29.54 +                _JVM_ConstantPoolGetFieldAtIfLoaded
   29.55 +                _JVM_ConstantPoolGetFloatAt
   29.56 +                _JVM_ConstantPoolGetIntAt
   29.57 +                _JVM_ConstantPoolGetLongAt
   29.58 +                _JVM_ConstantPoolGetMethodAt
   29.59 +                _JVM_ConstantPoolGetMethodAtIfLoaded
   29.60 +                _JVM_ConstantPoolGetMemberRefInfoAt
   29.61 +                _JVM_ConstantPoolGetSize
   29.62 +                _JVM_ConstantPoolGetStringAt
   29.63 +                _JVM_ConstantPoolGetUTF8At
   29.64 +                _JVM_CountStackFrames
   29.65 +                _JVM_CurrentClassLoader
   29.66 +                _JVM_CurrentLoadedClass
   29.67 +                _JVM_CurrentThread
   29.68 +                _JVM_CurrentTimeMillis
   29.69 +                _JVM_DefineClass
   29.70 +                _JVM_DefineClassWithSource
   29.71 +                _JVM_DefineClassWithSourceCond
   29.72 +                _JVM_DesiredAssertionStatus
   29.73 +                _JVM_DisableCompiler
   29.74 +                _JVM_DoPrivileged
   29.75 +                _JVM_DTraceGetVersion
   29.76 +                _JVM_DTraceActivate
   29.77 +                _JVM_DTraceIsProbeEnabled
   29.78 +                _JVM_DTraceIsSupported
   29.79 +                _JVM_DTraceDispose
   29.80 +                _JVM_DumpAllStacks
   29.81 +                _JVM_DumpThreads
   29.82 +                _JVM_EnableCompiler
   29.83 +                _JVM_Exit
   29.84 +                _JVM_FillInStackTrace
   29.85 +                _JVM_FindClassFromClass
   29.86 +                _JVM_FindClassFromClassLoader
   29.87 +                _JVM_FindClassFromBootLoader
   29.88 +                _JVM_FindLibraryEntry
   29.89 +                _JVM_FindLoadedClass
   29.90 +                _JVM_FindPrimitiveClass
   29.91 +                _JVM_FindSignal
   29.92 +                _JVM_FreeMemory
   29.93 +                _JVM_GC
   29.94 +                _JVM_GetAllThreads
   29.95 +                _JVM_GetArrayElement
   29.96 +                _JVM_GetArrayLength
   29.97 +                _JVM_GetCPClassNameUTF
   29.98 +                _JVM_GetCPFieldClassNameUTF
   29.99 +                _JVM_GetCPFieldModifiers
  29.100 +                _JVM_GetCPFieldNameUTF
  29.101 +                _JVM_GetCPFieldSignatureUTF
  29.102 +                _JVM_GetCPMethodClassNameUTF
  29.103 +                _JVM_GetCPMethodModifiers
  29.104 +                _JVM_GetCPMethodNameUTF
  29.105 +                _JVM_GetCPMethodSignatureUTF
  29.106 +                _JVM_GetCallerClass
  29.107 +                _JVM_GetClassAccessFlags
  29.108 +                _JVM_GetClassAnnotations
  29.109 +                _JVM_GetClassCPEntriesCount
  29.110 +                _JVM_GetClassCPTypes
  29.111 +                _JVM_GetClassConstantPool
  29.112 +                _JVM_GetClassContext
  29.113 +                _JVM_GetClassDeclaredConstructors
  29.114 +                _JVM_GetClassDeclaredFields
  29.115 +                _JVM_GetClassDeclaredMethods
  29.116 +                _JVM_GetClassFieldsCount
  29.117 +                _JVM_GetClassInterfaces
  29.118 +                _JVM_GetClassLoader
  29.119 +                _JVM_GetClassMethodsCount
  29.120 +                _JVM_GetClassModifiers
  29.121 +                _JVM_GetClassName
  29.122 +                _JVM_GetClassNameUTF
  29.123 +                _JVM_GetClassSignature
  29.124 +                _JVM_GetClassSigners
  29.125 +                _JVM_GetClassTypeAnnotations
  29.126 +                _JVM_GetComponentType
  29.127 +                _JVM_GetDeclaredClasses
  29.128 +                _JVM_GetDeclaringClass
  29.129 +                _JVM_GetEnclosingMethodInfo
  29.130 +                _JVM_GetFieldAnnotations
  29.131 +                _JVM_GetFieldIxModifiers
  29.132 +                _JVM_GetFieldTypeAnnotations
  29.133 +                _JVM_GetHostName
  29.134 +                _JVM_GetInheritedAccessControlContext
  29.135 +                _JVM_GetInterfaceVersion
  29.136 +                _JVM_GetLastErrorString
  29.137 +                _JVM_GetManagement
  29.138 +                _JVM_GetMethodAnnotations
  29.139 +                _JVM_GetMethodDefaultAnnotationValue
  29.140 +                _JVM_GetMethodIxArgsSize
  29.141 +                _JVM_GetMethodIxByteCode
  29.142 +                _JVM_GetMethodIxByteCodeLength
  29.143 +                _JVM_GetMethodIxExceptionIndexes
  29.144 +                _JVM_GetMethodIxExceptionTableEntry
  29.145 +                _JVM_GetMethodIxExceptionTableLength
  29.146 +                _JVM_GetMethodIxExceptionsCount
  29.147 +                _JVM_GetMethodIxLocalsCount
  29.148 +                _JVM_GetMethodIxMaxStack
  29.149 +                _JVM_GetMethodIxModifiers
  29.150 +                _JVM_GetMethodIxNameUTF
  29.151 +                _JVM_GetMethodIxSignatureUTF
  29.152 +                _JVM_GetMethodParameterAnnotations
  29.153 +                _JVM_GetMethodParameters
  29.154 +                _JVM_GetMethodTypeAnnotations
  29.155 +                _JVM_GetPrimitiveArrayElement
  29.156 +                _JVM_GetProtectionDomain
  29.157 +                _JVM_GetSockName
  29.158 +                _JVM_GetSockOpt
  29.159 +                _JVM_GetStackAccessControlContext
  29.160 +                _JVM_GetStackTraceDepth
  29.161 +                _JVM_GetStackTraceElement
  29.162 +                _JVM_GetSystemPackage
  29.163 +                _JVM_GetSystemPackages
  29.164 +                _JVM_GetThreadStateNames
  29.165 +                _JVM_GetThreadStateValues
  29.166 +                _JVM_GetVersionInfo
  29.167 +                _JVM_Halt
  29.168 +                _JVM_HoldsLock
  29.169 +                _JVM_IHashCode
  29.170 +                _JVM_InitAgentProperties
  29.171 +                _JVM_InitProperties
  29.172 +                _JVM_InitializeCompiler
  29.173 +                _JVM_InitializeSocketLibrary
  29.174 +                _JVM_InternString
  29.175 +                _JVM_Interrupt
  29.176 +                _JVM_InvokeMethod
  29.177 +                _JVM_IsArrayClass
  29.178 +                _JVM_IsConstructorIx
  29.179 +                _JVM_IsInterface
  29.180 +                _JVM_IsInterrupted
  29.181 +                _JVM_IsNaN
  29.182 +                _JVM_IsPrimitiveClass
  29.183 +                _JVM_IsSameClassPackage
  29.184 +                _JVM_IsSilentCompiler
  29.185 +                _JVM_IsSupportedJNIVersion
  29.186 +                _JVM_IsThreadAlive
  29.187 +                _JVM_IsVMGeneratedMethodIx
  29.188 +                _JVM_LatestUserDefinedLoader
  29.189 +                _JVM_Listen
  29.190 +                _JVM_LoadClass0
  29.191 +                _JVM_LoadLibrary
  29.192 +                _JVM_Lseek
  29.193 +                _JVM_MaxObjectInspectionAge
  29.194 +                _JVM_MaxMemory
  29.195 +                _JVM_MonitorNotify
  29.196 +                _JVM_MonitorNotifyAll
  29.197 +                _JVM_MonitorWait
  29.198 +                _JVM_NanoTime
  29.199 +                _JVM_NativePath
  29.200 +                _JVM_NewArray
  29.201 +                _JVM_NewInstanceFromConstructor
  29.202 +                _JVM_NewMultiArray
  29.203 +                _JVM_OnExit
  29.204 +                _JVM_Open
  29.205 +                _JVM_RaiseSignal
  29.206 +                _JVM_RawMonitorCreate
  29.207 +                _JVM_RawMonitorDestroy
  29.208 +                _JVM_RawMonitorEnter
  29.209 +                _JVM_RawMonitorExit
  29.210 +                _JVM_Read
  29.211 +                _JVM_Recv
  29.212 +                _JVM_RecvFrom
  29.213 +                _JVM_RegisterSignal
  29.214 +                _JVM_ReleaseUTF
  29.215 +                _JVM_ResolveClass
  29.216 +                _JVM_ResumeThread
  29.217 +                _JVM_Send
  29.218 +                _JVM_SendTo
  29.219 +                _JVM_SetArrayElement
  29.220 +                _JVM_SetClassSigners
  29.221 +                _JVM_SetLength
  29.222 +                _JVM_SetNativeThreadName
  29.223 +                _JVM_SetPrimitiveArrayElement
  29.224 +                _JVM_SetProtectionDomain
  29.225 +                _JVM_SetSockOpt
  29.226 +                _JVM_SetThreadPriority
  29.227 +                _JVM_Sleep
  29.228 +                _JVM_Socket
  29.229 +                _JVM_SocketAvailable
  29.230 +                _JVM_SocketClose
  29.231 +                _JVM_SocketShutdown
  29.232 +                _JVM_StartThread
  29.233 +                _JVM_StopThread
  29.234 +                _JVM_SuspendThread
  29.235 +                _JVM_SupportsCX8
  29.236 +                _JVM_Sync
  29.237 +                _JVM_Timeout
  29.238 +                _JVM_TotalMemory
  29.239 +                _JVM_TraceInstructions
  29.240 +                _JVM_TraceMethodCalls
  29.241 +                _JVM_UnloadLibrary
  29.242 +                _JVM_Write
  29.243 +                _JVM_Yield
  29.244 +                _JVM_handle_bsd_signal
  29.245  
  29.246 -                # JVM
  29.247 -                JVM_Accept;
  29.248 -                JVM_ActiveProcessorCount;
  29.249 -                JVM_AllocateNewArray;
  29.250 -                JVM_AllocateNewObject;
  29.251 -                JVM_ArrayCopy;
  29.252 -                JVM_AssertionStatusDirectives;
  29.253 -                JVM_Available;
  29.254 -                JVM_Bind;
  29.255 -                JVM_ClassDepth;
  29.256 -                JVM_ClassLoaderDepth;
  29.257 -                JVM_Clone;
  29.258 -                JVM_Close;
  29.259 -                JVM_CX8Field;
  29.260 -                JVM_CompileClass;
  29.261 -                JVM_CompileClasses;
  29.262 -                JVM_CompilerCommand;
  29.263 -                JVM_Connect;
  29.264 -                JVM_ConstantPoolGetClassAt;
  29.265 -                JVM_ConstantPoolGetClassAtIfLoaded;
  29.266 -                JVM_ConstantPoolGetDoubleAt;
  29.267 -                JVM_ConstantPoolGetFieldAt;
  29.268 -                JVM_ConstantPoolGetFieldAtIfLoaded;
  29.269 -                JVM_ConstantPoolGetFloatAt;
  29.270 -                JVM_ConstantPoolGetIntAt;
  29.271 -                JVM_ConstantPoolGetLongAt;
  29.272 -                JVM_ConstantPoolGetMethodAt;
  29.273 -                JVM_ConstantPoolGetMethodAtIfLoaded;
  29.274 -                JVM_ConstantPoolGetMemberRefInfoAt;
  29.275 -                JVM_ConstantPoolGetSize;
  29.276 -                JVM_ConstantPoolGetStringAt;
  29.277 -                JVM_ConstantPoolGetUTF8At;
  29.278 -                JVM_CountStackFrames;
  29.279 -                JVM_CurrentClassLoader;
  29.280 -                JVM_CurrentLoadedClass;
  29.281 -                JVM_CurrentThread;
  29.282 -                JVM_CurrentTimeMillis;
  29.283 -                JVM_DefineClass;
  29.284 -                JVM_DefineClassWithSource;
  29.285 -                JVM_DefineClassWithSourceCond;
  29.286 -                JVM_DesiredAssertionStatus;
  29.287 -                JVM_DisableCompiler;
  29.288 -                JVM_DoPrivileged;
  29.289 -                JVM_DTraceGetVersion;
  29.290 -                JVM_DTraceActivate;
  29.291 -                JVM_DTraceIsProbeEnabled;
  29.292 -                JVM_DTraceIsSupported;
  29.293 -                JVM_DTraceDispose;
  29.294 -                JVM_DumpAllStacks;
  29.295 -                JVM_DumpThreads;
  29.296 -                JVM_EnableCompiler;
  29.297 -                JVM_Exit;
  29.298 -                JVM_FillInStackTrace;
  29.299 -                JVM_FindClassFromClass;
  29.300 -                JVM_FindClassFromClassLoader;
  29.301 -                JVM_FindClassFromBootLoader;
  29.302 -                JVM_FindLibraryEntry;
  29.303 -                JVM_FindLoadedClass;
  29.304 -                JVM_FindPrimitiveClass;
  29.305 -                JVM_FindSignal;
  29.306 -                JVM_FreeMemory;
  29.307 -                JVM_GC;
  29.308 -                JVM_GetAllThreads;
  29.309 -                JVM_GetArrayElement;
  29.310 -                JVM_GetArrayLength;
  29.311 -                JVM_GetCPClassNameUTF;
  29.312 -                JVM_GetCPFieldClassNameUTF;
  29.313 -                JVM_GetCPFieldModifiers;
  29.314 -                JVM_GetCPFieldNameUTF;
  29.315 -                JVM_GetCPFieldSignatureUTF;
  29.316 -                JVM_GetCPMethodClassNameUTF;
  29.317 -                JVM_GetCPMethodModifiers;
  29.318 -                JVM_GetCPMethodNameUTF;
  29.319 -                JVM_GetCPMethodSignatureUTF;
  29.320 -                JVM_GetCallerClass;
  29.321 -                JVM_GetClassAccessFlags;
  29.322 -                JVM_GetClassAnnotations;
  29.323 -                JVM_GetClassCPEntriesCount;
  29.324 -                JVM_GetClassCPTypes;
  29.325 -                JVM_GetClassConstantPool;
  29.326 -                JVM_GetClassContext;
  29.327 -                JVM_GetClassDeclaredConstructors;
  29.328 -                JVM_GetClassDeclaredFields;
  29.329 -                JVM_GetClassDeclaredMethods;
  29.330 -                JVM_GetClassFieldsCount;
  29.331 -                JVM_GetClassInterfaces;
  29.332 -                JVM_GetClassLoader;
  29.333 -                JVM_GetClassMethodsCount;
  29.334 -                JVM_GetClassModifiers;
  29.335 -                JVM_GetClassName;
  29.336 -                JVM_GetClassNameUTF;
  29.337 -                        JVM_GetClassSignature;
  29.338 -                JVM_GetClassSigners;
  29.339 -                JVM_GetClassTypeAnnotations;
  29.340 -                JVM_GetComponentType;
  29.341 -                JVM_GetDeclaredClasses;
  29.342 -                JVM_GetDeclaringClass;
  29.343 -                JVM_GetEnclosingMethodInfo;
  29.344 -                JVM_GetFieldAnnotations;
  29.345 -                JVM_GetFieldIxModifiers;
  29.346 -                JVM_GetFieldTypeAnnotations;
  29.347 -                JVM_GetHostName;
  29.348 -                JVM_GetInheritedAccessControlContext;
  29.349 -                JVM_GetInterfaceVersion;
  29.350 -                JVM_GetLastErrorString;
  29.351 -                JVM_GetManagement;
  29.352 -                JVM_GetMethodAnnotations;
  29.353 -                JVM_GetMethodDefaultAnnotationValue;
  29.354 -                JVM_GetMethodIxArgsSize;
  29.355 -                JVM_GetMethodIxByteCode;
  29.356 -                JVM_GetMethodIxByteCodeLength;
  29.357 -                JVM_GetMethodIxExceptionIndexes;
  29.358 -                JVM_GetMethodIxExceptionTableEntry;
  29.359 -                JVM_GetMethodIxExceptionTableLength;
  29.360 -                JVM_GetMethodIxExceptionsCount;
  29.361 -                JVM_GetMethodIxLocalsCount;
  29.362 -                JVM_GetMethodIxMaxStack;
  29.363 -                JVM_GetMethodIxModifiers;
  29.364 -                JVM_GetMethodIxNameUTF;
  29.365 -                JVM_GetMethodIxSignatureUTF;
  29.366 -                JVM_GetMethodParameterAnnotations;
  29.367 -                JVM_GetMethodParameters;
  29.368 -                JVM_GetMethodTypeAnnotations;
  29.369 -                JVM_GetPrimitiveArrayElement;
  29.370 -                JVM_GetProtectionDomain;
  29.371 -                JVM_GetSockName;
  29.372 -                JVM_GetSockOpt;
  29.373 -                JVM_GetStackAccessControlContext;
  29.374 -                JVM_GetStackTraceDepth;
  29.375 -                JVM_GetStackTraceElement;
  29.376 -                JVM_GetSystemPackage;
  29.377 -                JVM_GetSystemPackages;
  29.378 -                JVM_GetThreadStateNames;
  29.379 -                JVM_GetThreadStateValues;
  29.380 -                JVM_GetVersionInfo;
  29.381 -                JVM_Halt;
  29.382 -                JVM_HoldsLock;
  29.383 -                JVM_IHashCode;
  29.384 -                JVM_InitAgentProperties;
  29.385 -                JVM_InitProperties;
  29.386 -                JVM_InitializeCompiler;
  29.387 -                JVM_InitializeSocketLibrary;
  29.388 -                JVM_InternString;
  29.389 -                JVM_Interrupt;
  29.390 -                JVM_InvokeMethod;
  29.391 -                JVM_IsArrayClass;
  29.392 -                JVM_IsConstructorIx;
  29.393 -                JVM_IsInterface;
  29.394 -                JVM_IsInterrupted;
  29.395 -                JVM_IsNaN;
  29.396 -                JVM_IsPrimitiveClass;
  29.397 -                JVM_IsSameClassPackage;
  29.398 -                JVM_IsSilentCompiler;
  29.399 -                JVM_IsSupportedJNIVersion;
  29.400 -                JVM_IsThreadAlive;
  29.401 -                JVM_IsVMGeneratedMethodIx;
  29.402 -                JVM_LatestUserDefinedLoader;
  29.403 -                JVM_Listen;
  29.404 -                JVM_LoadClass0;
  29.405 -                JVM_LoadLibrary;
  29.406 -                JVM_Lseek;
  29.407 -                JVM_MaxObjectInspectionAge;
  29.408 -                JVM_MaxMemory;
  29.409 -                JVM_MonitorNotify;
  29.410 -                JVM_MonitorNotifyAll;
  29.411 -                JVM_MonitorWait;
  29.412 -                JVM_NanoTime;
  29.413 -                JVM_NativePath;
  29.414 -                JVM_NewArray;
  29.415 -                JVM_NewInstanceFromConstructor;
  29.416 -                JVM_NewMultiArray;
  29.417 -                JVM_OnExit;
  29.418 -                JVM_Open;
  29.419 -                JVM_RaiseSignal;
  29.420 -                JVM_RawMonitorCreate;
  29.421 -                JVM_RawMonitorDestroy;
  29.422 -                JVM_RawMonitorEnter;
  29.423 -                JVM_RawMonitorExit;
  29.424 -                JVM_Read;
  29.425 -                JVM_Recv;
  29.426 -                JVM_RecvFrom;
  29.427 -                JVM_RegisterSignal;
  29.428 -                JVM_ReleaseUTF;
  29.429 -                JVM_ResolveClass;
  29.430 -                JVM_ResumeThread;
  29.431 -                JVM_Send;
  29.432 -                JVM_SendTo;
  29.433 -                JVM_SetArrayElement;
  29.434 -                JVM_SetClassSigners;
  29.435 -                JVM_SetLength;
  29.436 -                JVM_SetPrimitiveArrayElement;
  29.437 -                JVM_SetProtectionDomain;
  29.438 -                JVM_SetSockOpt;
  29.439 -                JVM_SetThreadPriority;
  29.440 -                JVM_Sleep;
  29.441 -                JVM_Socket;
  29.442 -                JVM_SocketAvailable;
  29.443 -                JVM_SocketClose;
  29.444 -                JVM_SocketShutdown;
  29.445 -                JVM_StartThread;
  29.446 -                JVM_StopThread;
  29.447 -                JVM_SuspendThread;
  29.448 -                JVM_SupportsCX8;
  29.449 -                JVM_Sync;
  29.450 -                JVM_Timeout;
  29.451 -                JVM_TotalMemory;
  29.452 -                JVM_TraceInstructions;
  29.453 -                JVM_TraceMethodCalls;
  29.454 -                JVM_UnloadLibrary;
  29.455 -                JVM_Write;
  29.456 -                JVM_Yield;
  29.457 -                JVM_handle_bsd_signal;
  29.458 -
  29.459 -                # Old reflection routines
  29.460 -                # These do not need to be present in the product build in JDK 1.4
  29.461 -                # but their code has not been removed yet because there will not
  29.462 -                # be a substantial code savings until JVM_InvokeMethod and
  29.463 -                # JVM_NewInstanceFromConstructor can also be removed; see
  29.464 -                # reflectionCompat.hpp.
  29.465 -                JVM_GetClassConstructor;
  29.466 -                JVM_GetClassConstructors;
  29.467 -                JVM_GetClassField;
  29.468 -                JVM_GetClassFields;
  29.469 -                JVM_GetClassMethod;
  29.470 -                JVM_GetClassMethods;
  29.471 -                JVM_GetField;
  29.472 -                JVM_GetPrimitiveField;
  29.473 -                JVM_NewInstance;
  29.474 -                JVM_SetField;
  29.475 -                JVM_SetPrimitiveField;
  29.476 -
  29.477 -                # debug JVM
  29.478 -                JVM_AccessVMBooleanFlag;
  29.479 -                JVM_AccessVMIntFlag;
  29.480 -                JVM_VMBreakPoint;
  29.481 +                # debug _JVM
  29.482 +                _JVM_AccessVMBooleanFlag
  29.483 +                _JVM_AccessVMIntFlag
  29.484 +                _JVM_VMBreakPoint
  29.485  
  29.486                  # miscellaneous functions
  29.487 -                jio_fprintf;
  29.488 -                jio_printf;
  29.489 -                jio_snprintf;
  29.490 -                jio_vfprintf;
  29.491 -                jio_vsnprintf;
  29.492 -                fork1;
  29.493 -                numa_warn;
  29.494 -                numa_error;
  29.495 -
  29.496 -                # Needed because there is no JVM interface for this.
  29.497 -                sysThreadAvailableStackWithSlack;
  29.498 +                _jio_fprintf
  29.499 +                _jio_printf
  29.500 +                _jio_snprintf
  29.501 +                _jio_vfprintf
  29.502 +                _jio_vsnprintf
  29.503  
  29.504                  # This is for Forte Analyzer profiling support.
  29.505 -                AsyncGetCallTrace;
  29.506 +                _AsyncGetCallTrace
  29.507  
  29.508                  # INSERT VTABLE SYMBOLS HERE
  29.509  
  29.510 -        local:
  29.511 -                *;
  29.512 -};
  29.513 -

    30.1 --- a/make/bsd/makefiles/mapfile-vers-product	Thu Jul 11 12:59:03 2013 -0400
    30.2 +++ b/make/bsd/makefiles/mapfile-vers-product	Mon Jul 15 11:07:03 2013 +0100
    30.3 @@ -1,7 +1,3 @@
    30.4 -#
    30.5 -# @(#)mapfile-vers-product	1.19 08/02/12 10:56:37
    30.6 -#
    30.7 -
    30.8  #
    30.9  # Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
   30.10  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   30.11 @@ -23,268 +19,239 @@
   30.12  # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   30.13  # or visit www.oracle.com if you need additional information or have any
   30.14  # questions.
   30.15 -#  
   30.16  #
   30.17 +#
   30.18 +# Only used for OSX/Darwin builds
   30.19  
   30.20  # Define public interface.
   30.21 +                # _JNI
   30.22 +                _JNI_CreateJavaVM
   30.23 +                _JNI_GetCreatedJavaVMs
   30.24 +                _JNI_GetDefaultJavaVMInitArgs
   30.25  
   30.26 -SUNWprivate_1.1 {
   30.27 -        global:
   30.28 -                # JNI
   30.29 -                JNI_CreateJavaVM;
   30.30 -                JNI_GetCreatedJavaVMs;
   30.31 -                JNI_GetDefaultJavaVMInitArgs;
   30.32 -
   30.33 -                # JVM
   30.34 -                JVM_Accept;
   30.35 -                JVM_ActiveProcessorCount;
   30.36 -                JVM_AllocateNewArray;
   30.37 -                JVM_AllocateNewObject;
   30.38 -                JVM_ArrayCopy;
   30.39 -                JVM_AssertionStatusDirectives;
   30.40 -                JVM_Available;
   30.41 -                JVM_Bind;
   30.42 -                JVM_ClassDepth;
   30.43 -                JVM_ClassLoaderDepth;
   30.44 -                JVM_Clone;
   30.45 -                JVM_Close;
   30.46 -                JVM_CX8Field;
   30.47 -                JVM_CompileClass;
   30.48 -                JVM_CompileClasses;
   30.49 -                JVM_CompilerCommand;
   30.50 -                JVM_Connect;
   30.51 -                JVM_ConstantPoolGetClassAt;
   30.52 -                JVM_ConstantPoolGetClassAtIfLoaded;
   30.53 -                JVM_ConstantPoolGetDoubleAt;
   30.54 -                JVM_ConstantPoolGetFieldAt;
   30.55 -                JVM_ConstantPoolGetFieldAtIfLoaded;
   30.56 -                JVM_ConstantPoolGetFloatAt;
   30.57 -                JVM_ConstantPoolGetIntAt;
   30.58 -                JVM_ConstantPoolGetLongAt;
   30.59 -                JVM_ConstantPoolGetMethodAt;
   30.60 -                JVM_ConstantPoolGetMethodAtIfLoaded;
   30.61 -                JVM_ConstantPoolGetMemberRefInfoAt;
   30.62 -                JVM_ConstantPoolGetSize;
   30.63 -                JVM_ConstantPoolGetStringAt;
   30.64 -                JVM_ConstantPoolGetUTF8At;
   30.65 -                JVM_CountStackFrames;
   30.66 -                JVM_CurrentClassLoader;
   30.67 -                JVM_CurrentLoadedClass;
   30.68 -                JVM_CurrentThread;
   30.69 -                JVM_CurrentTimeMillis;
   30.70 -                JVM_DefineClass;
   30.71 -                JVM_DefineClassWithSource;
   30.72 -                JVM_DefineClassWithSourceCond;
   30.73 -                JVM_DesiredAssertionStatus;
   30.74 -                JVM_DisableCompiler;
   30.75 -                JVM_DoPrivileged;
   30.76 -                JVM_DTraceGetVersion;
   30.77 -                JVM_DTraceActivate;
   30.78 -                JVM_DTraceIsProbeEnabled;
   30.79 -                JVM_DTraceIsSupported;
   30.80 -                JVM_DTraceDispose;
   30.81 -                JVM_DumpAllStacks;
   30.82 -                JVM_DumpThreads;
   30.83 -                JVM_EnableCompiler;
   30.84 -                JVM_Exit;
   30.85 -                JVM_FillInStackTrace;
   30.86 -                JVM_FindClassFromClass;
   30.87 -                JVM_FindClassFromClassLoader;
   30.88 -                JVM_FindClassFromBootLoader;
   30.89 -                JVM_FindLibraryEntry;
   30.90 -                JVM_FindLoadedClass;
   30.91 -                JVM_FindPrimitiveClass;
   30.92 -                JVM_FindSignal;
   30.93 -                JVM_FreeMemory;
   30.94 -                JVM_GC;
   30.95 -                JVM_GetAllThreads;
   30.96 -                JVM_GetArrayElement;
   30.97 -                JVM_GetArrayLength;
   30.98 -                JVM_GetCPClassNameUTF;
   30.99 -                JVM_GetCPFieldClassNameUTF;
  30.100 -                JVM_GetCPFieldModifiers;
  30.101 -                JVM_GetCPFieldNameUTF;
  30.102 -                JVM_GetCPFieldSignatureUTF;
  30.103 -                JVM_GetCPMethodClassNameUTF;
  30.104 -                JVM_GetCPMethodModifiers;
  30.105 -                JVM_GetCPMethodNameUTF;
  30.106 -                JVM_GetCPMethodSignatureUTF;
  30.107 -                JVM_GetCallerClass;
  30.108 -                JVM_GetClassAccessFlags;
  30.109 -                JVM_GetClassAnnotations;
  30.110 -                JVM_GetClassCPEntriesCount;
  30.111 -                JVM_GetClassCPTypes;
  30.112 -                JVM_GetClassConstantPool;
  30.113 -                JVM_GetClassContext;
  30.114 -                JVM_GetClassDeclaredConstructors;
  30.115 -                JVM_GetClassDeclaredFields;
  30.116 -                JVM_GetClassDeclaredMethods;
  30.117 -                JVM_GetClassFieldsCount;
  30.118 -                JVM_GetClassInterfaces;
  30.119 -                JVM_GetClassLoader;
  30.120 -                JVM_GetClassMethodsCount;
  30.121 -                JVM_GetClassModifiers;
  30.122 -                JVM_GetClassName;
  30.123 -                JVM_GetClassNameUTF;
  30.124 -                JVM_GetClassSignature;
  30.125 -                JVM_GetClassSigners;
  30.126 -                JVM_GetClassTypeAnnotations;
  30.127 -                JVM_GetComponentType;
  30.128 -                JVM_GetDeclaredClasses;
  30.129 -                JVM_GetDeclaringClass;
  30.130 -                JVM_GetEnclosingMethodInfo;
  30.131 -                JVM_GetFieldAnnotations;
  30.132 -                JVM_GetFieldIxModifiers;
  30.133 -                JVM_GetFieldTypeAnnotations;
  30.134 -                JVM_GetHostName;
  30.135 -                JVM_GetInheritedAccessControlContext;
  30.136 -                JVM_GetInterfaceVersion;
  30.137 -                JVM_GetLastErrorString;
  30.138 -                JVM_GetManagement;
  30.139 -                JVM_GetMethodAnnotations;
  30.140 -                JVM_GetMethodDefaultAnnotationValue;
  30.141 -                JVM_GetMethodIxArgsSize;
  30.142 -                JVM_GetMethodIxByteCode;
  30.143 -                JVM_GetMethodIxByteCodeLength;
  30.144 -                JVM_GetMethodIxExceptionIndexes;
  30.145 -                JVM_GetMethodIxExceptionTableEntry;
  30.146 -                JVM_GetMethodIxExceptionTableLength;
  30.147 -                JVM_GetMethodIxExceptionsCount;
  30.148 -                JVM_GetMethodIxLocalsCount;
  30.149 -                JVM_GetMethodIxMaxStack;
  30.150 -                JVM_GetMethodIxModifiers;
  30.151 -                JVM_GetMethodIxNameUTF;
  30.152 -                JVM_GetMethodIxSignatureUTF;
  30.153 -                JVM_GetMethodParameterAnnotations;
  30.154 -                JVM_GetMethodParameters;
  30.155 -                JVM_GetMethodTypeAnnotations;
  30.156 -                JVM_GetPrimitiveArrayElement;
  30.157 -                JVM_GetProtectionDomain;
  30.158 -                JVM_GetSockName;
  30.159 -                JVM_GetSockOpt;
  30.160 -                JVM_GetStackAccessControlContext;
  30.161 -                JVM_GetStackTraceDepth;
  30.162 -                JVM_GetStackTraceElement;
  30.163 -                JVM_GetSystemPackage;
  30.164 -                JVM_GetSystemPackages;
  30.165 -                JVM_GetThreadStateNames;
  30.166 -                JVM_GetThreadStateValues;
  30.167 -                JVM_GetVersionInfo;
  30.168 -                JVM_Halt;
  30.169 -                JVM_HoldsLock;
  30.170 -                JVM_IHashCode;
  30.171 -                JVM_InitAgentProperties;
  30.172 -                JVM_InitProperties;
  30.173 -                JVM_InitializeCompiler;
  30.174 -                JVM_InitializeSocketLibrary;
  30.175 -                JVM_InternString;
  30.176 -                JVM_Interrupt;
  30.177 -                JVM_InvokeMethod;
  30.178 -                JVM_IsArrayClass;
  30.179 -                JVM_IsConstructorIx;
  30.180 -                JVM_IsInterface;
  30.181 -                JVM_IsInterrupted;
  30.182 -                JVM_IsNaN;
  30.183 -                JVM_IsPrimitiveClass;
  30.184 -                JVM_IsSameClassPackage;
  30.185 -                JVM_IsSilentCompiler;
  30.186 -                JVM_IsSupportedJNIVersion;
  30.187 -                JVM_IsThreadAlive;
  30.188 -                JVM_IsVMGeneratedMethodIx;
  30.189 -                JVM_LatestUserDefinedLoader;
  30.190 -                JVM_Listen;
  30.191 -                JVM_LoadClass0;
  30.192 -                JVM_LoadLibrary;
  30.193 -                JVM_Lseek;
  30.194 -                JVM_MaxObjectInspectionAge;
  30.195 -                JVM_MaxMemory;
  30.196 -                JVM_MonitorNotify;
  30.197 -                JVM_MonitorNotifyAll;
  30.198 -                JVM_MonitorWait;
  30.199 -                JVM_NanoTime;
  30.200 -                JVM_NativePath;
  30.201 -                JVM_NewArray;
  30.202 -                JVM_NewInstanceFromConstructor;
  30.203 -                JVM_NewMultiArray;
  30.204 -                JVM_OnExit;
  30.205 -                JVM_Open;
  30.206 -                JVM_RaiseSignal;
  30.207 -                JVM_RawMonitorCreate;
  30.208 -                JVM_RawMonitorDestroy;
  30.209 -                JVM_RawMonitorEnter;
  30.210 -                JVM_RawMonitorExit;
  30.211 -                JVM_Read;
  30.212 -                JVM_Recv;
  30.213 -                JVM_RecvFrom;
  30.214 -                JVM_RegisterSignal;
  30.215 -                JVM_ReleaseUTF;
  30.216 -                JVM_ResolveClass;
  30.217 -                JVM_ResumeThread;
  30.218 -                JVM_Send;
  30.219 -                JVM_SendTo;
  30.220 -                JVM_SetArrayElement;
  30.221 -                JVM_SetClassSigners;
  30.222 -                JVM_SetLength;
  30.223 -                JVM_SetPrimitiveArrayElement;
  30.224 -                JVM_SetProtectionDomain;
  30.225 -                JVM_SetSockOpt;
  30.226 -                JVM_SetThreadPriority;
  30.227 -                JVM_Sleep;
  30.228 -                JVM_Socket;
  30.229 -                JVM_SocketAvailable;
  30.230 -                JVM_SocketClose;
  30.231 -                JVM_SocketShutdown;
  30.232 -                JVM_StartThread;
  30.233 -                JVM_StopThread;
  30.234 -                JVM_SuspendThread;
  30.235 -                JVM_SupportsCX8;
  30.236 -                JVM_Sync;
  30.237 -                JVM_Timeout;
  30.238 -                JVM_TotalMemory;
  30.239 -                JVM_TraceInstructions;
  30.240 -                JVM_TraceMethodCalls;
  30.241 -                JVM_UnloadLibrary;
  30.242 -                JVM_Write;
  30.243 -                JVM_Yield;
  30.244 -                JVM_handle_bsd_signal;
  30.245 -
  30.246 -                # Old reflection routines
  30.247 -                # These do not need to be present in the product build in JDK 1.4
  30.248 -                # but their code has not been removed yet because there will not
  30.249 -                # be a substantial code savings until JVM_InvokeMethod and
  30.250 -                # JVM_NewInstanceFromConstructor can also be removed; see
  30.251 -                # reflectionCompat.hpp.
  30.252 -                JVM_GetClassConstructor;
  30.253 -                JVM_GetClassConstructors;
  30.254 -                JVM_GetClassField;
  30.255 -                JVM_GetClassFields;
  30.256 -                JVM_GetClassMethod;
  30.257 -                JVM_GetClassMethods;
  30.258 -                JVM_GetField;
  30.259 -                JVM_GetPrimitiveField;
  30.260 -                JVM_NewInstance;
  30.261 -                JVM_SetField;
  30.262 -                JVM_SetPrimitiveField;
  30.263 +                # _JVM
  30.264 +                _JVM_Accept
  30.265 +                _JVM_ActiveProcessorCount
  30.266 +                _JVM_AllocateNewArray
  30.267 +                _JVM_AllocateNewObject
  30.268 +                _JVM_ArrayCopy
  30.269 +                _JVM_AssertionStatusDirectives
  30.270 +                _JVM_Available
  30.271 +                _JVM_Bind
  30.272 +                _JVM_ClassDepth
  30.273 +                _JVM_ClassLoaderDepth
  30.274 +                _JVM_Clone
  30.275 +                _JVM_Close
  30.276 +                _JVM_CX8Field
  30.277 +                _JVM_CompileClass
  30.278 +                _JVM_CompileClasses
  30.279 +                _JVM_CompilerCommand
  30.280 +                _JVM_Connect
  30.281 +                _JVM_ConstantPoolGetClassAt
  30.282 +                _JVM_ConstantPoolGetClassAtIfLoaded
  30.283 +                _JVM_ConstantPoolGetDoubleAt
  30.284 +                _JVM_ConstantPoolGetFieldAt
  30.285 +                _JVM_ConstantPoolGetFieldAtIfLoaded
  30.286 +                _JVM_ConstantPoolGetFloatAt
  30.287 +                _JVM_ConstantPoolGetIntAt
  30.288 +                _JVM_ConstantPoolGetLongAt
  30.289 +                _JVM_ConstantPoolGetMethodAt
  30.290 +                _JVM_ConstantPoolGetMethodAtIfLoaded
  30.291 +                _JVM_ConstantPoolGetMemberRefInfoAt
  30.292 +                _JVM_ConstantPoolGetSize
  30.293 +                _JVM_ConstantPoolGetStringAt
  30.294 +                _JVM_ConstantPoolGetUTF8At
  30.295 +                _JVM_CountStackFrames
  30.296 +                _JVM_CurrentClassLoader
  30.297 +                _JVM_CurrentLoadedClass
  30.298 +                _JVM_CurrentThread
  30.299 +                _JVM_CurrentTimeMillis
  30.300 +                _JVM_DefineClass
  30.301 +                _JVM_DefineClassWithSource
  30.302 +                _JVM_DefineClassWithSourceCond
  30.303 +                _JVM_DesiredAssertionStatus
  30.304 +                _JVM_DisableCompiler
  30.305 +                _JVM_DoPrivileged
  30.306 +                _JVM_DTraceGetVersion
  30.307 +                _JVM_DTraceActivate
  30.308 +                _JVM_DTraceIsProbeEnabled
  30.309 +                _JVM_DTraceIsSupported
  30.310 +                _JVM_DTraceDispose
  30.311 +                _JVM_DumpAllStacks
  30.312 +                _JVM_DumpThreads
  30.313 +                _JVM_EnableCompiler
  30.314 +                _JVM_Exit
  30.315 +                _JVM_FillInStackTrace
  30.316 +                _JVM_FindClassFromClass
  30.317 +                _JVM_FindClassFromClassLoader
  30.318 +                _JVM_FindClassFromBootLoader
  30.319 +                _JVM_FindLibraryEntry
  30.320 +                _JVM_FindLoadedClass
  30.321 +                _JVM_FindPrimitiveClass
  30.322 +                _JVM_FindSignal
  30.323 +                _JVM_FreeMemory
  30.324 +                _JVM_GC
  30.325 +                _JVM_GetAllThreads
  30.326 +                _JVM_GetArrayElement
  30.327 +                _JVM_GetArrayLength
  30.328 +                _JVM_GetCPClassNameUTF
  30.329 +                _JVM_GetCPFieldClassNameUTF
  30.330 +                _JVM_GetCPFieldModifiers
  30.331 +                _JVM_GetCPFieldNameUTF
  30.332 +                _JVM_GetCPFieldSignatureUTF
  30.333 +                _JVM_GetCPMethodClassNameUTF
  30.334 +                _JVM_GetCPMethodModifiers
  30.335 +                _JVM_GetCPMethodNameUTF
  30.336 +                _JVM_GetCPMethodSignatureUTF
  30.337 +                _JVM_GetCallerClass
  30.338 +                _JVM_GetClassAccessFlags
  30.339 +                _JVM_GetClassAnnotations
  30.340 +                _JVM_GetClassCPEntriesCount
  30.341 +                _JVM_GetClassCPTypes
  30.342 +                _JVM_GetClassConstantPool
  30.343 +                _JVM_GetClassContext
  30.344 +                _JVM_GetClassDeclaredConstructors
  30.345 +                _JVM_GetClassDeclaredFields
  30.346 +                _JVM_GetClassDeclaredMethods
  30.347 +                _JVM_GetClassFieldsCount
  30.348 +                _JVM_GetClassInterfaces
  30.349 +                _JVM_GetClassLoader
  30.350 +                _JVM_GetClassMethodsCount
  30.351 +                _JVM_GetClassModifiers
  30.352 +                _JVM_GetClassName
  30.353 +                _JVM_GetClassNameUTF
  30.354 +                _JVM_GetClassSignature
  30.355 +                _JVM_GetClassSigners
  30.356 +                _JVM_GetClassTypeAnnotations
  30.357 +                _JVM_GetComponentType
  30.358 +                _JVM_GetDeclaredClasses
  30.359 +                _JVM_GetDeclaringClass
  30.360 +                _JVM_GetEnclosingMethodInfo
  30.361 +                _JVM_GetFieldAnnotations
  30.362 +                _JVM_GetFieldIxModifiers
  30.363 +                _JVM_GetFieldTypeAnnotations
  30.364 +                _JVM_GetHostName
  30.365 +                _JVM_GetInheritedAccessControlContext
  30.366 +                _JVM_GetInterfaceVersion
  30.367 +                _JVM_GetLastErrorString
  30.368 +                _JVM_GetManagement
  30.369 +                _JVM_GetMethodAnnotations
  30.370 +                _JVM_GetMethodDefaultAnnotationValue
  30.371 +                _JVM_GetMethodIxArgsSize
  30.372 +                _JVM_GetMethodIxByteCode
  30.373 +                _JVM_GetMethodIxByteCodeLength
  30.374 +                _JVM_GetMethodIxExceptionIndexes
  30.375 +                _JVM_GetMethodIxExceptionTableEntry
  30.376 +                _JVM_GetMethodIxExceptionTableLength
  30.377 +                _JVM_GetMethodIxExceptionsCount
  30.378 +                _JVM_GetMethodIxLocalsCount
  30.379 +                _JVM_GetMethodIxMaxStack
  30.380 +                _JVM_GetMethodIxModifiers
  30.381 +                _JVM_GetMethodIxNameUTF
  30.382 +                _JVM_GetMethodIxSignatureUTF
  30.383 +                _JVM_GetMethodParameterAnnotations
  30.384 +                _JVM_GetMethodParameters
  30.385 +                _JVM_GetMethodTypeAnnotations
  30.386 +                _JVM_GetPrimitiveArrayElement
  30.387 +                _JVM_GetProtectionDomain
  30.388 +                _JVM_GetSockName
  30.389 +                _JVM_GetSockOpt
  30.390 +                _JVM_GetStackAccessControlContext
  30.391 +                _JVM_GetStackTraceDepth
  30.392 +                _JVM_GetStackTraceElement
  30.393 +                _JVM_GetSystemPackage
  30.394 +                _JVM_GetSystemPackages
  30.395 +                _JVM_GetThreadStateNames
  30.396 +                _JVM_GetThreadStateValues
  30.397 +                _JVM_GetVersionInfo
  30.398 +                _JVM_Halt
  30.399 +                _JVM_HoldsLock
  30.400 +                _JVM_IHashCode
  30.401 +                _JVM_InitAgentProperties
  30.402 +                _JVM_InitProperties
  30.403 +                _JVM_InitializeCompiler
  30.404 +                _JVM_InitializeSocketLibrary
  30.405 +                _JVM_InternString
  30.406 +                _JVM_Interrupt
  30.407 +                _JVM_InvokeMethod
  30.408 +                _JVM_IsArrayClass
  30.409 +                _JVM_IsConstructorIx
  30.410 +                _JVM_IsInterface
  30.411 +                _JVM_IsInterrupted
  30.412 +                _JVM_IsNaN
  30.413 +                _JVM_IsPrimitiveClass
  30.414 +                _JVM_IsSameClassPackage
  30.415 +                _JVM_IsSilentCompiler
  30.416 +                _JVM_IsSupportedJNIVersion
  30.417 +                _JVM_IsThreadAlive
  30.418 +                _JVM_IsVMGeneratedMethodIx
  30.419 +                _JVM_LatestUserDefinedLoader
  30.420 +                _JVM_Listen
  30.421 +                _JVM_LoadClass0
  30.422 +                _JVM_LoadLibrary
  30.423 +                _JVM_Lseek
  30.424 +                _JVM_MaxObjectInspectionAge
  30.425 +                _JVM_MaxMemory
  30.426 +                _JVM_MonitorNotify
  30.427 +                _JVM_MonitorNotifyAll
  30.428 +                _JVM_MonitorWait
  30.429 +                _JVM_NanoTime
  30.430 +                _JVM_NativePath
  30.431 +                _JVM_NewArray
  30.432 +                _JVM_NewInstanceFromConstructor
  30.433 +                _JVM_NewMultiArray
  30.434 +                _JVM_OnExit
  30.435 +                _JVM_Open
  30.436 +                _JVM_RaiseSignal
  30.437 +                _JVM_RawMonitorCreate
  30.438 +                _JVM_RawMonitorDestroy
  30.439 +                _JVM_RawMonitorEnter
  30.440 +                _JVM_RawMonitorExit
  30.441 +                _JVM_Read
  30.442 +                _JVM_Recv
  30.443 +                _JVM_RecvFrom
  30.444 +                _JVM_RegisterSignal
  30.445 +                _JVM_ReleaseUTF
  30.446 +                _JVM_ResolveClass
  30.447 +                _JVM_ResumeThread
  30.448 +                _JVM_Send
  30.449 +                _JVM_SendTo
  30.450 +                _JVM_SetArrayElement
  30.451 +                _JVM_SetClassSigners
  30.452 +                _JVM_SetLength
  30.453 +                _JVM_SetNativeThreadName
  30.454 +                _JVM_SetPrimitiveArrayElement
  30.455 +                _JVM_SetProtectionDomain
  30.456 +                _JVM_SetSockOpt
  30.457 +                _JVM_SetThreadPriority
  30.458 +                _JVM_Sleep
  30.459 +                _JVM_Socket
  30.460 +                _JVM_SocketAvailable
  30.461 +                _JVM_SocketClose
  30.462 +                _JVM_SocketShutdown
  30.463 +                _JVM_StartThread
  30.464 +                _JVM_StopThread
  30.465 +                _JVM_SuspendThread
  30.466 +                _JVM_SupportsCX8
  30.467 +                _JVM_Sync
  30.468 +                _JVM_Timeout
  30.469 +                _JVM_TotalMemory
  30.470 +                _JVM_TraceInstructions
  30.471 +                _JVM_TraceMethodCalls
  30.472 +                _JVM_UnloadLibrary
  30.473 +                _JVM_Write
  30.474 +                _JVM_Yield
  30.475 +                _JVM_handle_bsd_signal
  30.476  
  30.477                  # miscellaneous functions
  30.478 -                jio_fprintf;
  30.479 -                jio_printf;
  30.480 -                jio_snprintf;
  30.481 -                jio_vfprintf;
  30.482 -                jio_vsnprintf;
  30.483 -                fork1;
  30.484 -                numa_warn;
  30.485 -                numa_error;
  30.486 -
  30.487 -                # Needed because there is no JVM interface for this.
  30.488 -                sysThreadAvailableStackWithSlack;
  30.489 +                _jio_fprintf
  30.490 +                _jio_printf
  30.491 +                _jio_snprintf
  30.492 +                _jio_vfprintf
  30.493 +                _jio_vsnprintf
  30.494  
  30.495                  # This is for Forte Analyzer profiling support.
  30.496 -                AsyncGetCallTrace;
  30.497 +                _AsyncGetCallTrace
  30.498  
  30.499 -		# INSERT VTABLE SYMBOLS HERE
  30.500 +                # INSERT VTABLE SYMBOLS HERE
  30.501  
  30.502 -        local:
  30.503 -                *;
  30.504 -};
  30.505 -

    31.1 --- a/make/excludeSrc.make	Thu Jul 11 12:59:03 2013 -0400
    31.2 +++ b/make/excludeSrc.make	Mon Jul 15 11:07:03 2013 +0100
    31.3 @@ -112,3 +112,5 @@
    31.4  endif
    31.5  
    31.6  -include $(HS_ALT_MAKE)/excludeSrc.make
    31.7 +
    31.8 +.PHONY: $(HS_ALT_MAKE)/excludeSrc.make

    32.1 --- a/make/hotspot_version	Thu Jul 11 12:59:03 2013 -0400
    32.2 +++ b/make/hotspot_version	Mon Jul 15 11:07:03 2013 +0100
    32.3 @@ -35,7 +35,7 @@
    32.4  
    32.5  HS_MAJOR_VER=25
    32.6  HS_MINOR_VER=0
    32.7 -HS_BUILD_NUMBER=37
    32.8 +HS_BUILD_NUMBER=40
    32.9  
   32.10  JDK_MAJOR_VER=1
   32.11  JDK_MINOR_VER=8

    33.1 --- a/make/linux/makefiles/gcc.make	Thu Jul 11 12:59:03 2013 -0400
    33.2 +++ b/make/linux/makefiles/gcc.make	Mon Jul 15 11:07:03 2013 +0100
    33.3 @@ -214,7 +214,7 @@
    33.4    WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body
    33.5  endif
    33.6  
    33.7 -WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function
    33.8 +WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value
    33.9  
   33.10  ifeq ($(USE_CLANG),)
   33.11    # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
   33.12 @@ -350,9 +350,9 @@
   33.13    ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),)
   33.14        ifeq ($(USE_CLANG), true)
   33.15          # Clang doesn't understand -gstabs
   33.16 -        OPT_CFLAGS += -g
   33.17 +        DEBUG_CFLAGS += -g
   33.18        else
   33.19 -        OPT_CFLAGS += -gstabs
   33.20 +        DEBUG_CFLAGS += -gstabs
   33.21        endif
   33.22    endif
   33.23    
   33.24 @@ -365,9 +365,9 @@
   33.25      ifeq ($(FASTDEBUG_CFLAGS/$(BUILDARCH)),)
   33.26        ifeq ($(USE_CLANG), true)
   33.27          # Clang doesn't understand -gstabs
   33.28 -        OPT_CFLAGS += -g
   33.29 +        FASTDEBUG_CFLAGS += -g
   33.30        else
   33.31 -        OPT_CFLAGS += -gstabs
   33.32 +        FASTDEBUG_CFLAGS += -gstabs
   33.33        endif
   33.34      endif
   33.35    

    34.1 --- a/make/linux/makefiles/vm.make	Thu Jul 11 12:59:03 2013 -0400
    34.2 +++ b/make/linux/makefiles/vm.make	Mon Jul 15 11:07:03 2013 +0100
    34.3 @@ -107,6 +107,10 @@
    34.4  # File specific flags
    34.5  CXXFLAGS += $(CXXFLAGS/BYFILE)
    34.6  
    34.7 +# Large File Support
    34.8 +ifneq ($(LP64), 1)
    34.9 +CXXFLAGS/ostream.o += -D_FILE_OFFSET_BITS=64
   34.10 +endif # ifneq ($(LP64), 1)
   34.11  
   34.12  # CFLAGS_WARN holds compiler options to suppress/enable warnings.
   34.13  CFLAGS += $(CFLAGS_WARN/BYFILE)

    35.1 --- a/make/solaris/makefiles/vm.make	Thu Jul 11 12:59:03 2013 -0400
    35.2 +++ b/make/solaris/makefiles/vm.make	Mon Jul 15 11:07:03 2013 +0100
    35.3 @@ -95,6 +95,10 @@
    35.4  # File specific flags
    35.5  CXXFLAGS += $(CXXFLAGS/BYFILE)
    35.6  
    35.7 +# Large File Support
    35.8 +ifneq ($(LP64), 1)
    35.9 +CXXFLAGS/ostream.o += -D_FILE_OFFSET_BITS=64
   35.10 +endif # ifneq ($(LP64), 1)
   35.11  
   35.12  # CFLAGS_WARN holds compiler options to suppress/enable warnings.
   35.13  CFLAGS += $(CFLAGS_WARN)

    36.1 --- a/src/cpu/sparc/vm/assembler_sparc.hpp	Thu Jul 11 12:59:03 2013 -0400
    36.2 +++ b/src/cpu/sparc/vm/assembler_sparc.hpp	Mon Jul 15 11:07:03 2013 +0100
    36.3 @@ -57,7 +57,6 @@
    36.4      fbp_op2   = 5,
    36.5      br_op2    = 2,
    36.6      bp_op2    = 1,
    36.7 -    cb_op2    = 7, // V8
    36.8      sethi_op2 = 4
    36.9    };
   36.10  
   36.11 @@ -145,7 +144,6 @@
   36.12      ldsh_op3     = 0x0a,
   36.13      ldx_op3      = 0x0b,
   36.14  
   36.15 -    ldstub_op3   = 0x0d,
   36.16      stx_op3      = 0x0e,
   36.17      swap_op3     = 0x0f,
   36.18  
   36.19 @@ -163,15 +161,6 @@
   36.20  
   36.21      prefetch_op3 = 0x2d,
   36.22  
   36.23 -
   36.24 -    ldc_op3      = 0x30,
   36.25 -    ldcsr_op3    = 0x31,
   36.26 -    lddc_op3     = 0x33,
   36.27 -    stc_op3      = 0x34,
   36.28 -    stcsr_op3    = 0x35,
   36.29 -    stdcq_op3    = 0x36,
   36.30 -    stdc_op3     = 0x37,
   36.31 -
   36.32      casa_op3     = 0x3c,
   36.33      casxa_op3    = 0x3e,
   36.34  
   36.35 @@ -574,17 +563,11 @@
   36.36    static void vis3_only() { assert( VM_Version::has_vis3(), "This instruction only works on SPARC with VIS3"); }
   36.37  
   36.38    // instruction only in v9
   36.39 -  static void v9_only() { assert( VM_Version::v9_instructions_work(), "This instruction only works on SPARC V9"); }
   36.40 -
   36.41 -  // instruction only in v8
   36.42 -  static void v8_only() { assert( VM_Version::v8_instructions_work(), "This instruction only works on SPARC V8"); }
   36.43 +  static void v9_only() { } // do nothing
   36.44  
   36.45    // instruction deprecated in v9
   36.46    static void v9_dep()  { } // do nothing for now
   36.47  
   36.48 -  // some float instructions only exist for single prec. on v8
   36.49 -  static void v8_s_only(FloatRegisterImpl::Width w)  { if (w != FloatRegisterImpl::S)  v9_only(); }
   36.50 -
   36.51    // v8 has no CC field
   36.52    static void v8_no_cc(CC cc)  { if (cc)  v9_only(); }
   36.53  
   36.54 @@ -730,11 +713,6 @@
   36.55    inline void bp( Condition c, bool a, CC cc, Predict p, address d, relocInfo::relocType rt = relocInfo::none );
   36.56    inline void bp( Condition c, bool a, CC cc, Predict p, Label& L );
   36.57  
   36.58 -  // pp 121 (V8)
   36.59 -
   36.60 -  inline void cb( Condition c, bool a, address d, relocInfo::relocType rt = relocInfo::none );
   36.61 -  inline void cb( Condition c, bool a, Label& L );
   36.62 -
   36.63    // pp 149
   36.64  
   36.65    inline void call( address d,  relocInfo::relocType rt = relocInfo::runtime_call_type );
   36.66 @@ -775,8 +753,8 @@
   36.67  
   36.68    // pp 157
   36.69  
   36.70 -  void fcmp(  FloatRegisterImpl::Width w, CC cc, FloatRegister s1, FloatRegister s2) { v8_no_cc(cc);  emit_int32( op(arith_op) | cmpcc(cc) | op3(fpop2_op3) | fs1(s1, w) | opf(0x50 + w) | fs2(s2, w)); }
   36.71 -  void fcmpe( FloatRegisterImpl::Width w, CC cc, FloatRegister s1, FloatRegister s2) { v8_no_cc(cc);  emit_int32( op(arith_op) | cmpcc(cc) | op3(fpop2_op3) | fs1(s1, w) | opf(0x54 + w) | fs2(s2, w)); }
   36.72 +  void fcmp(  FloatRegisterImpl::Width w, CC cc, FloatRegister s1, FloatRegister s2) { emit_int32( op(arith_op) | cmpcc(cc) | op3(fpop2_op3) | fs1(s1, w) | opf(0x50 + w) | fs2(s2, w)); }
   36.73 +  void fcmpe( FloatRegisterImpl::Width w, CC cc, FloatRegister s1, FloatRegister s2) { emit_int32( op(arith_op) | cmpcc(cc) | op3(fpop2_op3) | fs1(s1, w) | opf(0x54 + w) | fs2(s2, w)); }
   36.74  
   36.75    // pp 159
   36.76  
   36.77 @@ -794,21 +772,11 @@
   36.78  
   36.79    // pp 162
   36.80  
   36.81 -  void fmov( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d ) { v8_s_only(w);  emit_int32( op(arith_op) | fd(d, w) | op3(fpop1_op3) | opf(0x00 + w) | fs2(s, w)); }
   36.82 +  void fmov( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d ) { emit_int32( op(arith_op) | fd(d, w) | op3(fpop1_op3) | opf(0x00 + w) | fs2(s, w)); }
   36.83  
   36.84 -  void fneg( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d ) { v8_s_only(w);  emit_int32( op(arith_op) | fd(d, w) | op3(fpop1_op3) | opf(0x04 + w) | fs2(s, w)); }
   36.85 +  void fneg( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d ) { emit_int32( op(arith_op) | fd(d, w) | op3(fpop1_op3) | opf(0x04 + w) | fs2(s, w)); }
   36.86  
   36.87 -  // page 144 sparc v8 architecture (double prec works on v8 if the source and destination registers are the same). fnegs is the only instruction available
   36.88 -  // on v8 to do negation of single, double and quad precision floats.
   36.89 -
   36.90 -  void fneg( FloatRegisterImpl::Width w, FloatRegister sd ) { if (VM_Version::v9_instructions_work()) emit_int32( op(arith_op) | fd(sd, w) | op3(fpop1_op3) | opf(0x04 + w) | fs2(sd, w)); else emit_int32( op(arith_op) | fd(sd, w) | op3(fpop1_op3) |  opf(0x05) | fs2(sd, w)); }
   36.91 -
   36.92 -  void fabs( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d ) { v8_s_only(w);  emit_int32( op(arith_op) | fd(d, w) | op3(fpop1_op3) | opf(0x08 + w) | fs2(s, w)); }
   36.93 -
   36.94 -  // page 144 sparc v8 architecture (double prec works on v8 if the source and destination registers are the same). fabss is the only instruction available
   36.95 -  // on v8 to do abs operation on single/double/quad precision floats.
   36.96 -
   36.97 -  void fabs( FloatRegisterImpl::Width w, FloatRegister sd ) { if (VM_Version::v9_instructions_work()) emit_int32( op(arith_op) | fd(sd, w) | op3(fpop1_op3) | opf(0x08 + w) | fs2(sd, w)); else emit_int32( op(arith_op) | fd(sd, w) | op3(fpop1_op3) | opf(0x09) | fs2(sd, w)); }
   36.98 +  void fabs( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d ) { emit_int32( op(arith_op) | fd(d, w) | op3(fpop1_op3) | opf(0x08 + w) | fs2(s, w)); }
   36.99  
  36.100    // pp 163
  36.101  
  36.102 @@ -839,11 +807,6 @@
  36.103    void impdep1( int id1, int const19a ) { v9_only();  emit_int32( op(arith_op) | fcn(id1) | op3(impdep1_op3) | u_field(const19a, 18, 0)); }
  36.104    void impdep2( int id1, int const19a ) { v9_only();  emit_int32( op(arith_op) | fcn(id1) | op3(impdep2_op3) | u_field(const19a, 18, 0)); }
  36.105  
  36.106 -  // pp 149 (v8)
  36.107 -
  36.108 -  void cpop1( int opc, int cr1, int cr2, int crd ) { v8_only();  emit_int32( op(arith_op) | fcn(crd) | op3(impdep1_op3) | u_field(cr1, 18, 14) | opf(opc) | u_field(cr2, 4, 0)); }
  36.109 -  void cpop2( int opc, int cr1, int cr2, int crd ) { v8_only();  emit_int32( op(arith_op) | fcn(crd) | op3(impdep2_op3) | u_field(cr1, 18, 14) | opf(opc) | u_field(cr2, 4, 0)); }
  36.110 -
  36.111    // pp 170
  36.112  
  36.113    void jmpl( Register s1, Register s2, Register d );
  36.114 @@ -860,16 +823,6 @@
  36.115    inline void ldxfsr( Register s1, Register s2 );
  36.116    inline void ldxfsr( Register s1, int simm13a);
  36.117  
  36.118 -  // pp 94 (v8)
  36.119 -
  36.120 -  inline void ldc(   Register s1, Register s2, int crd );
  36.121 -  inline void ldc(   Register s1, int simm13a, int crd);
  36.122 -  inline void lddc(  Register s1, Register s2, int crd );
  36.123 -  inline void lddc(  Register s1, int simm13a, int crd);
  36.124 -  inline void ldcsr( Register s1, Register s2, int crd );
  36.125 -  inline void ldcsr( Register s1, int simm13a, int crd);
  36.126 -
  36.127 -
  36.128    // 173
  36.129  
  36.130    void ldfa(  FloatRegisterImpl::Width w, Register s1, Register s2, int ia, FloatRegister d ) { v9_only();  emit_int32( op(ldst_op) | fd(d, w) | alt_op3(ldf_op3 | alt_bit_op3, w) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
  36.131 @@ -910,18 +863,6 @@
  36.132    void lduwa(  Register s1, int simm13a,         Register d ) {             emit_int32( op(ldst_op) | rd(d) | op3(lduw_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
  36.133    void ldxa(   Register s1, Register s2, int ia, Register d ) { v9_only();  emit_int32( op(ldst_op) | rd(d) | op3(ldx_op3  | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
  36.134    void ldxa(   Register s1, int simm13a,         Register d ) { v9_only();  emit_int32( op(ldst_op) | rd(d) | op3(ldx_op3  | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
  36.135 -  void ldda(   Register s1, Register s2, int ia, Register d ) { v9_dep();   emit_int32( op(ldst_op) | rd(d) | op3(ldd_op3  | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
  36.136 -  void ldda(   Register s1, int simm13a,         Register d ) { v9_dep();   emit_int32( op(ldst_op) | rd(d) | op3(ldd_op3  | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
  36.137 -
  36.138 -  // pp 179
  36.139 -
  36.140 -  inline void ldstub(  Register s1, Register s2, Register d );
  36.141 -  inline void ldstub(  Register s1, int simm13a, Register d);
  36.142 -
  36.143 -  // pp 180
  36.144 -
  36.145 -  void ldstuba( Register s1, Register s2, int ia, Register d ) { emit_int32( op(ldst_op) | rd(d) | op3(ldstub_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
  36.146 -  void ldstuba( Register s1, int simm13a,         Register d ) { emit_int32( op(ldst_op) | rd(d) | op3(ldstub_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
  36.147  
  36.148    // pp 181
  36.149  
  36.150 @@ -992,11 +933,6 @@
  36.151    void smulcc( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(smul_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
  36.152    void smulcc( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(smul_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
  36.153  
  36.154 -  // pp 199
  36.155 -
  36.156 -  void mulscc(   Register s1, Register s2, Register d ) { v9_dep();  emit_int32( op(arith_op) | rd(d) | op3(mulscc_op3) | rs1(s1) | rs2(s2) ); }
  36.157 -  void mulscc(   Register s1, int simm13a, Register d ) { v9_dep();  emit_int32( op(arith_op) | rd(d) | op3(mulscc_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
  36.158 -
  36.159    // pp 201
  36.160  
  36.161    void nop() { emit_int32( op(branch_op) | op2(sethi_op2) ); }
  36.162 @@ -1116,17 +1052,6 @@
  36.163    void stda(  Register d, Register s1, Register s2, int ia ) {             emit_int32( op(ldst_op) | rd(d) | op3(std_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
  36.164    void stda(  Register d, Register s1, int simm13a         ) {             emit_int32( op(ldst_op) | rd(d) | op3(std_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
  36.165  
  36.166 -  // pp 97 (v8)
  36.167 -
  36.168 -  inline void stc(   int crd, Register s1, Register s2 );
  36.169 -  inline void stc(   int crd, Register s1, int simm13a);
  36.170 -  inline void stdc(  int crd, Register s1, Register s2 );
  36.171 -  inline void stdc(  int crd, Register s1, int simm13a);
  36.172 -  inline void stcsr( int crd, Register s1, Register s2 );
  36.173 -  inline void stcsr( int crd, Register s1, int simm13a);
  36.174 -  inline void stdcq( int crd, Register s1, Register s2 );
  36.175 -  inline void stdcq( int crd, Register s1, int simm13a);
  36.176 -
  36.177    // pp 230
  36.178  
  36.179    void sub(    Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(sub_op3              ) | rs1(s1) | rs2(s2) ); }
  36.180 @@ -1153,20 +1078,16 @@
  36.181  
  36.182    void taddcc(    Register s1, Register s2, Register d ) {            emit_int32( op(arith_op) | rd(d) | op3(taddcc_op3  ) | rs1(s1) | rs2(s2) ); }
  36.183    void taddcc(    Register s1, int simm13a, Register d ) {            emit_int32( op(arith_op) | rd(d) | op3(taddcc_op3  ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
  36.184 -  void taddcctv(  Register s1, Register s2, Register d ) { v9_dep();  emit_int32( op(arith_op) | rd(d) | op3(taddcctv_op3) | rs1(s1) | rs2(s2) ); }
  36.185 -  void taddcctv(  Register s1, int simm13a, Register d ) { v9_dep();  emit_int32( op(arith_op) | rd(d) | op3(taddcctv_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
  36.186  
  36.187    // pp 235
  36.188  
  36.189    void tsubcc(    Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(tsubcc_op3  ) | rs1(s1) | rs2(s2) ); }
  36.190    void tsubcc(    Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(tsubcc_op3  ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
  36.191 -  void tsubcctv(  Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(tsubcctv_op3) | rs1(s1) | rs2(s2) ); }
  36.192 -  void tsubcctv(  Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(tsubcctv_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
  36.193  
  36.194    // pp 237
  36.195  
  36.196 -  void trap( Condition c, CC cc, Register s1, Register s2 ) { v8_no_cc(cc);  emit_int32( op(arith_op) | cond(c) | op3(trap_op3) | rs1(s1) | trapcc(cc) | rs2(s2)); }
  36.197 -  void trap( Condition c, CC cc, Register s1, int trapa   ) { v8_no_cc(cc);  emit_int32( op(arith_op) | cond(c) | op3(trap_op3) | rs1(s1) | trapcc(cc) | immed(true) | u_field(trapa, 6, 0)); }
  36.198 +  void trap( Condition c, CC cc, Register s1, Register s2 ) { emit_int32( op(arith_op) | cond(c) | op3(trap_op3) | rs1(s1) | trapcc(cc) | rs2(s2)); }
  36.199 +  void trap( Condition c, CC cc, Register s1, int trapa   ) { emit_int32( op(arith_op) | cond(c) | op3(trap_op3) | rs1(s1) | trapcc(cc) | immed(true) | u_field(trapa, 6, 0)); }
  36.200    // simple uncond. trap
  36.201    void trap( int trapa ) { trap( always, icc, G0, trapa ); }
  36.202  

    37.1 --- a/src/cpu/sparc/vm/assembler_sparc.inline.hpp	Thu Jul 11 12:59:03 2013 -0400
    37.2 +++ b/src/cpu/sparc/vm/assembler_sparc.inline.hpp	Mon Jul 15 11:07:03 2013 +0100
    37.3 @@ -63,9 +63,6 @@
    37.4  inline void Assembler::fbp( Condition c, bool a, CC cc, Predict p, address d, relocInfo::relocType rt ) { v9_only();  cti();  emit_data( op(branch_op) | annul(a) | cond(c) | op2(fbp_op2) | branchcc(cc) | predict(p) | wdisp(intptr_t(d), intptr_t(pc()), 19), rt);  has_delay_slot(); }
    37.5  inline void Assembler::fbp( Condition c, bool a, CC cc, Predict p, Label& L ) { fbp(c, a, cc, p, target(L)); }
    37.6  
    37.7 -inline void Assembler::cb( Condition c, bool a, address d, relocInfo::relocType rt ) { v8_only();  cti();  emit_data( op(branch_op) | annul(a) | cond(c) | op2(cb_op2) | wdisp(intptr_t(d), intptr_t(pc()), 22), rt);  has_delay_slot(); }
    37.8 -inline void Assembler::cb( Condition c, bool a, Label& L ) { cb(c, a, target(L)); }
    37.9 -
   37.10  inline void Assembler::br( Condition c, bool a, address d, relocInfo::relocType rt ) { v9_dep();  cti();   emit_data( op(branch_op) | annul(a) | cond(c) | op2(br_op2) | wdisp(intptr_t(d), intptr_t(pc()), 22), rt);  has_delay_slot(); }
   37.11  inline void Assembler::br( Condition c, bool a, Label& L ) { br(c, a, target(L)); }
   37.12  
   37.13 @@ -88,18 +85,9 @@
   37.14  inline void Assembler::ldf(FloatRegisterImpl::Width w, Register s1, Register s2, FloatRegister d) { emit_int32( op(ldst_op) | fd(d, w) | alt_op3(ldf_op3, w) | rs1(s1) | rs2(s2) ); }
   37.15  inline void Assembler::ldf(FloatRegisterImpl::Width w, Register s1, int simm13a, FloatRegister d, RelocationHolder const& rspec) { emit_data( op(ldst_op) | fd(d, w) | alt_op3(ldf_op3, w) | rs1(s1) | immed(true) | simm(simm13a, 13), rspec); }
   37.16  
   37.17 -inline void Assembler::ldfsr(  Register s1, Register s2) { v9_dep();   emit_int32( op(ldst_op) |             op3(ldfsr_op3) | rs1(s1) | rs2(s2) ); }
   37.18 -inline void Assembler::ldfsr(  Register s1, int simm13a) { v9_dep();   emit_data( op(ldst_op) |             op3(ldfsr_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
   37.19  inline void Assembler::ldxfsr( Register s1, Register s2) { v9_only();  emit_int32( op(ldst_op) | rd(G1)    | op3(ldfsr_op3) | rs1(s1) | rs2(s2) ); }
   37.20  inline void Assembler::ldxfsr( Register s1, int simm13a) { v9_only();  emit_data( op(ldst_op) | rd(G1)    | op3(ldfsr_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
   37.21  
   37.22 -inline void Assembler::ldc(   Register s1, Register s2, int crd) { v8_only();  emit_int32( op(ldst_op) | fcn(crd) | op3(ldc_op3  ) | rs1(s1) | rs2(s2) ); }
   37.23 -inline void Assembler::ldc(   Register s1, int simm13a, int crd) { v8_only();  emit_data( op(ldst_op) | fcn(crd) | op3(ldc_op3  ) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
   37.24 -inline void Assembler::lddc(  Register s1, Register s2, int crd) { v8_only();  emit_int32( op(ldst_op) | fcn(crd) | op3(lddc_op3 ) | rs1(s1) | rs2(s2) ); }
   37.25 -inline void Assembler::lddc(  Register s1, int simm13a, int crd) { v8_only();  emit_data( op(ldst_op) | fcn(crd) | op3(lddc_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
   37.26 -inline void Assembler::ldcsr( Register s1, Register s2, int crd) { v8_only();  emit_int32( op(ldst_op) | fcn(crd) | op3(ldcsr_op3) | rs1(s1) | rs2(s2) ); }
   37.27 -inline void Assembler::ldcsr( Register s1, int simm13a, int crd) { v8_only();  emit_data( op(ldst_op) | fcn(crd) | op3(ldcsr_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
   37.28 -
   37.29  inline void Assembler::ldsb(  Register s1, Register s2, Register d) { emit_int32( op(ldst_op) | rd(d) | op3(ldsb_op3) | rs1(s1) | rs2(s2) ); }
   37.30  inline void Assembler::ldsb(  Register s1, int simm13a, Register d) { emit_data( op(ldst_op) | rd(d) | op3(ldsb_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
   37.31  
   37.32 @@ -119,9 +107,6 @@
   37.33  inline void Assembler::ldd(   Register s1, Register s2, Register d) { v9_dep(); assert(d->is_even(), "not even"); emit_int32( op(ldst_op) | rd(d) | op3(ldd_op3) | rs1(s1) | rs2(s2) ); }
   37.34  inline void Assembler::ldd(   Register s1, int simm13a, Register d) { v9_dep(); assert(d->is_even(), "not even"); emit_data( op(ldst_op) | rd(d) | op3(ldd_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
   37.35  
   37.36 -inline void Assembler::ldstub(  Register s1, Register s2, Register d) { emit_int32( op(ldst_op) | rd(d) | op3(ldstub_op3) | rs1(s1) | rs2(s2) ); }
   37.37 -inline void Assembler::ldstub(  Register s1, int simm13a, Register d) { emit_data( op(ldst_op) | rd(d) | op3(ldstub_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
   37.38 -
   37.39  inline void Assembler::rett( Register s1, Register s2                         ) { cti();  emit_int32( op(arith_op) | op3(rett_op3) | rs1(s1) | rs2(s2));  has_delay_slot(); }
   37.40  inline void Assembler::rett( Register s1, int simm13a, relocInfo::relocType rt) { cti();  emit_data( op(arith_op) | op3(rett_op3) | rs1(s1) | immed(true) | simm(simm13a, 13), rt);  has_delay_slot(); }
   37.41  
   37.42 @@ -132,8 +117,6 @@
   37.43  inline void Assembler::stf(    FloatRegisterImpl::Width w, FloatRegister d, Register s1, Register s2) { emit_int32( op(ldst_op) | fd(d, w) | alt_op3(stf_op3, w) | rs1(s1) | rs2(s2) ); }
   37.44  inline void Assembler::stf(    FloatRegisterImpl::Width w, FloatRegister d, Register s1, int simm13a) { emit_data( op(ldst_op) | fd(d, w) | alt_op3(stf_op3, w) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
   37.45  
   37.46 -inline void Assembler::stfsr(  Register s1, Register s2) { v9_dep();   emit_int32( op(ldst_op) |             op3(stfsr_op3) | rs1(s1) | rs2(s2) ); }
   37.47 -inline void Assembler::stfsr(  Register s1, int simm13a) { v9_dep();   emit_data( op(ldst_op) |             op3(stfsr_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
   37.48  inline void Assembler::stxfsr( Register s1, Register s2) { v9_only();  emit_int32( op(ldst_op) | rd(G1)    | op3(stfsr_op3) | rs1(s1) | rs2(s2) ); }
   37.49  inline void Assembler::stxfsr( Register s1, int simm13a) { v9_only();  emit_data( op(ldst_op) | rd(G1)    | op3(stfsr_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
   37.50  
   37.51 @@ -152,17 +135,6 @@
   37.52  inline void Assembler::std(  Register d, Register s1, Register s2) { v9_dep(); assert(d->is_even(), "not even"); emit_int32( op(ldst_op) | rd(d) | op3(std_op3) | rs1(s1) | rs2(s2) ); }
   37.53  inline void Assembler::std(  Register d, Register s1, int simm13a) { v9_dep(); assert(d->is_even(), "not even"); emit_data( op(ldst_op) | rd(d) | op3(std_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
   37.54  
   37.55 -// v8 p 99
   37.56 -
   37.57 -inline void Assembler::stc(    int crd, Register s1, Register s2) { v8_only();  emit_int32( op(ldst_op) | fcn(crd) | op3(stc_op3 ) | rs1(s1) | rs2(s2) ); }
   37.58 -inline void Assembler::stc(    int crd, Register s1, int simm13a) { v8_only();  emit_data( op(ldst_op) | fcn(crd) | op3(stc_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
   37.59 -inline void Assembler::stdc(   int crd, Register s1, Register s2) { v8_only();  emit_int32( op(ldst_op) | fcn(crd) | op3(stdc_op3) | rs1(s1) | rs2(s2) ); }
   37.60 -inline void Assembler::stdc(   int crd, Register s1, int simm13a) { v8_only();  emit_data( op(ldst_op) | fcn(crd) | op3(stdc_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
   37.61 -inline void Assembler::stcsr(  int crd, Register s1, Register s2) { v8_only();  emit_int32( op(ldst_op) | fcn(crd) | op3(stcsr_op3) | rs1(s1) | rs2(s2) ); }
   37.62 -inline void Assembler::stcsr(  int crd, Register s1, int simm13a) { v8_only();  emit_data( op(ldst_op) | fcn(crd) | op3(stcsr_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
   37.63 -inline void Assembler::stdcq(  int crd, Register s1, Register s2) { v8_only();  emit_int32( op(ldst_op) | fcn(crd) | op3(stdcq_op3) | rs1(s1) | rs2(s2) ); }
   37.64 -inline void Assembler::stdcq(  int crd, Register s1, int simm13a) { v8_only();  emit_data( op(ldst_op) | fcn(crd) | op3(stdcq_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
   37.65 -
   37.66  // pp 231
   37.67  
   37.68  inline void Assembler::swap(    Register s1, Register s2, Register d) { v9_dep();  emit_int32( op(ldst_op) | rd(d) | op3(swap_op3) | rs1(s1) | rs2(s2) ); }

    38.1 --- a/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp	Thu Jul 11 12:59:03 2013 -0400
    38.2 +++ b/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp	Mon Jul 15 11:07:03 2013 +0100
    38.3 @@ -1,5 +1,5 @@
    38.4  /*
    38.5 - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
    38.6 + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
    38.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    38.8   *
    38.9   * This code is free software; you can redistribute it and/or modify it
   38.10 @@ -597,13 +597,6 @@
   38.11  
   38.12    __ sra(Rdividend, 31, Rscratch);
   38.13    __ wry(Rscratch);
   38.14 -  if (!VM_Version::v9_instructions_work()) {
   38.15 -    // v9 doesn't require these nops
   38.16 -    __ nop();
   38.17 -    __ nop();
   38.18 -    __ nop();
   38.19 -    __ nop();
   38.20 -  }
   38.21  
   38.22    add_debug_info_for_div0_here(op->info());
   38.23  
   38.24 @@ -652,10 +645,6 @@
   38.25        case lir_cond_lessEqual:     acond = (is_unordered ? Assembler::f_unorderedOrLessOrEqual   : Assembler::f_lessOrEqual);    break;
   38.26        case lir_cond_greaterEqual:  acond = (is_unordered ? Assembler::f_unorderedOrGreaterOrEqual: Assembler::f_greaterOrEqual); break;
   38.27        default :                         ShouldNotReachHere();
   38.28 -    };
   38.29 -
   38.30 -    if (!VM_Version::v9_instructions_work()) {
   38.31 -      __ nop();
   38.32      }
   38.33      __ fb( acond, false, Assembler::pn, *(op->label()));
   38.34    } else {
   38.35 @@ -725,9 +714,6 @@
   38.36        Label L;
   38.37        // result must be 0 if value is NaN; test by comparing value to itself
   38.38        __ fcmp(FloatRegisterImpl::S, Assembler::fcc0, rsrc, rsrc);
   38.39 -      if (!VM_Version::v9_instructions_work()) {
   38.40 -        __ nop();
   38.41 -      }
   38.42        __ fb(Assembler::f_unordered, true, Assembler::pn, L);
   38.43        __ delayed()->st(G0, addr); // annuled if contents of rsrc is not NaN
   38.44        __ ftoi(FloatRegisterImpl::S, rsrc, rsrc);
   38.45 @@ -1909,7 +1895,7 @@
   38.46        switch (code) {
   38.47          case lir_add:  __ add  (lreg, rreg, res); break;
   38.48          case lir_sub:  __ sub  (lreg, rreg, res); break;
   38.49 -        case lir_mul:  __ mult (lreg, rreg, res); break;
   38.50 +        case lir_mul:  __ mulx (lreg, rreg, res); break;
   38.51          default: ShouldNotReachHere();
   38.52        }
   38.53      }
   38.54 @@ -1924,7 +1910,7 @@
   38.55        switch (code) {
   38.56          case lir_add:  __ add  (lreg, simm13, res); break;
   38.57          case lir_sub:  __ sub  (lreg, simm13, res); break;
   38.58 -        case lir_mul:  __ mult (lreg, simm13, res); break;
   38.59 +        case lir_mul:  __ mulx (lreg, simm13, res); break;
   38.60          default: ShouldNotReachHere();
   38.61        }
   38.62      } else {
   38.63 @@ -1936,7 +1922,7 @@
   38.64        switch (code) {
   38.65          case lir_add:  __ add  (lreg, (int)con, res); break;
   38.66          case lir_sub:  __ sub  (lreg, (int)con, res); break;
   38.67 -        case lir_mul:  __ mult (lreg, (int)con, res); break;
   38.68 +        case lir_mul:  __ mulx (lreg, (int)con, res); break;
   38.69          default: ShouldNotReachHere();
   38.70        }
   38.71      }
   38.72 @@ -2960,6 +2946,9 @@
   38.73    }
   38.74  }
   38.75  
   38.76 +void LIR_Assembler::emit_updatecrc32(LIR_OpUpdateCRC32* op) {
   38.77 +  fatal("CRC32 intrinsic is not implemented on this platform");
   38.78 +}
   38.79  
   38.80  void LIR_Assembler::emit_lock(LIR_OpLock* op) {
   38.81    Register obj = op->obj_opr()->as_register();
   38.82 @@ -3234,48 +3223,26 @@
   38.83      Register base = mem_addr->base()->as_register();
   38.84      if (src->is_register() && dest->is_address()) {
   38.85        // G4 is high half, G5 is low half
   38.86 -      if (VM_Version::v9_instructions_work()) {
   38.87 -        // clear the top bits of G5, and scale up G4
   38.88 -        __ srl (src->as_register_lo(),  0, G5);
   38.89 -        __ sllx(src->as_register_hi(), 32, G4);
   38.90 -        // combine the two halves into the 64 bits of G4
   38.91 -        __ or3(G4, G5, G4);
   38.92 -        null_check_offset = __ offset();
   38.93 -        if (idx == noreg) {
   38.94 -          __ stx(G4, base, disp);
   38.95 -        } else {
   38.96 -          __ stx(G4, base, idx);
   38.97 -        }
   38.98 +      // clear the top bits of G5, and scale up G4
   38.99 +      __ srl (src->as_register_lo(),  0, G5);
  38.100 +      __ sllx(src->as_register_hi(), 32, G4);
  38.101 +      // combine the two halves into the 64 bits of G4
  38.102 +      __ or3(G4, G5, G4);
  38.103 +      null_check_offset = __ offset();
  38.104 +      if (idx == noreg) {
  38.105 +        __ stx(G4, base, disp);
  38.106        } else {
  38.107 -        __ mov (src->as_register_hi(), G4);
  38.108 -        __ mov (src->as_register_lo(), G5);
  38.109 -        null_check_offset = __ offset();
  38.110 -        if (idx == noreg) {
  38.111 -          __ std(G4, base, disp);
  38.112 -        } else {
  38.113 -          __ std(G4, base, idx);
  38.114 -        }
  38.115 +        __ stx(G4, base, idx);
  38.116        }
  38.117      } else if (src->is_address() && dest->is_register()) {
  38.118        null_check_offset = __ offset();
  38.119 -      if (VM_Version::v9_instructions_work()) {
  38.120 -        if (idx == noreg) {
  38.121 -          __ ldx(base, disp, G5);
  38.122 -        } else {
  38.123 -          __ ldx(base, idx, G5);
  38.124 -        }
  38.125 -        __ srax(G5, 32, dest->as_register_hi()); // fetch the high half into hi
  38.126 -        __ mov (G5, dest->as_register_lo());     // copy low half into lo
  38.127 +      if (idx == noreg) {
  38.128 +        __ ldx(base, disp, G5);
  38.129        } else {
  38.130 -        if (idx == noreg) {
  38.131 -          __ ldd(base, disp, G4);
  38.132 -        } else {
  38.133 -          __ ldd(base, idx, G4);
  38.134 -        }
  38.135 -        // G4 is high half, G5 is low half
  38.136 -        __ mov (G4, dest->as_register_hi());
  38.137 -        __ mov (G5, dest->as_register_lo());
  38.138 +        __ ldx(base, idx, G5);
  38.139        }
  38.140 +      __ srax(G5, 32, dest->as_register_hi()); // fetch the high half into hi
  38.141 +      __ mov (G5, dest->as_register_lo());     // copy low half into lo
  38.142      } else {
  38.143        Unimplemented();
  38.144      }

    39.1 --- a/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp	Thu Jul 11 12:59:03 2013 -0400
    39.2 +++ b/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp	Mon Jul 15 11:07:03 2013 +0100
    39.3 @@ -1,5 +1,5 @@
    39.4  /*
    39.5 - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
    39.6 + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
    39.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    39.8   *
    39.9   * This code is free software; you can redistribute it and/or modify it
   39.10 @@ -784,6 +784,10 @@
   39.11    set_no_result(x);
   39.12  }
   39.13  
   39.14 +void LIRGenerator::do_update_CRC32(Intrinsic* x) {
   39.15 +  fatal("CRC32 intrinsic is not implemented on this platform");
   39.16 +}
   39.17 +
   39.18  // _i2l, _i2f, _i2d, _l2i, _l2f, _l2d, _f2i, _f2l, _f2d, _d2i, _d2l, _d2f
   39.19  // _i2b, _i2c, _i2s
   39.20  void LIRGenerator::do_Convert(Convert* x) {

    40.1 --- a/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp	Thu Jul 11 12:59:03 2013 -0400
    40.2 +++ b/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp	Mon Jul 15 11:07:03 2013 +0100
    40.3 @@ -108,7 +108,7 @@
    40.4  
    40.5    // compare object markOop with Rmark and if equal exchange Rscratch with object markOop
    40.6    assert(mark_addr.disp() == 0, "cas must take a zero displacement");
    40.7 -  casx_under_lock(mark_addr.base(), Rmark, Rscratch, (address)StubRoutines::Sparc::atomic_memory_operation_lock_addr());
    40.8 +  cas_ptr(mark_addr.base(), Rmark, Rscratch);
    40.9    // if compare/exchange succeeded we found an unlocked object and we now have locked it
   40.10    // hence we are done
   40.11    cmp(Rmark, Rscratch);
   40.12 @@ -149,7 +149,7 @@
   40.13  
   40.14    // Check if it is still a light weight lock, this is is true if we see
   40.15    // the stack address of the basicLock in the markOop of the object
   40.16 -  casx_under_lock(mark_addr.base(), Rbox, Rmark, (address)StubRoutines::Sparc::atomic_memory_operation_lock_addr());
   40.17 +  cas_ptr(mark_addr.base(), Rbox, Rmark);
   40.18    cmp(Rbox, Rmark);
   40.19  
   40.20    brx(Assembler::notEqual, false, Assembler::pn, slow_case);
   40.21 @@ -276,7 +276,7 @@
   40.22      sub(var_size_in_bytes, hdr_size_in_bytes, t2); // compute size of body
   40.23      initialize_body(t1, t2);
   40.24  #ifndef _LP64
   40.25 -  } else if (VM_Version::v9_instructions_work() && con_size_in_bytes < threshold * 2) {
   40.26 +  } else if (con_size_in_bytes < threshold * 2) {
   40.27      // on v9 we can do double word stores to fill twice as much space.
   40.28      assert(hdr_size_in_bytes % 8 == 0, "double word aligned");
   40.29      assert(con_size_in_bytes % 8 == 0, "double word aligned");

    41.1 --- a/src/cpu/sparc/vm/c1_globals_sparc.hpp	Thu Jul 11 12:59:03 2013 -0400
    41.2 +++ b/src/cpu/sparc/vm/c1_globals_sparc.hpp	Mon Jul 15 11:07:03 2013 +0100
    41.3 @@ -49,8 +49,9 @@
    41.4  define_pd_global(bool, ResizeTLAB,                   true );
    41.5  define_pd_global(intx, ReservedCodeCacheSize,        32*M );
    41.6  define_pd_global(intx, CodeCacheExpansionSize,       32*K );
    41.7 -define_pd_global(uintx,CodeCacheMinBlockLength,      1);
    41.8 -define_pd_global(uintx,MetaspaceSize,                     12*M );
    41.9 +define_pd_global(uintx, CodeCacheMinBlockLength,     1);
   41.10 +define_pd_global(uintx, CodeCacheMinimumUseSpace,    400*K);
   41.11 +define_pd_global(uintx, MetaspaceSize,               12*M );
   41.12  define_pd_global(bool, NeverActAsServerClassMachine, true );
   41.13  define_pd_global(intx, NewSizeThreadIncrease,        16*K );
   41.14  define_pd_global(uint64_t,MaxRAM,                    1ULL*G);

    42.1 --- a/src/cpu/sparc/vm/c2_globals_sparc.hpp	Thu Jul 11 12:59:03 2013 -0400
    42.2 +++ b/src/cpu/sparc/vm/c2_globals_sparc.hpp	Mon Jul 15 11:07:03 2013 +0100
    42.3 @@ -86,7 +86,8 @@
    42.4  // Ergonomics related flags
    42.5  define_pd_global(uint64_t,MaxRAM,                    4ULL*G);
    42.6  #endif
    42.7 -define_pd_global(uintx,CodeCacheMinBlockLength,      4);
    42.8 +define_pd_global(uintx, CodeCacheMinBlockLength,     4);
    42.9 +define_pd_global(uintx, CodeCacheMinimumUseSpace,    400*K);
   42.10  
   42.11  // Heap related flags
   42.12  define_pd_global(uintx,MetaspaceSize,    ScaleForWordSize(16*M));

    43.1 --- a/src/cpu/sparc/vm/c2_init_sparc.cpp	Thu Jul 11 12:59:03 2013 -0400
    43.2 +++ b/src/cpu/sparc/vm/c2_init_sparc.cpp	Mon Jul 15 11:07:03 2013 +0100
    43.3 @@ -30,5 +30,4 @@
    43.4  
    43.5  void Compile::pd_compiler2_init() {
    43.6    guarantee(CodeEntryAlignment >= InteriorEntryAlignment, "" );
    43.7 -  guarantee( VM_Version::v9_instructions_work(), "Server compiler does not run on V8 systems" );
    43.8  }

    44.1 --- a/src/cpu/sparc/vm/disassembler_sparc.hpp	Thu Jul 11 12:59:03 2013 -0400
    44.2 +++ b/src/cpu/sparc/vm/disassembler_sparc.hpp	Mon Jul 15 11:07:03 2013 +0100
    44.3 @@ -30,8 +30,7 @@
    44.4    }
    44.5  
    44.6    static const char* pd_cpu_opts() {
    44.7 -    return (VM_Version::v9_instructions_work()?
    44.8 -            (VM_Version::v8_instructions_work()? "" : "v9only") : "v8only");
    44.9 +    return "v9only";
   44.10    }
   44.11  
   44.12  #endif // CPU_SPARC_VM_DISASSEMBLER_SPARC_HPP

    45.1 --- a/src/cpu/sparc/vm/frame_sparc.cpp	Thu Jul 11 12:59:03 2013 -0400
    45.2 +++ b/src/cpu/sparc/vm/frame_sparc.cpp	Mon Jul 15 11:07:03 2013 +0100
    45.3 @@ -257,11 +257,6 @@
    45.4        return false;
    45.5      }
    45.6  
    45.7 -    // Could be a zombie method
    45.8 -    if (sender_blob->is_zombie() || sender_blob->is_unloaded()) {
    45.9 -      return false;
   45.10 -    }
   45.11 -
   45.12      // It should be safe to construct the sender though it might not be valid
   45.13  
   45.14      frame sender(_SENDER_SP, younger_sp, adjusted_stack);
   45.15 @@ -680,7 +675,7 @@
   45.16  
   45.17    // validate ConstantPoolCache*
   45.18    ConstantPoolCache* cp = *interpreter_frame_cache_addr();
   45.19 -  if (cp == NULL || !cp->is_metadata()) return false;
   45.20 +  if (cp == NULL || !cp->is_metaspace_object()) return false;
   45.21  
   45.22    // validate locals
   45.23  

    46.1 --- a/src/cpu/sparc/vm/globals_sparc.hpp	Thu Jul 11 12:59:03 2013 -0400
    46.2 +++ b/src/cpu/sparc/vm/globals_sparc.hpp	Mon Jul 15 11:07:03 2013 +0100
    46.3 @@ -110,8 +110,5 @@
    46.4                                                                              \
    46.5    product(uintx,  ArraycopyDstPrefetchDistance, 0,                          \
    46.6            "Distance to prefetch destination array in arracopy")             \
    46.7 -                                                                            \
    46.8 -  develop(intx, V8AtomicOperationUnderLockSpinCount,    50,                 \
    46.9 -          "Number of times to spin wait on a v8 atomic operation lock")     \
   46.10  
   46.11  #endif // CPU_SPARC_VM_GLOBALS_SPARC_HPP

    47.1 --- a/src/cpu/sparc/vm/interp_masm_sparc.cpp	Thu Jul 11 12:59:03 2013 -0400
    47.2 +++ b/src/cpu/sparc/vm/interp_masm_sparc.cpp	Mon Jul 15 11:07:03 2013 +0100
    47.3 @@ -1210,8 +1210,7 @@
    47.4      st_ptr(mark_reg, lock_addr, BasicLock::displaced_header_offset_in_bytes());
    47.5      // compare and exchange object_addr, markOop | 1, stack address of basicLock
    47.6      assert(mark_addr.disp() == 0, "cas must take a zero displacement");
    47.7 -    casx_under_lock(mark_addr.base(), mark_reg, temp_reg,
    47.8 -      (address)StubRoutines::Sparc::atomic_memory_operation_lock_addr());
    47.9 +    cas_ptr(mark_addr.base(), mark_reg, temp_reg);
   47.10  
   47.11      // if the compare and exchange succeeded we are done (we saw an unlocked object)
   47.12      cmp_and_brx_short(mark_reg, temp_reg, Assembler::equal, Assembler::pt, done);
   47.13 @@ -1291,8 +1290,7 @@
   47.14      // we expect to see the stack address of the basicLock in case the
   47.15      // lock is still a light weight lock (lock_reg)
   47.16      assert(mark_addr.disp() == 0, "cas must take a zero displacement");
   47.17 -    casx_under_lock(mark_addr.base(), lock_reg, displaced_header_reg,
   47.18 -      (address)StubRoutines::Sparc::atomic_memory_operation_lock_addr());
   47.19 +    cas_ptr(mark_addr.base(), lock_reg, displaced_header_reg);
   47.20      cmp(lock_reg, displaced_header_reg);
   47.21      brx(Assembler::equal, true, Assembler::pn, done);
   47.22      delayed()->st_ptr(G0, lockobj_addr);  // free entry

    48.1 --- a/src/cpu/sparc/vm/macroAssembler_sparc.cpp	Thu Jul 11 12:59:03 2013 -0400
    48.2 +++ b/src/cpu/sparc/vm/macroAssembler_sparc.cpp	Mon Jul 15 11:07:03 2013 +0100
    48.3 @@ -118,7 +118,6 @@
    48.4        case bp_op2:     m = wdisp(  word_aligned_ones, 0, 19);  v = wdisp(  dest_pos, inst_pos, 19); break;
    48.5        case fb_op2:     m = wdisp(  word_aligned_ones, 0, 22);  v = wdisp(  dest_pos, inst_pos, 22); break;
    48.6        case br_op2:     m = wdisp(  word_aligned_ones, 0, 22);  v = wdisp(  dest_pos, inst_pos, 22); break;
    48.7 -      case cb_op2:     m = wdisp(  word_aligned_ones, 0, 22);  v = wdisp(  dest_pos, inst_pos, 22); break;
    48.8        case bpr_op2: {
    48.9          if (is_cbcond(inst)) {
   48.10            m = wdisp10(word_aligned_ones, 0);
   48.11 @@ -149,7 +148,6 @@
   48.12        case bp_op2:     r = inv_wdisp(  inst, pos, 19);  break;
   48.13        case fb_op2:     r = inv_wdisp(  inst, pos, 22);  break;
   48.14        case br_op2:     r = inv_wdisp(  inst, pos, 22);  break;
   48.15 -      case cb_op2:     r = inv_wdisp(  inst, pos, 22);  break;
   48.16        case bpr_op2: {
   48.17          if (is_cbcond(inst)) {
   48.18            r = inv_wdisp10(inst, pos);
   48.19 @@ -325,12 +323,6 @@
   48.20    trap(ST_RESERVED_FOR_USER_0);
   48.21  }
   48.22  
   48.23 -// flush windows (except current) using flushw instruction if avail.
   48.24 -void MacroAssembler::flush_windows() {
   48.25 -  if (VM_Version::v9_instructions_work())  flushw();
   48.26 -  else                                     flush_windows_trap();
   48.27 -}
   48.28 -
   48.29  // Write serialization page so VM thread can do a pseudo remote membar
   48.30  // We use the current thread pointer to calculate a thread specific
   48.31  // offset to write to within the page. This minimizes bus traffic
   48.32 @@ -358,88 +350,6 @@
   48.33    Unimplemented();
   48.34  }
   48.35  
   48.36 -void MacroAssembler::mult(Register s1, Register s2, Register d) {
   48.37 -  if(VM_Version::v9_instructions_work()) {
   48.38 -    mulx (s1, s2, d);
   48.39 -  } else {
   48.40 -    smul (s1, s2, d);
   48.41 -  }
   48.42 -}
   48.43 -
   48.44 -void MacroAssembler::mult(Register s1, int simm13a, Register d) {
   48.45 -  if(VM_Version::v9_instructions_work()) {
   48.46 -    mulx (s1, simm13a, d);
   48.47 -  } else {
   48.48 -    smul (s1, simm13a, d);
   48.49 -  }
   48.50 -}
   48.51 -
   48.52 -
   48.53 -#ifdef ASSERT
   48.54 -void MacroAssembler::read_ccr_v8_assert(Register ccr_save) {
   48.55 -  const Register s1 = G3_scratch;
   48.56 -  const Register s2 = G4_scratch;
   48.57 -  Label get_psr_test;
   48.58 -  // Get the condition codes the V8 way.
   48.59 -  read_ccr_trap(s1);
   48.60 -  mov(ccr_save, s2);
   48.61 -  // This is a test of V8 which has icc but not xcc
   48.62 -  // so mask off the xcc bits
   48.63 -  and3(s2, 0xf, s2);
   48.64 -  // Compare condition codes from the V8 and V9 ways.
   48.65 -  subcc(s2, s1, G0);
   48.66 -  br(Assembler::notEqual, true, Assembler::pt, get_psr_test);
   48.67 -  delayed()->breakpoint_trap();
   48.68 -  bind(get_psr_test);
   48.69 -}
   48.70 -
   48.71 -void MacroAssembler::write_ccr_v8_assert(Register ccr_save) {
   48.72 -  const Register s1 = G3_scratch;
   48.73 -  const Register s2 = G4_scratch;
   48.74 -  Label set_psr_test;
   48.75 -  // Write out the saved condition codes the V8 way
   48.76 -  write_ccr_trap(ccr_save, s1, s2);
   48.77 -  // Read back the condition codes using the V9 instruction
   48.78 -  rdccr(s1);
   48.79 -  mov(ccr_save, s2);
   48.80 -  // This is a test of V8 which has icc but not xcc
   48.81 -  // so mask off the xcc bits
   48.82 -  and3(s2, 0xf, s2);
   48.83 -  and3(s1, 0xf, s1);
   48.84 -  // Compare the V8 way with the V9 way.
   48.85 -  subcc(s2, s1, G0);
   48.86 -  br(Assembler::notEqual, true, Assembler::pt, set_psr_test);
   48.87 -  delayed()->breakpoint_trap();
   48.88 -  bind(set_psr_test);
   48.89 -}
   48.90 -#else
   48.91 -#define read_ccr_v8_assert(x)
   48.92 -#define write_ccr_v8_assert(x)
   48.93 -#endif // ASSERT
   48.94 -
   48.95 -void MacroAssembler::read_ccr(Register ccr_save) {
   48.96 -  if (VM_Version::v9_instructions_work()) {
   48.97 -    rdccr(ccr_save);
   48.98 -    // Test code sequence used on V8.  Do not move above rdccr.
   48.99 -    read_ccr_v8_assert(ccr_save);
  48.100 -  } else {
  48.101 -    read_ccr_trap(ccr_save);
  48.102 -  }
  48.103 -}
  48.104 -
  48.105 -void MacroAssembler::write_ccr(Register ccr_save) {
  48.106 -  if (VM_Version::v9_instructions_work()) {
  48.107 -    // Test code sequence used on V8.  Do not move below wrccr.
  48.108 -    write_ccr_v8_assert(ccr_save);
  48.109 -    wrccr(ccr_save);
  48.110 -  } else {
  48.111 -    const Register temp_reg1 = G3_scratch;
  48.112 -    const Register temp_reg2 = G4_scratch;
  48.113 -    write_ccr_trap(ccr_save, temp_reg1, temp_reg2);
  48.114 -  }
  48.115 -}
  48.116 -
  48.117 -
  48.118  // Calls to C land
  48.119  
  48.120  #ifdef ASSERT
  48.121 @@ -465,8 +375,8 @@
  48.122  #ifdef ASSERT
  48.123    AddressLiteral last_get_thread_addrlit(&last_get_thread);
  48.124    set(last_get_thread_addrlit, L3);
  48.125 -  inc(L4, get_pc(L4) + 2 * BytesPerInstWord); // skip getpc() code + inc + st_ptr to point L4 at call
  48.126 -  st_ptr(L4, L3, 0);
  48.127 +  rdpc(L4);
  48.128 +  inc(L4, 3 * BytesPerInstWord); // skip rdpc + inc + st_ptr to point L4 at call  st_ptr(L4, L3, 0);
  48.129  #endif
  48.130    call(CAST_FROM_FN_PTR(address, reinitialize_thread), relocInfo::runtime_call_type);
  48.131    delayed()->nop();
  48.132 @@ -1251,12 +1161,6 @@
  48.133    while (offset() % modulus != 0) nop();
  48.134  }
  48.135  
  48.136 -
  48.137 -void MacroAssembler::safepoint() {
  48.138 -  relocate(breakpoint_Relocation::spec(breakpoint_Relocation::safepoint));
  48.139 -}
  48.140 -
  48.141 -
  48.142  void RegistersForDebugging::print(outputStream* s) {
  48.143    FlagSetting fs(Debugging, true);
  48.144    int j;
  48.145 @@ -1327,7 +1231,7 @@
  48.146  
  48.147  void RegistersForDebugging::save_registers(MacroAssembler* a) {
  48.148    a->sub(FP, round_to(sizeof(RegistersForDebugging), sizeof(jdouble)) - STACK_BIAS, O0);
  48.149 -  a->flush_windows();
  48.150 +  a->flushw();
  48.151    int i;
  48.152    for (i = 0; i < 8; ++i) {
  48.153      a->ld_ptr(as_iRegister(i)->address_in_saved_window().after_save(), L1);  a->st_ptr( L1, O0, i_offset(i));
  48.154 @@ -1338,7 +1242,7 @@
  48.155    for (i = 0;  i < 32; ++i) {
  48.156      a->stf(FloatRegisterImpl::S, as_FloatRegister(i), O0, f_offset(i));
  48.157    }
  48.158 -  for (i = 0; i < (VM_Version::v9_instructions_work() ? 64 : 32); i += 2) {
  48.159 +  for (i = 0; i < 64; i += 2) {
  48.160      a->stf(FloatRegisterImpl::D, as_FloatRegister(i), O0, d_offset(i));
  48.161    }
  48.162  }
  48.163 @@ -1350,7 +1254,7 @@
  48.164    for (int j = 0; j < 32; ++j) {
  48.165      a->ldf(FloatRegisterImpl::S, O0, f_offset(j), as_FloatRegister(j));
  48.166    }
  48.167 -  for (int k = 0; k < (VM_Version::v9_instructions_work() ? 64 : 32); k += 2) {
  48.168 +  for (int k = 0; k < 64; k += 2) {
  48.169      a->ldf(FloatRegisterImpl::D, O0, d_offset(k), as_FloatRegister(k));
  48.170    }
  48.171  }
  48.172 @@ -1465,8 +1369,6 @@
  48.173  // the high bits of the O-regs if they contain Long values.  Acts as a 'leaf'
  48.174  // call.
  48.175  void MacroAssembler::verify_oop_subroutine() {
  48.176 -  assert( VM_Version::v9_instructions_work(), "VerifyOops not supported for V8" );
  48.177 -
  48.178    // Leaf call; no frame.
  48.179    Label succeed, fail, null_or_fail;
  48.180  
  48.181 @@ -1870,26 +1772,17 @@
  48.182    // And the equals case for the high part does not need testing,
  48.183    // since that triplet is reached only after finding the high halves differ.
  48.184  
  48.185 -  if (VM_Version::v9_instructions_work()) {
  48.186 -    mov(-1, Rresult);
  48.187 -    ba(done);  delayed()-> movcc(greater, false, icc,  1, Rresult);
  48.188 -  } else {
  48.189 -    br(less,    true, pt, done); delayed()-> set(-1, Rresult);
  48.190 -    br(greater, true, pt, done); delayed()-> set( 1, Rresult);
  48.191 -  }
  48.192 -
  48.193 -  bind( check_low_parts );
  48.194 -
  48.195 -  if (VM_Version::v9_instructions_work()) {
  48.196 -    mov(                               -1, Rresult);
  48.197 -    movcc(equal,           false, icc,  0, Rresult);
  48.198 -    movcc(greaterUnsigned, false, icc,  1, Rresult);
  48.199 -  } else {
  48.200 -    set(-1, Rresult);
  48.201 -    br(equal,           true, pt, done); delayed()->set( 0, Rresult);
  48.202 -    br(greaterUnsigned, true, pt, done); delayed()->set( 1, Rresult);
  48.203 -  }
  48.204 -  bind( done );
  48.205 +  mov(-1, Rresult);
  48.206 +  ba(done);
  48.207 +  delayed()->movcc(greater, false, icc,  1, Rresult);
  48.208 +
  48.209 +  bind(check_low_parts);
  48.210 +
  48.211 +  mov(                               -1, Rresult);
  48.212 +  movcc(equal,           false, icc,  0, Rresult);
  48.213 +  movcc(greaterUnsigned, false, icc,  1, Rresult);
  48.214 +
  48.215 +  bind(done);
  48.216  }
  48.217  
  48.218  void MacroAssembler::lneg( Register Rhi, Register Rlow ) {
  48.219 @@ -2117,119 +2010,24 @@
  48.220  void MacroAssembler::float_cmp( bool is_float, int unordered_result,
  48.221                                  FloatRegister Fa, FloatRegister Fb,
  48.222                                  Register Rresult) {
  48.223 -
  48.224 -  fcmp(is_float ? FloatRegisterImpl::S : FloatRegisterImpl::D, fcc0, Fa, Fb);
  48.225 -
  48.226 -  Condition lt = unordered_result == -1 ? f_unorderedOrLess    : f_less;
  48.227 -  Condition eq =                          f_equal;
  48.228 -  Condition gt = unordered_result ==  1 ? f_unorderedOrGreater : f_greater;
  48.229 -
  48.230 -  if (VM_Version::v9_instructions_work()) {
  48.231 -
  48.232 -    mov(-1, Rresult);
  48.233 -    movcc(eq, true, fcc0, 0, Rresult);
  48.234 -    movcc(gt, true, fcc0, 1, Rresult);
  48.235 -
  48.236 +  if (is_float) {
  48.237 +    fcmp(FloatRegisterImpl::S, fcc0, Fa, Fb);
  48.238    } else {
  48.239 -    Label done;
  48.240 -
  48.241 -    set( -1, Rresult );
  48.242 -    //fb(lt, true, pn, done); delayed()->set( -1, Rresult );
  48.243 -    fb( eq, true, pn, done);  delayed()->set(  0, Rresult );
  48.244 -    fb( gt, true, pn, done);  delayed()->set(  1, Rresult );
  48.245 -
  48.246 -    bind (done);
  48.247 +    fcmp(FloatRegisterImpl::D, fcc0, Fa, Fb);
  48.248 +  }
  48.249 +
  48.250 +  if (unordered_result == 1) {
  48.251 +    mov(                                    -1, Rresult);
  48.252 +    movcc(f_equal,              true, fcc0,  0, Rresult);
  48.253 +    movcc(f_unorderedOrGreater, true, fcc0,  1, Rresult);
  48.254 +  } else {
  48.255 +    mov(                                    -1, Rresult);
  48.256 +    movcc(f_equal,              true, fcc0,  0, Rresult);
  48.257 +    movcc(f_greater,            true, fcc0,  1, Rresult);
  48.258    }
  48.259  }
  48.260  
  48.261  
  48.262 -void MacroAssembler::fneg( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d)
  48.263 -{
  48.264 -  if (VM_Version::v9_instructions_work()) {
  48.265 -    Assembler::fneg(w, s, d);
  48.266 -  } else {
  48.267 -    if (w == FloatRegisterImpl::S) {
  48.268 -      Assembler::fneg(w, s, d);
  48.269 -    } else if (w == FloatRegisterImpl::D) {
  48.270 -      // number() does a sanity check on the alignment.
  48.271 -      assert(((s->encoding(FloatRegisterImpl::D) & 1) == 0) &&
  48.272 -        ((d->encoding(FloatRegisterImpl::D) & 1) == 0), "float register alignment check");
  48.273 -
  48.274 -      Assembler::fneg(FloatRegisterImpl::S, s, d);
  48.275 -      Assembler::fmov(FloatRegisterImpl::S, s->successor(), d->successor());
  48.276 -    } else {
  48.277 -      assert(w == FloatRegisterImpl::Q, "Invalid float register width");
  48.278 -
  48.279 -      // number() does a sanity check on the alignment.
  48.280 -      assert(((s->encoding(FloatRegisterImpl::D) & 3) == 0) &&
  48.281 -        ((d->encoding(FloatRegisterImpl::D) & 3) == 0), "float register alignment check");
  48.282 -
  48.283 -      Assembler::fneg(FloatRegisterImpl::S, s, d);
  48.284 -      Assembler::fmov(FloatRegisterImpl::S, s->successor(), d->successor());
  48.285 -      Assembler::fmov(FloatRegisterImpl::S, s->successor()->successor(), d->successor()->successor());
  48.286 -      Assembler::fmov(FloatRegisterImpl::S, s->successor()->successor()->successor(), d->successor()->successor()->successor());
  48.287 -    }
  48.288 -  }
  48.289 -}
  48.290 -
  48.291 -void MacroAssembler::fmov( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d)
  48.292 -{
  48.293 -  if (VM_Version::v9_instructions_work()) {
  48.294 -    Assembler::fmov(w, s, d);
  48.295 -  } else {
  48.296 -    if (w == FloatRegisterImpl::S) {
  48.297 -      Assembler::fmov(w, s, d);
  48.298 -    } else if (w == FloatRegisterImpl::D) {
  48.299 -      // number() does a sanity check on the alignment.
  48.300 -      assert(((s->encoding(FloatRegisterImpl::D) & 1) == 0) &&
  48.301 -        ((d->encoding(FloatRegisterImpl::D) & 1) == 0), "float register alignment check");
  48.302 -
  48.303 -      Assembler::fmov(FloatRegisterImpl::S, s, d);
  48.304 -      Assembler::fmov(FloatRegisterImpl::S, s->successor(), d->successor());
  48.305 -    } else {
  48.306 -      assert(w == FloatRegisterImpl::Q, "Invalid float register width");
  48.307 -
  48.308 -      // number() does a sanity check on the alignment.
  48.309 -      assert(((s->encoding(FloatRegisterImpl::D) & 3) == 0) &&
  48.310 -        ((d->encoding(FloatRegisterImpl::D) & 3) == 0), "float register alignment check");
  48.311 -
  48.312 -      Assembler::fmov(FloatRegisterImpl::S, s, d);
  48.313 -      Assembler::fmov(FloatRegisterImpl::S, s->successor(), d->successor());
  48.314 -      Assembler::fmov(FloatRegisterImpl::S, s->successor()->successor(), d->successor()->successor());
  48.315 -      Assembler::fmov(FloatRegisterImpl::S, s->successor()->successor()->successor(), d->successor()->successor()->successor());
  48.316 -    }
  48.317 -  }
  48.318 -}
  48.319 -
  48.320 -void MacroAssembler::fabs( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d)
  48.321 -{
  48.322 -  if (VM_Version::v9_instructions_work()) {
  48.323 -    Assembler::fabs(w, s, d);
  48.324 -  } else {
  48.325 -    if (w == FloatRegisterImpl::S) {
  48.326 -      Assembler::fabs(w, s, d);
  48.327 -    } else if (w == FloatRegisterImpl::D) {
  48.328 -      // number() does a sanity check on the alignment.
  48.329 -      assert(((s->encoding(FloatRegisterImpl::D) & 1) == 0) &&
  48.330 -        ((d->encoding(FloatRegisterImpl::D) & 1) == 0), "float register alignment check");
  48.331 -
  48.332 -      Assembler::fabs(FloatRegisterImpl::S, s, d);
  48.333 -      Assembler::fmov(FloatRegisterImpl::S, s->successor(), d->successor());
  48.334 -    } else {
  48.335 -      assert(w == FloatRegisterImpl::Q, "Invalid float register width");
  48.336 -
  48.337 -      // number() does a sanity check on the alignment.
  48.338 -      assert(((s->encoding(FloatRegisterImpl::D) & 3) == 0) &&
  48.339 -       ((d->encoding(FloatRegisterImpl::D) & 3) == 0), "float register alignment check");
  48.340 -
  48.341 -      Assembler::fabs(FloatRegisterImpl::S, s, d);
  48.342 -      Assembler::fmov(FloatRegisterImpl::S, s->successor(), d->successor());
  48.343 -      Assembler::fmov(FloatRegisterImpl::S, s->successor()->successor(), d->successor()->successor());
  48.344 -      Assembler::fmov(FloatRegisterImpl::S, s->successor()->successor()->successor(), d->successor()->successor()->successor());
  48.345 -    }
  48.346 -  }
  48.347 -}
  48.348 -
  48.349  void MacroAssembler::save_all_globals_into_locals() {
  48.350    mov(G1,L1);
  48.351    mov(G2,L2);
  48.352 @@ -2250,135 +2048,6 @@
  48.353    mov(L7,G7);
  48.354  }
  48.355  
  48.356 -// Use for 64 bit operation.
  48.357 -void MacroAssembler::casx_under_lock(Register top_ptr_reg, Register top_reg, Register ptr_reg, address lock_addr, bool use_call_vm)
  48.358 -{
  48.359 -  // store ptr_reg as the new top value
  48.360 -#ifdef _LP64
  48.361 -  casx(top_ptr_reg, top_reg, ptr_reg);
  48.362 -#else
  48.363 -  cas_under_lock(top_ptr_reg, top_reg, ptr_reg, lock_addr, use_call_vm);
  48.364 -#endif // _LP64
  48.365 -}
  48.366 -
  48.367 -// [RGV] This routine does not handle 64 bit operations.
  48.368 -//       use casx_under_lock() or casx directly!!!
  48.369 -void MacroAssembler::cas_under_lock(Register top_ptr_reg, Register top_reg, Register ptr_reg, address lock_addr, bool use_call_vm)
  48.370 -{
  48.371 -  // store ptr_reg as the new top value
  48.372 -  if (VM_Version::v9_instructions_work()) {
  48.373 -    cas(top_ptr_reg, top_reg, ptr_reg);
  48.374 -  } else {
  48.375 -
  48.376 -    // If the register is not an out nor global, it is not visible
  48.377 -    // after the save.  Allocate a register for it, save its
  48.378 -    // value in the register save area (the save may not flush
  48.379 -    // registers to the save area).
  48.380 -
  48.381 -    Register top_ptr_reg_after_save;
  48.382 -    Register top_reg_after_save;
  48.383 -    Register ptr_reg_after_save;
  48.384 -
  48.385 -    if (top_ptr_reg->is_out() || top_ptr_reg->is_global()) {
  48.386 -      top_ptr_reg_after_save = top_ptr_reg->after_save();
  48.387 -    } else {
  48.388 -      Address reg_save_addr = top_ptr_reg->address_in_saved_window();
  48.389 -      top_ptr_reg_after_save = L0;
  48.390 -      st(top_ptr_reg, reg_save_addr);
  48.391 -    }
  48.392 -
  48.393 -    if (top_reg->is_out() || top_reg->is_global()) {
  48.394 -      top_reg_after_save = top_reg->after_save();
  48.395 -    } else {
  48.396 -      Address reg_save_addr = top_reg->address_in_saved_window();
  48.397 -      top_reg_after_save = L1;
  48.398 -      st(top_reg, reg_save_addr);
  48.399 -    }
  48.400 -
  48.401 -    if (ptr_reg->is_out() || ptr_reg->is_global()) {
  48.402 -      ptr_reg_after_save = ptr_reg->after_save();
  48.403 -    } else {
  48.404 -      Address reg_save_addr = ptr_reg->address_in_saved_window();
  48.405 -      ptr_reg_after_save = L2;
  48.406 -      st(ptr_reg, reg_save_addr);
  48.407 -    }
  48.408 -
  48.409 -    const Register& lock_reg = L3;
  48.410 -    const Register& lock_ptr_reg = L4;
  48.411 -    const Register& value_reg = L5;
  48.412 -    const Register& yield_reg = L6;
  48.413 -    const Register& yieldall_reg = L7;
  48.414 -
  48.415 -    save_frame();
  48.416 -
  48.417 -    if (top_ptr_reg_after_save == L0) {
  48.418 -      ld(top_ptr_reg->address_in_saved_window().after_save(), top_ptr_reg_after_save);
  48.419 -    }
  48.420 -
  48.421 -    if (top_reg_after_save == L1) {
  48.422 -      ld(top_reg->address_in_saved_window().after_save(), top_reg_after_save);
  48.423 -    }
  48.424 -
  48.425 -    if (ptr_reg_after_save == L2) {
  48.426 -      ld(ptr_reg->address_in_saved_window().after_save(), ptr_reg_after_save);
  48.427 -    }
  48.428 -
  48.429 -    Label(retry_get_lock);
  48.430 -    Label(not_same);
  48.431 -    Label(dont_yield);
  48.432 -
  48.433 -    assert(lock_addr, "lock_address should be non null for v8");
  48.434 -    set((intptr_t)lock_addr, lock_ptr_reg);
  48.435 -    // Initialize yield counter
  48.436 -    mov(G0,yield_reg);
  48.437 -    mov(G0, yieldall_reg);
  48.438 -    set(StubRoutines::Sparc::locked, lock_reg);
  48.439 -
  48.440 -    bind(retry_get_lock);
  48.441 -    cmp_and_br_short(yield_reg, V8AtomicOperationUnderLockSpinCount, Assembler::less, Assembler::pt, dont_yield);
  48.442 -
  48.443 -    if(use_call_vm) {
  48.444 -      Untested("Need to verify global reg consistancy");
  48.445 -      call_VM(noreg, CAST_FROM_FN_PTR(address, SharedRuntime::yield_all), yieldall_reg);
  48.446 -    } else {
  48.447 -      // Save the regs and make space for a C call
  48.448 -      save(SP, -96, SP);
  48.449 -      save_all_globals_into_locals();
  48.450 -      call(CAST_FROM_FN_PTR(address,os::yield_all));
  48.451 -      delayed()->mov(yieldall_reg, O0);
  48.452 -      restore_globals_from_locals();
  48.453 -      restore();
  48.454 -    }
  48.455 -
  48.456 -    // reset the counter
  48.457 -    mov(G0,yield_reg);
  48.458 -    add(yieldall_reg, 1, yieldall_reg);
  48.459 -
  48.460 -    bind(dont_yield);
  48.461 -    // try to get lock
  48.462 -    Assembler::swap(lock_ptr_reg, 0, lock_reg);
  48.463 -
  48.464 -    // did we get the lock?
  48.465 -    cmp(lock_reg, StubRoutines::Sparc::unlocked);
  48.466 -    br(Assembler::notEqual, true, Assembler::pn, retry_get_lock);
  48.467 -    delayed()->add(yield_reg,1,yield_reg);
  48.468 -
  48.469 -    // yes, got lock.  do we have the same top?
  48.470 -    ld(top_ptr_reg_after_save, 0, value_reg);
  48.471 -    cmp_and_br_short(value_reg, top_reg_after_save, Assembler::notEqual, Assembler::pn, not_same);
  48.472 -
  48.473 -    // yes, same top.
  48.474 -    st(ptr_reg_after_save, top_ptr_reg_after_save, 0);
  48.475 -    membar(Assembler::StoreStore);
  48.476 -
  48.477 -    bind(not_same);
  48.478 -    mov(value_reg, ptr_reg_after_save);
  48.479 -    st(lock_reg, lock_ptr_reg, 0); // unlock
  48.480 -
  48.481 -    restore();
  48.482 -  }
  48.483 -}
  48.484 -
  48.485  RegisterOrConstant MacroAssembler::delayed_value_impl(intptr_t* delayed_value_addr,
  48.486                                                        Register tmp,
  48.487                                                        int offset) {
  48.488 @@ -2970,7 +2639,7 @@
  48.489                    markOopDesc::biased_lock_mask_in_place | markOopDesc::age_mask_in_place | markOopDesc::epoch_mask_in_place,
  48.490                    mark_reg);
  48.491    or3(G2_thread, mark_reg, temp_reg);
  48.492 -  casn(mark_addr.base(), mark_reg, temp_reg);
  48.493 +  cas_ptr(mark_addr.base(), mark_reg, temp_reg);
  48.494    // If the biasing toward our thread failed, this means that
  48.495    // another thread succeeded in biasing it toward itself and we
  48.496    // need to revoke that bias. The revocation will occur in the
  48.497 @@ -2998,7 +2667,7 @@
  48.498    load_klass(obj_reg, temp_reg);
  48.499    ld_ptr(Address(temp_reg, Klass::prototype_header_offset()), temp_reg);
  48.500    or3(G2_thread, temp_reg, temp_reg);
  48.501 -  casn(mark_addr.base(), mark_reg, temp_reg);
  48.502 +  cas_ptr(mark_addr.base(), mark_reg, temp_reg);
  48.503    // If the biasing toward our thread failed, this means that
  48.504    // another thread succeeded in biasing it toward itself and we
  48.505    // need to revoke that bias. The revocation will occur in the
  48.506 @@ -3027,7 +2696,7 @@
  48.507    // bits in this situation. Should attempt to preserve them.
  48.508    load_klass(obj_reg, temp_reg);
  48.509    ld_ptr(Address(temp_reg, Klass::prototype_header_offset()), temp_reg);
  48.510 -  casn(mark_addr.base(), mark_reg, temp_reg);
  48.511 +  cas_ptr(mark_addr.base(), mark_reg, temp_reg);
  48.512    // Fall through to the normal CAS-based lock, because no matter what
  48.513    // the result of the above CAS, some thread must have succeeded in
  48.514    // removing the bias bit from the object's header.
  48.515 @@ -3058,15 +2727,6 @@
  48.516  }
  48.517  
  48.518  
  48.519 -// CASN -- 32-64 bit switch hitter similar to the synthetic CASN provided by
  48.520 -// Solaris/SPARC's "as".  Another apt name would be cas_ptr()
  48.521 -
  48.522 -void MacroAssembler::casn (Register addr_reg, Register cmp_reg, Register set_reg ) {
  48.523 -  casx_under_lock (addr_reg, cmp_reg, set_reg, (address)StubRoutines::Sparc::atomic_memory_operation_lock_addr());
  48.524 -}
  48.525 -
  48.526 -
  48.527 -
  48.528  // compiler_lock_object() and compiler_unlock_object() are direct transliterations
  48.529  // of i486.ad fast_lock() and fast_unlock().  See those methods for detailed comments.
  48.530  // The code could be tightened up considerably.
  48.531 @@ -3129,8 +2789,7 @@
  48.532  
  48.533       // compare object markOop with Rmark and if equal exchange Rscratch with object markOop
  48.534       assert(mark_addr.disp() == 0, "cas must take a zero displacement");
  48.535 -     casx_under_lock(mark_addr.base(), Rmark, Rscratch,
  48.536 -        (address)StubRoutines::Sparc::atomic_memory_operation_lock_addr());
  48.537 +     cas_ptr(mark_addr.base(), Rmark, Rscratch);
  48.538  
  48.539       // if compare/exchange succeeded we found an unlocked object and we now have locked it
  48.540       // hence we are done
  48.541 @@ -3176,7 +2835,7 @@
  48.542        mov(Rbox,  Rscratch);
  48.543        or3(Rmark, markOopDesc::unlocked_value, Rmark);
  48.544        assert(mark_addr.disp() == 0, "cas must take a zero displacement");
  48.545 -      casn(mark_addr.base(), Rmark, Rscratch);
  48.546 +      cas_ptr(mark_addr.base(), Rmark, Rscratch);
  48.547        cmp(Rmark, Rscratch);
  48.548        brx(Assembler::equal, false, Assembler::pt, done);
  48.549        delayed()->sub(Rscratch, SP, Rscratch);
  48.550 @@ -3207,7 +2866,7 @@
  48.551        // Invariant: if we acquire the lock then _recursions should be 0.
  48.552        add(Rmark, ObjectMonitor::owner_offset_in_bytes()-2, Rmark);
  48.553        mov(G2_thread, Rscratch);
  48.554 -      casn(Rmark, G0, Rscratch);
  48.555 +      cas_ptr(Rmark, G0, Rscratch);
  48.556        cmp(Rscratch, G0);
  48.557        // Intentional fall-through into done
  48.558     } else {
  48.559 @@ -3240,7 +2899,7 @@
  48.560        mov(0, Rscratch);
  48.561        or3(Rmark, markOopDesc::unlocked_value, Rmark);
  48.562        assert(mark_addr.disp() == 0, "cas must take a zero displacement");
  48.563 -      casn(mark_addr.base(), Rmark, Rscratch);
  48.564 +      cas_ptr(mark_addr.base(), Rmark, Rscratch);
  48.565  // prefetch (mark_addr, Assembler::severalWritesAndPossiblyReads);
  48.566        cmp(Rscratch, Rmark);
  48.567        brx(Assembler::notZero, false, Assembler::pn, Recursive);
  48.568 @@ -3266,7 +2925,7 @@
  48.569        // the fast-path stack-lock code from the interpreter and always passed
  48.570        // control to the "slow" operators in synchronizer.cpp.
  48.571  
  48.572 -      // RScratch contains the fetched obj->mark value from the failed CASN.
  48.573 +      // RScratch contains the fetched obj->mark value from the failed CAS.
  48.574  #ifdef _LP64
  48.575        sub(Rscratch, STACK_BIAS, Rscratch);
  48.576  #endif
  48.577 @@ -3300,7 +2959,7 @@
  48.578        // Invariant: if we acquire the lock then _recursions should be 0.
  48.579        add(Rmark, ObjectMonitor::owner_offset_in_bytes()-2, Rmark);
  48.580        mov(G2_thread, Rscratch);
  48.581 -      casn(Rmark, G0, Rscratch);
  48.582 +      cas_ptr(Rmark, G0, Rscratch);
  48.583        cmp(Rscratch, G0);
  48.584        // ST box->displaced_header = NonZero.
  48.585        // Any non-zero value suffices:
  48.586 @@ -3336,8 +2995,7 @@
  48.587       // Check if it is still a light weight lock, this is is true if we see
  48.588       // the stack address of the basicLock in the markOop of the object
  48.589       assert(mark_addr.disp() == 0, "cas must take a zero displacement");
  48.590 -     casx_under_lock(mark_addr.base(), Rbox, Rmark,
  48.591 -       (address)StubRoutines::Sparc::atomic_memory_operation_lock_addr());
  48.592 +     cas_ptr(mark_addr.base(), Rbox, Rmark);
  48.593       ba(done);
  48.594       delayed()->cmp(Rbox, Rmark);
  48.595       bind(done);
  48.596 @@ -3398,7 +3056,7 @@
  48.597        delayed()->andcc(G0, G0, G0);
  48.598        add(Rmark, ObjectMonitor::owner_offset_in_bytes()-2, Rmark);
  48.599        mov(G2_thread, Rscratch);
  48.600 -      casn(Rmark, G0, Rscratch);
  48.601 +      cas_ptr(Rmark, G0, Rscratch);
  48.602        // invert icc.zf and goto done
  48.603        br_notnull(Rscratch, false, Assembler::pt, done);
  48.604        delayed()->cmp(G0, G0);
  48.605 @@ -3440,7 +3098,7 @@
  48.606     // A prototype implementation showed excellent results, although
  48.607     // the scavenger and timeout code was rather involved.
  48.608  
  48.609 -   casn(mark_addr.base(), Rbox, Rscratch);
  48.610 +   cas_ptr(mark_addr.base(), Rbox, Rscratch);
  48.611     cmp(Rbox, Rscratch);
  48.612     // Intentional fall through into done ...
  48.613  
  48.614 @@ -3540,7 +3198,8 @@
  48.615  
  48.616    if (CMSIncrementalMode || !Universe::heap()->supports_inline_contig_alloc()) {
  48.617      // No allocation in the shared eden.
  48.618 -    ba_short(slow_case);
  48.619 +    ba(slow_case);
  48.620 +    delayed()->nop();
  48.621    } else {
  48.622      // get eden boundaries
  48.623      // note: we need both top & top_addr!
  48.624 @@ -3583,7 +3242,7 @@
  48.625      // Compare obj with the value at top_addr; if still equal, swap the value of
  48.626      // end with the value at top_addr. If not equal, read the value at top_addr
  48.627      // into end.
  48.628 -    casx_under_lock(top_addr, obj, end, (address)StubRoutines::Sparc::atomic_memory_operation_lock_addr());
  48.629 +    cas_ptr(top_addr, obj, end);
  48.630      // if someone beat us on the allocation, try again, otherwise continue
  48.631      cmp(obj, end);
  48.632      brx(Assembler::notEqual, false, Assembler::pn, retry);

    49.1 --- a/src/cpu/sparc/vm/macroAssembler_sparc.hpp	Thu Jul 11 12:59:03 2013 -0400
    49.2 +++ b/src/cpu/sparc/vm/macroAssembler_sparc.hpp	Mon Jul 15 11:07:03 2013 +0100
    49.3 @@ -1,5 +1,5 @@
    49.4  /*
    49.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    49.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    49.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    49.8   *
    49.9   * This code is free software; you can redistribute it and/or modify it
   49.10 @@ -963,7 +963,7 @@
   49.11    inline void sub(Register s1, RegisterOrConstant s2, Register d, int offset = 0);
   49.12  
   49.13    using Assembler::swap;
   49.14 -  inline void swap(Address& a, Register d, int offset = 0);
   49.15 +  inline void swap(const Address& a, Register d, int offset = 0);
   49.16  
   49.17    // address pseudos: make these names unlike instruction names to avoid confusion
   49.18    inline intptr_t load_pc_address( Register reg, int bytes_to_skip );
   49.19 @@ -1056,13 +1056,6 @@
   49.20  
   49.21    void breakpoint_trap();
   49.22    void breakpoint_trap(Condition c, CC cc);
   49.23 -  void flush_windows_trap();
   49.24 -  void clean_windows_trap();
   49.25 -  void get_psr_trap();
   49.26 -  void set_psr_trap();
   49.27 -
   49.28 -  // V8/V9 flush_windows
   49.29 -  void flush_windows();
   49.30  
   49.31    // Support for serializing memory accesses between threads
   49.32    void serialize_memory(Register thread, Register tmp1, Register tmp2);
   49.33 @@ -1071,14 +1064,6 @@
   49.34    void enter();
   49.35    void leave();
   49.36  
   49.37 -  // V8/V9 integer multiply
   49.38 -  void mult(Register s1, Register s2, Register d);
   49.39 -  void mult(Register s1, int simm13a, Register d);
   49.40 -
   49.41 -  // V8/V9 read and write of condition codes.
   49.42 -  void read_ccr(Register d);
   49.43 -  void write_ccr(Register s);
   49.44 -
   49.45    // Manipulation of C++ bools
   49.46    // These are idioms to flag the need for care with accessing bools but on
   49.47    // this platform we assume byte size
   49.48 @@ -1162,21 +1147,6 @@
   49.49    // check_and_forward_exception to handle exceptions when it is safe
   49.50    void check_and_forward_exception(Register scratch_reg);
   49.51  
   49.52 - private:
   49.53 -  // For V8
   49.54 -  void read_ccr_trap(Register ccr_save);
   49.55 -  void write_ccr_trap(Register ccr_save1, Register scratch1, Register scratch2);
   49.56 -
   49.57 -#ifdef ASSERT
   49.58 -  // For V8 debugging.  Uses V8 instruction sequence and checks
   49.59 -  // result with V9 insturctions rdccr and wrccr.
   49.60 -  // Uses Gscatch and Gscatch2
   49.61 -  void read_ccr_v8_assert(Register ccr_save);
   49.62 -  void write_ccr_v8_assert(Register ccr_save);
   49.63 -#endif // ASSERT
   49.64 -
   49.65 - public:
   49.66 -
   49.67    // Write to card table for - register is destroyed afterwards.
   49.68    void card_table_write(jbyte* byte_map_base, Register tmp, Register obj);
   49.69  
   49.70 @@ -1314,20 +1284,9 @@
   49.71                    FloatRegister Fa, FloatRegister Fb,
   49.72                    Register Rresult);
   49.73  
   49.74 -  void fneg( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d);
   49.75 -  void fneg( FloatRegisterImpl::Width w, FloatRegister sd ) { Assembler::fneg(w, sd); }
   49.76 -  void fmov( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d);
   49.77 -  void fabs( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d);
   49.78 -
   49.79    void save_all_globals_into_locals();
   49.80    void restore_globals_from_locals();
   49.81  
   49.82 -  void casx_under_lock(Register top_ptr_reg, Register top_reg, Register ptr_reg,
   49.83 -    address lock_addr=0, bool use_call_vm=false);
   49.84 -  void cas_under_lock(Register top_ptr_reg, Register top_reg, Register ptr_reg,
   49.85 -    address lock_addr=0, bool use_call_vm=false);
   49.86 -  void casn (Register addr_reg, Register cmp_reg, Register set_reg) ;
   49.87 -
   49.88    // These set the icc condition code to equal if the lock succeeded
   49.89    // and notEqual if it failed and requires a slow case
   49.90    void compiler_lock_object(Register Roop, Register Rmark, Register Rbox,

    50.1 --- a/src/cpu/sparc/vm/macroAssembler_sparc.inline.hpp	Thu Jul 11 12:59:03 2013 -0400
    50.2 +++ b/src/cpu/sparc/vm/macroAssembler_sparc.inline.hpp	Mon Jul 15 11:07:03 2013 +0100
    50.3 @@ -1,5 +1,5 @@
    50.4  /*
    50.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    50.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    50.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    50.8   *
    50.9   * This code is free software; you can redistribute it and/or modify it
   50.10 @@ -229,10 +229,7 @@
   50.11  // Use the right branch for the platform
   50.12  
   50.13  inline void MacroAssembler::br( Condition c, bool a, Predict p, address d, relocInfo::relocType rt ) {
   50.14 -  if (VM_Version::v9_instructions_work())
   50.15 -    Assembler::bp(c, a, icc, p, d, rt);
   50.16 -  else
   50.17 -    Assembler::br(c, a, d, rt);
   50.18 +  Assembler::bp(c, a, icc, p, d, rt);
   50.19  }
   50.20  
   50.21  inline void MacroAssembler::br( Condition c, bool a, Predict p, Label& L ) {
   50.22 @@ -268,10 +265,7 @@
   50.23  }
   50.24  
   50.25  inline void MacroAssembler::fb( Condition c, bool a, Predict p, address d, relocInfo::relocType rt ) {
   50.26 -  if (VM_Version::v9_instructions_work())
   50.27 -    fbp(c, a, fcc0, p, d, rt);
   50.28 -  else
   50.29 -    Assembler::fb(c, a, d, rt);
   50.30 +  fbp(c, a, fcc0, p, d, rt);
   50.31  }
   50.32  
   50.33  inline void MacroAssembler::fb( Condition c, bool a, Predict p, Label& L ) {
   50.34 @@ -334,7 +328,7 @@
   50.35  
   50.36  // prefetch instruction
   50.37  inline void MacroAssembler::iprefetch( address d, relocInfo::relocType rt ) {
   50.38 -  if (VM_Version::v9_instructions_work())
   50.39 +  Assembler::bp( never, true, xcc, pt, d, rt );
   50.40      Assembler::bp( never, true, xcc, pt, d, rt );
   50.41  }
   50.42  inline void MacroAssembler::iprefetch( Label& L) { iprefetch( target(L) ); }
   50.43 @@ -344,15 +338,7 @@
   50.44  // returns delta from gotten pc to addr after
   50.45  inline int MacroAssembler::get_pc( Register d ) {
   50.46    int x = offset();
   50.47 -  if (VM_Version::v9_instructions_work())
   50.48 -    rdpc(d);
   50.49 -  else {
   50.50 -    Label lbl;
   50.51 -    Assembler::call(lbl, relocInfo::none);  // No relocation as this is call to pc+0x8
   50.52 -    if (d == O7)  delayed()->nop();
   50.53 -    else          delayed()->mov(O7, d);
   50.54 -    bind(lbl);
   50.55 -  }
   50.56 +  rdpc(d);
   50.57    return offset() - x;
   50.58  }
   50.59  
   50.60 @@ -646,41 +632,26 @@
   50.61  // returns if membar generates anything, obviously this code should mirror
   50.62  // membar below.
   50.63  inline bool MacroAssembler::membar_has_effect( Membar_mask_bits const7a ) {
   50.64 -  if( !os::is_MP() ) return false;  // Not needed on single CPU
   50.65 -  if( VM_Version::v9_instructions_work() ) {
   50.66 -    const Membar_mask_bits effective_mask =
   50.67 -        Membar_mask_bits(const7a & ~(LoadLoad | LoadStore | StoreStore));
   50.68 -    return (effective_mask != 0);
   50.69 -  } else {
   50.70 -    return true;
   50.71 -  }
   50.72 +  if (!os::is_MP())
   50.73 +    return false;  // Not needed on single CPU
   50.74 +  const Membar_mask_bits effective_mask =
   50.75 +      Membar_mask_bits(const7a & ~(LoadLoad | LoadStore | StoreStore));
   50.76 +  return (effective_mask != 0);
   50.77  }
   50.78  
   50.79  inline void MacroAssembler::membar( Membar_mask_bits const7a ) {
   50.80    // Uniprocessors do not need memory barriers
   50.81 -  if (!os::is_MP()) return;
   50.82 +  if (!os::is_MP())
   50.83 +    return;
   50.84    // Weakened for current Sparcs and TSO.  See the v9 manual, sections 8.4.3,
   50.85    // 8.4.4.3, a.31 and a.50.
   50.86 -  if( VM_Version::v9_instructions_work() ) {
   50.87 -    // Under TSO, setting bit 3, 2, or 0 is redundant, so the only value
   50.88 -    // of the mmask subfield of const7a that does anything that isn't done
   50.89 -    // implicitly is StoreLoad.
   50.90 -    const Membar_mask_bits effective_mask =
   50.91 -        Membar_mask_bits(const7a & ~(LoadLoad | LoadStore | StoreStore));
   50.92 -    if ( effective_mask != 0 ) {
   50.93 -      Assembler::membar( effective_mask );
   50.94 -    }
   50.95 -  } else {
   50.96 -    // stbar is the closest there is on v8.  Equivalent to membar(StoreStore).  We
   50.97 -    // do not issue the stbar because to my knowledge all v8 machines implement TSO,
   50.98 -    // which guarantees that all stores behave as if an stbar were issued just after
   50.99 -    // each one of them.  On these machines, stbar ought to be a nop.  There doesn't
  50.100 -    // appear to be an equivalent of membar(StoreLoad) on v8: TSO doesn't require it,
  50.101 -    // it can't be specified by stbar, nor have I come up with a way to simulate it.
  50.102 -    //
  50.103 -    // Addendum.  Dave says that ldstub guarantees a write buffer flush to coherent
  50.104 -    // space.  Put one here to be on the safe side.
  50.105 -    Assembler::ldstub(SP, 0, G0);
  50.106 +  // Under TSO, setting bit 3, 2, or 0 is redundant, so the only value
  50.107 +  // of the mmask subfield of const7a that does anything that isn't done
  50.108 +  // implicitly is StoreLoad.
  50.109 +  const Membar_mask_bits effective_mask =
  50.110 +      Membar_mask_bits(const7a & ~(LoadLoad | LoadStore | StoreStore));
  50.111 +  if (effective_mask != 0) {
  50.112 +    Assembler::membar(effective_mask);
  50.113    }
  50.114  }
  50.115  
  50.116 @@ -748,7 +719,7 @@
  50.117    if (offset != 0)       sub(d,  offset,                    d);
  50.118  }
  50.119  
  50.120 -inline void MacroAssembler::swap(Address& a, Register d, int offset) {
  50.121 +inline void MacroAssembler::swap(const Address& a, Register d, int offset) {
  50.122    relocate(a.rspec(offset));
  50.123    if (a.has_index()) { assert(offset == 0, ""); swap(a.base(), a.index(), d        ); }
  50.124    else               {                          swap(a.base(), a.disp() + offset, d); }

    51.1 --- a/src/cpu/sparc/vm/nativeInst_sparc.cpp	Thu Jul 11 12:59:03 2013 -0400
    51.2 +++ b/src/cpu/sparc/vm/nativeInst_sparc.cpp	Mon Jul 15 11:07:03 2013 +0100
    51.3 @@ -162,7 +162,7 @@
    51.4     int i1 = ((int*)code_buffer)[1];
    51.5     int* contention_addr = (int*) n_call->addr_at(1*BytesPerInstWord);
    51.6     assert(inv_op(*contention_addr) == Assembler::arith_op ||
    51.7 -          *contention_addr == nop_instruction() || !VM_Version::v9_instructions_work(),
    51.8 +          *contention_addr == nop_instruction(),
    51.9            "must not interfere with original call");
   51.10     // The set_long_at calls do the ICacheInvalidate so we just need to do them in reverse order
   51.11     n_call->set_long_at(1*BytesPerInstWord, i1);
   51.12 @@ -181,7 +181,7 @@
   51.13     // Make sure the first-patched instruction, which may co-exist
   51.14     // briefly with the call, will do something harmless.
   51.15     assert(inv_op(*contention_addr) == Assembler::arith_op ||
   51.16 -          *contention_addr == nop_instruction() || !VM_Version::v9_instructions_work(),
   51.17 +          *contention_addr == nop_instruction(),
   51.18            "must not interfere with original call");
   51.19  }
   51.20  
   51.21 @@ -933,11 +933,7 @@
   51.22    int code_size = 1 * BytesPerInstWord;
   51.23    CodeBuffer cb(verified_entry, code_size + 1);
   51.24    MacroAssembler* a = new MacroAssembler(&cb);
   51.25 -  if (VM_Version::v9_instructions_work()) {
   51.26 -    a->ldsw(G0, 0, O7); // "ld" must agree with code in the signal handler
   51.27 -  } else {
   51.28 -    a->lduw(G0, 0, O7); // "ld" must agree with code in the signal handler
   51.29 -  }
   51.30 +  a->ldsw(G0, 0, O7); // "ld" must agree with code in the signal handler
   51.31    ICache::invalidate_range(verified_entry, code_size);
   51.32  }
   51.33  
   51.34 @@ -1024,7 +1020,7 @@
   51.35     int i1 = ((int*)code_buffer)[1];
   51.36     int* contention_addr = (int*) h_jump->addr_at(1*BytesPerInstWord);
   51.37     assert(inv_op(*contention_addr) == Assembler::arith_op ||
   51.38 -          *contention_addr == nop_instruction() || !VM_Version::v9_instructions_work(),
   51.39 +          *contention_addr == nop_instruction(),
   51.40            "must not interfere with original call");
   51.41     // The set_long_at calls do the ICacheInvalidate so we just need to do them in reverse order
   51.42     h_jump->set_long_at(1*BytesPerInstWord, i1);
   51.43 @@ -1043,6 +1039,6 @@
   51.44     // Make sure the first-patched instruction, which may co-exist
   51.45     // briefly with the call, will do something harmless.
   51.46     assert(inv_op(*contention_addr) == Assembler::arith_op ||
   51.47 -          *contention_addr == nop_instruction() || !VM_Version::v9_instructions_work(),
   51.48 +          *contention_addr == nop_instruction(),
   51.49            "must not interfere with original call");
   51.50  }

    52.1 --- a/src/cpu/sparc/vm/nativeInst_sparc.hpp	Thu Jul 11 12:59:03 2013 -0400
    52.2 +++ b/src/cpu/sparc/vm/nativeInst_sparc.hpp	Mon Jul 15 11:07:03 2013 +0100
    52.3 @@ -70,8 +70,7 @@
    52.4    bool is_zombie() {
    52.5      int x = long_at(0);
    52.6      return is_op3(x,
    52.7 -                  VM_Version::v9_instructions_work() ?
    52.8 -                    Assembler::ldsw_op3 : Assembler::lduw_op3,
    52.9 +                  Assembler::ldsw_op3,
   52.10                    Assembler::ldst_op)
   52.11          && Assembler::inv_rs1(x) == G0
   52.12          && Assembler::inv_rd(x) == O7;

    53.1 --- a/src/cpu/sparc/vm/register_sparc.hpp	Thu Jul 11 12:59:03 2013 -0400
    53.2 +++ b/src/cpu/sparc/vm/register_sparc.hpp	Mon Jul 15 11:07:03 2013 +0100
    53.3 @@ -249,12 +249,10 @@
    53.4  
    53.5        case D:
    53.6          assert(c < 64  &&  (c & 1) == 0, "bad double float register");
    53.7 -        assert(c < 32 || VM_Version::v9_instructions_work(), "V9 float work only on V9 platform");
    53.8          return (c & 0x1e) | ((c & 0x20) >> 5);
    53.9  
   53.10        case Q:
   53.11          assert(c < 64  &&  (c & 3) == 0, "bad quad float register");
   53.12 -        assert(c < 32 || VM_Version::v9_instructions_work(), "V9 float work only on V9 platform");
   53.13          return (c & 0x1c) | ((c & 0x20) >> 5);
   53.14      }
   53.15      ShouldNotReachHere();

    54.1 --- a/src/cpu/sparc/vm/relocInfo_sparc.cpp	Thu Jul 11 12:59:03 2013 -0400
    54.2 +++ b/src/cpu/sparc/vm/relocInfo_sparc.cpp	Mon Jul 15 11:07:03 2013 +0100
    54.3 @@ -193,36 +193,6 @@
    54.4    return *(address*)addr();
    54.5  }
    54.6  
    54.7 -
    54.8 -int Relocation::pd_breakpoint_size() {
    54.9 -  // minimum breakpoint size, in short words
   54.10 -  return NativeIllegalInstruction::instruction_size / sizeof(short);
   54.11 -}
   54.12 -
   54.13 -void Relocation::pd_swap_in_breakpoint(address x, short* instrs, int instrlen) {
   54.14 -  Untested("pd_swap_in_breakpoint");
   54.15 -  // %%% probably do not need a general instrlen; just use the trap size
   54.16 -  if (instrs != NULL) {
   54.17 -    assert(instrlen * sizeof(short) == NativeIllegalInstruction::instruction_size, "enough instrlen in reloc. data");
   54.18 -    for (int i = 0; i < instrlen; i++) {
   54.19 -      instrs[i] = ((short*)x)[i];
   54.20 -    }
   54.21 -  }
   54.22 -  NativeIllegalInstruction::insert(x);
   54.23 -}
   54.24 -
   54.25 -
   54.26 -void Relocation::pd_swap_out_breakpoint(address x, short* instrs, int instrlen) {
   54.27 -  Untested("pd_swap_out_breakpoint");
   54.28 -  assert(instrlen * sizeof(short) == sizeof(int), "enough buf");
   54.29 -  union { int l; short s[1]; } u;
   54.30 -  for (int i = 0; i < instrlen; i++) {
   54.31 -    u.s[i] = instrs[i];
   54.32 -  }
   54.33 -  NativeInstruction* ni = nativeInstruction_at(x);
   54.34 -  ni->set_long_at(0, u.l);
   54.35 -}
   54.36 -
   54.37  void poll_Relocation::fix_relocation_after_move(const CodeBuffer* src, CodeBuffer* dest) {
   54.38  }
   54.39  

    55.1 --- a/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	Thu Jul 11 12:59:03 2013 -0400
    55.2 +++ b/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	Mon Jul 15 11:07:03 2013 +0100
    55.3 @@ -2459,7 +2459,7 @@
    55.4  
    55.5    // Finally just about ready to make the JNI call
    55.6  
    55.7 -  __ flush_windows();
    55.8 +  __ flushw();
    55.9    if (inner_frame_created) {
   55.10      __ restore();
   55.11    } else {

    56.1 --- a/src/cpu/sparc/vm/sparc.ad	Thu Jul 11 12:59:03 2013 -0400
    56.2 +++ b/src/cpu/sparc/vm/sparc.ad	Mon Jul 15 11:07:03 2013 +0100
    56.3 @@ -2778,10 +2778,7 @@
    56.4      Register Rold = reg_to_register_object($old$$reg);
    56.5      Register Rnew = reg_to_register_object($new$$reg);
    56.6  
    56.7 -    // casx_under_lock picks 1 of 3 encodings:
    56.8 -    // For 32-bit pointers you get a 32-bit CAS
    56.9 -    // For 64-bit pointers you get a 64-bit CASX
   56.10 -    __ casn(Rmem, Rold, Rnew); // Swap(*Rmem,Rnew) if *Rmem == Rold
   56.11 +    __ cas_ptr(Rmem, Rold, Rnew); // Swap(*Rmem,Rnew) if *Rmem == Rold
   56.12      __ cmp( Rold, Rnew );
   56.13    %}
   56.14  
   56.15 @@ -3067,7 +3064,7 @@
   56.16      AddressLiteral last_rethrow_addrlit(&last_rethrow);
   56.17      __ sethi(last_rethrow_addrlit, L1);
   56.18      Address addr(L1, last_rethrow_addrlit.low10());
   56.19 -    __ get_pc(L2);
   56.20 +    __ rdpc(L2);
   56.21      __ inc(L2, 3 * BytesPerInstWord);  // skip this & 2 more insns to point at jump_to
   56.22      __ st_ptr(L2, addr);
   56.23      __ restore();

    57.1 --- a/src/cpu/sparc/vm/stubGenerator_sparc.cpp	Thu Jul 11 12:59:03 2013 -0400
    57.2 +++ b/src/cpu/sparc/vm/stubGenerator_sparc.cpp	Mon Jul 15 11:07:03 2013 +0100
    57.3 @@ -566,7 +566,7 @@
    57.4      StubCodeMark mark(this, "StubRoutines", "flush_callers_register_windows");
    57.5      address start = __ pc();
    57.6  
    57.7 -    __ flush_windows();
    57.8 +    __ flushw();
    57.9      __ retl(false);
   57.10      __ delayed()->add( FP, STACK_BIAS, O0 );
   57.11      // The returned value must be a stack pointer whose register save area
   57.12 @@ -575,67 +575,9 @@
   57.13      return start;
   57.14    }
   57.15  
   57.16 -  // Helper functions for v8 atomic operations.
   57.17 -  //
   57.18 -  void get_v8_oop_lock_ptr(Register lock_ptr_reg, Register mark_oop_reg, Register scratch_reg) {
   57.19 -    if (mark_oop_reg == noreg) {
   57.20 -      address lock_ptr = (address)StubRoutines::Sparc::atomic_memory_operation_lock_addr();
   57.21 -      __ set((intptr_t)lock_ptr, lock_ptr_reg);
   57.22 -    } else {
   57.23 -      assert(scratch_reg != noreg, "just checking");
   57.24 -      address lock_ptr = (address)StubRoutines::Sparc::_v8_oop_lock_cache;
   57.25 -      __ set((intptr_t)lock_ptr, lock_ptr_reg);
   57.26 -      __ and3(mark_oop_reg, StubRoutines::Sparc::v8_oop_lock_mask_in_place, scratch_reg);
   57.27 -      __ add(lock_ptr_reg, scratch_reg, lock_ptr_reg);
   57.28 -    }
   57.29 -  }
   57.30 -
   57.31 -  void generate_v8_lock_prologue(Register lock_reg, Register lock_ptr_reg, Register yield_reg, Label& retry, Label& dontyield, Register mark_oop_reg = noreg, Register scratch_reg = noreg) {
   57.32 -
   57.33 -    get_v8_oop_lock_ptr(lock_ptr_reg, mark_oop_reg, scratch_reg);
   57.34 -    __ set(StubRoutines::Sparc::locked, lock_reg);
   57.35 -    // Initialize yield counter
   57.36 -    __ mov(G0,yield_reg);
   57.37 -
   57.38 -    __ BIND(retry);
   57.39 -    __ cmp_and_br_short(yield_reg, V8AtomicOperationUnderLockSpinCount, Assembler::less, Assembler::pt, dontyield);
   57.40 -
   57.41 -    // This code can only be called from inside the VM, this
   57.42 -    // stub is only invoked from Atomic::add().  We do not
   57.43 -    // want to use call_VM, because _last_java_sp and such
   57.44 -    // must already be set.
   57.45 -    //
   57.46 -    // Save the regs and make space for a C call
   57.47 -    __ save(SP, -96, SP);
   57.48 -    __ save_all_globals_into_locals();
   57.49 -    BLOCK_COMMENT("call os::naked_sleep");
   57.50 -    __ call(CAST_FROM_FN_PTR(address, os::naked_sleep));
   57.51 -    __ delayed()->nop();
   57.52 -    __ restore_globals_from_locals();
   57.53 -    __ restore();
   57.54 -    // reset the counter
   57.55 -    __ mov(G0,yield_reg);
   57.56 -
   57.57 -    __ BIND(dontyield);
   57.58 -
   57.59 -    // try to get lock
   57.60 -    __ swap(lock_ptr_reg, 0, lock_reg);
   57.61 -
   57.62 -    // did we get the lock?
   57.63 -    __ cmp(lock_reg, StubRoutines::Sparc::unlocked);
   57.64 -    __ br(Assembler::notEqual, true, Assembler::pn, retry);
   57.65 -    __ delayed()->add(yield_reg,1,yield_reg);
   57.66 -
   57.67 -    // yes, got lock. do the operation here.
   57.68 -  }
   57.69 -
   57.70 -  void generate_v8_lock_epilogue(Register lock_reg, Register lock_ptr_reg, Register yield_reg, Label& retry, Label& dontyield, Register mark_oop_reg = noreg, Register scratch_reg = noreg) {
   57.71 -    __ st(lock_reg, lock_ptr_reg, 0); // unlock
   57.72 -  }
   57.73 -
   57.74    // Support for jint Atomic::xchg(jint exchange_value, volatile jint* dest).
   57.75    //
   57.76 -  // Arguments :
   57.77 +  // Arguments:
   57.78    //
   57.79    //      exchange_value: O0
   57.80    //      dest:           O1
   57.81 @@ -656,33 +598,14 @@
   57.82        __ mov(O0, O3);       // scratch copy of exchange value
   57.83        __ ld(O1, 0, O2);     // observe the previous value
   57.84        // try to replace O2 with O3
   57.85 -      __ cas_under_lock(O1, O2, O3,
   57.86 -      (address)StubRoutines::Sparc::atomic_memory_operation_lock_addr(),false);
   57.87 +      __ cas(O1, O2, O3);
   57.88        __ cmp_and_br_short(O2, O3, Assembler::notEqual, Assembler::pn, retry);
   57.89  
   57.90        __ retl(false);
   57.91        __ delayed()->mov(O2, O0);  // report previous value to caller
   57.92 -
   57.93      } else {
   57.94 -      if (VM_Version::v9_instructions_work()) {
   57.95 -        __ retl(false);
   57.96 -        __ delayed()->swap(O1, 0, O0);
   57.97 -      } else {
   57.98 -        const Register& lock_reg = O2;
   57.99 -        const Register& lock_ptr_reg = O3;
  57.100 -        const Register& yield_reg = O4;
  57.101 -
  57.102 -        Label retry;
  57.103 -        Label dontyield;
  57.104 -
  57.105 -        generate_v8_lock_prologue(lock_reg, lock_ptr_reg, yield_reg, retry, dontyield);
  57.106 -        // got the lock, do the swap
  57.107 -        __ swap(O1, 0, O0);
  57.108 -
  57.109 -        generate_v8_lock_epilogue(lock_reg, lock_ptr_reg, yield_reg, retry, dontyield);
  57.110 -        __ retl(false);
  57.111 -        __ delayed()->nop();
  57.112 -      }
  57.113 +      __ retl(false);
  57.114 +      __ delayed()->swap(O1, 0, O0);
  57.115      }
  57.116  
  57.117      return start;
  57.118 @@ -691,7 +614,7 @@
  57.119  
  57.120    // Support for jint Atomic::cmpxchg(jint exchange_value, volatile jint* dest, jint compare_value)
  57.121    //
  57.122 -  // Arguments :
  57.123 +  // Arguments:
  57.124    //
  57.125    //      exchange_value: O0
  57.126    //      dest:           O1
  57.127 @@ -701,15 +624,12 @@
  57.128    //
  57.129    //     O0: the value previously stored in dest
  57.130    //
  57.131 -  // Overwrites (v8): O3,O4,O5
  57.132 -  //
  57.133    address generate_atomic_cmpxchg() {
  57.134      StubCodeMark mark(this, "StubRoutines", "atomic_cmpxchg");
  57.135      address start = __ pc();
  57.136  
  57.137      // cmpxchg(dest, compare_value, exchange_value)
  57.138 -    __ cas_under_lock(O1, O2, O0,
  57.139 -      (address)StubRoutines::Sparc::atomic_memory_operation_lock_addr(),false);
  57.140 +    __ cas(O1, O2, O0);
  57.141      __ retl(false);
  57.142      __ delayed()->nop();
  57.143  
  57.144 @@ -718,7 +638,7 @@
  57.145  
  57.146    // Support for jlong Atomic::cmpxchg(jlong exchange_value, volatile jlong *dest, jlong compare_value)
  57.147    //
  57.148 -  // Arguments :
  57.149 +  // Arguments:
  57.150    //
  57.151    //      exchange_value: O1:O0
  57.152    //      dest:           O2
  57.153 @@ -728,17 +648,12 @@
  57.154    //
  57.155    //     O1:O0: the value previously stored in dest
  57.156    //
  57.157 -  // This only works on V9, on V8 we don't generate any
  57.158 -  // code and just return NULL.
  57.159 -  //
  57.160    // Overwrites: G1,G2,G3
  57.161    //
  57.162    address generate_atomic_cmpxchg_long() {
  57.163      StubCodeMark mark(this, "StubRoutines", "atomic_cmpxchg_long");
  57.164      address start = __ pc();
  57.165  
  57.166 -    if (!VM_Version::supports_cx8())
  57.167 -        return NULL;;
  57.168      __ sllx(O0, 32, O0);
  57.169      __ srl(O1, 0, O1);
  57.170      __ or3(O0,O1,O0);      // O0 holds 64-bit value from compare_value
  57.171 @@ -756,7 +671,7 @@
  57.172  
  57.173    // Support for jint Atomic::add(jint add_value, volatile jint* dest).
  57.174    //
  57.175 -  // Arguments :
  57.176 +  // Arguments:
  57.177    //
  57.178    //      add_value: O0   (e.g., +1 or -1)
  57.179    //      dest:      O1
  57.180 @@ -765,47 +680,22 @@
  57.181    //
  57.182    //     O0: the new value stored in dest
  57.183    //
  57.184 -  // Overwrites (v9): O3
  57.185 -  // Overwrites (v8): O3,O4,O5
  57.186 +  // Overwrites: O3
  57.187    //
  57.188    address generate_atomic_add() {
  57.189      StubCodeMark mark(this, "StubRoutines", "atomic_add");
  57.190      address start = __ pc();
  57.191      __ BIND(_atomic_add_stub);
  57.192  
  57.193 -    if (VM_Version::v9_instructions_work()) {
  57.194 -      Label(retry);
  57.195 -      __ BIND(retry);
  57.196 -
  57.197 -      __ lduw(O1, 0, O2);
  57.198 -      __ add(O0, O2, O3);
  57.199 -      __ cas(O1, O2, O3);
  57.200 -      __ cmp_and_br_short(O2, O3, Assembler::notEqual, Assembler::pn, retry);
  57.201 -      __ retl(false);
  57.202 -      __ delayed()->add(O0, O2, O0); // note that cas made O2==O3
  57.203 -    } else {
  57.204 -      const Register& lock_reg = O2;
  57.205 -      const Register& lock_ptr_reg = O3;
  57.206 -      const Register& value_reg = O4;
  57.207 -      const Register& yield_reg = O5;
  57.208 -
  57.209 -      Label(retry);
  57.210 -      Label(dontyield);
  57.211 -
  57.212 -      generate_v8_lock_prologue(lock_reg, lock_ptr_reg, yield_reg, retry, dontyield);
  57.213 -      // got lock, do the increment
  57.214 -      __ ld(O1, 0, value_reg);
  57.215 -      __ add(O0, value_reg, value_reg);
  57.216 -      __ st(value_reg, O1, 0);
  57.217 -
  57.218 -      // %%% only for RMO and PSO
  57.219 -      __ membar(Assembler::StoreStore);
  57.220 -
  57.221 -      generate_v8_lock_epilogue(lock_reg, lock_ptr_reg, yield_reg, retry, dontyield);
  57.222 -
  57.223 -      __ retl(false);
  57.224 -      __ delayed()->mov(value_reg, O0);
  57.225 -    }
  57.226 +    Label(retry);
  57.227 +    __ BIND(retry);
  57.228 +
  57.229 +    __ lduw(O1, 0, O2);
  57.230 +    __ add(O0, O2, O3);
  57.231 +    __ cas(O1, O2, O3);
  57.232 +    __ cmp_and_br_short(O2, O3, Assembler::notEqual, Assembler::pn, retry);
  57.233 +    __ retl(false);
  57.234 +    __ delayed()->add(O0, O2, O0); // note that cas made O2==O3
  57.235  
  57.236      return start;
  57.237    }
  57.238 @@ -841,7 +731,7 @@
  57.239      __ mov(G3, L3);
  57.240      __ mov(G4, L4);
  57.241      __ mov(G5, L5);
  57.242 -    for (i = 0; i < (VM_Version::v9_instructions_work() ? 64 : 32); i += 2) {
  57.243 +    for (i = 0; i < 64; i += 2) {
  57.244        __ stf(FloatRegisterImpl::D, as_FloatRegister(i), preserve_addr, i * wordSize);
  57.245      }
  57.246  
  57.247 @@ -855,7 +745,7 @@
  57.248      __ mov(L3, G3);
  57.249      __ mov(L4, G4);
  57.250      __ mov(L5, G5);
  57.251 -    for (i = 0; i < (VM_Version::v9_instructions_work() ? 64 : 32); i += 2) {
  57.252 +    for (i = 0; i < 64; i += 2) {
  57.253        __ ldf(FloatRegisterImpl::D, preserve_addr, as_FloatRegister(i), i * wordSize);
  57.254      }
  57.255  

    58.1 --- a/src/cpu/sparc/vm/stubRoutines_sparc.cpp	Thu Jul 11 12:59:03 2013 -0400
    58.2 +++ b/src/cpu/sparc/vm/stubRoutines_sparc.cpp	Mon Jul 15 11:07:03 2013 +0100
    58.3 @@ -52,7 +52,3 @@
    58.4  address StubRoutines::Sparc::_flush_callers_register_windows_entry = CAST_FROM_FN_PTR(address, bootstrap_flush_windows);
    58.5  
    58.6  address StubRoutines::Sparc::_partial_subtype_check = NULL;
    58.7 -
    58.8 -int StubRoutines::Sparc::_atomic_memory_operation_lock = StubRoutines::Sparc::unlocked;
    58.9 -
   58.10 -int StubRoutines::Sparc::_v8_oop_lock_cache[StubRoutines::Sparc::nof_v8_oop_lock_cache_entries];

    59.1 --- a/src/cpu/sparc/vm/stubRoutines_sparc.hpp	Thu Jul 11 12:59:03 2013 -0400
    59.2 +++ b/src/cpu/sparc/vm/stubRoutines_sparc.hpp	Mon Jul 15 11:07:03 2013 +0100
    59.3 @@ -47,46 +47,14 @@
    59.4  class Sparc {
    59.5   friend class StubGenerator;
    59.6  
    59.7 - public:
    59.8 -  enum { nof_instance_allocators = 10 };
    59.9 -
   59.10 -  // allocator lock values
   59.11 -  enum {
   59.12 -    unlocked = 0,
   59.13 -    locked   = 1
   59.14 -  };
   59.15 -
   59.16 -  enum {
   59.17 -    v8_oop_lock_ignore_bits = 2,
   59.18 -    v8_oop_lock_bits = 4,
   59.19 -    nof_v8_oop_lock_cache_entries = 1 << (v8_oop_lock_bits+v8_oop_lock_ignore_bits),
   59.20 -    v8_oop_lock_mask = right_n_bits(v8_oop_lock_bits),
   59.21 -    v8_oop_lock_mask_in_place = v8_oop_lock_mask << v8_oop_lock_ignore_bits
   59.22 -  };
   59.23 -
   59.24 -  static int _v8_oop_lock_cache[nof_v8_oop_lock_cache_entries];
   59.25 -
   59.26   private:
   59.27    static address _test_stop_entry;
   59.28    static address _stop_subroutine_entry;
   59.29    static address _flush_callers_register_windows_entry;
   59.30  
   59.31 -  static int _atomic_memory_operation_lock;
   59.32 -
   59.33    static address _partial_subtype_check;
   59.34  
   59.35   public:
   59.36 -  // %%% global lock for everyone who needs to use atomic_compare_and_exchange
   59.37 -  // %%% or atomic_increment -- should probably use more locks for more
   59.38 -  // %%% scalability-- for instance one for each eden space or group of
   59.39 -
   59.40 -  // address of the lock for atomic_compare_and_exchange
   59.41 -  static int* atomic_memory_operation_lock_addr() { return &_atomic_memory_operation_lock; }
   59.42 -
   59.43 -  // accessor and mutator for _atomic_memory_operation_lock
   59.44 -  static int atomic_memory_operation_lock() { return _atomic_memory_operation_lock; }
   59.45 -  static void set_atomic_memory_operation_lock(int value) { _atomic_memory_operation_lock = value; }
   59.46 -
   59.47    // test assembler stop routine by setting registers
   59.48    static void (*test_stop_entry()) ()                     { return CAST_TO_FN_PTR(void (*)(void), _test_stop_entry); }
   59.49