/hg/release/icedtea7-forest-2.4/hotspot: 18 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Feb 14 01:01:47 PST 2013
changeset 7a2cf85fc36e in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7a2cf85fc36e
author: katleman
date: Fri Jan 11 09:00:00 2013 -0800
Added tag jdk7u11-b20 for changeset 25a92b94ad53
changeset b6d58acbaf5d in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b6d58acbaf5d
author: katleman
date: Sat Jan 12 14:42:56 2013 -0800
Added tag jdk7u11-b21 for changeset 7a2cf85fc36e
changeset 6767490c06a8 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=6767490c06a8
author: asaha
date: Fri Oct 12 11:55:32 2012 -0700
8000822: Fork hs23.7 hsx from hs23.6 for jdk7u11 and reinitialize build number
Reviewed-by: jcoomes
changeset db7028c8a953 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=db7028c8a953
author: kamg
date: Thu Nov 08 17:45:05 2012 -0500
8001307: Modify ACC_SUPER behavior
Summary: Disallow non-virtual calls even when ACC_SUPER is absent.
Reviewed-by: kvn, acorn
changeset 4d418a1b8be0 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4d418a1b8be0
author: katleman
date: Tue Nov 13 16:57:41 2012 -0800
Added tag jdk7u11-b03 for changeset db7028c8a953
changeset c893d43c9fb1 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c893d43c9fb1
author: ewendeli
date: Thu Nov 15 14:43:04 2012 +0100
Merge
changeset 2c4f06bc409a in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2c4f06bc409a
author: ewendeli
date: Mon Nov 19 16:27:32 2012 +0100
Merge
changeset f71032f398a3 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f71032f398a3
author: cl
date: Tue Nov 20 18:12:20 2012 -0800
Added tag jdk7u11-b04 for changeset 4d418a1b8be0
changeset 8ecba09e66cd in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=8ecba09e66cd
author: cl
date: Tue Nov 20 18:31:39 2012 -0800
Added tag jdk7u11-b05 for changeset f71032f398a3
changeset 0cbce123c902 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0cbce123c902
author: ewendeli
date: Thu Nov 22 08:19:35 2012 +0100
Merge
changeset c217f85ffff8 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c217f85ffff8
author: katleman
date: Wed Nov 28 15:41:55 2012 -0800
Added tag jdk7u11-b06 for changeset 0cbce123c902
changeset 94bf1e3dafef in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=94bf1e3dafef
author: ewendeli
date: Fri Nov 30 04:55:51 2012 +0100
Merge
changeset c1962395e8f2 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c1962395e8f2
author: katleman
date: Tue Dec 04 10:39:17 2012 -0800
Added tag jdk7u11-b07 for changeset 94bf1e3dafef
changeset 2b543aa340e4 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2b543aa340e4
author: ewendeli
date: Thu Dec 06 17:42:30 2012 +0100
Merge
changeset ed328ec14835 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ed328ec14835
author: katleman
date: Tue Dec 11 12:14:01 2012 -0800
Added tag jdk7u11-b08 for changeset 2b543aa340e4
changeset 34a7b6dda06e in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=34a7b6dda06e
author: ewendeli
date: Mon Jan 14 18:32:56 2013 +0100
Merge
changeset e0e52e35e0c5 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e0e52e35e0c5
author: katleman
date: Tue Jan 15 18:57:18 2013 -0800
Added tag jdk7u13-b09 for changeset 34a7b6dda06e
changeset b1dcd2cd0948 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b1dcd2cd0948
author: andrew
date: Thu Feb 14 02:27:28 2013 +0000
Merge jdk7u13-b20
diffstat:
.hgtags | 97 +
agent/make/saenv.sh | 2 +-
agent/make/start-debug-server-proc.sh | 7 +-
agent/src/os/linux/LinuxDebuggerLocal.c | 8 +-
agent/src/os/linux/Makefile | 11 +-
agent/src/os/linux/libproc.h | 40 +-
agent/src/os/linux/ps_core.c | 2 +-
agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java | 10 +-
agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java | 11 +-
agent/src/share/classes/sun/jvm/hotspot/code/CodeBlob.java | 1 -
agent/src/share/classes/sun/jvm/hotspot/code/CodeCache.java | 5 -
agent/src/share/classes/sun/jvm/hotspot/code/RicochetBlob.java | 70 -
agent/src/share/classes/sun/jvm/hotspot/debugger/ThreadContext.java | 4 +
agent/src/share/classes/sun/jvm/hotspot/debugger/amd64/AMD64ThreadContext.java | 5 +
agent/src/share/classes/sun/jvm/hotspot/debugger/ia64/IA64ThreadContext.java | 5 +
agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java | 6 +-
agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java | 15 +-
agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java | 18 +-
agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java | 16 +-
agent/src/share/classes/sun/jvm/hotspot/debugger/sparc/SPARCThreadContext.java | 5 +
agent/src/share/classes/sun/jvm/hotspot/debugger/x86/X86ThreadContext.java | 5 +
agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSeq.java | 4 +-
agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSetBase.java | 4 +-
agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java | 5 +-
agent/src/share/classes/sun/jvm/hotspot/jdi/VirtualMachineImpl.java | 14 +-
agent/src/share/classes/sun/jvm/hotspot/oops/AccessFlags.java | 1 +
agent/src/share/classes/sun/jvm/hotspot/oops/ConstMethod.java | 92 +-
agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java | 7 +-
agent/src/share/classes/sun/jvm/hotspot/oops/ExceptionTableElement.java | 81 +
agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java | 42 +-
agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java | 75 +-
agent/src/share/classes/sun/jvm/hotspot/oops/Method.java | 18 +-
agent/src/share/classes/sun/jvm/hotspot/runtime/ClassConstants.java | 2 +
agent/src/share/classes/sun/jvm/hotspot/runtime/Frame.java | 16 +-
agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java | 12 +-
agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java | 21 +-
agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCFrame.java | 16 -
agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCRicochetFrame.java | 77 -
agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java | 11 -
agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86RicochetFrame.java | 81 -
agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java | 27 +-
agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java | 66 +-
agent/src/share/classes/sun/jvm/hotspot/utilities/AltPlatformInfo.java | 31 +
agent/src/share/classes/sun/jvm/hotspot/utilities/BasicHashtable.java | 4 +-
agent/src/share/classes/sun/jvm/hotspot/utilities/BasicHashtableEntry.java | 2 +-
agent/src/share/classes/sun/jvm/hotspot/utilities/Hashtable.java | 2 +-
agent/src/share/classes/sun/jvm/hotspot/utilities/HashtableBucket.java | 2 +-
agent/src/share/classes/sun/jvm/hotspot/utilities/HashtableEntry.java | 2 +-
agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java | 7 +
agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFrame.java | 3 +-
make/Makefile | 180 +-
make/bsd/Makefile | 2 +-
make/bsd/makefiles/buildtree.make | 13 +-
make/bsd/makefiles/defs.make | 30 +-
make/bsd/makefiles/dtrace.make | 8 +-
make/bsd/makefiles/gcc.make | 105 +-
make/bsd/makefiles/jvmg.make | 4 +-
make/bsd/makefiles/sparcWorks.make | 13 +-
make/bsd/makefiles/universal.gmk | 3 +-
make/bsd/makefiles/vm.make | 17 +-
make/bsd/makefiles/wb.make | 46 +
make/defs.make | 35 +
make/hotspot_version | 8 +-
make/jprt.properties | 95 +-
make/linux/Makefile | 2 +-
make/linux/makefiles/adlc.make | 10 +-
make/linux/makefiles/buildtree.make | 15 +-
make/linux/makefiles/defs.make | 178 +-
make/linux/makefiles/dtrace.make | 40 +-
make/linux/makefiles/gcc.make | 124 +-
make/linux/makefiles/jsig.make | 6 +-
make/linux/makefiles/jvmg.make | 6 +-
make/linux/makefiles/rules.make | 10 -
make/linux/makefiles/sa.make | 14 +-
make/linux/makefiles/saproc.make | 21 +-
make/linux/makefiles/sparcWorks.make | 13 +-
make/linux/makefiles/vm.make | 74 +-
make/linux/makefiles/wb.make | 46 +
make/linux/platform_zero.in | 2 +-
make/pic.make | 2 +-
make/solaris/makefiles/adlc.make | 6 +-
make/solaris/makefiles/buildtree.make | 11 +
make/solaris/makefiles/defs.make | 164 +-
make/solaris/makefiles/dtrace.make | 22 +-
make/solaris/makefiles/fastdebug.make | 5 +
make/solaris/makefiles/gcc.make | 18 +-
make/solaris/makefiles/jsig.make | 4 +
make/solaris/makefiles/jvmg.make | 3 +-
make/solaris/makefiles/optimized.make | 5 +
make/solaris/makefiles/product.make | 5 +
make/solaris/makefiles/rules.make | 10 -
make/solaris/makefiles/saproc.make | 4 +
make/solaris/makefiles/sparcWorks.make | 25 +-
make/solaris/makefiles/vm.make | 17 +-
make/solaris/makefiles/wb.make | 46 +
make/windows/build.make | 4 +
make/windows/create_obj_files.sh | 2 +
make/windows/makefiles/compile.make | 12 +
make/windows/makefiles/debug.make | 6 +-
make/windows/makefiles/defs.make | 119 +-
make/windows/makefiles/fastdebug.make | 3 +-
make/windows/makefiles/product.make | 3 +-
make/windows/makefiles/projectcreator.make | 70 +-
make/windows/makefiles/rules.make | 15 +-
make/windows/makefiles/sa.make | 50 +-
make/windows/makefiles/shared.make | 7 +-
make/windows/makefiles/vm.make | 15 +
make/windows/makefiles/wb.make | 54 +
make/windows/projectfiles/common/Makefile | 2 +-
src/cpu/sparc/vm/assembler_sparc.cpp | 201 +-
src/cpu/sparc/vm/assembler_sparc.hpp | 18 +-
src/cpu/sparc/vm/assembler_sparc.inline.hpp | 6 +-
src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp | 79 -
src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp | 36 +-
src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp | 93 +-
src/cpu/sparc/vm/cppInterpreter_sparc.cpp | 26 +-
src/cpu/sparc/vm/frame_sparc.cpp | 5 +-
src/cpu/sparc/vm/globals_sparc.hpp | 41 +-
src/cpu/sparc/vm/interp_masm_sparc.cpp | 29 +-
src/cpu/sparc/vm/interp_masm_sparc.hpp | 3 +-
src/cpu/sparc/vm/interpreterGenerator_sparc.hpp | 1 -
src/cpu/sparc/vm/interpreter_sparc.cpp | 19 +-
src/cpu/sparc/vm/methodHandles_sparc.cpp | 2559 +-----
src/cpu/sparc/vm/methodHandles_sparc.hpp | 188 +-
src/cpu/sparc/vm/sharedRuntime_sparc.cpp | 621 +-
src/cpu/sparc/vm/sparc.ad | 730 +-
src/cpu/sparc/vm/stubGenerator_sparc.cpp | 8 -
src/cpu/sparc/vm/templateInterpreter_sparc.cpp | 25 +-
src/cpu/sparc/vm/templateTable_sparc.cpp | 417 +-
src/cpu/sparc/vm/templateTable_sparc.hpp | 7 +
src/cpu/sparc/vm/vm_version_sparc.cpp | 19 +-
src/cpu/sparc/vm/vm_version_sparc.hpp | 17 +-
src/cpu/sparc/vm/vtableStubs_sparc.cpp | 10 +-
src/cpu/x86/vm/assembler_x86.cpp | 2303 +++-
src/cpu/x86/vm/assembler_x86.hpp | 354 +-
src/cpu/x86/vm/c1_CodeStubs_x86.cpp | 62 -
src/cpu/x86/vm/c1_LIRAssembler_x86.cpp | 53 +
src/cpu/x86/vm/c1_LIRGenerator_x86.cpp | 129 +-
src/cpu/x86/vm/c1_LinearScan_x86.cpp | 75 +-
src/cpu/x86/vm/c1_Runtime1_x86.cpp | 22 +-
src/cpu/x86/vm/c2_globals_x86.hpp | 2 +-
src/cpu/x86/vm/cppInterpreter_x86.cpp | 22 +-
src/cpu/x86/vm/frame_x86.cpp | 13 +-
src/cpu/x86/vm/globals_x86.hpp | 51 +-
src/cpu/x86/vm/interp_masm_x86_32.cpp | 6 +-
src/cpu/x86/vm/interp_masm_x86_32.hpp | 5 +-
src/cpu/x86/vm/interp_masm_x86_64.cpp | 6 +-
src/cpu/x86/vm/interp_masm_x86_64.hpp | 11 +-
src/cpu/x86/vm/interpreterGenerator_x86.hpp | 1 -
src/cpu/x86/vm/interpreter_x86_32.cpp | 25 +-
src/cpu/x86/vm/interpreter_x86_64.cpp | 21 +-
src/cpu/x86/vm/methodHandles_x86.cpp | 2644 +-----
src/cpu/x86/vm/methodHandles_x86.hpp | 266 +-
src/cpu/x86/vm/register_x86.cpp | 4 +-
src/cpu/x86/vm/register_x86.hpp | 6 +-
src/cpu/x86/vm/sharedRuntime_x86_32.cpp | 327 +-
src/cpu/x86/vm/sharedRuntime_x86_64.cpp | 449 +-
src/cpu/x86/vm/stubGenerator_x86_32.cpp | 561 +-
src/cpu/x86/vm/stubGenerator_x86_64.cpp | 609 +-
src/cpu/x86/vm/stubRoutines_x86_32.cpp | 1 +
src/cpu/x86/vm/stubRoutines_x86_32.hpp | 4 +
src/cpu/x86/vm/stubRoutines_x86_64.cpp | 2 +
src/cpu/x86/vm/stubRoutines_x86_64.hpp | 11 +
src/cpu/x86/vm/templateInterpreter_x86_32.cpp | 32 +-
src/cpu/x86/vm/templateInterpreter_x86_64.cpp | 42 +-
src/cpu/x86/vm/templateTable_x86_32.cpp | 339 +-
src/cpu/x86/vm/templateTable_x86_32.hpp | 9 +-
src/cpu/x86/vm/templateTable_x86_64.cpp | 272 +-
src/cpu/x86/vm/templateTable_x86_64.hpp | 7 +-
src/cpu/x86/vm/vm_version_x86.cpp | 93 +-
src/cpu/x86/vm/vm_version_x86.hpp | 10 +-
src/cpu/x86/vm/vmreg_x86.cpp | 7 +-
src/cpu/x86/vm/vmreg_x86.inline.hpp | 6 +-
src/cpu/x86/vm/vtableStubs_x86_32.cpp | 6 +-
src/cpu/x86/vm/vtableStubs_x86_64.cpp | 9 +-
src/cpu/x86/vm/x86.ad | 4205 +++++++++-
src/cpu/x86/vm/x86_32.ad | 1351 +--
src/cpu/x86/vm/x86_64.ad | 1001 +-
src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp | 13 +-
src/cpu/zero/vm/cppInterpreter_zero.cpp | 571 +-
src/cpu/zero/vm/cppInterpreter_zero.hpp | 2 -
src/cpu/zero/vm/frame_zero.cpp | 7 +-
src/cpu/zero/vm/frame_zero.inline.hpp | 2 +
src/cpu/zero/vm/globals_zero.hpp | 5 +-
src/cpu/zero/vm/interpreterGenerator_zero.hpp | 1 -
src/cpu/zero/vm/interpreter_zero.cpp | 8 -
src/cpu/zero/vm/methodHandles_zero.cpp | 165 +-
src/cpu/zero/vm/methodHandles_zero.hpp | 12 +-
src/cpu/zero/vm/register_zero.hpp | 3 +
src/cpu/zero/vm/sharedRuntime_zero.cpp | 37 +-
src/os/bsd/vm/decoder_machO.cpp | 133 +
src/os/bsd/vm/decoder_machO.hpp | 19 +-
src/os/bsd/vm/osThread_bsd.hpp | 51 +-
src/os/bsd/vm/os_bsd.cpp | 63 +-
src/os/bsd/vm/os_bsd.hpp | 8 +-
src/os/bsd/vm/os_bsd.inline.hpp | 2 +-
src/os/bsd/vm/perfMemory_bsd.cpp | 75 +-
src/os/linux/vm/osThread_linux.hpp | 17 +-
src/os/linux/vm/os_linux.cpp | 106 +-
src/os/linux/vm/os_linux.hpp | 8 +-
src/os/linux/vm/os_linux.inline.hpp | 2 +-
src/os/linux/vm/perfMemory_linux.cpp | 75 +-
src/os/linux/vm/vmError_linux.cpp | 2 +-
src/os/posix/launcher/launcher.script | 38 +-
src/os/posix/vm/os_posix.cpp | 69 +-
src/os/solaris/dtrace/generateJvmOffsets.cpp | 4 +-
src/os/solaris/dtrace/hs_private.d | 1 -
src/os/solaris/dtrace/jhelper.d | 8 +-
src/os/solaris/dtrace/libjvm_db.c | 6 +-
src/os/solaris/vm/attachListener_solaris.cpp | 4 +-
src/os/solaris/vm/dtraceJSDT_solaris.cpp | 44 +-
src/os/solaris/vm/osThread_solaris.hpp | 5 +-
src/os/solaris/vm/os_solaris.cpp | 100 +-
src/os/solaris/vm/os_solaris.hpp | 4 +-
src/os/solaris/vm/os_solaris.inline.hpp | 2 +-
src/os/solaris/vm/perfMemory_solaris.cpp | 75 +-
src/os/windows/vm/decoder_windows.cpp | 4 +-
src/os/windows/vm/decoder_windows.hpp | 4 +
src/os/windows/vm/jvm_windows.h | 2 +-
src/os/windows/vm/osThread_windows.hpp | 10 +-
src/os/windows/vm/os_windows.cpp | 232 +-
src/os/windows/vm/os_windows.hpp | 8 +-
src/os/windows/vm/perfMemory_windows.cpp | 118 +-
src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp | 13 +-
src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp | 10 +-
src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 13 +-
src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp | 11 +-
src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp | 14 +-
src/os_cpu/linux_sparc/vm/vmStructs_linux_sparc.hpp | 6 +-
src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 16 +-
src/os_cpu/linux_x86/vm/vmStructs_linux_x86.hpp | 6 +-
src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 13 +-
src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp | 21 +-
src/os_cpu/solaris_sparc/vm/vmStructs_solaris_sparc.hpp | 6 +-
src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp | 12 +-
src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp | 20 +-
src/os_cpu/solaris_x86/vm/solaris_x86_32.il | 6 +
src/os_cpu/solaris_x86/vm/solaris_x86_64.il | 6 +
src/os_cpu/solaris_x86/vm/vmStructs_solaris_x86.hpp | 6 +-
src/os_cpu/windows_x86/vm/os_windows_x86.cpp | 36 +-
src/os_cpu/windows_x86/vm/vmStructs_windows_x86.hpp | 5 +-
src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java | 26 +-
src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java | 57 +-
src/share/tools/ProjectCreator/BuildConfig.java | 189 +-
src/share/tools/ProjectCreator/DirectoryTree.java | 287 -
src/share/tools/ProjectCreator/DirectoryTreeNode.java | 36 -
src/share/tools/ProjectCreator/FileFormatException.java | 35 -
src/share/tools/ProjectCreator/FileTreeCreator.java | 72 +
src/share/tools/ProjectCreator/FileTreeCreatorVC10.java | 142 +
src/share/tools/ProjectCreator/FileTreeCreatorVC7.java | 156 +
src/share/tools/ProjectCreator/ProjectCreator.java | 135 +-
src/share/tools/ProjectCreator/Util.java | 13 +-
src/share/tools/ProjectCreator/WinGammaPlatform.java | 276 +-
src/share/tools/ProjectCreator/WinGammaPlatformVC10.java | 291 +-
src/share/tools/ProjectCreator/WinGammaPlatformVC6.java | 297 -
src/share/tools/ProjectCreator/WinGammaPlatformVC7.java | 988 +-
src/share/tools/whitebox/sun/hotspot/WhiteBox.java | 72 +
src/share/tools/whitebox/sun/hotspot/parser/DiagnosticCommand.java | 43 +
src/share/vm/adlc/adlparse.cpp | 50 +-
src/share/vm/adlc/archDesc.cpp | 69 +-
src/share/vm/adlc/archDesc.hpp | 13 +-
src/share/vm/adlc/dict2.cpp | 2 +-
src/share/vm/adlc/filebuff.hpp | 8 +-
src/share/vm/adlc/forms.cpp | 37 +-
src/share/vm/adlc/forms.hpp | 9 +-
src/share/vm/adlc/formsopt.cpp | 13 +-
src/share/vm/adlc/formssel.cpp | 253 +-
src/share/vm/adlc/formssel.hpp | 15 +-
src/share/vm/adlc/main.cpp | 39 +-
src/share/vm/adlc/output_c.cpp | 155 +-
src/share/vm/adlc/output_h.cpp | 163 +-
src/share/vm/asm/assembler.cpp | 10 +
src/share/vm/asm/assembler.hpp | 8 +-
src/share/vm/asm/codeBuffer.cpp | 48 +-
src/share/vm/asm/codeBuffer.hpp | 4 +-
src/share/vm/asm/register.hpp | 47 +-
src/share/vm/c1/c1_CFGPrinter.cpp | 4 +-
src/share/vm/c1/c1_Canonicalizer.cpp | 31 +-
src/share/vm/c1/c1_Canonicalizer.hpp | 2 +
src/share/vm/c1/c1_CodeStubs.hpp | 65 -
src/share/vm/c1/c1_Compilation.cpp | 30 +-
src/share/vm/c1/c1_Compilation.hpp | 3 +
src/share/vm/c1/c1_Compiler.cpp | 2 +-
src/share/vm/c1/c1_FrameMap.cpp | 1 -
src/share/vm/c1/c1_FrameMap.hpp | 4 +-
src/share/vm/c1/c1_GraphBuilder.cpp | 694 +-
src/share/vm/c1/c1_GraphBuilder.hpp | 18 +-
src/share/vm/c1/c1_Instruction.cpp | 9 +-
src/share/vm/c1/c1_Instruction.hpp | 77 +-
src/share/vm/c1/c1_InstructionPrinter.cpp | 22 +-
src/share/vm/c1/c1_InstructionPrinter.hpp | 2 +
src/share/vm/c1/c1_LIR.cpp | 69 +-
src/share/vm/c1/c1_LIR.hpp | 90 +-
src/share/vm/c1/c1_LIRAssembler.cpp | 15 +-
src/share/vm/c1/c1_LIRAssembler.hpp | 2 +
src/share/vm/c1/c1_LIRGenerator.cpp | 308 +-
src/share/vm/c1/c1_LIRGenerator.hpp | 12 +-
src/share/vm/c1/c1_LinearScan.cpp | 16 +-
src/share/vm/c1/c1_Optimizer.cpp | 34 +
src/share/vm/c1/c1_Runtime1.cpp | 17 +
src/share/vm/c1/c1_Runtime1.hpp | 1 +
src/share/vm/c1/c1_ValueMap.cpp | 10 +-
src/share/vm/c1/c1_ValueMap.hpp | 20 +-
src/share/vm/c1/c1_ValueStack.cpp | 1 +
src/share/vm/c1/c1_ValueStack.hpp | 4 +
src/share/vm/c1/c1_ValueType.cpp | 17 +
src/share/vm/c1/c1_ValueType.hpp | 10 +-
src/share/vm/c1/c1_globals.hpp | 11 +-
src/share/vm/ci/bcEscapeAnalyzer.cpp | 40 +-
src/share/vm/ci/ciClassList.hpp | 4 +
src/share/vm/ci/ciEnv.cpp | 163 +-
src/share/vm/ci/ciEnv.hpp | 6 +-
src/share/vm/ci/ciInstanceKlass.cpp | 45 +-
src/share/vm/ci/ciInstanceKlass.hpp | 26 +-
src/share/vm/ci/ciMemberName.cpp | 39 +
src/share/vm/ci/ciMemberName.hpp | 44 +
src/share/vm/ci/ciMethod.cpp | 101 +-
src/share/vm/ci/ciMethod.hpp | 27 +-
src/share/vm/ci/ciMethodHandle.cpp | 82 +-
src/share/vm/ci/ciMethodHandle.hpp | 47 +-
src/share/vm/ci/ciMethodType.hpp | 76 +
src/share/vm/ci/ciObject.hpp | 75 +-
src/share/vm/ci/ciObjectFactory.cpp | 8 +-
src/share/vm/ci/ciSignature.cpp | 19 +
src/share/vm/ci/ciSignature.hpp | 6 +-
src/share/vm/ci/ciStreams.cpp | 88 +-
src/share/vm/ci/ciStreams.hpp | 15 +-
src/share/vm/ci/ciSymbol.cpp | 4 +
src/share/vm/ci/ciSymbol.hpp | 2 +
src/share/vm/ci/ciTypeFlow.cpp | 22 +-
src/share/vm/classfile/classFileParser.cpp | 546 +-
src/share/vm/classfile/classFileParser.hpp | 122 +-
src/share/vm/classfile/classLoader.cpp | 40 +-
src/share/vm/classfile/classLoader.hpp | 8 +-
src/share/vm/classfile/dictionary.cpp | 20 +-
src/share/vm/classfile/dictionary.hpp | 38 +-
src/share/vm/classfile/javaAssertions.cpp | 2 +-
src/share/vm/classfile/javaAssertions.hpp | 2 +-
src/share/vm/classfile/javaClasses.cpp | 307 +-
src/share/vm/classfile/javaClasses.hpp | 230 +-
src/share/vm/classfile/loaderConstraints.cpp | 16 +-
src/share/vm/classfile/loaderConstraints.hpp | 14 +-
src/share/vm/classfile/placeholders.cpp | 6 +-
src/share/vm/classfile/placeholders.hpp | 16 +-
src/share/vm/classfile/resolutionErrors.cpp | 6 +-
src/share/vm/classfile/resolutionErrors.hpp | 15 +-
src/share/vm/classfile/stackMapFrame.cpp | 165 +-
src/share/vm/classfile/stackMapFrame.hpp | 100 +-
src/share/vm/classfile/stackMapTable.cpp | 58 +-
src/share/vm/classfile/stackMapTable.hpp | 10 +-
src/share/vm/classfile/stackMapTableFormat.hpp | 140 +-
src/share/vm/classfile/symbolTable.cpp | 128 +-
src/share/vm/classfile/symbolTable.hpp | 79 +-
src/share/vm/classfile/systemDictionary.cpp | 405 +-
src/share/vm/classfile/systemDictionary.hpp | 236 +-
src/share/vm/classfile/verificationType.cpp | 46 +-
src/share/vm/classfile/verificationType.hpp | 6 +-
src/share/vm/classfile/verifier.cpp | 808 +-
src/share/vm/classfile/verifier.hpp | 202 +-
src/share/vm/classfile/vmSymbols.cpp | 19 +-
src/share/vm/classfile/vmSymbols.hpp | 124 +-
src/share/vm/code/codeBlob.cpp | 45 +-
src/share/vm/code/codeBlob.hpp | 48 +-
src/share/vm/code/codeCache.cpp | 8 +-
src/share/vm/code/codeCache.hpp | 3 +
src/share/vm/code/debugInfoRec.cpp | 1 +
src/share/vm/code/dependencies.cpp | 49 +-
src/share/vm/code/icBuffer.hpp | 4 +-
src/share/vm/code/nmethod.cpp | 19 +-
src/share/vm/code/nmethod.hpp | 12 +-
src/share/vm/code/stubs.cpp | 13 +-
src/share/vm/code/stubs.hpp | 20 +-
src/share/vm/code/vmreg.cpp | 4 +-
src/share/vm/code/vmreg.hpp | 4 +
src/share/vm/code/vtableStubs.hpp | 3 +
src/share/vm/compiler/abstractCompiler.hpp | 2 +-
src/share/vm/compiler/compileBroker.cpp | 82 +-
src/share/vm/compiler/compileBroker.hpp | 12 +-
src/share/vm/compiler/compileLog.cpp | 53 +-
src/share/vm/compiler/compileLog.hpp | 12 +
src/share/vm/compiler/compilerOracle.cpp | 5 +-
src/share/vm/compiler/disassembler.cpp | 12 +-
src/share/vm/compiler/disassembler.hpp | 3 +-
src/share/vm/compiler/methodLiveness.cpp | 12 +-
src/share/vm/compiler/oopMap.cpp | 4 +-
src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.cpp | 1257 --
src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.hpp | 296 -
src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.cpp | 2 +-
src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.hpp | 4 +-
src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp | 379 +-
src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp | 32 +-
src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp | 139 +-
src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp | 24 +-
src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp | 60 -
src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp | 103 -
src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp | 3 +-
src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp | 24 +-
src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp | 360 -
src/share/vm/gc_implementation/concurrentMarkSweep/freeList.hpp | 335 -
src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp | 2 +-
src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.hpp | 18 +-
src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp | 8 +-
src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp | 22 +-
src/share/vm/gc_implementation/g1/collectionSetChooser.cpp | 264 +-
src/share/vm/gc_implementation/g1/collectionSetChooser.hpp | 183 +-
src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp | 38 +-
src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp | 2 +-
src/share/vm/gc_implementation/g1/concurrentMark.cpp | 1564 +---
src/share/vm/gc_implementation/g1/concurrentMark.hpp | 259 +-
src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp | 72 +-
src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp | 19 +-
src/share/vm/gc_implementation/g1/dirtyCardQueue.hpp | 2 +-
src/share/vm/gc_implementation/g1/g1AllocRegion.cpp | 6 +-
src/share/vm/gc_implementation/g1/g1AllocRegion.hpp | 6 +-
src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp | 40 +-
src/share/vm/gc_implementation/g1/g1BlockOffsetTable.hpp | 67 +-
src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp | 9 +-
src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp | 1127 +-
src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp | 470 +-
src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp | 77 +-
src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp | 1288 +--
src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp | 467 +-
src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp | 5 +-
src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp | 323 +
src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp | 321 +
src/share/vm/gc_implementation/g1/g1Log.cpp | 56 +
src/share/vm/gc_implementation/g1/g1Log.hpp | 56 +
src/share/vm/gc_implementation/g1/g1MMUTracker.hpp | 2 +-
src/share/vm/gc_implementation/g1/g1MarkSweep.cpp | 33 +-
src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp | 43 +-
src/share/vm/gc_implementation/g1/g1MonitoringSupport.hpp | 6 +-
src/share/vm/gc_implementation/g1/g1OopClosures.hpp | 22 +-
src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp | 31 +-
src/share/vm/gc_implementation/g1/g1RemSet.cpp | 123 +-
src/share/vm/gc_implementation/g1/g1RemSet.hpp | 2 +-
src/share/vm/gc_implementation/g1/g1_globals.hpp | 64 +-
src/share/vm/gc_implementation/g1/heapRegion.cpp | 82 +-
src/share/vm/gc_implementation/g1/heapRegion.hpp | 87 +-
src/share/vm/gc_implementation/g1/heapRegion.inline.hpp | 1 -
src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp | 831 +-
src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp | 90 +-
src/share/vm/gc_implementation/g1/heapRegionSeq.cpp | 89 +-
src/share/vm/gc_implementation/g1/heapRegionSeq.hpp | 38 +-
src/share/vm/gc_implementation/g1/heapRegionSeq.inline.hpp | 10 +-
src/share/vm/gc_implementation/g1/heapRegionSet.cpp | 63 +-
src/share/vm/gc_implementation/g1/heapRegionSet.hpp | 22 +-
src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp | 19 +-
src/share/vm/gc_implementation/g1/ptrQueue.cpp | 4 +-
src/share/vm/gc_implementation/g1/satbQueue.cpp | 2 +-
src/share/vm/gc_implementation/g1/sparsePRT.cpp | 15 +-
src/share/vm/gc_implementation/g1/sparsePRT.hpp | 4 +-
src/share/vm/gc_implementation/g1/survRateGroup.cpp | 14 +-
src/share/vm/gc_implementation/g1/survRateGroup.hpp | 2 +-
src/share/vm/gc_implementation/g1/vmStructs_g1.hpp | 6 +-
src/share/vm/gc_implementation/g1/vm_operations_g1.cpp | 28 +-
src/share/vm/gc_implementation/g1/vm_operations_g1.hpp | 2 +-
src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp | 4 +-
src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp | 344 -
src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp | 249 -
src/share/vm/gc_implementation/parNew/parNewGeneration.cpp | 30 +-
src/share/vm/gc_implementation/parNew/parNewGeneration.hpp | 14 +-
src/share/vm/gc_implementation/parNew/parOopClosures.hpp | 2 +-
src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.hpp | 2 +-
src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp | 2 +-
src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp | 22 +-
src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.hpp | 6 +-
src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp | 4 +-
src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp | 2 +-
src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp | 6 +
src/share/vm/gc_implementation/parallelScavenge/objectStartArray.hpp | 2 +-
src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp | 4 +
src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp | 2 +-
src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp | 11 +-
src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp | 2 +-
src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp | 6 +-
src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp | 18 +-
src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp | 2 +-
src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp | 14 +-
src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp | 2 +-
src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp | 6 +-
src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp | 6 +-
src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp | 29 +-
src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp | 2 +-
src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp | 2 +-
src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp | 2 +-
src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp | 4 +-
src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp | 1 +
src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp | 10 +-
src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp | 4 +-
src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.hpp | 2 +-
src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp | 10 +-
src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp | 6 +-
src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp | 2 +-
src/share/vm/gc_implementation/shared/allocationStats.hpp | 90 +-
src/share/vm/gc_implementation/shared/cSpaceCounters.cpp | 2 +-
src/share/vm/gc_implementation/shared/cSpaceCounters.hpp | 4 +-
src/share/vm/gc_implementation/shared/collectorCounters.cpp | 2 +-
src/share/vm/gc_implementation/shared/collectorCounters.hpp | 4 +-
src/share/vm/gc_implementation/shared/gSpaceCounters.cpp | 2 +-
src/share/vm/gc_implementation/shared/gSpaceCounters.hpp | 4 +-
src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp | 2 +-
src/share/vm/gc_implementation/shared/gcStats.hpp | 2 +-
src/share/vm/gc_implementation/shared/gcUtil.hpp | 6 +-
src/share/vm/gc_implementation/shared/generationCounters.cpp | 2 +-
src/share/vm/gc_implementation/shared/generationCounters.hpp | 4 +-
src/share/vm/gc_implementation/shared/hSpaceCounters.cpp | 2 +-
src/share/vm/gc_implementation/shared/hSpaceCounters.hpp | 4 +-
src/share/vm/gc_implementation/shared/immutableSpace.cpp | 4 +-
src/share/vm/gc_implementation/shared/immutableSpace.hpp | 6 +-
src/share/vm/gc_implementation/shared/markSweep.cpp | 14 +-
src/share/vm/gc_implementation/shared/markSweep.hpp | 12 +-
src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp | 10 +-
src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp | 6 +-
src/share/vm/gc_implementation/shared/mutableSpace.cpp | 4 +-
src/share/vm/gc_implementation/shared/mutableSpace.hpp | 4 +-
src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp | 349 +
src/share/vm/gc_implementation/shared/parGCAllocBuffer.hpp | 264 +
src/share/vm/gc_implementation/shared/spaceCounters.cpp | 2 +-
src/share/vm/gc_implementation/shared/spaceCounters.hpp | 4 +-
src/share/vm/gc_implementation/shared/spaceDecorator.hpp | 2 +-
src/share/vm/gc_interface/collectedHeap.cpp | 7 +-
src/share/vm/gc_interface/collectedHeap.hpp | 23 +-
src/share/vm/gc_interface/collectedHeap.inline.hpp | 35 +-
src/share/vm/gc_interface/gcCause.hpp | 32 +
src/share/vm/interpreter/abstractInterpreter.hpp | 19 +-
src/share/vm/interpreter/bytecode.cpp | 40 +-
src/share/vm/interpreter/bytecode.hpp | 28 +-
src/share/vm/interpreter/bytecodeInterpreter.cpp | 98 +-
src/share/vm/interpreter/bytecodeInterpreter.hpp | 5 +-
src/share/vm/interpreter/bytecodes.cpp | 2 +
src/share/vm/interpreter/bytecodes.hpp | 9 +-
src/share/vm/interpreter/cppInterpreter.cpp | 6 +-
src/share/vm/interpreter/interpreter.cpp | 48 +-
src/share/vm/interpreter/interpreter.hpp | 6 +-
src/share/vm/interpreter/interpreterRuntime.cpp | 148 +-
src/share/vm/interpreter/interpreterRuntime.hpp | 3 +
src/share/vm/interpreter/linkResolver.cpp | 314 +-
src/share/vm/interpreter/linkResolver.hpp | 28 +-
src/share/vm/interpreter/oopMapCache.cpp | 12 +-
src/share/vm/interpreter/oopMapCache.hpp | 2 +-
src/share/vm/interpreter/rewriter.cpp | 83 +-
src/share/vm/interpreter/rewriter.hpp | 3 +-
src/share/vm/interpreter/templateInterpreter.cpp | 5 +-
src/share/vm/interpreter/templateTable.cpp | 4 +-
src/share/vm/interpreter/templateTable.hpp | 3 +-
src/share/vm/libadt/set.cpp | 6 +-
src/share/vm/libadt/vectset.cpp | 2 +-
src/share/vm/memory/allocation.cpp | 119 +-
src/share/vm/memory/allocation.hpp | 138 +-
src/share/vm/memory/allocation.inline.hpp | 55 +-
src/share/vm/memory/barrierSet.hpp | 2 +-
src/share/vm/memory/binaryTreeDictionary.cpp | 1346 +++
src/share/vm/memory/binaryTreeDictionary.hpp | 334 +
src/share/vm/memory/blockOffsetTable.cpp | 4 +
src/share/vm/memory/blockOffsetTable.hpp | 4 +-
src/share/vm/memory/cardTableModRefBS.cpp | 13 +-
src/share/vm/memory/cardTableModRefBS.hpp | 5 +-
src/share/vm/memory/cardTableRS.cpp | 17 +-
src/share/vm/memory/cardTableRS.hpp | 8 +-
src/share/vm/memory/collectorPolicy.cpp | 2 +-
src/share/vm/memory/collectorPolicy.hpp | 2 +-
src/share/vm/memory/compactingPermGenGen.cpp | 8 +-
src/share/vm/memory/compactingPermGenGen.hpp | 4 +-
src/share/vm/memory/defNewGeneration.cpp | 10 +-
src/share/vm/memory/defNewGeneration.hpp | 10 +-
src/share/vm/memory/dump.cpp | 30 +-
src/share/vm/memory/filemap.cpp | 9 +-
src/share/vm/memory/filemap.hpp | 2 +-
src/share/vm/memory/freeBlockDictionary.cpp | 68 +
src/share/vm/memory/freeBlockDictionary.hpp | 102 +
src/share/vm/memory/freeList.cpp | 370 +
src/share/vm/memory/freeList.hpp | 329 +
src/share/vm/memory/genCollectedHeap.cpp | 35 +-
src/share/vm/memory/genCollectedHeap.hpp | 4 +-
src/share/vm/memory/genMarkSweep.cpp | 26 +-
src/share/vm/memory/genOopClosures.hpp | 8 +-
src/share/vm/memory/genRemSet.hpp | 2 +-
src/share/vm/memory/generation.cpp | 6 +-
src/share/vm/memory/generation.hpp | 8 +-
src/share/vm/memory/generationSpec.cpp | 6 +-
src/share/vm/memory/generationSpec.hpp | 4 +-
src/share/vm/memory/heap.cpp | 5 +-
src/share/vm/memory/heap.hpp | 2 +-
src/share/vm/memory/heapInspection.cpp | 6 +-
src/share/vm/memory/heapInspection.hpp | 4 +-
src/share/vm/memory/memRegion.hpp | 4 +-
src/share/vm/memory/oopFactory.cpp | 17 +-
src/share/vm/memory/oopFactory.hpp | 8 +-
src/share/vm/memory/permGen.hpp | 2 +-
src/share/vm/memory/referencePolicy.hpp | 2 +-
src/share/vm/memory/referenceProcessor.cpp | 3 +-
src/share/vm/memory/referenceProcessor.hpp | 2 +-
src/share/vm/memory/resourceArea.hpp | 43 +-
src/share/vm/memory/restore.cpp | 8 +-
src/share/vm/memory/space.cpp | 47 +-
src/share/vm/memory/space.hpp | 21 +-
src/share/vm/memory/space.inline.hpp | 13 -
src/share/vm/memory/tenuredGeneration.cpp | 6 +-
src/share/vm/memory/threadLocalAllocBuffer.cpp | 2 +-
src/share/vm/memory/threadLocalAllocBuffer.hpp | 4 +-
src/share/vm/memory/universe.cpp | 10 +-
src/share/vm/memory/universe.hpp | 16 +-
src/share/vm/oops/constMethodKlass.cpp | 59 +-
src/share/vm/oops/constMethodKlass.hpp | 3 +-
src/share/vm/oops/constMethodOop.cpp | 52 +-
src/share/vm/oops/constMethodOop.hpp | 70 +-
src/share/vm/oops/constantPoolOop.cpp | 101 +-
src/share/vm/oops/constantPoolOop.hpp | 35 +-
src/share/vm/oops/cpCacheOop.cpp | 362 +-
src/share/vm/oops/cpCacheOop.hpp | 279 +-
src/share/vm/oops/fieldInfo.hpp | 18 +-
src/share/vm/oops/fieldStreams.hpp | 74 +-
src/share/vm/oops/generateOopMap.cpp | 38 +-
src/share/vm/oops/instanceKlass.cpp | 184 +-
src/share/vm/oops/instanceKlass.hpp | 317 +-
src/share/vm/oops/instanceKlassKlass.cpp | 100 +-
src/share/vm/oops/instanceKlassKlass.hpp | 4 +-
src/share/vm/oops/instanceRefKlass.cpp | 39 +-
src/share/vm/oops/klass.cpp | 15 +-
src/share/vm/oops/klass.hpp | 8 +-
src/share/vm/oops/methodKlass.cpp | 29 +-
src/share/vm/oops/methodOop.cpp | 324 +-
src/share/vm/oops/methodOop.hpp | 162 +-
src/share/vm/oops/objArrayKlass.cpp | 7 -
src/share/vm/oops/objArrayKlass.hpp | 4 +-
src/share/vm/oops/objArrayKlassKlass.cpp | 4 +-
src/share/vm/oops/oop.cpp | 12 +-
src/share/vm/oops/oop.hpp | 4 +-
src/share/vm/oops/symbol.cpp | 44 +-
src/share/vm/oops/symbol.hpp | 50 +-
src/share/vm/oops/typeArrayKlass.cpp | 2 +-
src/share/vm/opto/addnode.cpp | 62 +-
src/share/vm/opto/block.cpp | 6 +-
src/share/vm/opto/bytecodeInfo.cpp | 123 +-
src/share/vm/opto/c2_globals.hpp | 148 +-
src/share/vm/opto/callGenerator.cpp | 401 +-
src/share/vm/opto/callGenerator.hpp | 27 +-
src/share/vm/opto/callnode.cpp | 46 +-
src/share/vm/opto/callnode.hpp | 29 +-
src/share/vm/opto/cfgnode.cpp | 56 +-
src/share/vm/opto/chaitin.cpp | 232 +-
src/share/vm/opto/chaitin.hpp | 19 +-
src/share/vm/opto/classes.hpp | 84 +-
src/share/vm/opto/compile.cpp | 81 +-
src/share/vm/opto/compile.hpp | 5 +-
src/share/vm/opto/connode.cpp | 68 +-
src/share/vm/opto/connode.hpp | 12 +-
src/share/vm/opto/divnode.cpp | 168 +-
src/share/vm/opto/doCall.cpp | 229 +-
src/share/vm/opto/domgraph.cpp | 8 +-
src/share/vm/opto/escape.cpp | 4248 +++++----
src/share/vm/opto/escape.hpp | 550 +-
src/share/vm/opto/generateOptoStub.cpp | 80 +-
src/share/vm/opto/graphKit.cpp | 277 +-
src/share/vm/opto/graphKit.hpp | 51 +-
src/share/vm/opto/idealGraphPrinter.cpp | 12 +-
src/share/vm/opto/idealKit.cpp | 28 +-
src/share/vm/opto/idealKit.hpp | 34 +-
src/share/vm/opto/ifg.cpp | 31 +-
src/share/vm/opto/ifnode.cpp | 68 +-
src/share/vm/opto/lcm.cpp | 14 +-
src/share/vm/opto/library_call.cpp | 1569 ++-
src/share/vm/opto/loopPredicate.cpp | 36 +-
src/share/vm/opto/loopTransform.cpp | 182 +-
src/share/vm/opto/loopUnswitch.cpp | 35 +-
src/share/vm/opto/loopnode.cpp | 225 +-
src/share/vm/opto/loopnode.hpp | 2 +
src/share/vm/opto/loopopts.cpp | 149 +-
src/share/vm/opto/machnode.cpp | 6 +-
src/share/vm/opto/machnode.hpp | 7 +-
src/share/vm/opto/macro.cpp | 258 +-
src/share/vm/opto/macro.hpp | 2 +-
src/share/vm/opto/matcher.cpp | 139 +-
src/share/vm/opto/matcher.hpp | 18 +-
src/share/vm/opto/memnode.cpp | 156 +-
src/share/vm/opto/memnode.hpp | 117 +-
src/share/vm/opto/mulnode.cpp | 155 +-
src/share/vm/opto/mulnode.hpp | 6 +-
src/share/vm/opto/node.cpp | 21 +-
src/share/vm/opto/node.hpp | 37 +-
src/share/vm/opto/opcodes.cpp | 6 +-
src/share/vm/opto/opcodes.hpp | 6 +-
src/share/vm/opto/output.cpp | 10 +-
src/share/vm/opto/parse.hpp | 5 +-
src/share/vm/opto/parse1.cpp | 83 +-
src/share/vm/opto/parse2.cpp | 274 +-
src/share/vm/opto/parse3.cpp | 4 +-
src/share/vm/opto/parseHelper.cpp | 24 +-
src/share/vm/opto/phase.cpp | 13 +-
src/share/vm/opto/phase.hpp | 9 +-
src/share/vm/opto/phaseX.cpp | 109 +-
src/share/vm/opto/phaseX.hpp | 30 +-
src/share/vm/opto/postaloc.cpp | 85 +-
src/share/vm/opto/reg_split.cpp | 68 +-
src/share/vm/opto/regmask.cpp | 165 +-
src/share/vm/opto/regmask.hpp | 61 +-
src/share/vm/opto/runtime.cpp | 86 +-
src/share/vm/opto/runtime.hpp | 9 +-
src/share/vm/opto/split_if.cpp | 14 +-
src/share/vm/opto/stringopts.cpp | 62 +-
src/share/vm/opto/subnode.cpp | 188 +-
src/share/vm/opto/subnode.hpp | 1 +
src/share/vm/opto/superword.cpp | 817 +-
src/share/vm/opto/superword.hpp | 23 +-
src/share/vm/opto/type.cpp | 153 +-
src/share/vm/opto/type.hpp | 85 +-
src/share/vm/opto/vectornode.cpp | 625 +-
src/share/vm/opto/vectornode.hpp | 1085 +-
src/share/vm/precompiled/precompiled.hpp | 7 +-
src/share/vm/prims/jni.cpp | 26 +-
src/share/vm/prims/jniCheck.cpp | 6 +-
src/share/vm/prims/jvm.cpp | 58 +-
src/share/vm/prims/jvm.h | 2 +-
src/share/vm/prims/jvmtiClassFileReconstituter.cpp | 59 +-
src/share/vm/prims/jvmtiClassFileReconstituter.hpp | 4 +-
src/share/vm/prims/jvmtiCodeBlobEvents.cpp | 4 +-
src/share/vm/prims/jvmtiEnv.cpp | 20 +-
src/share/vm/prims/jvmtiEnvBase.cpp | 4 +-
src/share/vm/prims/jvmtiEnvBase.hpp | 6 +-
src/share/vm/prims/jvmtiEnvThreadState.cpp | 2 +-
src/share/vm/prims/jvmtiEnvThreadState.hpp | 4 +-
src/share/vm/prims/jvmtiExport.cpp | 8 +-
src/share/vm/prims/jvmtiExport.hpp | 2 +-
src/share/vm/prims/jvmtiExtensions.cpp | 4 +-
src/share/vm/prims/jvmtiGetLoadedClasses.cpp | 2 +-
src/share/vm/prims/jvmtiImpl.cpp | 8 +-
src/share/vm/prims/jvmtiImpl.hpp | 8 +-
src/share/vm/prims/jvmtiRawMonitor.cpp | 4 +-
src/share/vm/prims/jvmtiRedefineClasses.cpp | 93 +-
src/share/vm/prims/jvmtiTagMap.cpp | 40 +-
src/share/vm/prims/jvmtiTagMap.hpp | 2 +-
src/share/vm/prims/jvmtiThreadState.hpp | 2 +-
src/share/vm/prims/jvmtiUtil.cpp | 2 +-
src/share/vm/prims/methodHandleWalk.cpp | 2089 ----
src/share/vm/prims/methodHandleWalk.hpp | 486 -
src/share/vm/prims/methodHandles.cpp | 3287 +------
src/share/vm/prims/methodHandles.hpp | 833 +-
src/share/vm/prims/nativeLookup.cpp | 9 +-
src/share/vm/prims/unsafe.cpp | 92 +-
src/share/vm/prims/wbtestmethods/parserTests.cpp | 148 +
src/share/vm/prims/wbtestmethods/parserTests.hpp | 32 +
src/share/vm/prims/whitebox.cpp | 165 +
src/share/vm/prims/whitebox.hpp | 53 +
src/share/vm/runtime/advancedThresholdPolicy.cpp | 6 +-
src/share/vm/runtime/arguments.cpp | 134 +-
src/share/vm/runtime/arguments.hpp | 16 +-
src/share/vm/runtime/biasedLocking.cpp | 4 +-
src/share/vm/runtime/compilationPolicy.cpp | 32 +-
src/share/vm/runtime/compilationPolicy.hpp | 2 +-
src/share/vm/runtime/deoptimization.cpp | 21 +-
src/share/vm/runtime/deoptimization.hpp | 2 +-
src/share/vm/runtime/dtraceJSDT.hpp | 6 +-
src/share/vm/runtime/fieldDescriptor.cpp | 19 +
src/share/vm/runtime/fieldDescriptor.hpp | 4 +-
src/share/vm/runtime/fprofiler.cpp | 20 +-
src/share/vm/runtime/fprofiler.hpp | 2 +-
src/share/vm/runtime/frame.cpp | 28 +-
src/share/vm/runtime/frame.hpp | 4 +-
src/share/vm/runtime/globals.cpp | 39 +-
src/share/vm/runtime/globals.hpp | 344 +-
src/share/vm/runtime/globals_extension.hpp | 32 +-
src/share/vm/runtime/handles.cpp | 9 +-
src/share/vm/runtime/handles.hpp | 4 +-
src/share/vm/runtime/handles.inline.hpp | 7 +-
src/share/vm/runtime/interfaceSupport.hpp | 3 +
src/share/vm/runtime/java.cpp | 25 +-
src/share/vm/runtime/java.hpp | 24 +
src/share/vm/runtime/jniHandles.hpp | 2 +-
src/share/vm/runtime/monitorChunk.cpp | 2 +-
src/share/vm/runtime/monitorChunk.hpp | 2 +-
src/share/vm/runtime/mutex.hpp | 2 +-
src/share/vm/runtime/mutexLocker.cpp | 2 +
src/share/vm/runtime/mutexLocker.hpp | 1 +
src/share/vm/runtime/os.cpp | 170 +-
src/share/vm/runtime/os.hpp | 46 +-
src/share/vm/runtime/osThread.hpp | 21 +-
src/share/vm/runtime/park.cpp | 2 +-
src/share/vm/runtime/perfData.cpp | 12 +-
src/share/vm/runtime/perfData.hpp | 6 +-
src/share/vm/runtime/perfMemory.cpp | 8 +-
src/share/vm/runtime/reflection.cpp | 19 +-
src/share/vm/runtime/reflectionUtils.cpp | 2 +-
src/share/vm/runtime/relocator.cpp | 35 +-
src/share/vm/runtime/safepoint.cpp | 7 +-
src/share/vm/runtime/safepoint.hpp | 2 +-
src/share/vm/runtime/sharedRuntime.cpp | 392 +-
src/share/vm/runtime/sharedRuntime.hpp | 77 +-
src/share/vm/runtime/signature.hpp | 2 +
src/share/vm/runtime/simpleThresholdPolicy.cpp | 33 +-
src/share/vm/runtime/stubCodeGenerator.hpp | 2 +-
src/share/vm/runtime/stubRoutines.cpp | 5 +-
src/share/vm/runtime/stubRoutines.hpp | 15 +-
src/share/vm/runtime/sweeper.cpp | 2 +-
src/share/vm/runtime/task.cpp | 73 +-
src/share/vm/runtime/task.hpp | 45 +-
src/share/vm/runtime/thread.cpp | 300 +-
src/share/vm/runtime/thread.hpp | 38 +-
src/share/vm/runtime/timer.cpp | 15 +-
src/share/vm/runtime/unhandledOops.cpp | 2 +-
src/share/vm/runtime/vframe.cpp | 5 +-
src/share/vm/runtime/vframeArray.cpp | 48 +-
src/share/vm/runtime/vframeArray.hpp | 2 +-
src/share/vm/runtime/vframe_hp.cpp | 4 +-
src/share/vm/runtime/vframe_hp.hpp | 4 +-
src/share/vm/runtime/virtualspace.cpp | 25 +-
src/share/vm/runtime/vmStructs.cpp | 194 +-
src/share/vm/runtime/vmThread.cpp | 4 +-
src/share/vm/runtime/vmThread.hpp | 2 +-
src/share/vm/runtime/vm_operations.hpp | 2 +-
src/share/vm/runtime/vm_version.cpp | 18 +-
src/share/vm/runtime/vm_version.hpp | 11 +
src/share/vm/services/attachListener.cpp | 4 +-
src/share/vm/services/attachListener.hpp | 2 +-
src/share/vm/services/diagnosticArgument.cpp | 45 +-
src/share/vm/services/diagnosticArgument.hpp | 17 +-
src/share/vm/services/diagnosticCommand.hpp | 12 +-
src/share/vm/services/diagnosticFramework.cpp | 35 +-
src/share/vm/services/diagnosticFramework.hpp | 16 +-
src/share/vm/services/gcNotifier.cpp | 6 +-
src/share/vm/services/gcNotifier.hpp | 2 +-
src/share/vm/services/heapDumper.cpp | 15 +-
src/share/vm/services/lowMemoryDetector.hpp | 4 +-
src/share/vm/services/management.cpp | 46 +-
src/share/vm/services/memBaseline.cpp | 468 +
src/share/vm/services/memBaseline.hpp | 446 +
src/share/vm/services/memPtr.cpp | 42 +
src/share/vm/services/memPtr.hpp | 511 +
src/share/vm/services/memPtrArray.hpp | 306 +
src/share/vm/services/memRecorder.cpp | 165 +
src/share/vm/services/memRecorder.hpp | 268 +
src/share/vm/services/memReporter.cpp | 614 +
src/share/vm/services/memReporter.hpp | 281 +
src/share/vm/services/memSnapshot.cpp | 728 +
src/share/vm/services/memSnapshot.hpp | 404 +
src/share/vm/services/memTrackWorker.cpp | 204 +
src/share/vm/services/memTrackWorker.hpp | 74 +
src/share/vm/services/memTracker.cpp | 631 +
src/share/vm/services/memTracker.hpp | 417 +
src/share/vm/services/memoryManager.cpp | 12 +-
src/share/vm/services/memoryManager.hpp | 2 +-
src/share/vm/services/memoryPool.hpp | 2 +-
src/share/vm/services/memoryService.cpp | 4 +-
src/share/vm/services/nmtDCmd.cpp | 175 +
src/share/vm/services/nmtDCmd.hpp | 60 +
src/share/vm/services/threadService.cpp | 10 +-
src/share/vm/services/threadService.hpp | 12 +-
src/share/vm/shark/sharkCompiler.cpp | 4 +-
src/share/vm/trace/traceMacros.hpp | 6 +-
src/share/vm/utilities/accessFlags.hpp | 32 +-
src/share/vm/utilities/array.cpp | 10 +-
src/share/vm/utilities/array.hpp | 4 +-
src/share/vm/utilities/bitMap.cpp | 68 +-
src/share/vm/utilities/bitMap.hpp | 29 +-
src/share/vm/utilities/debug.cpp | 9 +-
src/share/vm/utilities/debug.hpp | 27 +-
src/share/vm/utilities/decoder.cpp | 12 +
src/share/vm/utilities/decoder.hpp | 9 +-
src/share/vm/utilities/decoder_elf.hpp | 4 +
src/share/vm/utilities/dtrace.hpp | 51 +-
src/share/vm/utilities/elfFile.cpp | 2 +-
src/share/vm/utilities/elfFile.hpp | 2 +-
src/share/vm/utilities/elfStringTable.cpp | 2 +-
src/share/vm/utilities/elfStringTable.hpp | 2 +-
src/share/vm/utilities/elfSymbolTable.cpp | 2 +-
src/share/vm/utilities/elfSymbolTable.hpp | 2 +-
src/share/vm/utilities/events.hpp | 2 +-
src/share/vm/utilities/exceptions.cpp | 146 +-
src/share/vm/utilities/exceptions.hpp | 54 +-
src/share/vm/utilities/globalDefinitions.hpp | 24 +-
src/share/vm/utilities/growableArray.cpp | 2 +-
src/share/vm/utilities/growableArray.hpp | 37 +-
src/share/vm/utilities/hashtable.cpp | 121 +-
src/share/vm/utilities/hashtable.hpp | 82 +-
src/share/vm/utilities/hashtable.inline.hpp | 25 +-
src/share/vm/utilities/histogram.cpp | 2 +-
src/share/vm/utilities/histogram.hpp | 4 +-
src/share/vm/utilities/intHisto.cpp | 2 +-
src/share/vm/utilities/intHisto.hpp | 2 +-
src/share/vm/utilities/macros.hpp | 16 +
src/share/vm/utilities/numberSeq.cpp | 22 +-
src/share/vm/utilities/numberSeq.hpp | 5 +-
src/share/vm/utilities/ostream.cpp | 80 +-
src/share/vm/utilities/ostream.hpp | 20 +-
src/share/vm/utilities/stack.hpp | 33 +-
src/share/vm/utilities/stack.inline.hpp | 158 +-
src/share/vm/utilities/taskqueue.hpp | 148 +-
src/share/vm/utilities/vmError.cpp | 28 +-
src/share/vm/utilities/workgroup.cpp | 7 +-
src/share/vm/utilities/workgroup.hpp | 4 +-
src/share/vm/utilities/xmlstream.cpp | 8 +-
test/Makefile | 31 +-
test/compiler/6340864/TestByteVect.java | 1487 +++
test/compiler/6340864/TestDoubleVect.java | 560 +
test/compiler/6340864/TestFloatVect.java | 560 +
test/compiler/6340864/TestIntVect.java | 1225 ++
test/compiler/6340864/TestLongVect.java | 1129 ++
test/compiler/6340864/TestShortVect.java | 1340 +++
test/compiler/6894807/Test6894807.sh | 19 +-
test/compiler/7119644/TestBooleanVect.java | 952 ++
test/compiler/7119644/TestByteDoubleVect.java | 571 +
test/compiler/7119644/TestByteFloatVect.java | 571 +
test/compiler/7119644/TestByteIntVect.java | 571 +
test/compiler/7119644/TestByteLongVect.java | 571 +
test/compiler/7119644/TestByteShortVect.java | 571 +
test/compiler/7119644/TestByteVect.java | 953 ++
test/compiler/7119644/TestCharShortVect.java | 571 +
test/compiler/7119644/TestCharVect.java | 953 ++
test/compiler/7119644/TestDoubleVect.java | 953 ++
test/compiler/7119644/TestFloatDoubleVect.java | 571 +
test/compiler/7119644/TestFloatVect.java | 953 ++
test/compiler/7119644/TestIntDoubleVect.java | 571 +
test/compiler/7119644/TestIntFloatVect.java | 571 +
test/compiler/7119644/TestIntLongVect.java | 571 +
test/compiler/7119644/TestIntVect.java | 953 ++
test/compiler/7119644/TestLongDoubleVect.java | 571 +
test/compiler/7119644/TestLongFloatVect.java | 571 +
test/compiler/7119644/TestLongVect.java | 953 ++
test/compiler/7119644/TestShortDoubleVect.java | 571 +
test/compiler/7119644/TestShortFloatVect.java | 571 +
test/compiler/7119644/TestShortIntVect.java | 571 +
test/compiler/7119644/TestShortLongVect.java | 571 +
test/compiler/7119644/TestShortVect.java | 953 ++
test/compiler/7160610/Test7160610.java | 71 +
test/compiler/7177917/Test7177917.java | 142 +
test/compiler/7184394/TestAESBase.java | 154 +
test/compiler/7184394/TestAESDecode.java | 57 +
test/compiler/7184394/TestAESEncode.java | 57 +
test/compiler/7184394/TestAESMain.java | 57 +
test/compiler/7190310/Test7190310.java | 78 +
test/compiler/7190310/Test7190310_unsafe.java | 142 +
test/compiler/7192963/TestByteVect.java | 203 +
test/compiler/7192963/TestDoubleVect.java | 203 +
test/compiler/7192963/TestFloatVect.java | 203 +
test/compiler/7192963/TestIntVect.java | 203 +
test/compiler/7192963/TestLongVect.java | 203 +
test/compiler/7192963/TestShortVect.java | 203 +
test/compiler/7196199/Test7196199.java | 189 +
test/compiler/7199742/Test7199742.java | 54 +
test/compiler/7200264/Test7200264.sh | 164 +
test/compiler/7200264/TestIntVect.java | 650 +
test/compiler/8000805/Test8000805.java | 85 +
test/compiler/8001183/TestCharVect.java | 1332 +++
test/compiler/8002069/Test8002069.java | 98 +
test/gc/6941923/test6941923.sh | 10 +-
test/gc/7168848/HumongousAlloc.java | 74 +
test/runtime/6294277/SourceDebugExtension.java | 136 +
test/runtime/6626217/Test6626217.sh | 24 +-
test/runtime/6878713/Test6878713.sh | 19 +-
test/runtime/6929067/Test6929067.sh | 104 +-
test/runtime/7020373/GenOOMCrashClass.java | 157 +
test/runtime/7020373/Test7020373.sh | 32 +-
test/runtime/7020373/testcase.jar | Bin
test/runtime/7051189/Xchecksig.sh | 35 +-
test/runtime/7110720/Test7110720.sh | 8 +-
test/runtime/7116786/Test7116786.java | 486 +
test/runtime/7116786/testcases.jar | Bin
test/runtime/7158988/FieldMonitor.java | 249 +
test/runtime/7158988/TestFieldMonitor.sh | 75 +
test/runtime/7158988/TestPostFieldModification.java | 58 +
test/runtime/7167069/PrintAsFlag.java | 38 +
test/runtime/7196045/Test7196045.java | 78 +
test/sanity/WBApi.java | 13 +
test/serviceability/7170638/SDTProbesGNULinuxTest.sh | 68 +
test/serviceability/ParserTest.java | 180 +
964 files changed, 76983 insertions(+), 40937 deletions(-)
diffs (truncated from 168406 to 500 lines):
diff -r 25a92b94ad53 -r b1dcd2cd0948 .hgtags
--- a/.hgtags Tue Dec 04 17:28:19 2012 -0800
+++ b/.hgtags Thu Feb 14 02:27:28 2013 +0000
@@ -50,6 +50,7 @@
faf94d94786b621f8e13cbcc941ca69c6d967c3f jdk7-b73
f4b900403d6e4b0af51447bd13bbe23fe3a1dac7 jdk7-b74
d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75
+b4ab978ce52c41bb7e8ee86285e6c9f28122bbe1 icedtea7-1.12
9174bb32e934965288121f75394874eeb1fcb649 jdk7-b76
455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77
e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78
@@ -87,6 +88,7 @@
07226e9eab8f74b37346b32715f829a2ef2c3188 hs18-b01
e7e7e36ccdb5d56edd47e5744351202d38f3b7ad jdk7-b87
4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b jdk7-b88
+a393ff93e7e54dd94cc4211892605a32f9c77dad icedtea7-1.13
15836273ac2494f36ef62088bc1cb6f3f011f565 jdk7-b89
4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b hs18-b02
605c9707a766ff518cd841fc04f9bb4b36a3a30b jdk7-b90
@@ -160,6 +162,7 @@
b898f0fc3cedc972d884d31a751afd75969531cf hs21-b05
bd586e392d93b7ed7a1636dcc8da2b6a4203a102 jdk7-b136
bd586e392d93b7ed7a1636dcc8da2b6a4203a102 hs21-b06
+591c7dc0b2ee879f87a7b5519a5388e0d81520be icedtea-1.14
2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f jdk7-b137
2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f hs21-b07
0930dc920c185afbf40fed9a655290b8e5b16783 jdk7-b138
@@ -182,6 +185,7 @@
38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16
81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147
81d815b05abb564aa1f4100ae13491c949b9a07e hs21-b17
+7693eb0fce1f6b484cce96c233ea20bdad8a09e0 icedtea-2.0-branchpoint
9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01
0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01
31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02
@@ -210,6 +214,7 @@
3ba0bb2e7c8ddac172f5b995aae57329cdd2dafa hs22-b10
f17fe2f4b6aacc19cbb8ee39476f2f13a1c4d3cd jdk7u2-b13
0744602f85c6fe62255326df595785eb2b32166d jdk7u2-b21
+f8f4d3f9b16567b91bcef4caaa8417c8de8015f0 icedtea-2.1-branchpoint
a40d238623e5b1ab1224ea6b36dc5b23d0a53880 jdk7u3-b02
6986bfb4c82e00b938c140f2202133350e6e73f8 jdk7u3-b03
8e6375b46717d74d4885f839b4e72d03f357a45f jdk7u3-b04
@@ -264,6 +269,7 @@
f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16
f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16
931e5f39e365a0d550d79148ff87a7f9e864d2e1 hs23-b16
+a2c5354863dcb3d147b7b6f55ef514b1bfecf920 icedtea-2.2-branchpoint
efb5f2662c96c472caa3327090268c75a86dd9c0 jdk7u4-b13
82e719a2e6416838b4421637646cbfd7104c7716 jdk7u4-b14
e5f7f95411fb9e837800b4152741c962118e5d7a jdk7u5-b01
@@ -311,6 +317,7 @@
cefe884c708aa6dfd63aff45f6c698a6bc346791 jdk7u6-b16
270a40a57b3d05ca64070208dcbb895b5b509d8e hs23.2-b08
7a37cec9d0d44ae6ea3d26a95407e42d99af6843 jdk7u6-b17
+354cfde7db2f1fd46312d883a63c8a76d5381bab icedtea-2.3-branchpoint
df0df4ae5af2f40b7f630c53a86e8c3d68ef5b66 jdk7u6-b18
1257f4373a06f788bd656ae1c7a953a026a285b9 jdk7u6-b19
a0c2fa4baeb6aad6f33dc87b676b21345794d61e hs23.2-b09
@@ -320,6 +327,7 @@
df57f6208cb76b4e8d1a0bd0eea3d2ad577cb79b jdk7u6-b23
b03c2687fb16514652e79261ad68d2c601dcee62 jdk7u6-b24
cffde29ea7cc8647f17002a4d0e94065dcd82839 jdk7u6-b30
+7566374c3c89b7d99be9bcdb9342283a3bea6930 jdk7u6-b31
f7933fecea9aa494e4032e17ff07e5fcec4b5961 jdk7u7-b10
eeef33dc4b40f9ba50c4c9b1ac61b30f0f2523bf jdk7u7-b30
f1551c70c7f598b7049bcc33e530fc738a81c7a4 jdk7u7-b11
@@ -343,3 +351,92 @@
5c154a591de987d515f5b102a988bcf96d439f53 jdk7u10-b17
78c7e1b4a006342230e04fbb73f637834207abef jdk7u10-b18
c6b78bbaf6976197ead9d5aa3f65e0224cd13541 jdk7u10-b30
+02a6c89432d724119565f9ba25672829b136fc5f jdk7u8-b01
+528502f930967f70c320472a002418f1e38029e0 jdk7u8-b02
+db63a909e1ad950ef2b9050389f51e68581b2d4e jdk7u8-b03
+0948731ccc7fdda064f1d961d0b9d0cbf49e1369 jdk7u8-b04
+21e2648677954145d0f12b91ab283e8908e80b08 hs23.4-b01
+baaa29c3d798ffe883091a5ad2ad1bf8324c49d2 jdk7u8-b05
+dc6893023f1121726178d9ac97df8ea5f170025a jdk7u10-b06
+0000000000000000000000000000000000000000 hs23.4-b01
+21e2648677954145d0f12b91ab283e8908e80b08 hs23.6-b01
+6f4d800251492aefcf13727965e8a7feda1338d6 hs23.6-b02
+5f67ff71653f23d7fbb0e1af26502b68b37da9aa jdk7u10-b07
+042438023396a3886a060ca14a06a4664ef85d9d hs23.6-b03
+4c525a19affa0f69c502a74a01d33f0dd74a1ade jdk7u10-b08
+d14ad18fc5168983f693bb173fa353a3846369ad jdk7u10-b09
+3b24e7e01d20ca590d0f86b1222bb7c3f1a2aa2d jdk8-b27
+975c4105f1e2ef1190a75b77124033f1fd4290b5 hs24-b01
+b183b0863611b85dbac16f3b08b40ba978756d19 jdk8-b28
+030b5306d60f140e822e4a6d301744cb110ff0c8 hs24-b02
+b45b5c564098c58ea69e7cff3f7d341f0254dd1d jdk8-b29
+d61761bf305031c94f7f8eca49abd978b7d3c5da jdk8-b30
+dfae0140457cfb2c381d7679735fbedbae862c62 hs24-b03
+f4767e53d6e0d5da7e3f1775904076cce54247c1 hs24-b04
+0cd147eaa673d1642b2f466f5dc257cf192db524 jdk8-b31
+27863e4586de38be7dd17da4163f542038f4d1d7 hs24-b05
+25410a347ebb0bef166c4338a90d9dea82463a20 jdk8-b32
+cd47da9383cd932cb2b659064057feafa2a91134 hs24-b06
+785bcf415ead2eaa5f6677aaf528481008140bac jdk8-b33
+7c6aba65acd2c334f1c3512b574f9038cddac24b hs24-b07
+f284b08835584517c1ca3dd67341f569e763841f jdk8-b34
+f621660a297baa48fab9dca28e99d318826e8304 jdk8-b35
+dff6e3459210f8dd0430b9b03ccc99280560da30 hs24-b08
+50b4400ca1ecb2ac2fde35f5e53ec8f04b86be7f jdk8-b36
+bfcf92bfefb82da00f7fdbf0d9273feaa0a9456d jdk8-b37
+7d5ec8bf38d1b12e0e09ec381f10976b8beede3b hs24-b09
+637c3f5f068f88fb9ec9c5867341cf59fd5ebedc jdk8-b38
+73147e6c48813b5fee904aa33f79a77103250ff4 hs24-b10
+96a403721094ecdaf6a1f4f52ebd0a82e07df199 jdk8-b39
+14b0e07ab9a6fa1662414496b7e07ac8450cf517 hs24-b11
+ff9decc8235d5af80ea45fda4ecbe643ea252564 jdk8-b40
+785573170238f0eae6dc8e22ecf1050fbc9ea055 hs24-b12
+37add4fa0296705f67481e1fd50e2900cd25e39b jdk8-b41
+bd568544be7fcd12a9327e6c448592198d57b043 hs24-b13
+55954061c6e8750ea39a63523fd65d580db6eeb1 jdk8-b42
+e77b8e0ed1f84e3e268239e276c7ab64fa573baa jdk8-b43
+5ba29a1db46ecb80a321ca873adb56a3fe6ad320 hs24-b14
+831e5c76a20af18f3c08c5a95ed31be0e128a010 jdk8-b44
+9d5f20961bc5846fa8d098d534effafbbdae0a58 jdk8-b45
+40e5a3f2907ed02b335c7caa8ecf068cc801380d hs24-b15
+cf37a594c38db2ea926954154636f9f81da2e032 jdk8-b46
+0c7bb1f4f9c8062b5c5bfa56b3bdca44839b4109 jdk8-b47
+66b0450071c1534e014b131892cc86b63f1d009c hs24-b16
+1e26f61bbb521642639f56fae11326f1932f5a7d jdk8-b48
+bd54fe36b5e50f9ef1e30a5047b27fee5297e268 hs24-b17
+e3619706a7253540a2d94e9e841acaab8ace7038 jdk8-b49
+72e0362c3f0cfacbbac8af8a5b9d2e182f21c17b hs24-b18
+58f237a9e83af6ded0d2e2c81d252cd47c0f4c45 jdk8-b50
+3b3ad16429701b2eb6712851c2f7c5a726eb2cbe hs24-b19
+663fc23da8d51c4c0552cbcb17ffc85f5869d4fd jdk8-b51
+4c8f2a12e757e7a808aa85827573e09f75d7459f hs24-b20
+6d0436885201db3f581523344a734793bb989549 jdk8-b52
+54240c1b8e87758f28da2c6a569a926fd9e0910a jdk8-b53
+9e3ae661284dc04185b029d85440fe7811f1ed07 hs24-b21
+e8fb566b94667f88462164defa654203f0ab6820 jdk8-b54
+09ea7e0752b306b8ae74713aeb4eb6263e1c6836 hs24-b22
+4767c78f350408f67eccb50a89f2f1c9df2328e0 hs24-b23
+b4da4e577c9992d9168d093600aa3c3e3aa5156d hs24-b24
+0601ca30c7b40026d5ac40e8aca39ea71f129f96 jdk7u12-b01
+1e5b6a49c06dd1fac6d2f579c64b7b67a8af0edf hs24-b25
+ce5983a3e0b2937cf9a672e61dbcb234f569b29e jdk7u12-b02
+94984276a8dcba53f63a5de563b14eeb5e336c55 jdk7u12-b03
+b9e0f2c87dd64fad932871fef82ee28ada04d6da hs24-b26
+ed9b424d5e4358b7886c9a115b87ef6f06e57137 jdk7u12-b04
+4e4026772caf17fbd5234d6941af8be56fc0c260 jdk7u12-b05
+364bc54d7096ed229d61fa015626276d4f1cedf5 hs24-b27
+2e497fde1807e9e97cb3dfd90bfbbcdcc19f0883 jdk7u12-b06
+c5ee80cc06234ef93e4b6a6ac77597e62fbd99f4 hs24-b28
+4f7ad6299356bfd2cfb448ea4c11e8ce0fbf69f4 jdk7u12-b07
+3bb803664f3d9c831d094cbe22b4ee5757e780c8 jdk7u12-b08
+92e382c3cccc0afbc7f72fccea4f996e05b66b3e jdk7u12-b09
+6e4feb17117d21e0e4360f2d0fbc68397ed3ba80 icedtea-2.4-branchpoint
+25a92b94ad538963d009bf8a53ce548e13f55c82 jdk7u11-b20
+7a2cf85fc36e845db9ccb2a22af195c70af33bdf jdk7u11-b21
+db7028c8a953f46225fceb6148f97de87c784dda jdk7u11-b03
+4d418a1b8be04220f504cf414b47877821a22a26 jdk7u11-b04
+f71032f398a3baea567710ba7161c64b94495cac jdk7u11-b05
+0cbce123c9027d531e585fd81fbc361c5f8407f1 jdk7u11-b06
+94bf1e3dafef3cc06d3f97f81d304313ccd999ee jdk7u11-b07
+2b543aa340e4a75671fe05803fcee08bf3e136db jdk7u11-b08
+34a7b6dda06e2ff6f7e9ad563e3fc3ecd8993579 jdk7u13-b09
diff -r 25a92b94ad53 -r b1dcd2cd0948 agent/make/saenv.sh
--- a/agent/make/saenv.sh Tue Dec 04 17:28:19 2012 -0800
+++ b/agent/make/saenv.sh Thu Feb 14 02:27:28 2013 +0000
@@ -26,7 +26,7 @@
# This file sets common environment variables for all SA scripts
OS=`uname`
-STARTDIR=`dirname $0`
+STARTDIR=`(cd \`dirname $0 \`; pwd)`
ARCH=`uname -m`
if [ "x$SA_JAVA" = "x" ]; then
diff -r 25a92b94ad53 -r b1dcd2cd0948 agent/make/start-debug-server-proc.sh
--- a/agent/make/start-debug-server-proc.sh Tue Dec 04 17:28:19 2012 -0800
+++ b/agent/make/start-debug-server-proc.sh Thu Feb 14 02:27:28 2013 +0000
@@ -25,10 +25,11 @@
. `dirname $0`/saenv.sh
-if [ -f $STARTDIR/sa.jar ] ; then
- CP=$STARTDIR/sa.jar
+if [ -f $STARTDIR/../lib/sa-jdi.jar ] ; then
+ CP=$STARTDIR/../lib/sa-jdi.jar
else
CP=$STARTDIR/../build/classes
fi
-$SA_JAVA -classpath $CP ${OPTIONS} -Djava.rmi.server.codebase=file:/$CP -Djava.security.policy=$STARTDIR\/grantAll.policy sun.jvm.hotspot.DebugServer $*
+$STARTDIR/java -classpath $CP ${OPTIONS} -Djava.rmi.server.codebase=file://$CP -Djava.security.policy=${STARTDIR}/grantAll.policy sun.jvm.hotspot.DebugServer $*
+
diff -r 25a92b94ad53 -r b1dcd2cd0948 agent/src/os/linux/LinuxDebuggerLocal.c
--- a/agent/src/os/linux/LinuxDebuggerLocal.c Tue Dec 04 17:28:19 2012 -0800
+++ b/agent/src/os/linux/LinuxDebuggerLocal.c Thu Feb 14 02:27:28 2013 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -55,11 +55,11 @@
#define THROW_NEW_DEBUGGER_EXCEPTION_(str, value) { throw_new_debugger_exception(env, str); return value; }
#define THROW_NEW_DEBUGGER_EXCEPTION(str) { throw_new_debugger_exception(env, str); return;}
-static void throw_new_debugger_exception(JNIEnv* env, const char* errMsg) {
+void throw_new_debugger_exception(JNIEnv* env, const char* errMsg) {
(*env)->ThrowNew(env, (*env)->FindClass(env, "sun/jvm/hotspot/debugger/DebuggerException"), errMsg);
}
-static struct ps_prochandle* get_proc_handle(JNIEnv* env, jobject this_obj) {
+struct ps_prochandle* get_proc_handle(JNIEnv* env, jobject this_obj) {
jlong ptr = (*env)->GetLongField(env, this_obj, p_ps_prochandle_ID);
return (struct ps_prochandle*)(intptr_t)ptr;
}
@@ -280,6 +280,7 @@
return (err == PS_OK)? array : 0;
}
+#if defined(i386) || defined(ia64) || defined(amd64) || defined(sparc) || defined(sparcv9)
JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLocal_getThreadIntegerRegisterSet0
(JNIEnv *env, jobject this_obj, jint lwp_id) {
@@ -410,3 +411,4 @@
(*env)->ReleaseLongArrayElements(env, array, regs, JNI_COMMIT);
return array;
}
+#endif
diff -r 25a92b94ad53 -r b1dcd2cd0948 agent/src/os/linux/Makefile
--- a/agent/src/os/linux/Makefile Tue Dec 04 17:28:19 2012 -0800
+++ b/agent/src/os/linux/Makefile Thu Feb 14 02:27:28 2013 +0000
@@ -23,7 +23,12 @@
#
ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi )
-GCC = gcc
+
+ifndef BUILD_GCC
+BUILD_GCC = gcc
+endif
+
+GCC = $(BUILD_GCC)
JAVAH = ${JAVA_HOME}/bin/javah
@@ -40,7 +45,7 @@
LIBS = -lthread_db
-CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) -D_FILE_OFFSET_BITS=64
+CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) -D_FILE_OFFSET_BITS=64
LIBSA = $(ARCH)/libsaproc.so
@@ -73,7 +78,7 @@
$(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(OBJS) $(LIBS)
test.o: test.c
- $(GCC) -c -o test.o -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) test.c
+ $(GCC) -c -o test.o -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) test.c
test: test.o
$(GCC) -o test test.o -L$(ARCH) -lsaproc $(LIBS)
diff -r 25a92b94ad53 -r b1dcd2cd0948 agent/src/os/linux/libproc.h
--- a/agent/src/os/linux/libproc.h Tue Dec 04 17:28:19 2012 -0800
+++ b/agent/src/os/linux/libproc.h Thu Feb 14 02:27:28 2013 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,15 @@
#ifndef _LIBPROC_H_
#define _LIBPROC_H_
+#include <jni.h>
#include <unistd.h>
#include <stdint.h>
#include "proc_service.h"
+#if defined(arm) || defined(ppc)
+#include "libproc_md.h"
+#endif
+
#if defined(sparc) || defined(sparcv9)
/*
If _LP64 is defined ptrace.h should be taken from /usr/include/asm-sparc64
@@ -36,9 +41,34 @@
These two files define pt_regs structure differently
*/
#ifdef _LP64
-#include "asm-sparc64/ptrace.h"
+struct pt_regs {
+ unsigned long u_regs[16]; /* globals and ins */
+ unsigned long tstate;
+ unsigned long tpc;
+ unsigned long tnpc;
+ unsigned int y;
+
+ /* We encode a magic number, PT_REGS_MAGIC, along
+ * with the %tt (trap type) register value at trap
+ * entry time. The magic number allows us to identify
+ * accurately a trap stack frame in the stack
+ * unwinder, and the %tt value allows us to test
+ * things like "in a system call" etc. for an arbitray
+ * process.
+ *
+ * The PT_REGS_MAGIC is chosen such that it can be
+ * loaded completely using just a sethi instruction.
+ */
+ unsigned int magic;
+};
#else
-#include "asm-sparc/ptrace.h"
+struct pt_regs {
+ unsigned long psr;
+ unsigned long pc;
+ unsigned long npc;
+ unsigned long y;
+ unsigned long u_regs[16]; /* globals and ins */
+};
#endif
#endif //sparc or sparcv9
@@ -139,4 +169,8 @@
// address->nearest symbol lookup. return NULL for no symbol
const char* symbol_for_pc(struct ps_prochandle* ph, uintptr_t addr, uintptr_t* poffset);
+struct ps_prochandle* get_proc_handle(JNIEnv* env, jobject this_obj);
+
+void throw_new_debugger_exception(JNIEnv* env, const char* errMsg);
+
#endif //__LIBPROC_H_
diff -r 25a92b94ad53 -r b1dcd2cd0948 agent/src/os/linux/ps_core.c
--- a/agent/src/os/linux/ps_core.c Tue Dec 04 17:28:19 2012 -0800
+++ b/agent/src/os/linux/ps_core.c Thu Feb 14 02:27:28 2013 +0000
@@ -440,7 +440,7 @@
int j = 0;
print_debug("---- sorted virtual address map ----\n");
for (j = 0; j < ph->core->num_maps; j++) {
- print_debug("base = 0x%lx\tsize = %d\n", ph->core->map_array[j]->vaddr,
+ print_debug("base = 0x%lx\tsize = %zu\n", ph->core->map_array[j]->vaddr,
ph->core->map_array[j]->memsz);
}
}
diff -r 25a92b94ad53 -r b1dcd2cd0948 agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java
--- a/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Tue Dec 04 17:28:19 2012 -0800
+++ b/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Thu Feb 14 02:27:28 2013 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -549,7 +549,13 @@
machDesc = new MachineDescriptionSPARC32Bit();
}
} else {
- throw new DebuggerException("Linux only supported on x86/ia64/amd64/sparc/sparc64");
+ try {
+ machDesc = (MachineDescription)
+ Class.forName("sun.jvm.hotspot.debugger.MachineDescription" +
+ cpu.toUpperCase()).newInstance();
+ } catch (Exception e) {
+ throw new DebuggerException("Linux not supported on machine type " + cpu);
+ }
}
LinuxDebuggerLocal dbg =
diff -r 25a92b94ad53 -r b1dcd2cd0948 agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java
--- a/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java Tue Dec 04 17:28:19 2012 -0800
+++ b/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java Thu Feb 14 02:27:28 2013 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -737,9 +737,16 @@
machDesc = new MachineDescriptionSPARC32Bit();
}
} else {
- throw new DebuggerException("Linux only supported on x86/ia64/amd64/sparc/sparc64");
+ try {
+ machDesc = (MachineDescription)
+ Class.forName("sun.jvm.hotspot.debugger.MachineDescription" +
+ cpu.toUpperCase()).newInstance();
+ } catch (Exception e) {
+ throw new DebuggerException("unsupported machine type");
+ }
}
+
// Note we do not use a cache for the local debugger in server
// mode; it will be taken care of on the client side (once remote
// debugging is implemented).
diff -r 25a92b94ad53 -r b1dcd2cd0948 agent/src/share/classes/sun/jvm/hotspot/code/CodeBlob.java
--- a/agent/src/share/classes/sun/jvm/hotspot/code/CodeBlob.java Tue Dec 04 17:28:19 2012 -0800
+++ b/agent/src/share/classes/sun/jvm/hotspot/code/CodeBlob.java Thu Feb 14 02:27:28 2013 +0000
@@ -93,7 +93,6 @@
public boolean isUncommonTrapStub() { return false; }
public boolean isExceptionStub() { return false; }
public boolean isSafepointStub() { return false; }
- public boolean isRicochetBlob() { return false; }
public boolean isAdapterBlob() { return false; }
// Fine grain nmethod support: isNmethod() == isJavaMethod() || isNativeMethod() || isOSRMethod()
diff -r 25a92b94ad53 -r b1dcd2cd0948 agent/src/share/classes/sun/jvm/hotspot/code/CodeCache.java
--- a/agent/src/share/classes/sun/jvm/hotspot/code/CodeCache.java Tue Dec 04 17:28:19 2012 -0800
+++ b/agent/src/share/classes/sun/jvm/hotspot/code/CodeCache.java Thu Feb 14 02:27:28 2013 +0000
@@ -57,7 +57,6 @@
virtualConstructor.addMapping("BufferBlob", BufferBlob.class);
virtualConstructor.addMapping("nmethod", NMethod.class);
virtualConstructor.addMapping("RuntimeStub", RuntimeStub.class);
- virtualConstructor.addMapping("RicochetBlob", RicochetBlob.class);
virtualConstructor.addMapping("AdapterBlob", AdapterBlob.class);
virtualConstructor.addMapping("MethodHandlesAdapterBlob", MethodHandlesAdapterBlob.class);
virtualConstructor.addMapping("SafepointBlob", SafepointBlob.class);
@@ -127,10 +126,6 @@
Assert.that(result.blobContains(start) || result.blobContains(start.addOffsetTo(8)),
"found wrong CodeBlob");
}
- if (result.isRicochetBlob()) {
- // This should probably be done for other SingletonBlobs
- return VM.getVM().ricochetBlob();
- }
return result;
}
diff -r 25a92b94ad53 -r b1dcd2cd0948 agent/src/share/classes/sun/jvm/hotspot/code/RicochetBlob.java
--- a/agent/src/share/classes/sun/jvm/hotspot/code/RicochetBlob.java Tue Dec 04 17:28:19 2012 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.code;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-
-/** RicochetBlob (currently only used by Compiler 2) */
-
-public class RicochetBlob extends SingletonBlob {
- static {
- VM.registerVMInitializedObserver(new Observer() {
- public void update(Observable o, Object data) {
- initialize(VM.getVM().getTypeDataBase());
- }
- });
- }
-
- private static void initialize(TypeDataBase db) {
- Type type = db.lookupType("RicochetBlob");
-
- bounceOffsetField = type.getCIntegerField("_bounce_offset");
- exceptionOffsetField = type.getCIntegerField("_exception_offset");
- }
-
- private static CIntegerField bounceOffsetField;
- private static CIntegerField exceptionOffsetField;
-
- public RicochetBlob(Address addr) {
- super(addr);
- }
-
- public boolean isRicochetBlob() {
- return true;
- }
-
- public Address bounceAddr() {
- return codeBegin().addOffsetTo(bounceOffsetField.getValue(addr));
- }
-
More information about the distro-pkg-dev
mailing list