/hg/icedtea7-forest/hotspot: 26 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Jul 27 15:49:32 UTC 2017
changeset 12b2ef172230 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=12b2ef172230
author: goetz
date: Thu Feb 16 08:07:06 2017 +0100
8028471: PPC64 (part 215): opto: Extend ImplicitNullCheck optimization.
Summary: Other parts of this change came with "8165807: PPC64: Backport PPC64 port to OpenJDK 7"
Reviewed-by: andrew
changeset 124fc080dc67 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=124fc080dc67
author: tschatzl
date: Tue Apr 18 04:54:54 2017 +0100
7112912: Message "Error occurred during initialization of VM" on boxes with lots of RAM
Summary: Ergonomics now also takes available virtual memory into account when deciding for a heap size. The helper method to determine the maximum allocatable memory block now uses the appropriate OS specific calls to retrieve available virtual memory for the java process. In 32 bit environments this method now also searches for the maximum actually reservable amount of memory. Merge previously separate implementations for Linux/BSD/Solaris into a single method.
Reviewed-by: jmasa, tamao
changeset 2b734e53d73b in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=2b734e53d73b
author: tschatzl
date: Tue Apr 18 05:08:02 2017 +0100
8006088: Incompatible heap size flags accepted by VM
Summary: Make processing of minimum, initial and maximum heap size more intiutive by removing previous limitations on allowed values, and make error reporting consistent. Further, fix errors in ergonomic heap sizing.
Reviewed-by: johnc, jwilhelm, tamao
changeset 03022253c1f9 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=03022253c1f9
author: tschatzl
date: Mon May 13 09:45:33 2013 +0200
8014058: Regression tests for 8006088
Summary: The patch for 8006088 misses regression tests after a merge error, this CR provides them.
Reviewed-by: jwilhelm, tamao, jmasa
changeset ffff2a9460e3 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=ffff2a9460e3
author: tschatzl
date: Tue May 14 17:08:31 2013 +0200
8014489: tests/gc/arguments/Test(Serial|CMS|Parallel|G1)HeapSizeFlags jtreg tests invoke wrong class
Summary: Some jtreg tests reference unknown classes in the @run and @build lines. This change fixes them.
Reviewed-by: stefank, ehelin
changeset b86041bd7b99 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=b86041bd7b99
author: tschatzl
date: Tue Apr 18 06:37:32 2017 +0100
8010722: assert: failed: heap size is too big for compressed oops
Summary: Use conservative assumptions of required alignment for the various garbage collector components into account when determining the maximum heap size that supports compressed oops. Using this conservative value avoids several circular dependencies in the calculation.
Reviewed-by: stefank, dholmes
changeset 7ebf7aba6e6d in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=7ebf7aba6e6d
author: tschatzl
date: Wed Sep 18 10:02:19 2013 +0200
8024662: gc/arguments/TestUseCompressedOopsErgo.java does not compile.
Summary: Fix compilation error and use of an outdated VM option in the test
Reviewed-by: stefank, jwilhelm
changeset bbd1934c49f7 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=bbd1934c49f7
author: tschatzl
date: Tue Apr 18 07:03:25 2017 +0100
8024669: Native OOME when allocating after changes to maximum heap supporting Coops sizing on sparcv9
Summary: After changes in 8010722 the ergonomics for calculating the size of the heap that supports zero based compressed oops changed. This lead to the VM actually using zero based compressed oops. Due to low default HeapBaseMinAddress, the OS mapping in the application image at the same address, and limitations of the malloc implementation on Solaris this resulted in very little C heap available for the VM. So the VM immediately gives a native OOME when the machine has lots of physical memory (>=32G). The solution is to increase the HeapBaseMinAddress so that the VM has enough C heap.
Reviewed-by: kvn, brutisso
changeset 8ba07ad46983 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=8ba07ad46983
author: tschatzl
date: Tue Apr 18 07:25:46 2017 +0100
8147910: Cache initial active_processor_count
Summary: Introduce and initialize active_processor_count variable in VM.
Reviewed-by: dholmes, jprovino
changeset ed3280425403 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=ed3280425403
author: ctornqvi
date: Tue Apr 18 07:37:58 2017 +0100
8059803: Update use of GetVersionEx to get correct Windows version in hs_err files
Summary: Update use of GetVersionEx to get correct Windows version in hs_err files
Reviewed-by: dcubed, gtriantafill
changeset e7b7a2666508 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=e7b7a2666508
author: msolovie
date: Fri Dec 09 19:40:47 2016 +0300
8150490: Update OS detection code to recognize Windows Server 2016
Reviewed-by: mgronlun, alanb, dholmes
changeset 45ffde7121de in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=45ffde7121de
author: aeriksso
date: Wed Apr 19 03:21:51 2017 +0100
6869327: Add new C2 flag to keep safepoints in counted loops.
Reviewed-by: kvn
changeset bc8dd9311b96 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=bc8dd9311b96
author: roland
date: Mon Jul 25 14:31:42 2016 -0700
8161147: jvm crashes when -XX:+UseCountedLoopSafepoints is enabled
Summary: don't convert loop with safepoint on the backedge to Counted loop
Reviewed-by: kvn
changeset e3c151303b10 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=e3c151303b10
author: dpochepk
date: Thu Jul 28 16:09:31 2016 +0300
8162603: Unrecognized VM option 'UseCountedLoopSafepoints'
Reviewed-by: kvn
changeset 935f879e4eb0 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=935f879e4eb0
author: vkempik
date: Wed Apr 19 04:15:53 2017 +0100
8016302: Change type of the number of GC workers to unsigned int (2)
Reviewed-by: tschatzl, jwilhelm
changeset bb6a7cb5339b in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=bb6a7cb5339b
author: tschatzl
date: Wed Apr 19 04:27:50 2017 +0100
8161993: G1 crashes if active_processor_count changes during startup
Summary: Use the initial active processor count for memory initialization instead of the current active one.
Reviewed-by: dholmes, mgerdin
changeset 8745b05c4772 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=8745b05c4772
author: morris
date: Wed Apr 19 05:07:18 2017 +0100
6518907: cleanup IA64 specific code in Hotspot
Summary: removed unused IA64 specific code
Reviewed-by: twisti, kvn, dholmes
changeset 193f5ad08f89 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=193f5ad08f89
author: dholmes
date: Tue Dec 20 16:06:10 2016 -0500
8170307: Stack size option -Xss is ignored
Reviewed-by: dcubed, sspitsyn, gtriantafill
changeset 661dc6d8482f in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=661dc6d8482f
author: jwilhelm
date: Wed Apr 19 05:37:53 2017 +0100
8000351: Tenuring threshold should be unsigned
Summary: Change the flags and variables related to tenuring threshold to be unsigned
Reviewed-by: jmasa, johnc
changeset 58c34ffeff58 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=58c34ffeff58
author: hseigel
date: Wed Apr 19 06:00:00 2017 +0100
7102489: RFE: cleanup jlong typedef on __APPLE__and _LLP64 systems.
Summary: Define jlong as long on all LP64 platforms and add JLONG_FORMAT macro.
Reviewed-by: dholmes, coleenp, mikael, kvn
changeset be8da42894af in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=be8da42894af
author: dholmes
date: Wed Apr 19 06:17:56 2017 +0100
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
Summary: Set apparent physical memory to cgroup memory limit when UseCGroupMemoryLimitForHeap is true
Reviewed-by: acorn, gtriantafill
Contributed-by: Christine Flood <chf at redhat.com>
changeset d3aedf9af54b in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=d3aedf9af54b
author: andrew
date: Thu Apr 27 02:45:35 2017 +0100
Added tag jdk7u141-b00 for changeset be8da42894af
changeset 22c5a6ca09e3 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=22c5a6ca09e3
author: tschatzl
date: Mon Jul 21 09:40:19 2014 +0200
8043723: max_heap_for_compressed_oops() declared with size_t, but defined with uintx
Summary: The mismatch in declaration and definition has been encountered when compiling on a platform where the sizes are different. Change the method definition to match the declaration.
Reviewed-by: tschatzl, sjohanss
Contributed-by: Dan Horak <dhorak at redhat.com>
changeset 56ad25be7d88 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=56ad25be7d88
author: andrew
date: Thu Apr 27 06:11:42 2017 +0100
Added tag jdk7u141-b01 for changeset 22c5a6ca09e3
changeset 490b222d74de in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=490b222d74de
author: andrew
date: Fri Jul 14 00:56:19 2017 +0100
Merge jdk7u141-b02
changeset 13005b6e273c in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=13005b6e273c
author: andrew
date: Thu Jul 27 16:57:32 2017 +0100
Added tag icedtea-2.7.0pre12 for changeset 490b222d74de
diffstat:
.hgtags | 62 +-
.jcheck/conf | 2 -
agent/src/os/linux/LinuxDebuggerLocal.c | 15 +-
agent/src/os/linux/Makefile | 11 +-
agent/src/os/linux/elfmacros.h | 2 +
agent/src/os/linux/libproc.h | 10 +-
agent/src/os/linux/ps_core.c | 25 +-
agent/src/os/linux/ps_proc.c | 54 +-
agent/src/os/linux/salibelf.c | 1 +
agent/src/os/linux/symtab.c | 2 +-
agent/src/os/win32/windbg/sawindbg.cpp | 92 +-
agent/src/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java | 2 +-
make/bsd/Makefile | 18 +-
make/bsd/makefiles/gcc.make | 14 +
make/bsd/makefiles/vm.make | 2 +-
make/bsd/platform_zero.in | 2 +-
make/defs.make | 23 +-
make/linux/Makefile | 70 +-
make/linux/makefiles/aarch64.make | 41 +
make/linux/makefiles/adlc.make | 2 +
make/linux/makefiles/buildtree.make | 3 +
make/linux/makefiles/defs.make | 73 +-
make/linux/makefiles/gcc.make | 55 +-
make/linux/makefiles/jsig.make | 6 +-
make/linux/makefiles/rules.make | 20 +-
make/linux/makefiles/sa.make | 3 +-
make/linux/makefiles/saproc.make | 8 +-
make/linux/makefiles/vm.make | 77 +-
make/linux/makefiles/zeroshark.make | 32 +
make/linux/platform_aarch64 | 15 +
make/linux/platform_zero.in | 2 +-
make/solaris/makefiles/adlc.make | 6 +-
make/solaris/makefiles/dtrace.make | 16 +
make/solaris/makefiles/gcc.make | 4 +-
make/solaris/makefiles/jsig.make | 4 +
make/solaris/makefiles/rules.make | 10 -
make/solaris/makefiles/saproc.make | 4 +
make/solaris/makefiles/vm.make | 14 +-
make/windows/create_obj_files.sh | 2 +-
make/windows/makefiles/compile.make | 2 +-
make/windows/makefiles/vm.make | 8 +
src/cpu/aarch64/vm/aarch64.ad | 11622 ++++++++++
src/cpu/aarch64/vm/aarch64Test.cpp | 38 +
src/cpu/aarch64/vm/aarch64_ad.m4 | 367 +
src/cpu/aarch64/vm/aarch64_call.cpp | 197 +
src/cpu/aarch64/vm/aarch64_linkage.S | 163 +
src/cpu/aarch64/vm/ad_encode.m4 | 73 +
src/cpu/aarch64/vm/assembler_aarch64.cpp | 5555 ++++
src/cpu/aarch64/vm/assembler_aarch64.hpp | 3585 +++
src/cpu/aarch64/vm/assembler_aarch64.inline.hpp | 44 +
src/cpu/aarch64/vm/bytecodeInterpreter_aarch64.cpp | 51 +
src/cpu/aarch64/vm/bytecodeInterpreter_aarch64.hpp | 117 +
src/cpu/aarch64/vm/bytecodeInterpreter_aarch64.inline.hpp | 287 +
src/cpu/aarch64/vm/bytecodes_aarch64.cpp | 39 +
src/cpu/aarch64/vm/bytecodes_aarch64.hpp | 32 +
src/cpu/aarch64/vm/bytes_aarch64.hpp | 76 +
src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp | 431 +
src/cpu/aarch64/vm/c1_Defs_aarch64.hpp | 82 +
src/cpu/aarch64/vm/c1_FpuStackSim_aarch64.cpp | 203 +
src/cpu/aarch64/vm/c1_FpuStackSim_aarch64.hpp | 74 +
src/cpu/aarch64/vm/c1_FrameMap_aarch64.cpp | 345 +
src/cpu/aarch64/vm/c1_FrameMap_aarch64.hpp | 142 +
src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp | 2935 ++
src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp | 80 +
src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp | 1429 +
src/cpu/aarch64/vm/c1_LinearScan_aarch64.cpp | 39 +
src/cpu/aarch64/vm/c1_LinearScan_aarch64.hpp | 78 +
src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.cpp | 456 +
src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.hpp | 107 +
src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp | 1347 +
src/cpu/aarch64/vm/c1_globals_aarch64.hpp | 79 +
src/cpu/aarch64/vm/c2_globals_aarch64.hpp | 87 +
src/cpu/aarch64/vm/c2_init_aarch64.cpp | 37 +
src/cpu/aarch64/vm/codeBuffer_aarch64.hpp | 36 +
src/cpu/aarch64/vm/compile_aarch64.hpp | 40 +
src/cpu/aarch64/vm/copy_aarch64.hpp | 62 +
src/cpu/aarch64/vm/cppInterpreterGenerator_aarch64.hpp | 35 +
src/cpu/aarch64/vm/cpustate_aarch64.hpp | 592 +
src/cpu/aarch64/vm/debug_aarch64.cpp | 36 +
src/cpu/aarch64/vm/decode_aarch64.hpp | 409 +
src/cpu/aarch64/vm/depChecker_aarch64.cpp | 31 +
src/cpu/aarch64/vm/depChecker_aarch64.hpp | 32 +
src/cpu/aarch64/vm/disassembler_aarch64.hpp | 38 +
src/cpu/aarch64/vm/dump_aarch64.cpp | 127 +
src/cpu/aarch64/vm/frame_aarch64.cpp | 843 +
src/cpu/aarch64/vm/frame_aarch64.hpp | 215 +
src/cpu/aarch64/vm/frame_aarch64.inline.hpp | 332 +
src/cpu/aarch64/vm/globalDefinitions_aarch64.hpp | 36 +
src/cpu/aarch64/vm/globals_aarch64.hpp | 126 +
src/cpu/aarch64/vm/icBuffer_aarch64.cpp | 76 +
src/cpu/aarch64/vm/icache_aarch64.cpp | 41 +
src/cpu/aarch64/vm/icache_aarch64.hpp | 45 +
src/cpu/aarch64/vm/immediate_aarch64.cpp | 312 +
src/cpu/aarch64/vm/immediate_aarch64.hpp | 51 +
src/cpu/aarch64/vm/interp_masm_aarch64.cpp | 1505 +
src/cpu/aarch64/vm/interp_masm_aarch64.hpp | 286 +
src/cpu/aarch64/vm/interpreterGenerator_aarch64.hpp | 57 +
src/cpu/aarch64/vm/interpreterRT_aarch64.cpp | 429 +
src/cpu/aarch64/vm/interpreterRT_aarch64.hpp | 66 +
src/cpu/aarch64/vm/interpreter_aarch64.cpp | 314 +
src/cpu/aarch64/vm/interpreter_aarch64.hpp | 44 +
src/cpu/aarch64/vm/javaFrameAnchor_aarch64.hpp | 79 +
src/cpu/aarch64/vm/jniFastGetField_aarch64.cpp | 175 +
src/cpu/aarch64/vm/jniTypes_aarch64.hpp | 108 +
src/cpu/aarch64/vm/jni_aarch64.h | 64 +
src/cpu/aarch64/vm/methodHandles_aarch64.cpp | 445 +
src/cpu/aarch64/vm/methodHandles_aarch64.hpp | 63 +
src/cpu/aarch64/vm/nativeInst_aarch64.cpp | 318 +
src/cpu/aarch64/vm/nativeInst_aarch64.hpp | 495 +
src/cpu/aarch64/vm/registerMap_aarch64.hpp | 46 +
src/cpu/aarch64/vm/register_aarch64.cpp | 55 +
src/cpu/aarch64/vm/register_aarch64.hpp | 255 +
src/cpu/aarch64/vm/register_definitions_aarch64.cpp | 156 +
src/cpu/aarch64/vm/relocInfo_aarch64.cpp | 144 +
src/cpu/aarch64/vm/relocInfo_aarch64.hpp | 39 +
src/cpu/aarch64/vm/runtime_aarch64.cpp | 49 +
src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp | 3127 ++
src/cpu/aarch64/vm/stubGenerator_aarch64.cpp | 2380 ++
src/cpu/aarch64/vm/stubRoutines_aarch64.cpp | 290 +
src/cpu/aarch64/vm/stubRoutines_aarch64.hpp | 128 +
src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.hpp | 36 +
src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp | 2199 +
src/cpu/aarch64/vm/templateInterpreter_aarch64.hpp | 40 +
src/cpu/aarch64/vm/templateTable_aarch64.cpp | 3905 +++
src/cpu/aarch64/vm/templateTable_aarch64.hpp | 43 +
src/cpu/aarch64/vm/vmStructs_aarch64.hpp | 70 +
src/cpu/aarch64/vm/vm_version_aarch64.cpp | 220 +
src/cpu/aarch64/vm/vm_version_aarch64.hpp | 91 +
src/cpu/aarch64/vm/vmreg_aarch64.cpp | 52 +
src/cpu/aarch64/vm/vmreg_aarch64.hpp | 35 +
src/cpu/aarch64/vm/vmreg_aarch64.inline.hpp | 65 +
src/cpu/aarch64/vm/vtableStubs_aarch64.cpp | 245 +
src/cpu/ppc/vm/ppc.ad | 6 +-
src/cpu/ppc/vm/vm_version_ppc.cpp | 9 +-
src/cpu/sparc/vm/sparc.ad | 12 +-
src/cpu/sparc/vm/vm_version_sparc.cpp | 15 +-
src/cpu/sparc/vm/vm_version_sparc.hpp | 8 +-
src/cpu/x86/vm/assembler_x86.cpp | 14 +-
src/cpu/x86/vm/c2_globals_x86.hpp | 2 +-
src/cpu/x86/vm/jni_x86.h | 9 +-
src/cpu/x86/vm/stubGenerator_x86_32.cpp | 3 +-
src/cpu/x86/vm/stubGenerator_x86_64.cpp | 6 +-
src/cpu/x86/vm/vm_version_x86.cpp | 5 +
src/cpu/x86/vm/vm_version_x86.hpp | 2 +-
src/cpu/x86/vm/x86_64.ad | 61 +-
src/cpu/zero/vm/arm32JIT.cpp | 8583 +++++++
src/cpu/zero/vm/arm_cas.S | 31 +
src/cpu/zero/vm/asm_helper.cpp | 746 +
src/cpu/zero/vm/bytecodes_arm.def | 7850 ++++++
src/cpu/zero/vm/bytecodes_zero.cpp | 52 +-
src/cpu/zero/vm/bytecodes_zero.hpp | 41 +-
src/cpu/zero/vm/cppInterpreter_arm.S | 7390 ++++++
src/cpu/zero/vm/cppInterpreter_zero.cpp | 51 +-
src/cpu/zero/vm/cppInterpreter_zero.hpp | 2 +
src/cpu/zero/vm/entry_zero.hpp | 4 +-
src/cpu/zero/vm/methodHandles_zero.hpp | 12 +-
src/cpu/zero/vm/nativeInst_zero.cpp | 3 +-
src/cpu/zero/vm/sharedRuntime_zero.cpp | 4 +-
src/cpu/zero/vm/stack_zero.hpp | 2 +-
src/cpu/zero/vm/stack_zero.inline.hpp | 9 +-
src/cpu/zero/vm/vm_version_zero.cpp | 12 +-
src/cpu/zero/vm/vm_version_zero.hpp | 11 +-
src/os/aix/vm/perfMemory_aix.cpp | 11 +-
src/os/bsd/vm/chaitin_bsd.cpp | 42 -
src/os/bsd/vm/os_bsd.cpp | 24 +-
src/os/bsd/vm/os_bsd.hpp | 5 +-
src/os/bsd/vm/os_bsd.inline.hpp | 10 +-
src/os/linux/vm/chaitin_linux.cpp | 42 -
src/os/linux/vm/osThread_linux.cpp | 3 +
src/os/linux/vm/os_linux.cpp | 362 +-
src/os/linux/vm/os_linux.inline.hpp | 13 +-
src/os/linux/vm/thread_linux.inline.hpp | 5 +
src/os/posix/launcher/java_md.c | 7 +-
src/os/posix/launcher/java_md.h | 8 +-
src/os/posix/vm/os_posix.cpp | 64 +
src/os/solaris/vm/chaitin_solaris.cpp | 46 -
src/os/solaris/vm/os_solaris.cpp | 26 +-
src/os/solaris/vm/os_solaris.inline.hpp | 5 +-
src/os/windows/launcher/java_md.c | 7 +-
src/os/windows/launcher/java_md.h | 4 +-
src/os/windows/vm/chaitin_windows.cpp | 78 -
src/os/windows/vm/os_windows.cpp | 417 +-
src/os/windows/vm/os_windows.hpp | 1 -
src/os/windows/vm/os_windows.inline.hpp | 3 -
src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp | 8 +-
src/os_cpu/linux_aarch64/vm/assembler_linux_aarch64.cpp | 53 +
src/os_cpu/linux_aarch64/vm/atomic_linux_aarch64.inline.hpp | 144 +
src/os_cpu/linux_aarch64/vm/bytes_linux_aarch64.inline.hpp | 44 +
src/os_cpu/linux_aarch64/vm/copy_linux_aarch64.inline.hpp | 124 +
src/os_cpu/linux_aarch64/vm/globals_linux_aarch64.hpp | 46 +
src/os_cpu/linux_aarch64/vm/linux_aarch64.S | 25 +
src/os_cpu/linux_aarch64/vm/linux_aarch64.ad | 68 +
src/os_cpu/linux_aarch64/vm/orderAccess_linux_aarch64.inline.hpp | 144 +
src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | 753 +
src/os_cpu/linux_aarch64/vm/os_linux_aarch64.hpp | 58 +
src/os_cpu/linux_aarch64/vm/os_linux_aarch64.inline.hpp | 39 +
src/os_cpu/linux_aarch64/vm/prefetch_linux_aarch64.inline.hpp | 45 +
src/os_cpu/linux_aarch64/vm/threadLS_linux_aarch64.cpp | 41 +
src/os_cpu/linux_aarch64/vm/threadLS_linux_aarch64.hpp | 36 +
src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.cpp | 92 +
src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.hpp | 85 +
src/os_cpu/linux_aarch64/vm/vmStructs_linux_aarch64.hpp | 65 +
src/os_cpu/linux_aarch64/vm/vm_version_linux_aarch64.cpp | 28 +
src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 2 +-
src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp | 22 +-
src/os_cpu/linux_zero/vm/globals_linux_zero.hpp | 8 +-
src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 43 +-
src/os_cpu/linux_zero/vm/os_linux_zero.hpp | 6 +
src/os_cpu/solaris_sparc/vm/globals_solaris_sparc.hpp | 4 +-
src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp | 242 +-
src/share/tools/ProjectCreator/WinGammaPlatformVC10.java | 2 +-
src/share/tools/hsdis/Makefile | 19 +-
src/share/tools/hsdis/hsdis.c | 12 +
src/share/tools/launcher/java.c | 4 +-
src/share/tools/launcher/java.h | 3 +-
src/share/vm/adlc/main.cpp | 5 +
src/share/vm/adlc/output_c.cpp | 2 +-
src/share/vm/asm/assembler.cpp | 3 +
src/share/vm/asm/assembler.hpp | 7 +
src/share/vm/asm/codeBuffer.hpp | 5 +-
src/share/vm/c1/c1_Canonicalizer.cpp | 7 +
src/share/vm/c1/c1_Compilation.cpp | 26 +
src/share/vm/c1/c1_Defs.hpp | 6 +
src/share/vm/c1/c1_FpuStackSim.hpp | 3 +
src/share/vm/c1/c1_FrameMap.cpp | 3 +
src/share/vm/c1/c1_FrameMap.hpp | 3 +
src/share/vm/c1/c1_InstructionPrinter.cpp | 4 +-
src/share/vm/c1/c1_LIR.cpp | 53 +-
src/share/vm/c1/c1_LIR.hpp | 56 +-
src/share/vm/c1/c1_LIRAssembler.cpp | 7 +
src/share/vm/c1/c1_LIRAssembler.hpp | 6 +
src/share/vm/c1/c1_LIRGenerator.cpp | 10 +-
src/share/vm/c1/c1_LIRGenerator.hpp | 3 +
src/share/vm/c1/c1_LinearScan.cpp | 6 +-
src/share/vm/c1/c1_LinearScan.hpp | 3 +
src/share/vm/c1/c1_MacroAssembler.hpp | 6 +
src/share/vm/c1/c1_Runtime1.cpp | 36 +-
src/share/vm/c1/c1_globals.hpp | 3 +
src/share/vm/ci/ciInstanceKlass.cpp | 31 +-
src/share/vm/ci/ciInstanceKlass.hpp | 6 +-
src/share/vm/ci/ciMethod.cpp | 38 +
src/share/vm/ci/ciMethod.hpp | 2 +
src/share/vm/ci/ciTypeFlow.cpp | 2 +-
src/share/vm/classfile/classFileParser.cpp | 10 +-
src/share/vm/classfile/classFileStream.hpp | 3 +
src/share/vm/classfile/javaClasses.cpp | 21 +-
src/share/vm/classfile/javaClasses.hpp | 1 +
src/share/vm/classfile/stackMapTable.hpp | 3 +
src/share/vm/classfile/systemDictionary.cpp | 1 -
src/share/vm/classfile/verifier.cpp | 26 +-
src/share/vm/classfile/vmSymbols.hpp | 14 +-
src/share/vm/code/codeBlob.cpp | 3 +
src/share/vm/code/compiledIC.cpp | 2 +-
src/share/vm/code/compiledIC.hpp | 3 +
src/share/vm/code/icBuffer.cpp | 3 +
src/share/vm/code/nmethod.cpp | 22 +
src/share/vm/code/relocInfo.cpp | 4 +
src/share/vm/code/relocInfo.hpp | 3 +
src/share/vm/code/vmreg.hpp | 9 +
src/share/vm/compiler/compileBroker.cpp | 6 +-
src/share/vm/compiler/disassembler.cpp | 3 +
src/share/vm/compiler/disassembler.hpp | 3 +
src/share/vm/compiler/methodLiveness.cpp | 12 +-
src/share/vm/compiler/oopMap.cpp | 7 +
src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp | 6 +-
src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp | 4 +-
src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp | 6 +-
src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp | 24 +-
src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp | 22 +-
src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp | 10 +-
src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp | 2 +-
src/share/vm/gc_implementation/g1/concurrentG1RefineThread.hpp | 6 +-
src/share/vm/gc_implementation/g1/concurrentMark.cpp | 15 +-
src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp | 32 +-
src/share/vm/gc_implementation/g1/dirtyCardQueue.hpp | 16 +-
src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp | 20 +-
src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp | 9 +-
src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp | 8 +-
src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp | 4 +-
src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp | 2 +-
src/share/vm/gc_implementation/g1/g1HotCardCache.cpp | 10 +-
src/share/vm/gc_implementation/g1/g1HotCardCache.hpp | 2 +-
src/share/vm/gc_implementation/g1/g1MarkSweep.cpp | 11 +
src/share/vm/gc_implementation/g1/g1OopClosures.hpp | 4 +-
src/share/vm/gc_implementation/g1/g1RemSet.cpp | 24 +-
src/share/vm/gc_implementation/g1/g1RemSet.hpp | 12 +-
src/share/vm/gc_implementation/g1/heapRegion.cpp | 6 +-
src/share/vm/gc_implementation/g1/heapRegion.hpp | 4 +-
src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp | 16 +-
src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp | 2 +-
src/share/vm/gc_implementation/g1/satbQueue.cpp | 4 +-
src/share/vm/gc_implementation/g1/satbQueue.hpp | 6 +-
src/share/vm/gc_implementation/parNew/parNewGeneration.cpp | 15 +-
src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp | 2 +-
src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp | 12 +
src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp | 7 +-
src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp | 4 +-
src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp | 6 +-
src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp | 20 +-
src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp | 7 +-
src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp | 2 +-
src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp | 2 +-
src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp | 33 +-
src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp | 6 +-
src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp | 4 +-
src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp | 4 +-
src/share/vm/gc_implementation/shared/ageTable.cpp | 12 +-
src/share/vm/gc_implementation/shared/ageTable.hpp | 4 +-
src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp | 2 +-
src/share/vm/interpreter/abstractInterpreter.hpp | 8 +
src/share/vm/interpreter/bytecode.hpp | 3 +
src/share/vm/interpreter/bytecodeInterpreter.cpp | 10 +-
src/share/vm/interpreter/bytecodeInterpreter.hpp | 28 +-
src/share/vm/interpreter/bytecodeInterpreter.inline.hpp | 3 +
src/share/vm/interpreter/bytecodeStream.hpp | 3 +
src/share/vm/interpreter/bytecodes.cpp | 3 +
src/share/vm/interpreter/bytecodes.hpp | 4 +
src/share/vm/interpreter/cppInterpreter.hpp | 3 +
src/share/vm/interpreter/cppInterpreterGenerator.hpp | 8 +
src/share/vm/interpreter/interpreter.hpp | 3 +
src/share/vm/interpreter/interpreterGenerator.hpp | 3 +
src/share/vm/interpreter/interpreterRuntime.cpp | 7 +-
src/share/vm/interpreter/interpreterRuntime.hpp | 5 +-
src/share/vm/interpreter/templateInterpreter.hpp | 3 +
src/share/vm/interpreter/templateInterpreterGenerator.hpp | 3 +
src/share/vm/interpreter/templateTable.cpp | 5 +
src/share/vm/interpreter/templateTable.hpp | 6 +
src/share/vm/memory/allocation.hpp | 37 +-
src/share/vm/memory/allocation.inline.hpp | 8 +-
src/share/vm/memory/collectorPolicy.cpp | 130 +-
src/share/vm/memory/collectorPolicy.hpp | 6 +-
src/share/vm/memory/defNewGeneration.cpp | 13 +-
src/share/vm/memory/defNewGeneration.hpp | 4 +-
src/share/vm/memory/genCollectedHeap.cpp | 6 +-
src/share/vm/memory/genCollectedHeap.hpp | 5 +
src/share/vm/memory/generation.cpp | 12 +
src/share/vm/memory/tenuredGeneration.cpp | 12 +
src/share/vm/memory/threadLocalAllocBuffer.hpp | 2 +-
src/share/vm/memory/universe.cpp | 2 +-
src/share/vm/oops/constantPoolOop.hpp | 3 +
src/share/vm/oops/instanceKlass.cpp | 15 +
src/share/vm/oops/instanceKlass.hpp | 5 +
src/share/vm/oops/markOop.hpp | 8 +-
src/share/vm/oops/methodOop.cpp | 16 +
src/share/vm/oops/methodOop.hpp | 6 +
src/share/vm/oops/objArrayKlass.inline.hpp | 4 +-
src/share/vm/oops/oop.hpp | 2 +-
src/share/vm/oops/oop.inline.hpp | 5 +-
src/share/vm/oops/typeArrayOop.hpp | 3 +
src/share/vm/opto/block.cpp | 506 +-
src/share/vm/opto/block.hpp | 345 +-
src/share/vm/opto/buildOopMap.cpp | 83 +-
src/share/vm/opto/bytecodeInfo.cpp | 44 +-
src/share/vm/opto/c2_globals.hpp | 19 +-
src/share/vm/opto/c2compiler.cpp | 12 +-
src/share/vm/opto/callGenerator.cpp | 62 +-
src/share/vm/opto/callGenerator.hpp | 1 +
src/share/vm/opto/callnode.cpp | 81 +-
src/share/vm/opto/callnode.hpp | 68 +-
src/share/vm/opto/cfgnode.cpp | 4 +-
src/share/vm/opto/chaitin.cpp | 634 +-
src/share/vm/opto/chaitin.hpp | 174 +-
src/share/vm/opto/coalesce.cpp | 435 +-
src/share/vm/opto/coalesce.hpp | 14 +-
src/share/vm/opto/compile.cpp | 204 +-
src/share/vm/opto/compile.hpp | 39 +-
src/share/vm/opto/doCall.cpp | 14 +-
src/share/vm/opto/domgraph.cpp | 73 +-
src/share/vm/opto/escape.cpp | 80 +-
src/share/vm/opto/gcm.cpp | 440 +-
src/share/vm/opto/generateOptoStub.cpp | 59 +-
src/share/vm/opto/graphKit.cpp | 35 +-
src/share/vm/opto/idealGraphPrinter.cpp | 36 +-
src/share/vm/opto/ifg.cpp | 256 +-
src/share/vm/opto/ifnode.cpp | 2 +-
src/share/vm/opto/lcm.cpp | 359 +-
src/share/vm/opto/library_call.cpp | 4 +-
src/share/vm/opto/live.cpp | 115 +-
src/share/vm/opto/live.hpp | 4 +-
src/share/vm/opto/locknode.hpp | 3 +
src/share/vm/opto/loopPredicate.cpp | 4 +-
src/share/vm/opto/loopnode.cpp | 108 +-
src/share/vm/opto/loopnode.hpp | 5 +-
src/share/vm/opto/macro.cpp | 95 +-
src/share/vm/opto/macro.hpp | 3 +-
src/share/vm/opto/matcher.cpp | 27 +-
src/share/vm/opto/matcher.hpp | 26 +-
src/share/vm/opto/memnode.cpp | 644 +-
src/share/vm/opto/memnode.hpp | 6 +-
src/share/vm/opto/multnode.cpp | 33 +-
src/share/vm/opto/multnode.hpp | 2 +
src/share/vm/opto/node.cpp | 35 +-
src/share/vm/opto/node.hpp | 2 +-
src/share/vm/opto/output.cpp | 361 +-
src/share/vm/opto/output.hpp | 6 +-
src/share/vm/opto/parse.hpp | 8 +-
src/share/vm/opto/parse1.cpp | 6 +-
src/share/vm/opto/parse2.cpp | 12 +-
src/share/vm/opto/parse3.cpp | 28 +-
src/share/vm/opto/parseHelper.cpp | 5 +
src/share/vm/opto/phase.cpp | 2 +
src/share/vm/opto/phase.hpp | 1 +
src/share/vm/opto/phaseX.cpp | 18 +-
src/share/vm/opto/phasetype.hpp | 8 +-
src/share/vm/opto/postaloc.cpp | 160 +-
src/share/vm/opto/reg_split.cpp | 239 +-
src/share/vm/opto/regalloc.hpp | 11 +-
src/share/vm/opto/regmask.cpp | 3 +
src/share/vm/opto/regmask.hpp | 3 +
src/share/vm/opto/runtime.cpp | 3 +
src/share/vm/opto/stringopts.cpp | 8 +-
src/share/vm/opto/type.cpp | 74 +-
src/share/vm/opto/type.hpp | 32 +-
src/share/vm/prims/jni.cpp | 86 +-
src/share/vm/prims/jniCheck.cpp | 45 +-
src/share/vm/prims/jni_md.h | 3 +
src/share/vm/prims/jvmtiClassFileReconstituter.cpp | 3 +
src/share/vm/prims/jvmtiEnv.cpp | 3 +
src/share/vm/prims/jvmtiExport.cpp | 41 +
src/share/vm/prims/jvmtiExport.hpp | 7 +
src/share/vm/prims/jvmtiTagMap.cpp | 8 +-
src/share/vm/prims/methodHandles.hpp | 8 +
src/share/vm/prims/unsafe.cpp | 63 +
src/share/vm/prims/whitebox.cpp | 20 +-
src/share/vm/runtime/advancedThresholdPolicy.cpp | 2 +-
src/share/vm/runtime/aprofiler.cpp | 4 +-
src/share/vm/runtime/arguments.cpp | 227 +-
src/share/vm/runtime/arguments.hpp | 15 +-
src/share/vm/runtime/atomic.cpp | 3 +
src/share/vm/runtime/biasedLocking.cpp | 2 +-
src/share/vm/runtime/deoptimization.cpp | 6 +
src/share/vm/runtime/dtraceJSDT.hpp | 3 +
src/share/vm/runtime/frame.cpp | 3 +
src/share/vm/runtime/frame.hpp | 6 +
src/share/vm/runtime/frame.inline.hpp | 6 +
src/share/vm/runtime/globals.hpp | 59 +-
src/share/vm/runtime/icache.hpp | 3 +
src/share/vm/runtime/interfaceSupport.hpp | 18 +-
src/share/vm/runtime/java.cpp | 3 +
src/share/vm/runtime/javaCalls.hpp | 3 +
src/share/vm/runtime/javaFrameAnchor.hpp | 6 +
src/share/vm/runtime/objectMonitor.cpp | 35 +-
src/share/vm/runtime/os.cpp | 85 +-
src/share/vm/runtime/os.hpp | 36 +-
src/share/vm/runtime/perfData.cpp | 4 +-
src/share/vm/runtime/registerMap.hpp | 6 +
src/share/vm/runtime/relocator.hpp | 3 +
src/share/vm/runtime/safepoint.cpp | 4 +
src/share/vm/runtime/sharedRuntime.cpp | 30 +-
src/share/vm/runtime/stackValueCollection.cpp | 3 +
src/share/vm/runtime/statSampler.cpp | 3 +
src/share/vm/runtime/stubCodeGenerator.cpp | 3 +
src/share/vm/runtime/stubRoutines.cpp | 5 +
src/share/vm/runtime/stubRoutines.hpp | 6 +
src/share/vm/runtime/thread.cpp | 9 +-
src/share/vm/runtime/thread.hpp | 13 +-
src/share/vm/runtime/threadLocalStorage.hpp | 3 +
src/share/vm/runtime/vframe.cpp | 3 +-
src/share/vm/runtime/vframeArray.cpp | 4 +-
src/share/vm/runtime/virtualspace.cpp | 4 +-
src/share/vm/runtime/vmStructs.cpp | 23 +-
src/share/vm/runtime/vm_version.cpp | 8 +-
src/share/vm/services/diagnosticArgument.cpp | 6 +-
src/share/vm/services/heapDumper.cpp | 4 +-
src/share/vm/services/lowMemoryDetector.cpp | 4 +-
src/share/vm/shark/sharkCompiler.cpp | 6 +-
src/share/vm/shark/shark_globals.hpp | 10 +
src/share/vm/trace/trace.dtd | 3 -
src/share/vm/utilities/bitMap.hpp | 2 +-
src/share/vm/utilities/bitMap.inline.hpp | 20 +-
src/share/vm/utilities/copy.cpp | 171 +-
src/share/vm/utilities/copy.hpp | 15 +-
src/share/vm/utilities/elfFile.cpp | 5 +
src/share/vm/utilities/globalDefinitions.hpp | 16 +
src/share/vm/utilities/globalDefinitions_gcc.hpp | 14 +-
src/share/vm/utilities/globalDefinitions_sparcWorks.hpp | 9 -
src/share/vm/utilities/globalDefinitions_xlc.hpp | 8 -
src/share/vm/utilities/macros.hpp | 8 +
src/share/vm/utilities/ostream.cpp | 8 +-
src/share/vm/utilities/taskqueue.cpp | 6 +-
src/share/vm/utilities/taskqueue.hpp | 3 +
src/share/vm/utilities/vmError.cpp | 23 +-
src/share/vm/utilities/vmError.hpp | 8 +
test/compiler/6934604/TestByteBoxing.java | 777 +
test/compiler/6934604/TestDoubleBoxing.java | 777 +
test/compiler/6934604/TestFloatBoxing.java | 777 +
test/compiler/6934604/TestIntBoxing.java | 777 +
test/compiler/6934604/TestLongBoxing.java | 777 +
test/compiler/6934604/TestShortBoxing.java | 777 +
test/compiler/codegen/IntRotateWithImmediate.java | 24 +-
test/compiler/floatingpoint/TestFloatJNIArgs.java | 86 +
test/compiler/floatingpoint/TestFloatJNIArgs.sh | 104 +
test/compiler/floatingpoint/libTestFloatJNIArgs.c | 68 +
test/compiler/loopopts/ConstFPVectorization.java | 63 +
test/compiler/loopopts/TestCountedLoopSafepointBackedge.java | 53 +
test/compiler/loopopts/UseCountedLoopSafepoints.java | 67 +
test/compiler/stringopts/TestStringObjectInitialization.java | 78 +
test/compiler/unsafe/JdkInternalMiscUnsafeUnalignedAccess.java | 315 +
test/gc/arguments/TestCMSHeapSizeFlags.java | 46 +
test/gc/arguments/TestG1HeapSizeFlags.java | 46 +
test/gc/arguments/TestMaxHeapSizeTools.java | 295 +
test/gc/arguments/TestMinInitialErgonomics.java | 45 +
test/gc/arguments/TestParallelHeapSizeFlags.java | 49 +
test/gc/arguments/TestSerialHeapSizeFlags.java | 46 +
test/gc/arguments/TestUseCompressedOopsErgo.java | 50 +
test/gc/arguments/TestUseCompressedOopsErgoTools.java | 177 +
test/runtime/7020373/GenOOMCrashClass.java | 157 +
test/runtime/7020373/Test7020373.sh | 4 +
test/runtime/7020373/testcase.jar | Bin
test/runtime/InitialThreadOverflow/DoOverflow.java | 41 +
test/runtime/InitialThreadOverflow/invoke.cxx | 70 +
test/runtime/InitialThreadOverflow/testme.sh | 73 +
test/runtime/RedefineFinalizer/RedefineFinalizer.java | 64 +
test/runtime/RedefineTests/RedefineRunningMethodsWithResolutionErrors.java | 143 +
test/runtime/stackMapCheck/BadMap.jasm | 152 +
test/runtime/stackMapCheck/BadMapDstore.jasm | 79 +
test/runtime/stackMapCheck/BadMapIstore.jasm | 79 +
test/runtime/stackMapCheck/StackMapCheck.java | 63 +
test/serviceability/jvmti/TestRedefineWithUnresolvedClass.java | 82 +
test/serviceability/jvmti/UnresolvedClassAgent.java | 69 +
test/serviceability/jvmti/UnresolvedClassAgent.mf | 3 +
test/test_env.sh | 5 +
test/testlibrary/RedefineClassHelper.java | 79 +
test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java | 81 +-
test/testlibrary/com/oracle/java/testlibrary/Utils.java | 263 +
test/testlibrary/whitebox/sun/hotspot/WhiteBox.java | 5 +
test/testlibrary_tests/RedefineClassTest.java | 54 +
tools/mkbc.c | 607 +
528 files changed, 94266 insertions(+), 4048 deletions(-)
diffs (truncated from 113070 to 500 lines):
diff -r 457394dc689c -r 13005b6e273c .hgtags
--- a/.hgtags Tue Feb 07 01:26:24 2017 +0000
+++ b/.hgtags Thu Jul 27 16:57:32 2017 +0100
@@ -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
@@ -302,6 +308,9 @@
e974e15945658e574e6c344c4a7ba225f5708c10 hs23.2-b03
f08a3a0e60c32cb0e8350e72fdc54849759096a4 jdk7u6-b12
7a8d3cd6562170f4c262e962270f679ac503f456 hs23.2-b04
+d72dd66fdc3d52aee909f8dd8f25f62f13569ffa ppc-aix-port-b01
+1efaab66c81d0a5701cc819e67376f1b27bfea47 ppc-aix-port-b02
+b69b779a26dfc5e2333504d0c82fc998ff915499 ppc-aix-port-b03
28746e6d615f27816f483485a53b790c7a463f0c jdk7u6-b13
202880d633e646d4936798d0fba6efc0cab04dc8 hs23.2-b05
6b0f178141388f5721aa5365cb542715acbf0cc7 jdk7u6-b14
@@ -311,6 +320,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
@@ -440,6 +450,7 @@
4f7ad6299356bfd2cfb448ea4c11e8ce0fbf69f4 jdk7u12-b07
3bb803664f3d9c831d094cbe22b4ee5757e780c8 jdk7u12-b08
92e382c3cccc0afbc7f72fccea4f996e05b66b3e jdk7u12-b09
+6e4feb17117d21e0e4360f2d0fbc68397ed3ba80 icedtea-2.4-branchpoint
7554f9b2bcc72204ac10ba8b08b8e648459504df hs24-b29
181528fd1e74863a902f171a2ad46270a2fb15e0 jdk7u14-b10
4008cf63c30133f2fac148a39903552fe7a33cea hs24-b30
@@ -496,6 +507,7 @@
273e8afccd6ef9e10e9fe121f7b323755191f3cc jdk7u25-b32
e3d2c238e29c421c3b5c001e400acbfb30790cfc jdk7u14-b14
860ae068f4dff62a77c8315f0335b7e935087e86 hs24-b34
+ca298f18e21dc66c6b5235600f8b50bcc9bbaa38 ppc-aix-port-b04
12619005c5e29be6e65f0dc9891ca19d9ffb1aaa jdk7u14-b15
be21f8a4d42c03cafde4f616fd80ece791ba2f21 hs24-b35
10e0043bda0878dbc85f3f280157eab592b47c91 jdk7u14-b16
@@ -590,6 +602,9 @@
12374864c655a2cefb0d65caaacf215d5365ec5f jdk7u45-b18
3677c8cc3c89c0fa608f485b84396e4cf755634b jdk7u45-b30
520b7b3d9153c1407791325946b07c5c222cf0d6 jdk7u45-b31
+ae4adc1492d1c90a70bd2d139a939fc0c8329be9 jdk7u60-b00
+af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60
+cc83359f5e5eb46dd9176b0a272390b1a0a51fdc hs24.60-b01
c373a733d5d5147f99eaa2b91d6b937c28214fc9 jdk7u45-b33
0bcb43482f2ac5615437541ffb8dc0f79ece3148 jdk7u45-b34
12ea8d416f105f5971c808c89dddc1006bfc4c53 jdk7u45-b35
@@ -646,6 +661,8 @@
0025a2a965c8f21376278245c2493d8861386fba jdk7u60-b02
fa59add77d1a8f601a695f137248462fdc68cc2f hs24.60-b05
a59134ccb1b704b2cd05e157970d425af43e5437 hs24.60-b06
+bc178be7e9d6fcc97e09c909ffe79d96e2305218 icedtea-2.5pre01
+f30e87f16d90f1e659b935515a3fc083ab8a0156 icedtea-2.5pre02
2c971ed884cec0a9293ccff3def696da81823225 jdk7u60-b03
1afbeb8cb558429156d432f35e7582716053a9cb hs24.60-b07
05fe7a87d14908eb3f21a0d29fc72cee2f996b7f jdk7u60-b04
@@ -810,13 +827,36 @@
ff18bcebe2943527cdbc094375c38c27ec7f2442 hs24.80-b03
1b9722b5134a8e565d8b8fe851849e034beff057 hs24.80-b04
04d6919c44db8c9d811ef0ac4775a579f854cdfc hs24.80-b05
+882a93010fb90f928331bf31a226992755d6cfb2 icedtea-2.6pre01
ee18e60e7e8da9f1912895af353564de0330a2b1 hs24.80-b06
+138ef7288fd40de0012a3a24839fa7cb3569ab43 icedtea-2.6pre02
+4ab69c6e4c85edf628c01c685bc12c591b9807d9 icedtea-2.6pre03
+b226be2040f971855626f5b88cb41a7d5299fea0 jdk7u60-b14
+2fd819c8b5066a480f9524d901dbd34f2cf563ad icedtea-2.6pre04
+fae3b09fe959294f7a091a6ecaae91daf1cb4f5c icedtea-2.6pre05
05fe7a87d14908eb3f21a0d29fc72cee2f996b7f jdk7u80-b00
e2533d62ca887078e4b952a75a75680cfb7894b9 jdk7u80-b01
+8ffb87775f56ed5c602f320d2513351298ee4778 icedtea-2.6pre07
+b517477362d1b0d4f9b567c82db85136fd14bc6e icedtea-2.6pre06
+6d5ec408f4cac2c2004bf6120403df1b18051a21 icedtea-2.6pre08
bad107a5d096b070355c5a2d80aa50bc5576144b jdk7u80-b02
+4722cfd15c8386321c8e857951b3cb55461e858b icedtea-2.6pre09
+c8417820ac943736822e7b84518b5aca80f39593 icedtea-2.6pre10
+e13857ecc7870c28dbebca79ff36612693dac157 icedtea-2.6pre11
9d2b485d2a58ea57ab2b3c06b2128f456ab39a38 jdk7u80-b03
+0c2099cd04cd24778c5baccc7c8a72c311ef6f84 icedtea-2.6pre12
+c6fa18ed8a01a15e1210bf44dc7075463e0a514b icedtea-2.6pre13
+1d3d9e81c8e16bfe948da9bc0756e922a3802ca4 icedtea-2.6pre14
+5ad4c09169742e076305193c1e0b8256635cf33e icedtea-2.6pre15
+7891f0e7ae10d8f636fdbf29bcfe06f43d057e5f icedtea-2.6pre16
+4d25046abb67ae570ae1dbb5e3e48e7a63d93b88 icedtea-2.6pre17
a89267b51c40cba0b26fe84831478389723c8321 jdk7u80-b04
00402b4ff7a90a6deba09816192e335cadfdb4f0 jdk7u80-b05
+1792bfb4a54d87ff87438413a34004a6b6004987 icedtea-2.6pre18
+8f3c9cf0636f4d40e9c3647e03c7d0ca6d1019ee icedtea-2.6pre19
+904317834a259bdddd4568b74874c2472f119a3c icedtea-2.6pre20
+1939c010fd371d22de5c1baf2583a96e8f38da44 icedtea-2.6pre21
+cb42e88f9787c8aa28662f31484d605e550c6d53 icedtea-2.6pre22
87d4354a3ce8aafccf1f1cd9cb9d88a58731dde8 jdk7u80-b06
d496bd71dc129828c2b5962e2072cdb591454e4a jdk7u80-b07
5ce33a4444cf74e04c22fb11b1e1b76b68a6477a jdk7u80-b08
@@ -829,9 +869,19 @@
27e0103f3b11f06bc3277914564ed9a1976fb3d5 jdk7u80-b30
426e09df7eda980317d1308af15c29ef691cd471 jdk7u80-b15
198c700d102cc2051b304fc382ac58c5d76e8d26 jdk7u80-b32
-ea2051eb6ee8be8e292711caaae05a7014466ddc jdk7u85-b00
-1c6c2bdf4321c0ece7723663341f7f1a35cac843 jdk7u85-b01
+1afefe2d5f90112e87034a4eac57fdad53fe5b9f icedtea-2.6pre23
+94f15794d5e7847a60540eacbe3e276dbe127a1a icedtea-2.6pre24
+94f15794d5e7847a60540eacbe3e276dbe127a1a icedtea-2.6.0
+501fc984fa3b3d51e1a7f1220f2de635a2b370b9 jdk7u85-b00
+3f1b4a1fe4a274cd1f89d9ec83d8018f7f4b7d01 jdk7u85-b01
+94f15794d5e7847a60540eacbe3e276dbe127a1a icedtea-2.6-branchpoint
+aea5b566bfabd6bf12afaaefe0038e781a92d77b icedtea-2.7.0pre01
+08b2ebf152c2898ed7f4106d9a58816669a4240e icedtea-2.7.0pre02
e45a07be1cac074dfbde6757f64b91f0608f30fb jdk7u85-b02
+193c9550e6f72b675deb9d5f078891c118c1342c icedtea-2.7.0pre03
+43c066bdfc9fd7038d86f156706952bf17a35b6f icedtea-2.7.0pre04
+88abb663cdf92a426e963ae4121d8eb085fd0bc8 icedtea-2.7.0pre05
+601fbf4bf8c188c9ad3d7e10f4b1b9c3bdb48b4d icedtea-2.7.0pre06
cce12560430861a962349343b61d3a9eb12c6571 jdk7u91-b00
5eaaa63440c4416cd9c03d586f72b3be8c7c73f8 jdk7u91-b01
2f2d431ace967c9a71194e1bb46f38b35ea43512 jdk7u91-b02
@@ -840,5 +890,13 @@
6e42747134be8a4a366d337da1fc84a847ad8381 jdk7u101-b00
14d0f4da4a74897fc3274f8f549f41544bb4625a jdk7u111-b00
9efa3fae3c278a7f48badec775d7f9b2d5320b6d jdk7u111-b01
+b6971126dc0fbb792acb92c6fb159001117a1e2a icedtea-2.7.0pre07
+c2a745174c849bd6222ee7c764cadaef4dbc1b8b icedtea-2.7.0pre08
+9a1457cc02ae1d5feedb4a965652d8e280e66e31 icedtea-2.7.0pre09
17b40d99ea3665de2bfffe163b68f2dfcf675cba jdk7u121-b00
95e4ea3d479ebdab9d78725776b6b11d4add6b0e jdk7u131-b00
+4eea81cf6f6397e6cdcb855b574488f2132ee07b icedtea-2.7.0pre10
+8d8fc01744986c518e31e9b6e50af697f9dc4a18 icedtea-2.7.0pre11
+be8da42894af5f7d11b4bad83e166186f01ce1b4 jdk7u141-b00
+22c5a6ca09e35b63baf51bad4cb3d8f0cf326705 jdk7u141-b01
+490b222d74de50e26c5b485c1fa47208541ade89 icedtea-2.7.0pre12
diff -r 457394dc689c -r 13005b6e273c .jcheck/conf
--- a/.jcheck/conf Tue Feb 07 01:26:24 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r 457394dc689c -r 13005b6e273c agent/src/os/linux/LinuxDebuggerLocal.c
--- a/agent/src/os/linux/LinuxDebuggerLocal.c Tue Feb 07 01:26:24 2017 +0000
+++ b/agent/src/os/linux/LinuxDebuggerLocal.c Thu Jul 27 16:57:32 2017 +0100
@@ -23,6 +23,7 @@
*/
#include <jni.h>
+#include <stdlib.h>
#include "libproc.h"
#if defined(x86_64) && !defined(amd64)
@@ -73,7 +74,7 @@
(JNIEnv *env, jclass cls) {
jclass listClass;
- if (init_libproc(getenv("LIBSAPROC_DEBUG")) != true) {
+ if (init_libproc(getenv("LIBSAPROC_DEBUG") != NULL) != true) {
THROW_NEW_DEBUGGER_EXCEPTION("can't initialize libproc");
}
@@ -280,7 +281,7 @@
return (err == PS_OK)? array : 0;
}
-#if defined(i386) || defined(ia64) || defined(amd64) || defined(sparc) || defined(sparcv9)
+#if defined(i386) || 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) {
@@ -299,9 +300,6 @@
#ifdef i386
#define NPRGREG sun_jvm_hotspot_debugger_x86_X86ThreadContext_NPRGREG
#endif
-#ifdef ia64
-#define NPRGREG IA64_REG_COUNT
-#endif
#ifdef amd64
#define NPRGREG sun_jvm_hotspot_debugger_amd64_AMD64ThreadContext_NPRGREG
#endif
@@ -336,13 +334,6 @@
#endif /* i386 */
-#if ia64
- regs = (*env)->GetLongArrayElements(env, array, &isCopy);
- for (i = 0; i < NPRGREG; i++ ) {
- regs[i] = 0xDEADDEAD;
- }
-#endif /* ia64 */
-
#ifdef amd64
#define REG_INDEX(reg) sun_jvm_hotspot_debugger_amd64_AMD64ThreadContext_##reg
diff -r 457394dc689c -r 13005b6e273c agent/src/os/linux/Makefile
--- a/agent/src/os/linux/Makefile Tue Feb 07 01:26:24 2017 +0000
+++ b/agent/src/os/linux/Makefile Thu Jul 27 16:57:32 2017 +0100
@@ -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 457394dc689c -r 13005b6e273c agent/src/os/linux/elfmacros.h
--- a/agent/src/os/linux/elfmacros.h Tue Feb 07 01:26:24 2017 +0000
+++ b/agent/src/os/linux/elfmacros.h Thu Jul 27 16:57:32 2017 +0100
@@ -33,6 +33,7 @@
#define ELF_NHDR Elf64_Nhdr
#define ELF_DYN Elf64_Dyn
#define ELF_ADDR Elf64_Addr
+#define ELF_AUXV Elf64_auxv_t
#define ELF_ST_TYPE ELF64_ST_TYPE
@@ -45,6 +46,7 @@
#define ELF_NHDR Elf32_Nhdr
#define ELF_DYN Elf32_Dyn
#define ELF_ADDR Elf32_Addr
+#define ELF_AUXV Elf32_auxv_t
#define ELF_ST_TYPE ELF32_ST_TYPE
diff -r 457394dc689c -r 13005b6e273c agent/src/os/linux/libproc.h
--- a/agent/src/os/linux/libproc.h Tue Feb 07 01:26:24 2017 +0000
+++ b/agent/src/os/linux/libproc.h Thu Jul 27 16:57:32 2017 +0100
@@ -34,7 +34,7 @@
#include "libproc_md.h"
#endif
-#include <linux/ptrace.h>
+#include <sys/ptrace.h>
/************************************************************************************
@@ -67,14 +67,6 @@
*************************************************************************************/
-#ifdef ia64
-struct user_regs_struct {
-/* copied from user.h which doesn't define this in a struct */
-
-#define IA64_REG_COUNT (EF_SIZE/8+32) /* integer and fp regs */
-unsigned long regs[IA64_REG_COUNT]; /* integer and fp regs */
-};
-#endif
#if defined(sparc) || defined(sparcv9) || defined(ppc64)
#define user_regs_struct pt_regs
diff -r 457394dc689c -r 13005b6e273c agent/src/os/linux/ps_core.c
--- a/agent/src/os/linux/ps_core.c Tue Feb 07 01:26:24 2017 +0000
+++ b/agent/src/os/linux/ps_core.c Thu Jul 27 16:57:32 2017 +0100
@@ -629,6 +629,18 @@
if (notep->n_type == NT_PRSTATUS) {
if (core_handle_prstatus(ph, descdata, notep->n_descsz) != true)
return false;
+ } else if (notep->n_type == NT_AUXV) {
+ // Get first segment from entry point
+ ELF_AUXV *auxv = (ELF_AUXV *)descdata;
+ while (auxv->a_type != AT_NULL) {
+ if (auxv->a_type == AT_ENTRY) {
+ // Set entry point address to address of dynamic section.
+ // We will adjust it in read_exec_segments().
+ ph->core->dynamic_addr = auxv->a_un.a_val;
+ break;
+ }
+ auxv++;
+ }
}
p = descdata + ROUNDUP(notep->n_descsz, 4);
}
@@ -811,7 +823,13 @@
// from PT_DYNAMIC we want to read address of first link_map addr
case PT_DYNAMIC: {
- ph->core->dynamic_addr = exec_php->p_vaddr;
+ if (exec_ehdr->e_type == ET_EXEC) {
+ ph->core->dynamic_addr = exec_php->p_vaddr;
+ } else { // ET_DYN
+ // dynamic_addr has entry point of executable.
+ // Thus we should substract it.
+ ph->core->dynamic_addr += exec_php->p_vaddr - exec_ehdr->e_entry;
+ }
print_debug("address of _DYNAMIC is 0x%lx\n", ph->core->dynamic_addr);
break;
}
@@ -1007,8 +1025,9 @@
goto err;
}
- if (read_elf_header(ph->core->exec_fd, &exec_ehdr) != true || exec_ehdr.e_type != ET_EXEC) {
- print_debug("executable file is not a valid ELF ET_EXEC file\n");
+ if (read_elf_header(ph->core->exec_fd, &exec_ehdr) != true ||
+ ((exec_ehdr.e_type != ET_EXEC) && (exec_ehdr.e_type != ET_DYN))) {
+ print_debug("executable file is not a valid ELF file\n");
goto err;
}
diff -r 457394dc689c -r 13005b6e273c agent/src/os/linux/ps_proc.c
--- a/agent/src/os/linux/ps_proc.c Tue Feb 07 01:26:24 2017 +0000
+++ b/agent/src/os/linux/ps_proc.c Thu Jul 27 16:57:32 2017 +0100
@@ -27,6 +27,8 @@
#include <string.h>
#include <signal.h>
#include <errno.h>
+#include <sys/types.h>
+#include <sys/wait.h>
#include <sys/ptrace.h>
#include "libproc_impl.h"
@@ -261,7 +263,7 @@
static bool read_lib_info(struct ps_prochandle* ph) {
char fname[32];
- char buf[256];
+ char buf[PATH_MAX];
FILE *fp = NULL;
sprintf(fname, "/proc/%d/maps", ph->pid);
@@ -271,10 +273,52 @@
return false;
}
- while(fgets_no_cr(buf, 256, fp)){
- char * word[6];
- int nwords = split_n_str(buf, 6, word, ' ', '\0');
- if (nwords > 5 && find_lib(ph, word[5]) == false) {
+ while(fgets_no_cr(buf, PATH_MAX, fp)){
+ char * word[7];
+ int nwords = split_n_str(buf, 7, word, ' ', '\0');
+
+ if (nwords < 6) {
+ // not a shared library entry. ignore.
+ continue;
+ }
+
+ if (word[5][0] == '[') {
+ // not a shared library entry. ignore.
+ if (strncmp(word[5],"[stack",6) == 0) {
+ continue;
+ }
+ if (strncmp(word[5],"[heap]",6) == 0) {
+ continue;
+ }
+
+ // SA don't handle VDSO
+ if (strncmp(word[5],"[vdso]",6) == 0) {
+ continue;
+ }
+ if (strncmp(word[5],"[vsyscall]",6) == 0) {
+ continue;
+ }
+ }
+
+ if (nwords > 6) {
+ // prelink altered mapfile when the program is running.
+ // Entries like one below have to be skipped
+ // /lib64/libc-2.15.so (deleted)
+ // SO name in entries like one below have to be stripped.
+ // /lib64/libpthread-2.15.so.#prelink#.EECVts
+ char *s = strstr(word[5],".#prelink#");
+ if (s == NULL) {
+ // No prelink keyword. skip deleted library
+ print_debug("skip shared object %s deleted by prelink\n", word[5]);
+ continue;
+ }
+
+ // Fall through
+ print_debug("rectifing shared object name %s changed by prelink\n", word[5]);
+ *s = 0;
+ }
+
+ if (find_lib(ph, word[5]) == false) {
intptr_t base;
lib_info* lib;
#ifdef _LP64
diff -r 457394dc689c -r 13005b6e273c agent/src/os/linux/salibelf.c
--- a/agent/src/os/linux/salibelf.c Tue Feb 07 01:26:24 2017 +0000
+++ b/agent/src/os/linux/salibelf.c Thu Jul 27 16:57:32 2017 +0100
@@ -25,6 +25,7 @@
#include "salibelf.h"
#include <stdlib.h>
#include <unistd.h>
+#include <string.h>
extern void print_debug(const char*,...);
diff -r 457394dc689c -r 13005b6e273c agent/src/os/linux/symtab.c
--- a/agent/src/os/linux/symtab.c Tue Feb 07 01:26:24 2017 +0000
+++ b/agent/src/os/linux/symtab.c Thu Jul 27 16:57:32 2017 +0100
@@ -305,7 +305,7 @@
unsigned char *bytes
= (unsigned char*)(note+1) + note->n_namesz;
- unsigned char *filename
+ char *filename
= (build_id_to_debug_filename (note->n_descsz, bytes));
fd = pathmap_open(filename);
diff -r 457394dc689c -r 13005b6e273c agent/src/os/win32/windbg/sawindbg.cpp
--- a/agent/src/os/win32/windbg/sawindbg.cpp Tue Feb 07 01:26:24 2017 +0000
+++ b/agent/src/os/win32/windbg/sawindbg.cpp Thu Jul 27 16:57:32 2017 +0100
@@ -27,10 +27,7 @@
#include "sun_jvm_hotspot_debugger_windbg_WindbgDebuggerLocal.h"
-#ifdef _M_IA64
- #include "sun_jvm_hotspot_debugger_ia64_IA64ThreadContext.h"
- #define NPRGREG sun_jvm_hotspot_debugger_ia64_IA64ThreadContext_NPRGREG
-#elif _M_IX86
+#ifdef _M_IX86
#include "sun_jvm_hotspot_debugger_x86_X86ThreadContext.h"
#define NPRGREG sun_jvm_hotspot_debugger_x86_X86ThreadContext_NPRGREG
#elif _M_AMD64
@@ -491,92 +488,7 @@
memset(&context, 0, sizeof(CONTEXT));
#undef REG_INDEX
-#ifdef _M_IA64
- #define REG_INDEX(x) sun_jvm_hotspot_debugger_ia64_IA64ThreadContext_##x
-
- context.ContextFlags = CONTEXT_FULL | CONTEXT_DEBUG;
- ptrIDebugAdvanced->GetThreadContext(&context, sizeof(CONTEXT));
-
- ptrRegs[REG_INDEX(GR0)] = 0; // always 0
- ptrRegs[REG_INDEX(GR1)] = context.IntGp; // r1
- ptrRegs[REG_INDEX(GR2)] = context.IntT0; // r2-r3
- ptrRegs[REG_INDEX(GR3)] = context.IntT1;
- ptrRegs[REG_INDEX(GR4)] = context.IntS0; // r4-r7
- ptrRegs[REG_INDEX(GR5)] = context.IntS1;
- ptrRegs[REG_INDEX(GR6)] = context.IntS2;
- ptrRegs[REG_INDEX(GR7)] = context.IntS3;
More information about the distro-pkg-dev
mailing list