Mercurial > hg > truffle
changeset 6813:5c8fbbfed964
Merge
author | stefank |
---|---|
date | Mon, 01 Oct 2012 11:07:31 +0200 |
parents | 988bf00cc564 (diff) 1b582b1bf7cb (current diff) |
children | 85f1cded9793 |
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 src/share/tools/ProjectCreator/DirectoryTree.java src/share/tools/ProjectCreator/DirectoryTreeNode.java src/share/tools/ProjectCreator/FileFormatException.java src/share/tools/ProjectCreator/WinGammaPlatformVC6.java |
diffstat | 3 files changed, 159 insertions(+), 100 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/concurrentMark.cpp Fri Sep 28 14:36:20 2012 -0700 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.cpp Mon Oct 01 11:07:31 2012 +0200 @@ -1188,29 +1188,14 @@ // liveness counting data. class CMCountDataClosureBase: public HeapRegionClosure { protected: + G1CollectedHeap* _g1h; ConcurrentMark* _cm; + CardTableModRefBS* _ct_bs; + BitMap* _region_bm; BitMap* _card_bm; - void set_card_bitmap_range(BitMap::idx_t start_idx, BitMap::idx_t last_idx) { - assert(start_idx <= last_idx, "sanity"); - - // Set the inclusive bit range [start_idx, last_idx]. - // For small ranges (up to 8 cards) use a simple loop; otherwise - // use par_at_put_range. - if ((last_idx - start_idx) < 8) { - for (BitMap::idx_t i = start_idx; i <= last_idx; i += 1) { - _card_bm->par_set_bit(i); - } - } else { - assert(last_idx < _card_bm->size(), "sanity"); - // Note BitMap::par_at_put_range() is exclusive. - BitMap::idx_t max_idx = MAX2(last_idx+1, _card_bm->size()); - _card_bm->par_at_put_range(start_idx, max_idx, true); - } - } - - // It takes a region that's not empty (i.e., it has at least one + // Takes a region that's not empty (i.e., it has at least one // live object in it and sets its corresponding bit on the region // bitmap to 1. If the region is "starts humongous" it will also set // to 1 the bits on the region bitmap that correspond to its @@ -1231,9 +1216,11 @@ } public: - CMCountDataClosureBase(ConcurrentMark *cm, + CMCountDataClosureBase(G1CollectedHeap* g1h, BitMap* region_bm, BitMap* card_bm): - _cm(cm), _region_bm(region_bm), _card_bm(card_bm) { } + _g1h(g1h), _cm(g1h->concurrent_mark()), + _ct_bs((CardTableModRefBS*) (g1h->barrier_set())), + _region_bm(region_bm), _card_bm(card_bm) { } }; // Closure that calculates the # live objects per region. Used @@ -1243,9 +1230,9 @@ size_t _region_marked_bytes; public: - CalcLiveObjectsClosure(CMBitMapRO *bm, ConcurrentMark *cm, + CalcLiveObjectsClosure(CMBitMapRO *bm, G1CollectedHeap* g1h, BitMap* region_bm, BitMap* card_bm) : - CMCountDataClosureBase(cm, region_bm, card_bm), + CMCountDataClosureBase(g1h, region_bm, card_bm), _bm(bm), _region_marked_bytes(0) { } bool doHeapRegion(HeapRegion* hr) { @@ -1261,44 +1248,63 @@ return false; } - HeapWord* nextTop = hr->next_top_at_mark_start(); - HeapWord* start = hr->bottom(); - - assert(start <= hr->end() && start <= nextTop && nextTop <= hr->end(), + HeapWord* ntams = hr->next_top_at_mark_start(); + HeapWord* start = hr->bottom(); + + assert(start <= hr->end() && start <= ntams && ntams <= hr->end(), err_msg("Preconditions not met - " - "start: "PTR_FORMAT", nextTop: "PTR_FORMAT", end: "PTR_FORMAT, - start, nextTop, hr->end())); + "start: "PTR_FORMAT", ntams: "PTR_FORMAT", end: "PTR_FORMAT, + start, ntams, hr->end())); // Find the first marked object at or after "start". - start = _bm->getNextMarkedWordAddress(start, nextTop); + start = _bm->getNextMarkedWordAddress(start, ntams); size_t marked_bytes = 0; - while (start < nextTop) { + while (start < ntams) { oop obj = oop(start); int obj_sz = obj->size(); - HeapWord* obj_last = start + obj_sz - 1; + HeapWord* obj_end = start + obj_sz; BitMap::idx_t start_idx = _cm->card_bitmap_index_for(start); - BitMap::idx_t last_idx = _cm->card_bitmap_index_for(obj_last); - - // Set the bits in the card BM for this object (inclusive). - set_card_bitmap_range(start_idx, last_idx); + BitMap::idx_t end_idx = _cm->card_bitmap_index_for(obj_end); + + // Note: if we're looking at the last region in heap - obj_end + // could be actually just beyond the end of the heap; end_idx + // will then correspond to a (non-existent) card that is also + // just beyond the heap. + if (_g1h->is_in_g1_reserved(obj_end) && !_ct_bs->is_card_aligned(obj_end)) { + // end of object is not card aligned - increment to cover + // all the cards spanned by the object + end_idx += 1; + } + + // Set the bits in the card BM for the cards spanned by this object. + _cm->set_card_bitmap_range(_card_bm, start_idx, end_idx, true /* is_par */); // Add the size of this object to the number of marked bytes. marked_bytes += (size_t)obj_sz * HeapWordSize; // Find the next marked object after this one. - start = _bm->getNextMarkedWordAddress(obj_last + 1, nextTop); + start = _bm->getNextMarkedWordAddress(obj_end, ntams); } // Mark the allocated-since-marking portion... HeapWord* top = hr->top(); - if (nextTop < top) { - BitMap::idx_t start_idx = _cm->card_bitmap_index_for(nextTop); - BitMap::idx_t last_idx = _cm->card_bitmap_index_for(top - 1); - - set_card_bitmap_range(start_idx, last_idx); + if (ntams < top) { + BitMap::idx_t start_idx = _cm->card_bitmap_index_for(ntams); + BitMap::idx_t end_idx = _cm->card_bitmap_index_for(top); + + // Note: if we're looking at the last region in heap - top + // could be actually just beyond the end of the heap; end_idx + // will then correspond to a (non-existent) card that is also + // just beyond the heap. + if (_g1h->is_in_g1_reserved(top) && !_ct_bs->is_card_aligned(top)) { + // end of object is not card aligned - increment to cover + // all the cards spanned by the object + end_idx += 1; + } + _cm->set_card_bitmap_range(_card_bm, start_idx, end_idx, true /* is_par */); // This definitely means the region has live objects. set_bit_for_region(hr); @@ -1325,6 +1331,7 @@ // regions during the STW cleanup pause. class VerifyLiveObjectDataHRClosure: public HeapRegionClosure { + G1CollectedHeap* _g1h; ConcurrentMark* _cm; CalcLiveObjectsClosure _calc_cl; BitMap* _region_bm; // Region BM to be verified @@ -1337,14 +1344,14 @@ int _failures; public: - VerifyLiveObjectDataHRClosure(ConcurrentMark* cm, + VerifyLiveObjectDataHRClosure(G1CollectedHeap* g1h, BitMap* region_bm, BitMap* card_bm, BitMap* exp_region_bm, BitMap* exp_card_bm, bool verbose) : - _cm(cm), - _calc_cl(_cm->nextMarkBitMap(), _cm, exp_region_bm, exp_card_bm), + _g1h(g1h), _cm(g1h->concurrent_mark()), + _calc_cl(_cm->nextMarkBitMap(), g1h, exp_region_bm, exp_card_bm), _region_bm(region_bm), _card_bm(card_bm), _verbose(verbose), _exp_region_bm(exp_region_bm), _exp_card_bm(exp_card_bm), _failures(0) { } @@ -1491,7 +1498,7 @@ void work(uint worker_id) { assert(worker_id < _n_workers, "invariant"); - VerifyLiveObjectDataHRClosure verify_cl(_cm, + VerifyLiveObjectDataHRClosure verify_cl(_g1h, _actual_region_bm, _actual_card_bm, _expected_region_bm, _expected_card_bm, @@ -1521,10 +1528,10 @@ class FinalCountDataUpdateClosure: public CMCountDataClosureBase { public: - FinalCountDataUpdateClosure(ConcurrentMark* cm, + FinalCountDataUpdateClosure(G1CollectedHeap* g1h, BitMap* region_bm, BitMap* card_bm) : - CMCountDataClosureBase(cm, region_bm, card_bm) { } + CMCountDataClosureBase(g1h, region_bm, card_bm) { } bool doHeapRegion(HeapRegion* hr) { @@ -1548,24 +1555,29 @@ if (ntams < top) { // This definitely means the region has live objects. set_bit_for_region(hr); - } - - // Now set the bits for [ntams, top] - BitMap::idx_t start_idx = _cm->card_bitmap_index_for(ntams); - // set_card_bitmap_range() expects the last_idx to be with - // the range of the bit map (see assertion in set_card_bitmap_range()), - // so limit it to that range with this application of MIN2. - BitMap::idx_t last_idx = MIN2(_cm->card_bitmap_index_for(top), - _card_bm->size()-1); - if (start_idx < _card_bm->size()) { - set_card_bitmap_range(start_idx, last_idx); - } else { - // To reach here start_idx must be beyond the end of - // the bit map and last_idx must have been limited by - // the MIN2(). - assert(start_idx == last_idx + 1, - err_msg("Not beyond end start_idx " SIZE_FORMAT " last_idx " - SIZE_FORMAT, start_idx, last_idx)); + + // Now set the bits in the card bitmap for [ntams, top) + BitMap::idx_t start_idx = _cm->card_bitmap_index_for(ntams); + BitMap::idx_t end_idx = _cm->card_bitmap_index_for(top); + + // Note: if we're looking at the last region in heap - top + // could be actually just beyond the end of the heap; end_idx + // will then correspond to a (non-existent) card that is also + // just beyond the heap. + if (_g1h->is_in_g1_reserved(top) && !_ct_bs->is_card_aligned(top)) { + // end of object is not card aligned - increment to cover + // all the cards spanned by the object + end_idx += 1; + } + + assert(end_idx <= _card_bm->size(), + err_msg("oob: end_idx= "SIZE_FORMAT", bitmap size= "SIZE_FORMAT, + end_idx, _card_bm->size())); + assert(start_idx < _card_bm->size(), + err_msg("oob: start_idx= "SIZE_FORMAT", bitmap size= "SIZE_FORMAT, + start_idx, _card_bm->size())); + + _cm->set_card_bitmap_range(_card_bm, start_idx, end_idx, true /* is_par */); } // Set the bit for the region if it contains live data @@ -1606,7 +1618,7 @@ void work(uint worker_id) { assert(worker_id < _n_workers, "invariant"); - FinalCountDataUpdateClosure final_update_cl(_cm, + FinalCountDataUpdateClosure final_update_cl(_g1h, _actual_region_bm, _actual_card_bm); @@ -2846,20 +2858,19 @@ // Aggregate the counting data that was constructed concurrently // with marking. class AggregateCountDataHRClosure: public HeapRegionClosure { + G1CollectedHeap* _g1h; ConcurrentMark* _cm; + CardTableModRefBS* _ct_bs; BitMap* _cm_card_bm; size_t _max_task_num; public: - AggregateCountDataHRClosure(ConcurrentMark *cm, + AggregateCountDataHRClosure(G1CollectedHeap* g1h, BitMap* cm_card_bm, size_t max_task_num) : - _cm(cm), _cm_card_bm(cm_card_bm), - _max_task_num(max_task_num) { } - - bool is_card_aligned(HeapWord* p) { - return ((uintptr_t(p) & (CardTableModRefBS::card_size - 1)) == 0); - } + _g1h(g1h), _cm(g1h->concurrent_mark()), + _ct_bs((CardTableModRefBS*) (g1h->barrier_set())), + _cm_card_bm(cm_card_bm), _max_task_num(max_task_num) { } bool doHeapRegion(HeapRegion* hr) { if (hr->continuesHumongous()) { @@ -2890,16 +2901,23 @@ return false; } - assert(is_card_aligned(start), "sanity"); - assert(is_card_aligned(end), "sanity"); + // 'start' should be in the heap. + assert(_g1h->is_in_g1_reserved(start) && _ct_bs->is_card_aligned(start), "sanity"); + // 'end' *may* be just beyone the end of the heap (if hr is the last region) + assert(!_g1h->is_in_g1_reserved(end) || _ct_bs->is_card_aligned(end), "sanity"); BitMap::idx_t start_idx = _cm->card_bitmap_index_for(start); BitMap::idx_t limit_idx = _cm->card_bitmap_index_for(limit); BitMap::idx_t end_idx = _cm->card_bitmap_index_for(end); - // If ntams is not card aligned then we bump the index for - // limit so that we get the card spanning ntams. - if (!is_card_aligned(limit)) { + // If ntams is not card aligned then we bump card bitmap index + // for limit so that we get the all the cards spanned by + // the object ending at ntams. + // Note: if this is the last region in the heap then ntams + // could be actually just beyond the end of the the heap; + // limit_idx will then correspond to a (non-existent) card + // that is also outside the heap. + if (_g1h->is_in_g1_reserved(limit) && !_ct_bs->is_card_aligned(limit)) { limit_idx += 1; } @@ -2928,7 +2946,7 @@ // BitMap::get_next_one_offset() can handle the case when // its left_offset parameter is greater than its right_offset - // parameter. If does, however, have an early exit if + // parameter. It does, however, have an early exit if // left_offset == right_offset. So let's limit the value // passed in for left offset here. BitMap::idx_t next_idx = MIN2(scan_idx + 1, limit_idx); @@ -2964,7 +2982,7 @@ _active_workers(n_workers) { } void work(uint worker_id) { - AggregateCountDataHRClosure cl(_cm, _cm_card_bm, _max_task_num); + AggregateCountDataHRClosure cl(_g1h, _cm_card_bm, _max_task_num); if (G1CollectedHeap::use_parallel_gc_threads()) { _g1h->heap_region_par_iterate_chunked(&cl, worker_id,
--- a/src/share/vm/gc_implementation/g1/concurrentMark.hpp Fri Sep 28 14:36:20 2012 -0700 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.hpp Mon Oct 01 11:07:31 2012 +0200 @@ -806,7 +806,14 @@ return _MARKING_VERBOSE_ && _verbose_level >= high_verbose; } - // Counting data structure accessors + // Liveness counting + + // Utility routine to set an exclusive range of cards on the given + // card liveness bitmap + inline void set_card_bitmap_range(BitMap* card_bm, + BitMap::idx_t start_idx, + BitMap::idx_t end_idx, + bool is_par); // Returns the card number of the bottom of the G1 heap. // Used in biasing indices into accounting card bitmaps.
--- a/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp Fri Sep 28 14:36:20 2012 -0700 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp Mon Oct 01 11:07:31 2012 +0200 @@ -28,6 +28,42 @@ #include "gc_implementation/g1/concurrentMark.hpp" #include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +// Utility routine to set an exclusive range of cards on the given +// card liveness bitmap +inline void ConcurrentMark::set_card_bitmap_range(BitMap* card_bm, + BitMap::idx_t start_idx, + BitMap::idx_t end_idx, + bool is_par) { + + // Set the exclusive bit range [start_idx, end_idx). + assert((end_idx - start_idx) > 0, "at least one card"); + assert(end_idx <= card_bm->size(), "sanity"); + + // Silently clip the end index + end_idx = MIN2(end_idx, card_bm->size()); + + // For small ranges use a simple loop; otherwise use set_range or + // use par_at_put_range (if parallel). The range is made up of the + // cards that are spanned by an object/mem region so 8 cards will + // allow up to object sizes up to 4K to be handled using the loop. + if ((end_idx - start_idx) <= 8) { + for (BitMap::idx_t i = start_idx; i < end_idx; i += 1) { + if (is_par) { + card_bm->par_set_bit(i); + } else { + card_bm->set_bit(i); + } + } + } else { + // Note BitMap::par_at_put_range() and BitMap::set_range() are exclusive. + if (is_par) { + card_bm->par_at_put_range(start_idx, end_idx, true); + } else { + card_bm->set_range(start_idx, end_idx); + } + } +} + // Returns the index in the liveness accounting card bitmap // for the given address inline BitMap::idx_t ConcurrentMark::card_bitmap_index_for(HeapWord* addr) { @@ -35,7 +71,6 @@ // by the card shift -- address 0 corresponds to card number 0. One // must subtract the card num of the bottom of the heap to obtain a // card table index. - intptr_t card_num = intptr_t(uintptr_t(addr) >> CardTableModRefBS::card_shift); return card_num - heap_bottom_card_num(); } @@ -46,8 +81,10 @@ size_t* marked_bytes_array, BitMap* task_card_bm) { G1CollectedHeap* g1h = _g1h; + CardTableModRefBS* ct_bs = (CardTableModRefBS*) (g1h->barrier_set()); + HeapWord* start = mr.start(); - HeapWord* last = mr.last(); + HeapWord* end = mr.end(); size_t region_size_bytes = mr.byte_size(); uint index = hr->hrs_index(); @@ -61,24 +98,21 @@ marked_bytes_array[index] += region_size_bytes; BitMap::idx_t start_idx = card_bitmap_index_for(start); - BitMap::idx_t last_idx = card_bitmap_index_for(last); + BitMap::idx_t end_idx = card_bitmap_index_for(end); - // The card bitmap is task/worker specific => no need to use 'par' routines. - // Set bits in the inclusive bit range [start_idx, last_idx]. - // - // For small ranges use a simple loop; otherwise use set_range - // The range are the cards that are spanned by the object/region - // so 8 cards will allow objects/regions up to 4K to be handled - // using the loop. - if ((last_idx - start_idx) <= 8) { - for (BitMap::idx_t i = start_idx; i <= last_idx; i += 1) { - task_card_bm->set_bit(i); - } - } else { - assert(last_idx < task_card_bm->size(), "sanity"); - // Note: BitMap::set_range() is exclusive. - task_card_bm->set_range(start_idx, last_idx+1); + // Note: if we're looking at the last region in heap - end + // could be actually just beyond the end of the heap; end_idx + // will then correspond to a (non-existent) card that is also + // just beyond the heap. + if (g1h->is_in_g1_reserved(end) && !ct_bs->is_card_aligned(end)) { + // end of region is not card aligned - incremement to cover + // all the cards spanned by the region. + end_idx += 1; } + // The card bitmap is task/worker specific => no need to use + // the 'par' BitMap routines. + // Set bits in the exclusive bit range [start_idx, end_idx). + set_card_bitmap_range(task_card_bm, start_idx, end_idx, false /* is_par */); } // Counts the given memory region in the task/worker counting