--- a/control/make/motif-rules.gmk	Tue May 08 19:38:19 2007 +0000
+++ b/control/make/motif-rules.gmk	Fri May 25 00:49:14 2007 +0000
@@ -48,8 +48,8 @@
 
 motif-build:
 	$(CD) $(MOTIF_TOPDIR)/lib/Xm ; \
-	$(MAKE) ARCH_DATA_MODEL=$(ARCH_DATA_MODEL) ARCH=$(ARCH); \
-	$(MAKE) includes ARCH_DATA_MODEL=$(ARCH_DATA_MODEL) ARCH=$(ARCH)
+	$(MAKE) PLATFORM=$(PLATFORM) ARCH_DATA_MODEL=$(ARCH_DATA_MODEL) ARCH=$(ARCH) ARCH_FAMILY=$(ARCH_FAMILY) all; \
+	$(MAKE) PLATFORM=$(PLATFORM) ARCH_DATA_MODEL=$(ARCH_DATA_MODEL) ARCH=$(ARCH) ARCH_FAMILY=$(ARCH_FAMILY) includes
 
 motif-install: motif-install-lib motif-install-include
 
@@ -69,7 +69,7 @@
 #
 motif-clobber:
 	( $(CD) $(MOTIF_TOPDIR)/lib/Xm ; \
-		$(MAKE) clean ARCH_DATA_MODEL=$(ARCH_DATA_MODEL) ARCH=$(ARCH); ); \
+		$(MAKE) PLATFORM=$(PLATFORM) ARCH_DATA_MODEL=$(ARCH_DATA_MODEL) ARCH=$(ARCH) ARCH_FAMILY=$(ARCH_FAMILY) clean; ); \
 	$(RM) $(MOTIF_TOPDIR)/lib/libXm.a \
 	      $(MOTIF_TOPDIR)/lib/Xm/Xm.msg 
 	$(RM) -r $(MOTIF_TOPDIR)/lib/Xm/exports

--- a/control/make/templates/bsd-header	Tue May 08 19:38:19 2007 +0000
+++ b/control/make/templates/bsd-header	Fri May 25 00:49:14 2007 +0000
@@ -1,4 +1,4 @@
-Copyright (c) %year% Sun Microsystems, Inc.  All rights reserved.
+Copyright %YEARS% Sun Microsystems, Inc.  All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

--- a/control/make/templates/gpl-cp-header	Tue May 08 19:38:19 2007 +0000
+++ b/control/make/templates/gpl-cp-header	Fri May 25 00:49:14 2007 +0000
@@ -1,4 +1,4 @@
-Copyright (c) %year% Sun Microsystems, Inc.  All Rights Reserved.
+Copyright %YEARS% Sun Microsystems, Inc.  All Rights Reserved.
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
 This code is free software; you can redistribute it and/or modify it

--- a/control/make/templates/gpl-header	Tue May 08 19:38:19 2007 +0000
+++ b/control/make/templates/gpl-header	Fri May 25 00:49:14 2007 +0000
@@ -1,4 +1,4 @@
-Copyright (c) %year% Sun Microsystems, Inc.  All Rights Reserved.
+Copyright %YEARS% Sun Microsystems, Inc.  All Rights Reserved.
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
 This code is free software; you can redistribute it and/or modify it

--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/OopHandle.java	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/OopHandle.java	Fri May 25 00:49:14 2007 +0000
@@ -36,9 +36,6 @@
 
     <P> Note that in the case of debugging a remote VM, it is not
     workable to handle the automatic updating of these handles.
-// #ifdef JVMPI_SUPPORT
-//     JVMPI attempts to do this but it is too intrusive.
-// #endif // JVMPI_SUPPORT
     If the debugger allows the VM to resume running, it will have to
     look up once again any object references via the path they were
     found (i.e., the activation on the stack as the root, etc.) </P>

--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/JVMPIDaemonThread.java	Tue May 08 19:38:19 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *  
- */
-
-// #ifdef JVMPI_SUPPORT
-// package sun.jvm.hotspot.runtime;
-// 
-// 
-// import sun.jvm.hotspot.debugger.*;
-// import sun.jvm.hotspot.types.*;
-// 
-// public class JVMPIDaemonThread extends JavaThread {
-//   public JVMPIDaemonThread(Address addr) {
-//     super(addr);
-//   }
-// 
-//   public boolean isJavaThread() { return false; }
-// 
-//   public boolean isJVMPIDaemonThread() { return true; }
-// }
-// #endif // JVMPI_SUPPORT

--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaVFrame.java	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaVFrame.java	Fri May 25 00:49:14 2007 +0000
@@ -45,12 +45,6 @@
     super(fr, regMap, thread);
   }
 
-// #ifdef JVMPI_SUPPORT
-//  /** Fabricate heavyweight monitors for lightweight monitors */
-//  // FIXME: not yet implemented 
-//  //  void jvmpi_fab_heavy_monitors(bool query, int* index, int frame_count, GrowableArray<ObjectMonitor*>* fab_list);
-// #endif // JVMPI_SUPPORT
-
   /** Get monitor (if any) that this JavaVFrame is trying to enter */
   // FIXME: not yet implemented 
   //  public Address getPendingMonitor(int frameCount);

--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ObjectSynchronizer.java	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ObjectSynchronizer.java	Fri May 25 00:49:14 2007 +0000
@@ -85,11 +85,7 @@
 
   private static class ObjectMonitorIterator implements Iterator {
 
-// #ifdef JVMPI_SUPPORT
-//     // JVMTI/JVMPI raw monitors are not pointed by gBlockList
-// #else // !JVMPI_SUPPORT
     // JVMTI raw monitors are not pointed by gBlockList
-// #endif // JVMPI_SUPPORT
     // and are not included by this Iterator. May add them later.
 
     ObjectMonitorIterator() {

--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Thread.java	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Thread.java	Fri May 25 00:49:14 2007 +0000
@@ -110,9 +110,6 @@
   public boolean   isJavaThread()              { return false; }
   public boolean   isCompilerThread()          { return false; }
   public boolean   isHiddenFromExternalView()  { return false; } 
-// #ifdef JVMPI_SUPPORT
-//   public boolean   isJVMPIDaemonThread()       { return false; }
-// #endif // JVMPI_SUPPORT
   public boolean   isJvmtiAgentThread()        { return false; }
   public boolean   isWatcherThread()           { return false; }
   public boolean   isConcurrentMarkSweepThread() { return false; }

--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java	Fri May 25 00:49:14 2007 +0000
@@ -106,9 +106,6 @@
         }
         // for now, use JavaThread itself. fix it later with appropriate class if needed
         virtualConstructor.addMapping("SurrogateLockerThread", JavaThread.class);
-// #ifdef JVMPI_SUPPORT
-//         virtualConstructor.addMapping("JVMPIDaemonThread", JVMPIDaemonThread.class);
-// #endif // JVMPI_SUPPORT
         virtualConstructor.addMapping("JvmtiAgentThread", JvmtiAgentThread.class);
         virtualConstructor.addMapping("LowMemoryDetectorThread", LowMemoryDetectorThread.class);
     }
