Context Navigation

← Previous Change
Next Change →

share

Timestamp:

Jul 2, 2012, 3:05:26 PM (13 years ago)

Author:

dmik

Message:

trunk: Merged in openjdk6 b25 from branches/vendor/oracle.

This accompanies an incomplete r389.

Location:

trunk/openjdk/hotspot/src/share/vm

Files:

: 39 edited

adlc/output_c.cpp (modified) (1 diff)
c1/c1_Compilation.cpp (modified) (1 diff)
c1/c1_Compilation.hpp (modified) (1 diff)
c1/c1_LIRGenerator.cpp (modified) (1 diff)
ci/ciEnv.cpp (modified) (1 diff)
gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp (modified) (1 diff)
gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp (modified) (1 diff)
gc_implementation/g1/vm_operations_g1.cpp (modified) (1 diff)
gc_implementation/parallelScavenge/psMarkSweep.cpp (modified) (1 diff)
gc_implementation/parallelScavenge/psParallelCompact.cpp (modified) (1 diff)
gc_implementation/parallelScavenge/vmPSOperations.cpp (modified) (1 diff)
gc_implementation/shared/vmGCOperations.cpp (modified) (1 diff)
gc_implementation/shared/vmGCOperations.hpp (modified) (1 diff)
memory/allocation.cpp (modified) (1 diff)
memory/allocation.hpp (modified) (1 diff)
memory/genMarkSweep.cpp (modified) (1 diff)
opto/ifnode.cpp (modified) (1 diff)
opto/loopTransform.cpp (modified) (1 diff)
opto/loopnode.hpp (modified) (1 diff)
opto/loopopts.cpp (modified) (1 diff)
opto/node.cpp (modified) (1 diff)
prims/jvmtiEventController.cpp (modified) (1 diff)
prims/jvmtiExport.cpp (modified) (1 diff)
prims/jvmtiExport.hpp (modified) (1 diff)
prims/jvmtiImpl.cpp (modified) (1 diff)
prims/jvmtiImpl.hpp (modified) (1 diff)
prims/jvmtiTagMap.cpp (modified) (1 diff)
prims/jvmtiTagMap.hpp (modified) (1 diff)
runtime/arguments.hpp (modified) (1 diff)
runtime/globals.hpp (modified) (1 diff)
runtime/jniHandles.cpp (modified) (1 diff)
services/heapDumper.cpp (modified) (1 diff)
utilities/debug.cpp (modified) (1 diff)
utilities/debug.hpp (modified) (1 diff)
utilities/globalDefinitions_gcc.hpp (modified) (1 diff)
utilities/globalDefinitions_sparcWorks.hpp (modified) (1 diff)
utilities/globalDefinitions_visCPP.hpp (modified) (1 diff)
utilities/vmError.cpp (modified) (1 diff)
utilities/vmError.hpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/openjdk/hotspot/src/share/vm/adlc/output_c.cpp

r309	r390
1	1	/*
2		* Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/c1/c1_Compilation.cpp

r309	r390
1	1	/*
2		* Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/c1/c1_Compilation.hpp

r309	r390
1	1	/*
2		* Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp

r309	r390
1	1	/*
2		* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/ci/ciEnv.cpp

r309	r390
1	1	/*
2		* Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp

r309	r390
1	1	/*
2		* Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp

r309	r390
1	1	/*
2		* Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp

r309	r390
1	1	/*
2		* Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp

r309	r390
1	1	/*
2		* Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp

r309	r390
1	1	/*
2		* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp

r309	r390
1	1	/*
2		* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp

r309	r390
1	1	/*
2		* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp

r309	r390
1	1	/*
2		* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/memory/allocation.cpp

r309	r390
1	1	/*
2		* Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/memory/allocation.hpp

r309	r390
1	1	/*
2		* Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/memory/genMarkSweep.cpp

r309	r390
1	1	/*
2		* Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/opto/ifnode.cpp

r309	r390
1	1	/*
2		* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/opto/loopTransform.cpp

r309	r390
1	1	/*
2		* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/opto/loopnode.hpp

r309	r390
1	1	/*
2		* Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/opto/loopopts.cpp

r309	r390
1	1	/*
2		* Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/opto/node.cpp

r309	r390
1	1	/*
2		* Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/prims/jvmtiEventController.cpp

r309	r390
1	1	/*
2		* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp

r309	r390
1	1	/*
2		* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/prims/jvmtiExport.hpp

r309	r390
1	1	/*
2		* Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/prims/jvmtiImpl.cpp

r309	r390
1	1	/*
2		* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/prims/jvmtiImpl.hpp

r309	r390
1	1	/*
2		* Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/prims/jvmtiTagMap.cpp

r309	r390
1	1	/*
2		* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/prims/jvmtiTagMap.hpp

r309	r390
1	1	/*
2		* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/runtime/arguments.hpp

r309	r390
1	1	/*
2		* Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/runtime/globals.hpp

r309	r390
1	1	/*
2		* Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/runtime/jniHandles.cpp

r309	r390
1	1	/*
2		* Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/services/heapDumper.cpp

r309	r390
1	1	/*
2		* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/utilities/debug.cpp

r309	r390
1	1	/*
2		* Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/utilities/debug.hpp

r309	r390
1	1	/*
2		* Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp

r309	r390
1	1	/*
2		* Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp

r309	r390
1	1	/*
2		* Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp

r309	r390
1	1	/*
2		* Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/utilities/vmError.cpp

r309	r390
1	1	/*
2		* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

trunk/openjdk/hotspot/src/share/vm/utilities/vmError.hpp

r309	r390
1	1	/*
2		* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
	2	* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
3	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	4	*

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 390 for trunk/openjdk/hotspot/src/share

Legend:

Download in other formats: