changeset 6783:3d739d45d9fd

Merge
author minqi
date Mon, 24 Sep 2012 20:04:19 -0700
parents b711844284e2 (diff) 5a98bf7d847b (current diff)
children 45535ab90688
files agent/make/ClosureFinder.java agent/src/share/classes/sun/jvm/hotspot/TestDebugger.java agent/src/share/classes/sun/jvm/hotspot/asm/AbstractInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/Address.java agent/src/share/classes/sun/jvm/hotspot/asm/Arithmetic.java agent/src/share/classes/sun/jvm/hotspot/asm/ArithmeticInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/BaseIndexScaleDispAddress.java agent/src/share/classes/sun/jvm/hotspot/asm/BranchInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/CPUHelper.java agent/src/share/classes/sun/jvm/hotspot/asm/CallInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/DirectAddress.java agent/src/share/classes/sun/jvm/hotspot/asm/Immediate.java agent/src/share/classes/sun/jvm/hotspot/asm/IndirectAddress.java agent/src/share/classes/sun/jvm/hotspot/asm/Instruction.java agent/src/share/classes/sun/jvm/hotspot/asm/LoadInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/LogicInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/MemoryInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/MoveInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/PCRelativeAddress.java agent/src/share/classes/sun/jvm/hotspot/asm/RTLDataTypes.java agent/src/share/classes/sun/jvm/hotspot/asm/RTLOperations.java agent/src/share/classes/sun/jvm/hotspot/asm/ReturnInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/ShiftInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/StoreInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/amd64/AMD64FloatRegisters.java agent/src/share/classes/sun/jvm/hotspot/asm/amd64/AMD64Helper.java agent/src/share/classes/sun/jvm/hotspot/asm/amd64/AMD64Register.java agent/src/share/classes/sun/jvm/hotspot/asm/amd64/AMD64Registers.java agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64FloatRegister.java agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64FloatRegisters.java agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64Helper.java agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64Register.java agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64Registers.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/AlternateSpaceLdstubDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/AlternateSpaceLoadDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/AlternateSpaceStoreDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/AlternateSpaceSwapDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/ArithmeticDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/BranchDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/CallDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/CoprocessorBranchDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/CoprocessorDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FP2RegisterDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FPArithmeticDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FPMoveDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FPopDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FloatBranchDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FloatDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FlushDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/Format3ADecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/IllegalInstructionDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/InstructionDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/IntegerBranchDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/JmplDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/LdstubDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/LoadDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/LogicDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/MemoryInstructionDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/ReadDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/ReadWriteDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/RegisterDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/RestoreDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/RettDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCArithmeticInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCAtomicLoadStoreInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCBranchInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCCallInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCDisassembler.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFP2RegisterInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFPArithmeticInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFPMoveInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFloatRegister.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFloatRegisters.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFlushInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFormat3AInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCHelper.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCIllegalInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCIndirectCallInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCInstructionFactory.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCInstructionFactoryImpl.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCJmplInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCLdstubInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCLoadInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCLogicInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCMemoryInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCMoveInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCNoopInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCOpcodes.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCReadInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegisterIndirectAddress.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRestoreInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRettInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCReturnInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSaveInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSethiInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCShiftInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSpecialLoadInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSpecialRegisterInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSpecialRegisters.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSpecialStoreInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCStbarInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCStoreInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSwapInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCTrapInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCUnimpInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV8Disassembler.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9BranchInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9CasInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9ConditionFlags.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9Disassembler.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9DoneInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9FMOVccInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9FMOVrInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9FlushwInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9IlltrapInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9ImpdepInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9Instruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9InstructionFactory.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9InstructionFactoryImpl.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9MOVccInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9MOVrInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9MembarInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9Opcodes.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9PopcInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9PrefetchInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9PrivilegedRegisterInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9PrivilegedRegisters.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RdprInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9ReadInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RegisterBranchInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RegisterIndirectAddress.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RestoredInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RetryInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9ReturnInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9SavedInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9SirInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9SpecialRegisterInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9SpecialRegisters.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9WriteInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9WrprInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCWriteInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SaveDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SethiDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/ShiftDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SpecialLoadDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SpecialLoadStoreDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SpecialStoreDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/StoreDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SwapDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/TrapDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/UnimpDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V8FPop1Decoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V8FPop2Decoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpaceDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpaceLdstubDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpaceLoadDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpacePrefetchDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpaceStoreDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpaceSwapDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9BranchDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9CCBranchDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9CMoveDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9CasDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9DoneRetryDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FMOVccDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FMOVrDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FPop1Decoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FPop2Decoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FloatBranchDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FlushwDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9InstructionDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9IntRegisterBranchDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9IntegerBranchDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9MOVccDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9MOVrDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9PopcDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9PrefetchDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9PrivilegedReadWriteDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9RdprDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9ReadDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9RegisterBranchDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9SavedRestoredDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9ShiftDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9SpecialLoadDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9SpecialStoreDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9WriteDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9WrprDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/sparc/WriteDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/ArithmeticDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/BranchDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/CallDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/ConditionalJmpDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/FPArithmeticDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/FPInstructionDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/FPLoadDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/FPStoreDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/FloatDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/FloatGRPDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/GRPDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/InstructionDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/JmpDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/LogicalDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/MoveDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/RotateDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSEArithmeticDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSEInstructionDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSELogicalDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSEMoveDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSEShiftDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/ShiftDecoder.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86ArithmeticInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86BranchInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86CallInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86CondJmpInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86DirectAddress.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Disassembler.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FPArithmeticInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FPInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FPLoadInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FPStoreInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FloatRegister.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FloatRegisters.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86GeneralInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Helper.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86IllegalInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Instruction.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86InstructionFactory.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86InstructionFactoryImpl.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86JmpInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86LogicInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MMXRegister.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MMXRegisters.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MemoryIndirectAddress.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MemoryInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MoveInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MoveLoadInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MoveStoreInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Opcodes.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86PCRelativeAddress.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Register.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RegisterDirectAddress.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RegisterIndirectAddress.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RegisterPart.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Registers.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RotateInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86SegmentRegister.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86SegmentRegisterAddress.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86SegmentRegisters.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86ShiftInstruction.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86XMMRegister.java agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86XMMRegisters.java agent/src/share/classes/sun/jvm/hotspot/runtime/ia64/IA64CurrentFrameGuess.java agent/src/share/classes/sun/jvm/hotspot/runtime/ia64/IA64Frame.java agent/src/share/classes/sun/jvm/hotspot/runtime/ia64/IA64JavaCallWrapper.java agent/src/share/classes/sun/jvm/hotspot/runtime/ia64/IA64RegisterMap.java agent/src/share/classes/sun/jvm/hotspot/runtime/ia64/cInterpreter.java agent/src/share/classes/sun/jvm/hotspot/runtime/linux_ia64/LinuxIA64JavaThreadPDAccess.java agent/src/share/classes/sun/jvm/hotspot/runtime/win32_ia64/Win32IA64JavaThreadPDAccess.java
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/services/memTracker.cpp	Mon Sep 24 12:44:00 2012 -0700
+++ b/src/share/vm/services/memTracker.cpp	Mon Sep 24 20:04:19 2012 -0700
@@ -71,8 +71,13 @@
   _tracking_level = NMT_off;
   if (strncmp(option_line, "=summary", 8) == 0) {
     _tracking_level = NMT_summary;
-  } else if (strncmp(option_line, "=detail", 8) == 0) {
+  } else if (strncmp(option_line, "=detail", 7) == 0) {
     _tracking_level = NMT_detail;
+  } else {
+    char msg[255];
+    //+1 to remove the '=' character
+    jio_snprintf(msg, 255, "Unknown option given to XX:NativeMemoryTracking: %s", option_line+1);
+    vm_exit_during_initialization(msg, NULL);
   }
 }