@@ -117,11 +114,7 @@
     }
     
     /** NOTE: this returns objects of type JavaThread, CompilerThread,
-// #ifdef JVMPI_SUPPORT
-//       JvmtiAgentThread, LowMemoryDetectorThread and JVMPIDaemonThread.
-// #else // !JVMPI_SUPPORT
       JvmtiAgentThread, and LowMemoryDetectorThread.
-// #endif // JVMPI_SUPPORT
       The latter four are subclasses of the former. Most operations
       (fetching the top frame, etc.) are only allowed to be performed on
       a "pure" JavaThread. For this reason, {@link
@@ -150,12 +143,7 @@
             return thread;
         } catch (Exception e) {
             throw new RuntimeException("Unable to deduce type of thread from address " + threadAddr +
-// #ifdef JVMPI_SUPPORT
-//             " (expected type JavaThread, CompilerThread, LowMemoryDetectorThread, JvmtiAgentThread, JVMPIDaemonThread or SurrogateLockerThread)", e);
-// #else // !JVMPI_SUPPORT
             " (expected type JavaThread, CompilerThread, LowMemoryDetectorThread, JvmtiAgentThread, or SurrogateLockerThread)", e);
-// #endif // JVMPI_SUPPORT
-            
         }
     }
     

--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/MonitorCacheDumpPanel.java	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/MonitorCacheDumpPanel.java	Fri May 25 00:49:14 2007 +0000
@@ -54,11 +54,7 @@
 
     ByteArrayOutputStream bos = new ByteArrayOutputStream();
     PrintStream tty = new PrintStream(bos);
-// #ifdef JVMPI_SUPPORT
-//     tty.println("Monitor Cache Dump (not including JVMPI/JVMTI raw monitors):");
-// #else // !JVMPI_SUPPORT
     tty.println("Monitor Cache Dump (not including JVMTI raw monitors):");
-// #endif // JVMPI_SUPPORT
     tty.println();
     dumpOn(tty);
 

--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js	Fri May 25 00:49:14 2007 +0000
@@ -1090,9 +1090,6 @@
 vmType2Class["JavaThread"] = sapkg.runtime.JavaThread;
 vmType2Class["CompilerThread"] = sapkg.runtime.CompilerThread;
 vmType2Class["SurrogateLockerThread"] = sapkg.runtime.JavaThread;
-// #ifdef JVMPI_SUPPORT
-// vmType2Class["JVMPIDaemonThread"] = sapkg.runtime.JVMPIDaemonThread;
-// #endif // JVMPI_SUPPORT
 vmType2Class["DebuggerThread"] = sapkg.runtime.DebuggerThread;
 
 // gc

--- a/hotspot/build/linux/makefiles/top.make	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/build/linux/makefiles/top.make	Fri May 25 00:49:14 2007 +0000
@@ -62,6 +62,7 @@
 Include_DBs/GC          = $(VM)/includeDB_gc \
                           $(VM)/gc_implementation/includeDB_gc_parallelScavenge \
                           $(VM)/gc_implementation/includeDB_gc_concurrentMarkSweep \
+                          $(VM)/gc_implementation/includeDB_gc_parNew \
                           $(VM)/gc_implementation/includeDB_gc_shared
 
 Include_DBs/CORE        = $(VM)/includeDB_core   $(Include_DBs/GC)

--- a/hotspot/build/linux/makefiles/vm.make	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/build/linux/makefiles/vm.make	Fri May 25 00:49:14 2007 +0000
@@ -183,6 +183,11 @@
 LD_SCRIPT_FLAG = -Wl,-T,$(LD_SCRIPT)
 endif
 
+# With more recent Redhat releases (or the cutting edge version Fedora), if
+# SELinux is configured to be enabled, the runtime linker will fail to apply
+# the text relocation to libjvm.so considering that it is built as a non-PIC
+# DSO. To workaround that, we run chcon to libjvm.so after it is built. See 
+# details in bug 6538311.
 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
 	$(QUIETLY) {                                                    \
 	    echo Linking vm...;                                         \
@@ -191,6 +196,15 @@
 		       $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM);       \
 	    $(LINK_LIB.CC/POST_HOOK)                                    \
 	    rm -f $@.1; ln -s $@ $@.1;                                  \
+	    if [ -x /usr/sbin/selinuxenabled ] ; then                   \
+	      /usr/sbin/selinuxenabled;                                 \
+              if [ $$? = 0 ] ; then					\
+		/usr/bin/chcon -t textrel_shlib_t $@;                   \
+		if [ $$? != 0 ]; then                                   \
+		  echo "ERROR: Cannot chcon $@"; exit 1;                \
+		fi							\
+	      fi							\
+	    fi                                                          \
 	}
 
 DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM)

--- a/hotspot/build/solaris/makefiles/reorder_COMPILER1_i486	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/build/solaris/makefiles/reorder_COMPILER1_i486	Fri May 25 00:49:14 2007 +0000
@@ -756,9 +756,6 @@
 text: .text%__1cZInterpreterMacroAssemblerNunlock_object6MpnMRegisterImpl__v_;
 text: .text%__1cJAssemblerElock6M_v_;
 text: .text%__1cJAssemblerHcmpxchg6MpnMRegisterImpl_nHAddress__v_;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cZInterpreterMacroAssemblerYnotify_jvmpi_method_exit6MnITosState__v_;
-#endif // JVMPI_SUPPORT
 text: .text%__1cHAddress2t6MinJrelocInfoJrelocType__v_;
 text: .text%__1cOMacroAssemblerFleave6M_v_;
 text: .text%__1cbCAbstractInterpreterGeneratorbMgenerate_ArrayIndexOutOfBounds_handler6Mpkc_pC_;
@@ -2302,10 +2299,6 @@
 text: .text%__1cLJvmtiExportQenter_live_phase6F_v_;
 text: .text%__1cLJvmtiExportTpost_vm_initialized6F_v_;
 text: .text%__1cUJvmtiEventControllerHvm_init6F_v_;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cFjvmpibDpost_vm_initialization_events6F_v_;
-# text: .text%__1cUVM_JVMPIPostObjAllocRclear_restriction6F_v_;
-#endif // JVMPI_SUPPORT
 text: .text%__1cHMonitorKnotify_all6M_i_;
 text: .text%__1cFChunkbDstart_chunk_pool_cleaner_task6F_v_;
 text: .text%__1cMPeriodicTask2t6MI_v_;
@@ -4687,9 +4680,6 @@
 text: .text%__1cNMemoryServiceGgc_end6Fi_v_;
 text: .text%__1cPGCMemoryManagerGgc_end6M_v_;
 text: .text%__1cRLowMemoryDetectorWdetect_after_gc_memory6FpnKMemoryPool__v_;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cFjvmpiYpost_class_unload_events6F_v_;
-#endif // JVMPI_SUPPORT
 text: .text%__1cNJvmtiGCMarker2T6M_v_;
 text: .text%__1cPVM_GC_OperationNdoit_epilogue6M_v_;
 text: .text%__1cPVM_GC_OperationbKrelease_and_notify_pending_list_lock6M_v_;

--- a/hotspot/build/solaris/makefiles/reorder_COMPILER1_sparc	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/build/solaris/makefiles/reorder_COMPILER1_sparc	Fri May 25 00:49:14 2007 +0000
@@ -565,9 +565,6 @@
 text: .text%__1cOMacroAssemblerDset6MipnMRegisterImpl_rknQRelocationHolder__v_: interpreter_sparc.o;
 text: .text%__1cZInterpreterMacroAssemblerHpop_ptr6MpnMRegisterImpl__v_;
 text: .text%__1cOMacroAssemblerNset_vm_result6MpnMRegisterImpl__v_;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cZInterpreterMacroAssemblerYnotify_jvmpi_method_exit6MinITosState__v_;
-#endif // JVMPI_SUPPORT
 text: .text%__1cOMacroAssemblerNload_contents6MrnHAddress_pnMRegisterImpl_i_v_: interp_masm_sparc.o;
 text: .text%__1cOMacroAssemblerCbr6MnJAssemblerJCondition_in0BHPredict_rnFLabel__v_: interp_masm_sparc.o;
 text: .text%__1cZInterpreterMacroAssemblerSsuper_call_VM_leaf6MpnMRegisterImpl_pC2_v_;
@@ -1710,9 +1707,6 @@
 text: .text%__1cLJvmtiExportQenter_live_phase6F_v_;
 text: .text%__1cLJvmtiExportTpost_vm_initialized6F_v_;
 text: .text%__1cUJvmtiEventControllerHvm_init6F_v_;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cFjvmpibDpost_vm_initialization_events6F_v_;
-#endif // JVMPI_SUPPORT
 text: .text%__1cHMonitorKnotify_all6M_i_;
 text: .text%__1cFChunkbDstart_chunk_pool_cleaner_task6F_v_;
 text: .text%__1cMPeriodicTask2t6MI_v_;
@@ -4034,9 +4028,6 @@
 text: .text%__1cXTraceMemoryManagerStats2T6M_v_;
 text: .text%__1cPGCMemoryManagerGgc_end6M_v_;
 text: .text%__1cRLowMemoryDetectorWdetect_after_gc_memory6FpnKMemoryPool__v_;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cFjvmpiYpost_class_unload_events6F_v_;
-#endif // JVMPI_SUPPORT
 text: .text%__1cNJvmtiGCMarker2T6M_v_;
 text: .text%__1cPVM_GC_OperationNdoit_epilogue6M_v_;
 text: .text%__1cQinstanceRefKlassbKrelease_and_notify_pending_list_lock6FipnJBasicLock__v_;

--- a/hotspot/build/solaris/makefiles/reorder_COMPILER2_amd64	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/build/solaris/makefiles/reorder_COMPILER2_amd64	Fri May 25 00:49:14 2007 +0000
@@ -6547,9 +6547,6 @@
 text: .text%__1cXNativeSignatureIteratorHdo_bool6M_v_;
 text: .text%__1cQmulI_mem_immNodePoper_input_base6kM_I_;
 text: .text%__1cbCAbstractInterpreterGeneratorXbang_stack_shadow_pages6Mi_v_;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cZInterpreterMacroAssemblerYnotify_jvmpi_method_exit6MnITosState__v_;
-#endif // JVMPI_SUPPORT
 text: .text%__1cZInterpreterMacroAssemblerTnotify_method_entry6M_v_;
 text: .text%__1cNdecL_rRegNodeGExpand6MpnFState_rnJNode_List__pnIMachNode__;
 text: .text%__1cOLibraryCallKitXinline_string_compareTo6M_i_;
@@ -7833,9 +7830,6 @@
 text: .text%__1cbEinitialize_converter_functions6F_v_;
 text: .text%JVM_SupportsCX8;
 text: .text%__1cUciObjArrayKlassKlassEmake6F_p0_;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cUVM_JVMPIPostObjAllocRclear_restriction6F_v_;
-#endif // JVMPI_SUPPORT
 text: .text%__1cTcompilerOracle_init6F_v_;
 text: .text%__1cOCompilerOracleRparse_from_string6Fpkc_v_;
 text: .text%__1cOCompilerOraclePparse_from_file6F_v_;
@@ -7844,9 +7838,6 @@
 text: .text%__1cKTypeOopPtrFxdual6kM_pknEType__;
 text: .text%__1cOCompilerOracleOread_from_line6Fpc_v_;
 text: .text%__1cPciObjectFactoryTinit_shared_objects6M_v_;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cFjvmpibDpost_vm_initialization_events6F_v_;
-#endif // JVMPI_SUPPORT
 text: .text%__1cVcompiledICHolderKlassSallocate_permanent6kMrnLKlassHandle_ipnGThread__pv_;
 text: .text%__1cVcompiledICHolderKlassOset_alloc_size6MI_v_;
 text: .text%__1cU__STATIC_CONSTRUCTOR6F_v_: jvmtiEnvBase.o;
@@ -8065,15 +8056,9 @@
 text: .text%__1cICarSpaceEinit6F_v_;
 text: .text%__1cNcarSpace_init6F_v_;
 text: .text%__1cORuntimeServiceEinit6F_v_;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cLOptoRuntimeWjvmpi_method_exit_Type6F_pknITypeFunc__;
-#endif // JVMPI_SUPPORT
 text: .text%__1cU__STATIC_CONSTRUCTOR6F_v_: genCollectedHeap.o;
 text: .text%__1cTAssertIsPermClosure2t6M_v_: genCollectedHeap.o;
 text: .text%__1cRAlwaysTrueClosure2t6M_v_: genCollectedHeap.o;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cLOptoRuntimeXjvmpi_method_entry_Type6F_pknITypeFunc__;
-#endif // JVMPI_SUPPORT
 text: .text%__1cLOptoRuntimeVhandle_exception_Type6F_pknITypeFunc__;
 text: .text%__1cLOptoRuntimeSfetch_monitor_Type6F_pknITypeFunc__;
 text: .text%__1cJAssemblerDorl6MpnMRegisterImpl_i_v_;

--- a/hotspot/build/solaris/makefiles/reorder_COMPILER2_i486	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/build/solaris/makefiles/reorder_COMPILER2_i486	Fri May 25 00:49:14 2007 +0000
@@ -6873,9 +6873,6 @@
 text: .text%__1cRaddL_eReg_memNodeErule6kM_I_: ad_i486_misc.o;
 text: .text%__1cODeoptimizationYfetch_unroll_info_helper6FpnKJavaThread__pn0ALUnrollBlock__;
 text: .text%__1cOMacroAssemblerFenter6M_v_;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cZInterpreterMacroAssemblerYnotify_jvmpi_method_exit6MnITosState__v_;
-#endif // JVMPI_SUPPORT
 text: .text%Unsafe_GetNativeByte;
 text: .text%__1cOMacroAssemblerNpop_FPU_state6M_v_;
 text: .text%__1cTsarL_eReg_32_63NodeGExpand6MpnFState_rnJNode_List__pnIMachNode__;
@@ -7895,10 +7892,6 @@
 text: .text%__1cU__STATIC_CONSTRUCTOR6F_v_: jvmtiEnvBase.o;
 text: .text%__1cWNonPrintingResourceObj2n6FInLResourceObjPallocation_type__pv_: jvmtiEnvBase.o;
 text: .text%__1cNGrowableArray4CpnMJvmtiEnvBase__2t6Mii_v_: jvmtiEnvBase.o;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cFjvmpibDpost_vm_initialization_events6F_v_;
-# text: .text%__1cUVM_JVMPIPostObjAllocRclear_restriction6F_v_;
-#endif // JVMPI_SUPPORT
 text: .text%JVM_SupportsCX8;
 text: .text%__1cbEinitialize_converter_functions6F_v_;
 text: .text%JVM_Socket;
@@ -8098,10 +8091,6 @@
 text: .text%__1cU__STATIC_CONSTRUCTOR6F_v_: runtimeService.o;
 text: .text%__1cORuntimeServiceYrecord_application_start6F_v_;
 text: .text%__1cORuntimeServiceEinit6F_v_;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cLOptoRuntimeWjvmpi_method_exit_Type6F_pknITypeFunc__;
-# text: .text%__1cLOptoRuntimeXjvmpi_method_entry_Type6F_pknITypeFunc__;
-#endif // JVMPI_SUPPORT
 text: .text%__1cLOptoRuntimeVhandle_exception_Type6F_pknITypeFunc__;
 text: .text%__1cLOptoRuntimeUmultianewarray5_Type6F_pknITypeFunc__;
 text: .text%__1cLOptoRuntimeUmultianewarray4_Type6F_pknITypeFunc__;

--- a/hotspot/build/solaris/makefiles/reorder_COMPILER2_sparc	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/build/solaris/makefiles/reorder_COMPILER2_sparc	Fri May 25 00:49:14 2007 +0000
@@ -5845,9 +5845,6 @@
 text: .text%__1cSmulL_reg_imm13NodeIpipeline6kM_pknIPipeline__;
 text: .text%__1cbCAbstractInterpreterGeneratorZgenerate_safept_entry_for6MnITosState_pC_2_;
 text: .text%__1cLcastP2INodeErule6kM_I_: ad_sparc_misc.o;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cZInterpreterMacroAssemblerYnotify_jvmpi_method_exit6MinITosState__v_;
-#endif // JVMPI_SUPPORT
 text: .text%__1cPBytecode_invokeLresult_type6kMpnGThread__nJBasicType__;
 text: .text%__1cLCastP2INodeUdepends_only_on_test6kM_i_: classes.o;
 text: .text%__1cOloadConL13NodeEemit6kMrnKCodeBuffer_pnNPhaseRegAlloc__v_;
@@ -6742,9 +6739,6 @@
 text: .text%__1cbEinitialize_converter_functions6F_v_;
 text: .text%JVM_SupportsCX8;
 text: .text%__1cOcmovIF_immNodeEsize6kMpnNPhaseRegAlloc__I_;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cFjvmpibDpost_vm_initialization_events6F_v_;
-#endif // JVMPI_SUPPORT
 text: .text%__1cU__STATIC_CONSTRUCTOR6F_v_: jvmtiEnvBase.o;
 text: .text%__1cUJvmtiEventControllerIvm_start6F_v_;
 text: .text%__1cUJvmtiEventControllerHvm_init6F_v_;
@@ -6910,10 +6904,6 @@
 text: .text%__1cORuntimeServiceYrecord_application_start6F_v_;
 text: .text%__1cOMacroAssemblerNset_vm_result6MpnMRegisterImpl__v_;
 text: .text%__1cORuntimeServiceEinit6F_v_;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cLOptoRuntimeWjvmpi_method_exit_Type6F_pknITypeFunc__;
-# text: .text%__1cLOptoRuntimeXjvmpi_method_entry_Type6F_pknITypeFunc__;
-#endif // JVMPI_SUPPORT
 text: .text%__1cLOptoRuntimeVhandle_exception_Type6F_pknITypeFunc__;
 text: .text%__1cLOptoRuntimeSfetch_monitor_Type6F_pknITypeFunc__;
 text: .text%__1cOMacroAssemblerVverify_oop_subroutine6M_v_;

--- a/hotspot/build/solaris/makefiles/reorder_COMPILER2_sparcv9	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/build/solaris/makefiles/reorder_COMPILER2_sparcv9	Fri May 25 00:49:14 2007 +0000
@@ -5834,9 +5834,6 @@
 text: .text%__1cOstackSlotFOperKin_RegMask6kMi_pknHRegMask__;
 text: .text%__1cKCodeBufferQalloc_relocation6MI_v_;
 text: .text%__1cPjava_lang_ClassYcreate_basic_type_mirror6FpkcpnGThread__pnHoopDesc__;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cZInterpreterMacroAssemblerYnotify_jvmpi_method_exit6MinITosState__v_;
-#endif // JVMPI_SUPPORT
 text: .text%__1cZInterpreterMacroAssemblerMdispatch_via6MnITosState_ppC_v_;
 text: .text%__1cNloadConPCNodeEemit6kMrnKCodeBuffer_pnNPhaseRegAlloc__v_;
 text: .text%__1cNloadConL0NodeEsize6kMpnNPhaseRegAlloc__I_;
@@ -6688,9 +6685,6 @@
 text: .text%__1cUParallelScavengeHeapNgc_threads_do6kMpnNThreadClosure__v_;
 text: .text%__1cUParallelScavengeHeapYpermanent_object_iterate6MpnNObjectClosure__v_;
 text: .text%__1cKvtune_init6F_v_;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cFjvmpibDpost_vm_initialization_events6F_v_;
-#endif // JVMPI_SUPPORT
 text: .text%JVM_SupportsCX8;
 text: .text%__1cLOptoRuntimebSgenerate_polling_page_safepoint_handler_blob6F_v_;
 text: .text%__1cTAbstract_VM_VersionJvm_vendor6F_pkc_;
@@ -6865,10 +6859,6 @@
 text: .text%__1cNTemplateTableGdaload6F_v_;
 text: .text%__1cNTemplateTableGaaload6F_v_;
 text: .text%__1cWInlineCacheBuffer_init6F_v_;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cLOptoRuntimeWjvmpi_method_exit_Type6F_pknITypeFunc__;
-# text: .text%__1cLOptoRuntimeXjvmpi_method_entry_Type6F_pknITypeFunc__;
-#endif // JVMPI_SUPPORT
 text: .text%__1cLOptoRuntimeVhandle_exception_Type6F_pknITypeFunc__;
 text: .text%__1cNTemplateTableHcall_VM6FpnMRegisterImpl_pC222_v_;
 text: .text%__1cLOptoRuntimeNfetch_monitor6FipnJBasicLock_pC_pnHoopDesc__;

--- a/hotspot/build/solaris/makefiles/reorder_TIERED_amd64	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/build/solaris/makefiles/reorder_TIERED_amd64	Fri May 25 00:49:14 2007 +0000
@@ -6547,9 +6547,6 @@
 text: .text%__1cXNativeSignatureIteratorHdo_bool6M_v_;
 text: .text%__1cQmulI_mem_immNodePoper_input_base6kM_I_;
 text: .text%__1cbCAbstractInterpreterGeneratorXbang_stack_shadow_pages6Mi_v_;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cZInterpreterMacroAssemblerYnotify_jvmpi_method_exit6MnITosState__v_;
-#endif // JVMPI_SUPPORT
 text: .text%__1cZInterpreterMacroAssemblerTnotify_method_entry6M_v_;
 text: .text%__1cNdecL_rRegNodeGExpand6MpnFState_rnJNode_List__pnIMachNode__;
 text: .text%__1cOLibraryCallKitXinline_string_compareTo6M_i_;
@@ -7833,9 +7830,6 @@
 text: .text%__1cbEinitialize_converter_functions6F_v_;
 text: .text%JVM_SupportsCX8;
 text: .text%__1cUciObjArrayKlassKlassEmake6F_p0_;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cUVM_JVMPIPostObjAllocRclear_restriction6F_v_;
-#endif // JVMPI_SUPPORT
 text: .text%__1cTcompilerOracle_init6F_v_;
 text: .text%__1cOCompilerOracleRparse_from_string6Fpkc_v_;
 text: .text%__1cOCompilerOraclePparse_from_file6F_v_;
@@ -7844,9 +7838,6 @@
 text: .text%__1cKTypeOopPtrFxdual6kM_pknEType__;
 text: .text%__1cOCompilerOracleOread_from_line6Fpc_v_;
 text: .text%__1cPciObjectFactoryTinit_shared_objects6M_v_;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cFjvmpibDpost_vm_initialization_events6F_v_;
-#endif // JVMPI_SUPPORT
 text: .text%__1cVcompiledICHolderKlassSallocate_permanent6kMrnLKlassHandle_ipnGThread__pv_;
 text: .text%__1cVcompiledICHolderKlassOset_alloc_size6MI_v_;
 text: .text%__1cU__STATIC_CONSTRUCTOR6F_v_: jvmtiEnvBase.o;
@@ -8065,15 +8056,9 @@
 text: .text%__1cICarSpaceEinit6F_v_;
 text: .text%__1cNcarSpace_init6F_v_;
 text: .text%__1cORuntimeServiceEinit6F_v_;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cLOptoRuntimeWjvmpi_method_exit_Type6F_pknITypeFunc__;
-#endif // JVMPI_SUPPORT
 text: .text%__1cU__STATIC_CONSTRUCTOR6F_v_: genCollectedHeap.o;
 text: .text%__1cTAssertIsPermClosure2t6M_v_: genCollectedHeap.o;
 text: .text%__1cRAlwaysTrueClosure2t6M_v_: genCollectedHeap.o;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cLOptoRuntimeXjvmpi_method_entry_Type6F_pknITypeFunc__;
-#endif // JVMPI_SUPPORT
 text: .text%__1cLOptoRuntimeVhandle_exception_Type6F_pknITypeFunc__;
 text: .text%__1cLOptoRuntimeSfetch_monitor_Type6F_pknITypeFunc__;
 text: .text%__1cJAssemblerDorl6MpnMRegisterImpl_i_v_;

--- a/hotspot/build/solaris/makefiles/reorder_TIERED_i486	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/build/solaris/makefiles/reorder_TIERED_i486	Fri May 25 00:49:14 2007 +0000
@@ -6873,9 +6873,6 @@
 text: .text%__1cRaddL_eReg_memNodeErule6kM_I_: ad_i486_misc.o;
 text: .text%__1cODeoptimizationYfetch_unroll_info_helper6FpnKJavaThread__pn0ALUnrollBlock__;
 text: .text%__1cOMacroAssemblerFenter6M_v_;
-#ifdef JVMPI_SUPPORT
-text: .text%__1cZInterpreterMacroAssemblerYnotify_jvmpi_method_exit6MnITosState__v_;
-#endif // JVMPI_SUPPORT
 text: .text%Unsafe_GetNativeByte;
 text: .text%__1cOMacroAssemblerNpop_FPU_state6M_v_;
 text: .text%__1cTsarL_eReg_32_63NodeGExpand6MpnFState_rnJNode_List__pnIMachNode__;
@@ -7895,10 +7892,6 @@
 text: .text%__1cU__STATIC_CONSTRUCTOR6F_v_: jvmtiEnvBase.o;
 text: .text%__1cWNonPrintingResourceObj2n6FInLResourceObjPallocation_type__pv_: jvmtiEnvBase.o;
 text: .text%__1cNGrowableArray4CpnMJvmtiEnvBase__2t6Mii_v_: jvmtiEnvBase.o;
-#ifdef JVMPI_SUPPORT
-text: .text%__1cFjvmpibDpost_vm_initialization_events6F_v_;
-text: .text%__1cUVM_JVMPIPostObjAllocRclear_restriction6F_v_;
-#endif // JVMPI_SUPPORT
 text: .text%JVM_SupportsCX8;
 text: .text%__1cbEinitialize_converter_functions6F_v_;
 text: .text%JVM_Socket;
@@ -8098,10 +8091,6 @@
 text: .text%__1cU__STATIC_CONSTRUCTOR6F_v_: runtimeService.o;
 text: .text%__1cORuntimeServiceYrecord_application_start6F_v_;
 text: .text%__1cORuntimeServiceEinit6F_v_;
-#ifdef JVMPI_SUPPORT
-text: .text%__1cLOptoRuntimeWjvmpi_method_exit_Type6F_pknITypeFunc__;
-text: .text%__1cLOptoRuntimeXjvmpi_method_entry_Type6F_pknITypeFunc__;
-#endif // JVMPI_SUPPORT
 text: .text%__1cLOptoRuntimeVhandle_exception_Type6F_pknITypeFunc__;
 text: .text%__1cLOptoRuntimeUmultianewarray5_Type6F_pknITypeFunc__;
 text: .text%__1cLOptoRuntimeUmultianewarray4_Type6F_pknITypeFunc__;

--- a/hotspot/build/solaris/makefiles/reorder_TIERED_sparc	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/build/solaris/makefiles/reorder_TIERED_sparc	Fri May 25 00:49:14 2007 +0000
@@ -5845,9 +5845,6 @@
 text: .text%__1cSmulL_reg_imm13NodeIpipeline6kM_pknIPipeline__;
 text: .text%__1cbCAbstractInterpreterGeneratorZgenerate_safept_entry_for6MnITosState_pC_2_;
 text: .text%__1cLcastP2INodeErule6kM_I_: ad_sparc_misc.o;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cZInterpreterMacroAssemblerYnotify_jvmpi_method_exit6MinITosState__v_;
-#endif // JVMPI_SUPPORT
 text: .text%__1cPBytecode_invokeLresult_type6kMpnGThread__nJBasicType__;
 text: .text%__1cLCastP2INodeUdepends_only_on_test6kM_i_: classes.o;
 text: .text%__1cOloadConL13NodeEemit6kMrnKCodeBuffer_pnNPhaseRegAlloc__v_;
@@ -6742,9 +6739,6 @@
 text: .text%__1cbEinitialize_converter_functions6F_v_;
 text: .text%JVM_SupportsCX8;
 text: .text%__1cOcmovIF_immNodeEsize6kMpnNPhaseRegAlloc__I_;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cFjvmpibDpost_vm_initialization_events6F_v_;
-#endif // JVMPI_SUPPORT
 text: .text%__1cU__STATIC_CONSTRUCTOR6F_v_: jvmtiEnvBase.o;
 text: .text%__1cUJvmtiEventControllerIvm_start6F_v_;
 text: .text%__1cUJvmtiEventControllerHvm_init6F_v_;
@@ -6910,10 +6904,6 @@
 text: .text%__1cORuntimeServiceYrecord_application_start6F_v_;
 text: .text%__1cOMacroAssemblerNset_vm_result6MpnMRegisterImpl__v_;
 text: .text%__1cORuntimeServiceEinit6F_v_;
-#ifdef JVMPI_SUPPORT
-# text: .text%__1cLOptoRuntimeWjvmpi_method_exit_Type6F_pknITypeFunc__;
-# text: .text%__1cLOptoRuntimeXjvmpi_method_entry_Type6F_pknITypeFunc__;
-#endif // JVMPI_SUPPORT
 text: .text%__1cLOptoRuntimeVhandle_exception_Type6F_pknITypeFunc__;
 text: .text%__1cLOptoRuntimeSfetch_monitor_Type6F_pknITypeFunc__;
 text: .text%__1cOMacroAssemblerVverify_oop_subroutine6M_v_;

--- a/hotspot/build/solaris/makefiles/top.make	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/build/solaris/makefiles/top.make	Fri May 25 00:49:14 2007 +0000
@@ -52,6 +52,7 @@
 Include_DBs/GC          = $(VM)/includeDB_gc \
                           $(VM)/gc_implementation/includeDB_gc_parallelScavenge \
                           $(VM)/gc_implementation/includeDB_gc_concurrentMarkSweep \
+                          $(VM)/gc_implementation/includeDB_gc_parNew \
                           $(VM)/gc_implementation/includeDB_gc_shared
 
 Include_DBs/CORE        = $(VM)/includeDB_core   $(Include_DBs/GC)   

--- a/hotspot/build/windows/makefiles/adlc.make	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/build/windows/makefiles/adlc.make	Fri May 25 00:49:14 2007 +0000
@@ -52,7 +52,7 @@
   /I "$(WorkSpace)\src\share\vm\compiler"    \
   /I "$(WorkSpace)\src\share\vm\code"        \
   /I "$(WorkSpace)\src\share\vm\interpreter" \
-  /I "$(WorkSpace)\src\share\vm\lookup"      \
+  /I "$(WorkSpace)\src\share\vm\classfile"   \
   /I "$(WorkSpace)\src\share\vm\asm"         \
   /I "$(WorkSpace)\src\share\vm\memory"      \
   /I "$(WorkSpace)\src\share\vm\oops"        \

--- a/hotspot/build/windows/makefiles/generated.make	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/build/windows/makefiles/generated.make	Fri May 25 00:49:14 2007 +0000
@@ -39,7 +39,7 @@
 default:: includeDB.current Dependencies $(JvmtiGeneratedFiles)
 !endif
 
-IncludeDBs=$(WorkSpace)/src/share/vm/includeDB_core $(WorkSpace)/src/share/vm/includeDB_gc $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_shared $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep
+IncludeDBs=$(WorkSpace)/src/share/vm/includeDB_core $(WorkSpace)/src/share/vm/includeDB_gc $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_shared $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_parNew $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep
 
 !if "$(Variant)" == "core"
 IncludeDBs=$(IncludeDBs) 

--- a/hotspot/build/windows/makefiles/makedeps.make	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/build/windows/makefiles/makedeps.make	Fri May 25 00:49:14 2007 +0000
@@ -59,10 +59,10 @@
         -relativeInclude src\share\vm\code \
         -relativeInclude src\share\vm\interpreter \
         -relativeInclude src\share\vm\ci \
-        -relativeInclude src\share\vm\jvmci \
-        -relativeInclude src\share\vm\lookup \
+        -relativeInclude src\share\vm\classfile \
         -relativeInclude src\share\vm\gc_implementation\parallelScavenge \
         -relativeInclude src\share\vm\gc_implementation\shared \
+        -relativeInclude src\share\vm\gc_implementation\parNew \
         -relativeInclude src\share\vm\gc_implementation\concurrentMarkSweep \
         -relativeInclude src\share\vm\gc_interface \
         -relativeInclude src\share\vm\asm \
@@ -111,6 +111,7 @@
         -additionalFile includeDB_gc \
         -additionalFile includeDB_gc_parallelScavenge \
         -additionalFile includeDB_gc_concurrentMarkSweep \
+        -additionalFile includeDB_gc_parNew \
         -additionalFile includeDB_gc_shared \
         -additionalGeneratedFile $(HOTSPOTBUILDSPACE)\%f\%b vm.def \
         -prelink  "" "Generating vm.def..." "cd $(HOTSPOTBUILDSPACE)\%f\%b	$(HOTSPOTMKSHOME)\sh $(HOTSPOTWORKSPACE)\build\windows\build_vm_def.sh" \

--- a/hotspot/build/windows/makefiles/vm.make	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/build/windows/makefiles/vm.make	Fri May 25 00:49:14 2007 +0000
@@ -109,10 +109,10 @@
   /I "$(WorkSpace)\src\share\vm\code"        \
   /I "$(WorkSpace)\src\share\vm\interpreter" \
   /I "$(WorkSpace)\src\share\vm\ci"          \
-  /I "$(WorkSpace)\src\share\vm\jvmci"       \
-  /I "$(WorkSpace)\src\share\vm\lookup"      \
+  /I "$(WorkSpace)\src\share\vm\classfile"   \
   /I "$(WorkSpace)\src\share\vm\gc_implementation\parallelScavenge"\
   /I "$(WorkSpace)\src\share\vm\gc_implementation\shared"\
+  /I "$(WorkSpace)\src\share\vm\gc_implementation\parNew"\
   /I "$(WorkSpace)\src\share\vm\gc_implementation\concurrentMarkSweep"\
   /I "$(WorkSpace)\src\share\vm\gc_interface"\
   /I "$(WorkSpace)\src\share\vm\asm"         \
@@ -138,10 +138,10 @@
 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/code
 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/interpreter
 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/ci
-VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/jvmci
-VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/lookup
+VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/classfile
 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/parallelScavenge
 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/shared
+VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/parNew
 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/concurrentMarkSweep
 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_interface
 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/asm
@@ -198,10 +198,7 @@
 {$(WorkSpace)\src\share\vm\ci}.cpp.obj::
         $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
 
-{$(WorkSpace)\src\share\vm\jvmci}.cpp.obj::
-        $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
-
-{$(WorkSpace)\src\share\vm\lookup}.cpp.obj::
+{$(WorkSpace)\src\share\vm\classfile}.cpp.obj::
         $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
 
 {$(WorkSpace)\src\share\vm\gc_implementation\parallelScavenge}.cpp.obj::
@@ -210,6 +207,9 @@
 {$(WorkSpace)\src\share\vm\gc_implementation\shared}.cpp.obj::
         $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
 
+{$(WorkSpace)\src\share\vm\gc_implementation\parNew}.cpp.obj::
+        $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+
 {$(WorkSpace)\src\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj::
         $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
 

--- a/hotspot/build/windows/projectfiles/common/Makefile	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/build/windows/projectfiles/common/Makefile	Fri May 25 00:49:14 2007 +0000
@@ -50,6 +50,7 @@
 IncludeDBs_base=$(IncludeDBs_base) $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_gc
 IncludeDBs_base=$(IncludeDBs_base) $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge
 IncludeDBs_base=$(IncludeDBs_base) $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_shared
+IncludeDBs_base=$(IncludeDBs_base) $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_parNew
 IncludeDBs_base=$(IncludeDBs_base) $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep
 
 IncludeDBs_core =$(IncludeDBs_base) 

--- a/hotspot/make/templates/bsd-header	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/make/templates/bsd-header	Fri May 25 00:49:14 2007 +0000
@@ -1,4 +1,4 @@
-Copyright (c) %year% Sun Microsystems, Inc.  All rights reserved.
+Copyright %YEARS% Sun Microsystems, Inc.  All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

--- a/hotspot/make/templates/gpl-cp-header	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/make/templates/gpl-cp-header	Fri May 25 00:49:14 2007 +0000
@@ -1,4 +1,4 @@
-Copyright (c) %year% Sun Microsystems, Inc.  All Rights Reserved.
+Copyright %YEARS% Sun Microsystems, Inc.  All Rights Reserved.
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
 This code is free software; you can redistribute it and/or modify it

--- a/hotspot/make/templates/gpl-header	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/make/templates/gpl-header	Fri May 25 00:49:14 2007 +0000
@@ -1,4 +1,4 @@
-Copyright (c) %year% Sun Microsystems, Inc.  All Rights Reserved.
+Copyright %YEARS% Sun Microsystems, Inc.  All Rights Reserved.
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
 This code is free software; you can redistribute it and/or modify it

--- a/hotspot/src/cpu/amd64/vm/amd64.ad	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/src/cpu/amd64/vm/amd64.ad	Fri May 25 00:49:14 2007 +0000
@@ -2517,6 +2517,10 @@
     // to allow platform-specific tweaking on sparc.
     __ cmpq(Rrax, Rrsi);
     __ jcc(Assembler::equal, hit);
+#ifndef PRODUCT
+    __ movq(Rrcx, (intptr_t) &SharedRuntime::_partial_subtype_ctr);
+    __ incrementl(Address(Rrcx));
+#endif //PRODUCT
     __ movq(Rrdi, Address(Rrsi, 
                           sizeof(oopDesc) + 
                           Klass::secondary_supers_offset_in_bytes()));
@@ -3333,6 +3337,9 @@
     assert (objReg != boxReg && objReg != tmpReg && 
             objReg != scrReg && tmpReg != scrReg, "invariant") ; 
 
+    if (_counters != NULL) {
+      masm.atomic_incl(Address((address) _counters->total_entry_count_addr(), relocInfo::none));
+    }
     if (EmitSync & 1) { 
         masm.movq (Address(boxReg), intptr_t(markOopDesc::unused_mark())) ; 
         masm.cmpq (rsp, 0) ; 
@@ -3341,7 +3348,7 @@
         Label DONE_LABEL;
         if (UseBiasedLocking) {
            // Note: tmpReg maps to the swap_reg argument and scrReg to the tmp_reg argument.
-          masm.biased_locking_enter(boxReg, objReg, tmpReg, scrReg, false, DONE_LABEL, NULL);
+          masm.biased_locking_enter(boxReg, objReg, tmpReg, scrReg, false, DONE_LABEL, NULL, _counters);
         }
         masm.movl(tmpReg, 0x1);
         masm.orq(tmpReg, Address(objReg));
@@ -3374,7 +3381,7 @@
         // If this invariant is not held we'll suffer exclusion (safety) failure.
           
         if (UseBiasedLocking) {
-          masm.biased_locking_enter(boxReg, objReg, tmpReg, scrReg, true, DONE_LABEL, NULL);
+          masm.biased_locking_enter(boxReg, objReg, tmpReg, scrReg, true, DONE_LABEL, NULL, _counters);
           masm.movq  (tmpReg, Address(objReg)) ;        // [FETCH]
         }
 
@@ -3382,9 +3389,9 @@
         masm.movq  (Address(boxReg), tmpReg) ;  
         if (os::is_MP()) { masm.lock(); } 
         masm.cmpxchgq(boxReg, Address(objReg)); // Updates tmpReg
-        if (PrintBiasedLockingStatistics) {
+        if (_counters != NULL) {
            masm.cond_incl(Assembler::equal, 
-             Address((address) BiasedLocking::fast_path_entry_count_addr(), relocInfo::none));
+             Address((address) _counters->fast_path_entry_count_addr(), relocInfo::none));
         }
         masm.jcc   (Assembler::equal, DONE_LABEL);
     
@@ -3392,9 +3399,9 @@
         masm.subq  (tmpReg, rsp);
         masm.andq  (tmpReg, 7 - os::vm_page_size());
         masm.movq  (Address(boxReg), tmpReg);
-        if (PrintBiasedLockingStatistics) {
+        if (_counters != NULL) {
            masm.cond_incl(Assembler::equal, 
-             Address((address) BiasedLocking::fast_path_entry_count_addr(), relocInfo::none));
+             Address((address) _counters->fast_path_entry_count_addr(), relocInfo::none));
         }
         masm.jmp   (DONE_LABEL) ; 
 
@@ -3570,7 +3577,7 @@
     // Compare first characters
     masm.subl(rcx, rdi);
     masm.jcc(Assembler::notZero,  POP_LABEL);
-    masm.decl(rsi);
+    masm.decrementl(rsi);
     masm.jcc(Assembler::zero, LENGTH_DIFF_LABEL);
 
     {
@@ -3599,7 +3606,7 @@
     masm.load_unsigned_word(rdi, Address(rax, rsi, Address::times_2, 0));
     masm.subl(rcx, rdi);
     masm.jcc(Assembler::notZero, POP_LABEL);
-    masm.incq(rsi);
+    masm.incrementq(rsi);
     masm.jcc(Assembler::notZero, WHILE_HEAD_LABEL);
     
     // Strings are equal up to min length.  Return the length difference.
@@ -6801,6 +6808,7 @@
 
 instruct incI_rReg(rRegI dst, immI1 src, rFlagsReg cr)
 %{
+  predicate(UseIncDec);
   match(Set dst (AddI dst src));
   effect(KILL cr);
 
@@ -6812,6 +6820,7 @@
 
 instruct incI_mem(memory dst, immI1 src, rFlagsReg cr)
 %{
+  predicate(UseIncDec);
   match(Set dst (StoreI dst (AddI (LoadI dst) src)));
   effect(KILL cr);
 
@@ -6825,6 +6834,7 @@
 // XXX why does that use AddI
 instruct decI_rReg(rRegI dst, immI_M1 src, rFlagsReg cr) 
 %{
+  predicate(UseIncDec);
   match(Set dst (AddI dst src));
   effect(KILL cr);
 
@@ -6837,6 +6847,7 @@
 // XXX why does that use AddI
 instruct decI_mem(memory dst, immI_M1 src, rFlagsReg cr)
 %{
+  predicate(UseIncDec);
   match(Set dst (StoreI dst (AddI (LoadI dst) src)));
   effect(KILL cr);
 
@@ -6919,6 +6930,7 @@
 
 instruct incL_rReg(rRegI dst, immL1 src, rFlagsReg cr)
 %{
+  predicate(UseIncDec);
   match(Set dst (AddL dst src));
   effect(KILL cr);
 
@@ -6930,6 +6942,7 @@
 
 instruct incL_mem(memory dst, immL1 src, rFlagsReg cr)
 %{
+  predicate(UseIncDec);
   match(Set dst (StoreL dst (AddL (LoadL dst) src)));
   effect(KILL cr);
 
@@ -6943,6 +6956,7 @@
 // XXX why does that use AddL
 instruct decL_rReg(rRegL dst, immL_M1 src, rFlagsReg cr) 
 %{
+  predicate(UseIncDec);
   match(Set dst (AddL dst src));
   effect(KILL cr);
 
@@ -6955,6 +6969,7 @@
 // XXX why does that use AddL
 instruct decL_mem(memory dst, immL_M1 src, rFlagsReg cr)
 %{
+  predicate(UseIncDec);
   match(Set dst (StoreL dst (AddL (LoadL dst) src)));
   effect(KILL cr);
 
@@ -10026,6 +10041,42 @@
   ins_pipe(ialu_mem_reg);
 %}
 
+instruct MoveF2I_reg_reg(rRegI dst, regF src) %{
+  match(Set dst (MoveF2I src));
+  effect(DEF dst, USE src);
+  ins_cost(85);
+  format %{ "movd    $dst,$src\t# MoveF2I" %}
+  ins_encode %{ __ movdl($dst$$Register, $src$$FloatRegister); %}
+  ins_pipe( pipe_slow );
+%}
+
+instruct MoveD2L_reg_reg(rRegL dst, regD src) %{
+  match(Set dst (MoveD2L src));
+  effect(DEF dst, USE src);
+  ins_cost(85);
+  format %{ "movd    $dst,$src\t# MoveD2L" %}
+  ins_encode %{ __ movdq($dst$$Register, $src$$FloatRegister); %}
+  ins_pipe( pipe_slow );
+%}
+
+// The next instructions have long latency and use Int unit. Set high cost.
+instruct MoveI2F_reg_reg(regF dst, rRegI src) %{
+  match(Set dst (MoveI2F src));
+  effect(DEF dst, USE src);
+  ins_cost(300);
+  format %{ "movd    $dst,$src\t# MoveI2F" %}
+  ins_encode %{ __ movdl($dst$$FloatRegister, $src$$Register); %}
+  ins_pipe( pipe_slow );
+%}
+
+instruct MoveL2D_reg_reg(regD dst, rRegL src) %{
+  match(Set dst (MoveL2D src));
+  effect(DEF dst, USE src);
+  ins_cost(300);
+  format %{ "movd    $dst,$src\t# MoveL2D" %}
+  ins_encode %{ __ movdq($dst$$FloatRegister, $src$$Register); %}
+  ins_pipe( pipe_slow );
+%}
 
 // =======================================================================
 // fast clearing of an array

--- a/hotspot/src/cpu/amd64/vm/assembler_amd64.cpp	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/src/cpu/amd64/vm/assembler_amd64.cpp	Fri May 25 00:49:14 2007 +0000
@@ -1,5 +1,5 @@
 #ifdef USE_PRAGMA_IDENT_SRC
-#pragma ident "@(#)assembler_amd64.cpp	1.55 07/05/05 17:04:10 JVM"
+#pragma ident "@(#)assembler_amd64.cpp	1.56 07/05/17 15:39:38 JVM"
 #endif
 /*
  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
@@ -2878,21 +2878,9 @@
   ucomiss(dst, src);
 }
 
-void Assembler::decb(Register dst) 
-{
-  int dstenc = dst->encoding();
-  if (dstenc >= 8) {
-    prefix(REX_B);
-    dstenc -= 8;
-  } else if (dstenc >= 4) {
-    prefix(REX);
-  }
-  emit_byte(0xFE);
-  emit_byte(0xC8 | dstenc);
-}
-
 void Assembler::decl(Register dst)
 {
+  // Don't use it directly. Use MacroAssembler::decrementl() instead.
   // Use two-byte form (one-byte from is a REX prefix in 64-bit mode)
   int dstenc = dst->encoding();
   if (dstenc >= 8) {
@@ -2905,6 +2893,7 @@
 
 void Assembler::decl(Address dst)
 {
+  // Don't use it directly. Use MacroAssembler::decrementl() instead.
   InstructionMark im(this);
   if (dst.base_needs_rex()) {
     if (dst.index_needs_rex()) {
@@ -2923,6 +2912,7 @@
 
 void Assembler::decq(Register dst) 
 {
+  // Don't use it directly. Use MacroAssembler::decrementq() instead.
   // Use two-byte form (one-byte from is a REX prefix in 64-bit mode)
   int dstenc = dst->encoding();
   if (dstenc < 8) {
@@ -2937,6 +2927,7 @@
 
 void Assembler::decq(Address dst)
 {
+  // Don't use it directly. Use MacroAssembler::decrementq() instead.
   InstructionMark im(this);
   if (dst.base_needs_rex()) {
     if (dst.index_needs_rex()) {
@@ -3100,6 +3091,7 @@
 
 void Assembler::incl(Register dst)
 {
+  // Don't use it directly. Use MacroAssembler::incrementl() instead.
   // Use two-byte form (one-byte from is a REX prefix in 64-bit mode)
   int dstenc = dst->encoding();
   if (dstenc >= 8) {
@@ -3112,6 +3104,7 @@
 
 void Assembler::incl(Address dst)
 {
+  // Don't use it directly. Use MacroAssembler::incrementl() instead.
   InstructionMark im(this);
   if (dst.base_needs_rex()) {
     if (dst.index_needs_rex()) {
@@ -3130,6 +3123,7 @@
 
 void Assembler::incq(Register dst)
 {
+  // Don't use it directly. Use MacroAssembler::incrementq() instead.
   // Use two-byte form (one-byte from is a REX prefix in 64-bit mode)
   int dstenc = dst->encoding();
   if (dstenc < 8) {
@@ -3144,6 +3138,7 @@
 
 void Assembler::incq(Address dst)
 {
+  // Don't use it directly. Use MacroAssembler::incrementq() instead.
   InstructionMark im(this);
   if (dst.base_needs_rex()) {
     if (dst.index_needs_rex()) {
@@ -4576,6 +4571,87 @@
 
 void Assembler::nop(int i) {
   assert(i > 0, " ");
+  if (UseAddressNop) {
+    // Using multi-bytes nops "0x0F 0x1F [address]"
+    while(i >= 15) {
+      // don't generate sequential addess nops (mix with regular nops).
+      i -= 15;
+      emit_byte(0x66);   // size prefix
+      emit_byte(0x66);   // size prefix
+      emit_byte(0x66);   // size prefix
+      emit_byte(0x0F);   // NOP DWORD PTR [EAX+EAX*0+0] 32-bits offset
+      emit_byte(0x1F);
+      emit_byte(0x84);   // emit_rm(cbuf, 0x2, EAX_enc, 0x4);
+      emit_byte(0x00);   // emit_rm(cbuf, 0x0, EAX_enc, EAX_enc);
+      emit_long(0);      // 32-bits offset
+      emit_byte(0x66);   // size prefix
+      emit_byte(0x66);   // size prefix
+      emit_byte(0x66);   // size prefix
+      emit_byte(0x90);   // nop
+    }
+    switch (i) {
+      case 14:
+        emit_byte(0x66); // size prefix
+      case 13:
+        emit_byte(0x66); // size prefix
+      case 12:
+        emit_byte(0x0F); // NOP DWORD PTR [EAX+EAX*0+0] 32-bits offset
+        emit_byte(0x1F);
+        emit_byte(0x84); // emit_rm(cbuf, 0x2, EAX_enc, 0x4);
+        emit_byte(0x00); // emit_rm(cbuf, 0x0, EAX_enc, EAX_enc);
+        emit_long(0);    // 32-bits offset
+        emit_byte(0x66); // size prefix
+        emit_byte(0x66); // size prefix
+        emit_byte(0x66); // size prefix
+        emit_byte(0x90); // nop
+        break;
+      case 11:
+        emit_byte(0x66); // size prefix
+      case 10:
+        emit_byte(0x66); // size prefix
+      case 9:
+        emit_byte(0x66); // size prefix
+      case 8: // NOP DWORD PTR [EAX+EAX*0+0] 32-bits offset
+        emit_byte(0x0F);
+        emit_byte(0x1F);
+        emit_byte(0x84); // emit_rm(cbuf, 0x2, EAX_enc, 0x4);
+        emit_byte(0x00); // emit_rm(cbuf, 0x0, EAX_enc, EAX_enc);
+        emit_long(0);    // 32-bits offset
+        break;
+      case 7: // NOP DWORD PTR [EAX+0] 32-bits offset
+        emit_byte(0x0F);
+        emit_byte(0x1F);
+        emit_byte(0x80); // emit_rm(cbuf, 0x2, EAX_enc, EAX_enc);
+        emit_long(0);    // 32-bits offset
+        break;
+      case 6:
+        emit_byte(0x66); // size prefix
+      case 5: // NOP DWORD PTR [EAX+EAX*0+0]
+        emit_byte(0x0F);
+        emit_byte(0x1F);
+        emit_byte(0x44); // emit_rm(cbuf, 0x1, EAX_enc, 0x4);
+        emit_byte(0x00); // emit_rm(cbuf, 0x0, EAX_enc, EAX_enc);
+        emit_byte(0);    // 8-bits offset
+        break;
+      case 4:            // NOP DWORD PTR [EAX+0]
+        emit_byte(0x0F);
+        emit_byte(0x1F);
+        emit_byte(0x40); // emit_rm(cbuf, 0x1, EAX_enc, EAX_enc);
+        emit_byte(0);    // 8-bits offset
+        break;
+      case 3: 
+        // Don't use "0x0F 0x1F 0x00" (NOP DWORD PTR [EAX])
+        emit_byte(0x66); // size prefix
+      case 2:
+        emit_byte(0x66); // size prefix
+      case 1:
+        emit_byte(0x90); // nop
+        break;
+      default:
+        assert(i == 0, " ");
+    }
+    return;
+  }
   // Using nops with size prefixes "0x66 0x90".
   // From AMD Optimization Guide:
   //  1: 0x90
@@ -6008,36 +6084,76 @@
 
 void MacroAssembler::incrementl(Register reg, int value)
 {
+  if (value == min_jint) { addl(reg, value); return; }
   if (value <  0) { decrementl(reg, -value); return; }
   if (value == 0) {                        ; return; }
-  if (value == 1) { incl(reg)              ; return; }
+  if (value == 1 && UseIncDec) { incl(reg) ; return; }
   /* else */      { addl(reg, value)       ; return; }
 }
 
 void MacroAssembler::decrementl(Register reg, int value)
 {
+  if (value == min_jint) { subl(reg, value); return; }
   if (value <  0) { incrementl(reg, -value); return; }
   if (value == 0) {                        ; return; }
-  if (value == 1) { decl(reg)              ; return; }
+  if (value == 1 && UseIncDec) { decl(reg) ; return; }
   /* else */      { subl(reg, value)       ; return; }
 }
 
 void MacroAssembler::incrementq(Register reg, int value)
 {
+  if (value == min_jint) { addq(reg, value); return; }
   if (value <  0) { decrementq(reg, -value); return; }
   if (value == 0) {                        ; return; }
-  if (value == 1) { incq(reg)              ; return; }
+  if (value == 1 && UseIncDec) { incq(reg) ; return; }
   /* else */      { addq(reg, value)       ; return; }
 }
 
 void MacroAssembler::decrementq(Register reg, int value)
 {
+  if (value == min_jint) { subq(reg, value); return; }
   if (value <  0) { incrementq(reg, -value); return; }
   if (value == 0) {                        ; return; }
-  if (value == 1) { decq(reg)              ; return; }
+  if (value == 1 && UseIncDec) { decq(reg) ; return; }
   /* else */      { subq(reg, value)       ; return; }
 }
 
