Merge

Thu, 15 Jan 2009 13:30:09 -0800

author
swamyv
date
Thu, 15 Jan 2009 13:30:09 -0800
changeset 965
fc14734c5aec
parent 964
8db2b3e46c38
parent 963
37b3ca071522
child 966
40ee984935b9

Merge

     1.1 --- a/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep	Wed Jan 14 19:45:01 2009 -0800
     1.2 +++ b/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep	Thu Jan 15 13:30:09 2009 -0800
     1.3 @@ -28,6 +28,7 @@
     1.4  binaryTreeDictionary.cpp                binaryTreeDictionary.hpp
     1.5  binaryTreeDictionary.cpp                globals.hpp
     1.6  binaryTreeDictionary.cpp                ostream.hpp
     1.7 +binaryTreeDictionary.cpp                space.inline.hpp
     1.8  binaryTreeDictionary.cpp                spaceDecorator.hpp
     1.9  
    1.10  binaryTreeDictionary.hpp                freeBlockDictionary.hpp
     2.1 --- a/src/share/vm/gc_implementation/includeDB_gc_g1	Wed Jan 14 19:45:01 2009 -0800
     2.2 +++ b/src/share/vm/gc_implementation/includeDB_gc_g1	Thu Jan 15 13:30:09 2009 -0800
     2.3 @@ -34,6 +34,7 @@
     2.4  collectionSetChooser.cpp		g1CollectedHeap.hpp
     2.5  collectionSetChooser.cpp		g1CollectorPolicy.hpp
     2.6  collectionSetChooser.cpp		collectionSetChooser.hpp
     2.7 +collectionSetChooser.cpp		space.inline.hpp
     2.8  
     2.9  collectionSetChooser.hpp		heapRegion.hpp
    2.10  collectionSetChooser.hpp                growableArray.hpp
    2.11 @@ -44,6 +45,7 @@
    2.12  concurrentG1Refine.cpp			copy.hpp
    2.13  concurrentG1Refine.cpp			g1CollectedHeap.hpp
    2.14  concurrentG1Refine.cpp			g1RemSet.hpp
    2.15 +concurrentG1Refine.cpp			space.inline.hpp
    2.16  
    2.17  concurrentG1Refine.hpp			globalDefinitions.hpp
    2.18  
    2.19 @@ -264,7 +266,7 @@
    2.20  heapRegion.cpp                          iterator.hpp
    2.21  heapRegion.cpp                          oop.inline.hpp
    2.22  
    2.23 -heapRegion.hpp                          space.hpp
    2.24 +heapRegion.hpp                          space.inline.hpp
    2.25  heapRegion.hpp                          spaceDecorator.hpp
    2.26  heapRegion.hpp                          g1BlockOffsetTable.inline.hpp
    2.27  heapRegion.hpp                          watermark.hpp
     3.1 --- a/src/share/vm/gc_implementation/includeDB_gc_parNew	Wed Jan 14 19:45:01 2009 -0800
     3.2 +++ b/src/share/vm/gc_implementation/includeDB_gc_parNew	Thu Jan 15 13:30:09 2009 -0800
     3.3 @@ -29,6 +29,8 @@
     3.4  asParNewGeneration.cpp                  cmsAdaptiveSizePolicy.hpp
     3.5  asParNewGeneration.cpp                  cmsGCAdaptivePolicyCounters.hpp
     3.6  asParNewGeneration.cpp                  defNewGeneration.inline.hpp
     3.7 +asParNewGeneration.cpp                  markOop.inline.hpp
     3.8 +asParNewGeneration.cpp                  markSweep.inline.hpp
     3.9  asParNewGeneration.cpp                  oop.pcgc.inline.hpp
    3.10  asParNewGeneration.cpp                  parNewGeneration.hpp
    3.11  asParNewGeneration.cpp                  referencePolicy.hpp
    3.12 @@ -40,7 +42,7 @@
    3.13  parCardTableModRefBS.cpp                java.hpp
    3.14  parCardTableModRefBS.cpp                mutexLocker.hpp
    3.15  parCardTableModRefBS.cpp                sharedHeap.hpp
    3.16 -parCardTableModRefBS.cpp                space.hpp
    3.17 +parCardTableModRefBS.cpp                space.inline.hpp
    3.18  parCardTableModRefBS.cpp                universe.hpp
    3.19  parCardTableModRefBS.cpp                virtualspace.hpp
    3.20  
     4.1 --- a/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge	Wed Jan 14 19:45:01 2009 -0800
     4.2 +++ b/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge	Thu Jan 15 13:30:09 2009 -0800
     4.3 @@ -302,6 +302,8 @@
     4.4  psOldGen.hpp                            spaceCounters.hpp
     4.5  
     4.6  psPermGen.cpp                           gcUtil.hpp
     4.7 +psPermGen.cpp                           markOop.inline.hpp
     4.8 +psPermGen.cpp                           markSweep.inline.hpp
     4.9  psPermGen.cpp                           parallelScavengeHeap.hpp
    4.10  psPermGen.cpp                           psMarkSweepDecorator.hpp
    4.11  psPermGen.cpp                           psParallelCompact.hpp
     5.1 --- a/src/share/vm/includeDB_compiler2	Wed Jan 14 19:45:01 2009 -0800
     5.2 +++ b/src/share/vm/includeDB_compiler2	Thu Jan 15 13:30:09 2009 -0800
     5.3 @@ -140,6 +140,7 @@
     5.4  c2_globals_<os_family>.hpp              macros.hpp
     5.5  
     5.6  c2_init_<arch>.cpp                      compile.hpp
     5.7 +c2_init_<arch>.cpp                      node.hpp
     5.8  
     5.9  c2compiler.cpp                          ad_<arch_model>.hpp
    5.10  c2compiler.cpp                          c2compiler.hpp
    5.11 @@ -839,6 +840,7 @@
    5.12  phase.cpp                               compile.hpp
    5.13  phase.cpp                               compileBroker.hpp
    5.14  phase.cpp                               nmethod.hpp
    5.15 +phase.cpp                               node.hpp
    5.16  phase.cpp                               phase.hpp
    5.17  
    5.18  phase.hpp                               port.hpp
     6.1 --- a/src/share/vm/includeDB_core	Wed Jan 14 19:45:01 2009 -0800
     6.2 +++ b/src/share/vm/includeDB_core	Thu Jan 15 13:30:09 2009 -0800
     6.3 @@ -1311,6 +1311,7 @@
     6.4  cppInterpreter_<arch>.cpp               debug.hpp
     6.5  cppInterpreter_<arch>.cpp               deoptimization.hpp
     6.6  cppInterpreter_<arch>.cpp               frame.inline.hpp
     6.7 +cppInterpreter_<arch>.cpp               interfaceSupport.hpp
     6.8  cppInterpreter_<arch>.cpp               interpreterRuntime.hpp
     6.9  cppInterpreter_<arch>.cpp               interpreter.hpp
    6.10  cppInterpreter_<arch>.cpp               interpreterGenerator.hpp
    6.11 @@ -2014,7 +2015,7 @@
    6.12  instanceKlass.cpp                       vmSymbols.hpp
    6.13  
    6.14  instanceKlass.hpp                       accessFlags.hpp
    6.15 -instanceKlass.hpp                       bitMap.hpp
    6.16 +instanceKlass.hpp                       bitMap.inline.hpp
    6.17  instanceKlass.hpp                       constMethodOop.hpp
    6.18  instanceKlass.hpp                       constantPoolOop.hpp
    6.19  instanceKlass.hpp                       handles.hpp
    6.20 @@ -3771,6 +3772,7 @@
    6.21  
    6.22  spaceDecorator.cpp                      copy.hpp
    6.23  spaceDecorator.cpp                      spaceDecorator.hpp
    6.24 +spaceDecorator.cpp                      space.inline.hpp
    6.25  
    6.26  specialized_oop_closures.cpp            ostream.hpp
    6.27  specialized_oop_closures.cpp            specialized_oop_closures.hpp
     7.1 --- a/src/share/vm/includeDB_features	Wed Jan 14 19:45:01 2009 -0800
     7.2 +++ b/src/share/vm/includeDB_features	Thu Jan 15 13:30:09 2009 -0800
     7.3 @@ -59,6 +59,8 @@
     7.4  
     7.5  dump_<arch_model>.cpp                   assembler_<arch>.inline.hpp
     7.6  dump_<arch_model>.cpp                   compactingPermGenGen.hpp
     7.7 +dump_<arch_model>.cpp                   generation.inline.hpp
     7.8 +dump_<arch_model>.cpp                   space.inline.hpp
     7.9  
    7.10  forte.cpp                               collectedHeap.inline.hpp
    7.11  forte.cpp                               debugInfoRec.hpp

mercurial