+void MacroAssembler::incrementl(Address dst, int value)
+{
+  if (value == min_jint) { addl(dst, value); return; }
+  if (value <  0) { decrementl(dst, -value); return; }
+  if (value == 0) {                        ; return; }
+  if (value == 1 && UseIncDec) { incl(dst) ; return; }
+  /* else */      { addl(dst, value)       ; return; }
+}
+
+void MacroAssembler::decrementl(Address dst, int value)
+{
+  if (value == min_jint) { subl(dst, value); return; }
+  if (value <  0) { incrementl(dst, -value); return; }
+  if (value == 0) {                        ; return; }
+  if (value == 1 && UseIncDec) { decl(dst) ; return; }
+  /* else */      { subl(dst, value)       ; return; }
+}
+
+void MacroAssembler::incrementq(Address dst, int value)
+{
+  if (value == min_jint) { addq(dst, value); return; }
+  if (value <  0) { decrementq(dst, -value); return; }
+  if (value == 0) {                        ; return; }
+  if (value == 1 && UseIncDec) { incq(dst) ; return; }
+  /* else */      { addq(dst, value)       ; return; }
+}
+
+void MacroAssembler::decrementq(Address dst, int value)
+{
+  if (value == min_jint) { subq(dst, value); return; }
+  if (value <  0) { incrementq(dst, -value); return; }
+  if (value == 0) {                        ; return; }
+  if (value == 1 && UseIncDec) { decq(dst) ; return; }
+  /* else */      { subq(dst, value)       ; return; }
+}
+
 void MacroAssembler::align(int modulus)
 {
   if (offset() % modulus != 0) {
@@ -6729,7 +6845,7 @@
   int offset = (1 << shift_value) - 1 ;
 
   if (offset == 1) {
-    incl(reg);
+    incrementl(reg);
   } else {
     addl(reg, offset);
   }
@@ -7093,7 +7209,8 @@
 
 int MacroAssembler::biased_locking_enter(Register lock_reg, Register obj_reg, Register swap_reg, Register tmp_reg,
                                          bool swap_reg_contains_mark,
-                                         Label& done, Label* slow_case) {
+                                         Label& done, Label* slow_case,
+                                         BiasedLockingCounters* counters) {
   assert(UseBiasedLocking, "why call this otherwise?");
   assert(swap_reg == rax, "swap_reg must be rax for cmpxchgq");
   assert(tmp_reg != noreg, "tmp_reg must be supplied");
@@ -7103,6 +7220,9 @@
   Address klass_addr     (obj_reg, oopDesc::klass_offset_in_bytes());
   Address saved_mark_addr(lock_reg);
 
+  if (PrintBiasedLockingStatistics && counters == NULL)
+    counters = BiasedLocking::counters();
+
   // Biased locking
   // See whether the lock is currently biased toward our thread and
   // whether the epoch is still valid
@@ -7126,8 +7246,8 @@
   orq(tmp_reg, r15_thread);
   xorq(tmp_reg, swap_reg);
   andq(tmp_reg, ~((int) markOopDesc::age_mask_in_place));
-  if (PrintBiasedLockingStatistics) {
-    cond_incl(Assembler::zero, Address((address) BiasedLocking::biased_lock_entry_count_addr(), relocInfo::none));
+  if (counters != NULL) {
+    cond_incl(Assembler::zero, Address((address) counters->biased_lock_entry_count_addr(), relocInfo::none));
   }
   jcc(Assembler::equal, done);
 
@@ -7176,8 +7296,8 @@
   // another thread succeeded in biasing it toward itself and we
   // need to revoke that bias. The revocation will occur in the
   // interpreter runtime in the slow case.
-  if (PrintBiasedLockingStatistics) {
-    cond_incl(Assembler::zero, Address((address) BiasedLocking::anonymously_biased_lock_entry_count_addr(), relocInfo::none));
+  if (counters != NULL) {
+    cond_incl(Assembler::zero, Address((address) counters->anonymously_biased_lock_entry_count_addr(), relocInfo::none));
   }
   if (slow_case != NULL) {
     jcc(Assembler::notZero, *slow_case);
@@ -7204,8 +7324,8 @@
   // If the biasing toward our thread failed, then another thread
   // succeeded in biasing it toward itself and we need to revoke that
   // bias. The revocation will occur in the runtime in the slow case.
-  if (PrintBiasedLockingStatistics) {
-    cond_incl(Assembler::zero, Address((address) BiasedLocking::rebiased_lock_entry_count_addr(), relocInfo::none));
+  if (counters != NULL) {
+    cond_incl(Assembler::zero, Address((address) counters->rebiased_lock_entry_count_addr(), relocInfo::none));
   }
   if (slow_case != NULL) {
     jcc(Assembler::notZero, *slow_case);
@@ -7233,8 +7353,8 @@
   // Fall through to the normal CAS-based lock, because no matter what
   // the result of the above CAS, some thread must have succeeded in
   // removing the bias bit from the object's header.
-  if (PrintBiasedLockingStatistics) {
-    cond_incl(Assembler::zero, Address((address) BiasedLocking::revoked_lock_entry_count_addr(), relocInfo::none));
+  if (counters != NULL) {
+    cond_incl(Assembler::zero, Address((address) counters->revoked_lock_entry_count_addr(), relocInfo::none));
   }
 
   bind(cas_label);
@@ -7287,12 +7407,16 @@
   Condition negated_cond = negate_condition(cond);
   Label L;
   jcc(negated_cond, L);
+  atomic_incl(counter_addr);
+  bind(L);
+}
+
+void MacroAssembler::atomic_incl(Address counter_addr) {
   pushfq();
   if (os::is_MP())
     lock();
-  incl(counter_addr);
+  incrementl(counter_addr);
   popfq();
-  bind(L);
 }
 
 SkipIfEqual::SkipIfEqual(

--- a/hotspot/src/cpu/amd64/vm/assembler_amd64.hpp	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/src/cpu/amd64/vm/assembler_amd64.hpp	Fri May 25 00:49:14 2007 +0000
@@ -1,5 +1,5 @@
 #ifdef USE_PRAGMA_IDENT_HDR
-#pragma ident "@(#)assembler_amd64.hpp	1.39 07/05/05 17:04:03 JVM"
+#pragma ident "@(#)assembler_amd64.hpp	1.40 07/05/17 15:39:42 JVM"
 #endif
 /*
  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
@@ -25,6 +25,8 @@
  *  
  */
 
+class BiasedLockingCounters;
+
 // Contains all the definitions needed for amd64 assembly code generation.
 
 // Calling convention
@@ -520,12 +522,24 @@
   void ucomiss(FloatRegister dst, FloatRegister src);
   void ucomisd(FloatRegister dst, FloatRegister src);
 
-  void decb(Register dst);
+ protected:
+  // Don't use next inc() and dec() methods directly. INC & DEC instructions 
+  // could cause a partial flag stall since they don't set CF flag.
+  // Use MacroAssembler::decrement() & MacroAssembler::increment() methods
+  // which call inc() & dec() or add() & sub() in accordance with 
+  // the product flag UseIncDec value.
+
   void decl(Register dst);
   void decl(Address dst);
   void decq(Register dst);
   void decq(Address dst);
 
+  void incl(Register dst);
+  void incl(Address dst);
+  void incq(Register dst);
+  void incq(Address dst);
+
+ public:
   void idivl(Register src);
   void idivq(Register src);
   void cdql();
@@ -536,11 +550,6 @@
   void imulq(Register dst, Register src);
   void imulq(Register dst, Register src, int value);
 
-  void incl(Register dst);
-  void incl(Address dst);
-  void incq(Register dst);
-  void incq(Address dst);
-
   void leal(Register dst, Address src);
   void leaq(Register dst, Address src);
 
@@ -887,10 +896,15 @@
 
   // Support for inc/dec with optimal instruction selection depending
   // on value
-  void incrementl(Register reg, int value);
-  void decrementl(Register reg, int value);
-  void incrementq(Register reg, int value);
-  void decrementq(Register reg, int value);
+  void incrementl(Register reg, int value = 1);
+  void decrementl(Register reg, int value = 1);
+  void incrementq(Register reg, int value = 1);
+  void decrementq(Register reg, int value = 1);
+
+  void incrementl(Address dst, int value = 1);
+  void decrementl(Address dst, int value = 1);
+  void incrementq(Address dst, int value = 1);
+  void decrementq(Address dst, int value = 1);
 
   // Alignment
   void align(int modulus);
@@ -1476,7 +1490,6 @@
   void cmpq(Register dst, Register src)     { Assembler::cmpq(dst, src); }
   void ucomiss(FloatRegister dst, FloatRegister src) { Assembler::ucomiss(dst, src); }
   void ucomisd(FloatRegister dst, FloatRegister src) { Assembler::ucomisd(dst, src); }
-  void decb(Register dst)                   { Assembler::decb(dst); }
   void decl(Register dst)                   { Assembler::decl(dst); }
   void decq(Register dst)                   { Assembler::decq(dst); }
   void idivl(Register src)                  { Assembler::idivl(src); }
@@ -1772,7 +1785,8 @@
   // the calling code has already passed any potential faults.
   int biased_locking_enter(Register lock_reg, Register obj_reg, Register swap_reg, Register tmp_reg,
                            bool swap_reg_contains_mark,
-                           Label& done, Label* slow_case = NULL);
+                           Label& done, Label* slow_case = NULL,
+                           BiasedLockingCounters* counters = NULL);
   void biased_locking_exit (Register obj_reg, Register temp_reg, Label& done);
 
   Condition negate_condition(Condition cond);
@@ -1780,6 +1794,8 @@
   // Helper functions for statistics gathering.
   // Conditionally (atomically, on MPs) increments passed counter address, preserving condition codes.
   void cond_incl(Condition cond, Address counter_addr);
+  // Unconditional atomic increment.
+  void atomic_incl(Address counter_addr);
 };
 
 /**

--- a/hotspot/src/cpu/amd64/vm/disassembler_amd64.cpp	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/src/cpu/amd64/vm/disassembler_amd64.cpp	Fri May 25 00:49:14 2007 +0000
@@ -1,5 +1,5 @@
 #ifdef USE_PRAGMA_IDENT_SRC
-#pragma ident "@(#)disassembler_amd64.cpp	1.13 07/05/05 17:04:04 JVM"
+#pragma ident "@(#)disassembler_amd64.cpp	1.14 07/05/17 15:39:44 JVM"
 #endif
 /*
  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
@@ -158,7 +158,7 @@
 {
   st = st ? st : tty;
 
-  const int show_bytes = true; // for disassembler debugging
+  const int show_bytes = false; // for disassembler debugging
 
   if (!load_library()) {
     st->print_cr("Could not load disassembler");
@@ -167,9 +167,14 @@
 
   amd64_env env(NULL, st);
   unsigned char* p = (unsigned char*) begin;
+  CodeBlob* cb = CodeCache::find_blob_unsafe(begin);
   while (p < (unsigned char*) end) {
+    if (cb != NULL) {
+      cb->print_block_comment(st, (intptr_t)(p - cb->instructions_begin()));
+    }
+
     unsigned char* p0 = p;
-    st->print(INTPTR_FORMAT ": ", p);
+    st->print("  " INTPTR_FORMAT ": ", p);
     p = decode_instruction(p, &env);
     if (show_bytes) {
       st->print("\t\t\t");

--- a/hotspot/src/cpu/amd64/vm/icache_amd64.cpp	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/src/cpu/amd64/vm/icache_amd64.cpp	Fri May 25 00:49:14 2007 +0000
@@ -1,5 +1,5 @@
 #ifdef USE_PRAGMA_IDENT_SRC
-#pragma ident "@(#)icache_amd64.cpp	1.12 07/05/05 17:04:06 JVM"
+#pragma ident "@(#)icache_amd64.cpp	1.13 07/05/17 15:39:46 JVM"
 #endif
 /*
  * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
@@ -53,7 +53,7 @@
   __ bind(flush_line);
   __ clflush(Address(addr));
   __ addq(addr, ICache::line_size);
-  __ decl(lines);
+  __ decrementl(lines);
   __ jcc(Assembler::notZero, flush_line);
 
   __ mfence();

--- a/hotspot/src/cpu/amd64/vm/interp_masm_amd64.cpp	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/src/cpu/amd64/vm/interp_masm_amd64.cpp	Fri May 25 00:49:14 2007 +0000
@@ -1,5 +1,5 @@
 #ifdef USE_PRAGMA_IDENT_SRC
-#pragma ident "@(#)interp_masm_amd64.cpp	1.41 07/05/05 17:04:05 JVM"
+#pragma ident "@(#)interp_masm_amd64.cpp	1.42 07/05/17 15:39:48 JVM"
 #endif
 /*
  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
@@ -817,11 +817,7 @@
 
   bind(no_unlock);
 
-#ifdef JVMPI_SUPPORT
-  // jvmpi/jvmti support
-#else // !JVMPI_SUPPORT
   // jvmti support
-#endif // JVMPI_SUPPORT
   if (notify_jvmdi) {
     notify_method_exit(state, NotifyJVMTI);    // preserve TOSCA
   } else {
@@ -1573,31 +1569,6 @@
                                     InterpreterRuntime::post_method_entry));
     bind(L);
   }
-#ifdef JVMPI_SUPPORT
-  Label E;
-  Label S;
-  cmpl(Address((address) 
-        jvmpi::event_flags_array_at_addr(JVMPI_EVENT_METHOD_ENTRY),
-        relocInfo::none),
-      (int) JVMPI_EVENT_ENABLED);
-  jcc(Assembler::equal, S);
-  cmpl(Address((address) 
-        jvmpi::event_flags_array_at_addr(JVMPI_EVENT_METHOD_ENTRY2),
-        relocInfo::none),
-      (int) JVMPI_EVENT_ENABLED);
-  jcc(Assembler::notEqual, E);
-  bind(S);
-  // notify method entry
-  get_method(c_rarg1);
-  // get receiver
-  xorl(c_rarg2, c_rarg2);             // receiver = NULL for a static method
-  movl(rax, Address(c_rarg1, methodOopDesc::access_flags_offset()));
-  testl(rax, JVM_ACC_STATIC); // check if method is static
-  cmovq(Assembler::zero, c_rarg2, Address(r14));    // otherwise get receiver
-  call_VM(noreg, CAST_FROM_FN_PTR(address, 
-                   SharedRuntime::jvmpi_method_entry), c_rarg1, c_rarg2);
-  bind(E);
-#endif // JVMPI_SUPPORT
 
   {
     SkipIfEqual skip(this, &DTraceMethodProbes, false);
@@ -1629,23 +1600,6 @@
     pop(state);     
   }
 
-#ifdef JVMPI_SUPPORT
-  Label E;
-  cmpl(Address((address) 
-        jvmpi::event_flags_array_at_addr(JVMPI_EVENT_METHOD_EXIT),
-        relocInfo::none),
-      (int) JVMPI_EVENT_ENABLED);
-  jcc(Assembler::notEqual, E);
-
-  // notify method exit
-  push(state);
-  get_method(c_rarg1);
-  call_VM(noreg, 
-          CAST_FROM_FN_PTR(address, SharedRuntime::jvmpi_method_exit), c_rarg1);
-  pop(state);
-  bind(E);
-#endif // JVMPI_SUPPORT
-
   {
     SkipIfEqual skip(this, &DTraceMethodProbes, false);
     push(state);

--- a/hotspot/src/cpu/amd64/vm/interp_masm_amd64.hpp	Tue May 08 19:38:19 2007 +0000
+++ b/hotspot/src/cpu/amd64/vm/interp_masm_amd64.hpp	Fri May 25 00:49:14 2007 +0000
@@ -1,5 +1,5 @@
 #ifdef USE_PRAGMA_IDENT_HDR
-#pragma ident "@(#)interp_masm_amd64.hpp	1.20 07/05/05 17:04:07 JVM"
+#pragma ident "@(#)interp_masm_amd64.hpp	1.21 07/05/17 15:39:50 JVM"
 #endif
 /*
  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
@@ -243,11 +243,7 @@
 
   typedef enum { NotifyJVMTI, SkipNotifyJVMTI } NotifyMethodExitMode;
 
-#ifdef JVMPI_SUPPORT
-  // support for jvmpi/jvmti/dtrace
-#else // !JVMPI_SUPPORT
   // support for jvmti/dtrace
-#endif // JVMPI_SUPPORT
   void notify_method_entry();
   void notify_method_exit(TosState state, NotifyMethodExitMode mode);
 };