hotspot/src/share/vm/includeDB_compiler2

Print this page
rev 611 : Merge

@@ -1,7 +1,7 @@
 //
-// Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
+// Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License version 2 only, as
 // published by the Free Software Foundation.

@@ -24,11 +24,11 @@
 
 ad_<arch_model>.cpp                     adGlobals_<arch_model>.hpp
 ad_<arch_model>.cpp                     ad_<arch_model>.hpp
 ad_<arch_model>.cpp                     allocation.inline.hpp
 ad_<arch_model>.cpp                     assembler.hpp
-ad_<arch_model>.cpp                     assembler_<arch_model>.inline.hpp
+ad_<arch_model>.cpp                     assembler_<arch>.inline.hpp
 ad_<arch_model>.cpp                     biasedLocking.hpp
 ad_<arch_model>.cpp                     cfgnode.hpp
 ad_<arch_model>.cpp                     collectedHeap.inline.hpp
 ad_<arch_model>.cpp                     compiledICHolderOop.hpp
 ad_<arch_model>.cpp                     growableArray.hpp

@@ -162,10 +162,11 @@
 callGenerator.hpp                       compile.hpp
 callGenerator.hpp                       deoptimization.hpp
 callGenerator.hpp                       type.hpp
 
 callnode.cpp                            callnode.hpp
+callnode.cpp                            bcEscapeAnalyzer.hpp
 callnode.cpp                            escape.hpp
 callnode.cpp                            locknode.hpp
 callnode.cpp                            machnode.hpp
 callnode.cpp                            matcher.hpp
 callnode.cpp                            oopMap.hpp

@@ -174,11 +175,10 @@
 callnode.cpp                            regmask.hpp
 callnode.cpp                            rootnode.hpp
 callnode.cpp                            runtime.hpp
 
 callnode.hpp                            connode.hpp
-callnode.hpp                            escape.hpp
 callnode.hpp                            mulnode.hpp
 callnode.hpp                            multnode.hpp
 callnode.hpp                            opcodes.hpp
 callnode.hpp                            phaseX.hpp
 callnode.hpp                            type.hpp

@@ -345,11 +345,10 @@
 
 connode.cpp                             addnode.hpp
 connode.cpp                             allocation.inline.hpp
 connode.cpp                             compile.hpp
 connode.cpp                             connode.hpp
-connode.cpp                             escape.hpp
 connode.cpp                             machnode.hpp
 connode.cpp                             matcher.hpp
 connode.cpp                             memnode.hpp
 connode.cpp                             phaseX.hpp
 connode.cpp                             sharedRuntime.hpp

@@ -408,10 +407,11 @@
 domgraph.cpp                            rootnode.hpp
 domgraph.cpp                            vectset.hpp
 
 escape.cpp                              allocation.hpp
 escape.cpp                              bcEscapeAnalyzer.hpp
+escape.cpp                              c2compiler.hpp
 escape.cpp                              callnode.hpp
 escape.cpp                              cfgnode.hpp
 escape.cpp                              compile.hpp
 escape.cpp                              escape.hpp
 escape.cpp                              phaseX.hpp

@@ -459,14 +459,17 @@
 globals.cpp                             c2_globals.hpp
 
 graphKit.cpp                            addnode.hpp
 graphKit.cpp                            barrierSet.hpp
 graphKit.cpp                            cardTableModRefBS.hpp
+graphKit.cpp                            g1SATBCardTableModRefBS.hpp
 graphKit.cpp                            collectedHeap.hpp
 graphKit.cpp                            compileLog.hpp
 graphKit.cpp                            deoptimization.hpp
 graphKit.cpp                            graphKit.hpp
+graphKit.cpp                            heapRegion.hpp
+graphKit.cpp                            idealKit.hpp
 graphKit.cpp                            locknode.hpp
 graphKit.cpp                            machnode.hpp
 graphKit.cpp                            parse.hpp
 graphKit.cpp                            rootnode.hpp
 graphKit.cpp                            runtime.hpp

@@ -482,10 +485,11 @@
 
 idealKit.cpp                            addnode.hpp
 idealKit.cpp                            callnode.hpp
 idealKit.cpp                            cfgnode.hpp
 idealKit.cpp                            idealKit.hpp
+idealKit.cpp                            runtime.hpp
 
 idealKit.hpp                            connode.hpp
 idealKit.hpp                            mulnode.hpp
 idealKit.hpp                            phaseX.hpp
 idealKit.hpp                            subnode.hpp

@@ -580,10 +584,11 @@
 locknode.hpp                            subnode.hpp
 
 loopTransform.cpp                       addnode.hpp
 loopTransform.cpp                       allocation.inline.hpp
 loopTransform.cpp                       connode.hpp
+loopTransform.cpp                       compileLog.hpp
 loopTransform.cpp                       divnode.hpp
 loopTransform.cpp                       loopnode.hpp
 loopTransform.cpp                       mulnode.hpp
 loopTransform.cpp                       rootnode.hpp
 loopTransform.cpp                       subnode.hpp

@@ -595,10 +600,11 @@
 
 loopnode.cpp                            addnode.hpp
 loopnode.cpp                            allocation.inline.hpp
 loopnode.cpp                            callnode.hpp
 loopnode.cpp                            ciMethodData.hpp
+loopnode.cpp                            compileLog.hpp
 loopnode.cpp                            connode.hpp
 loopnode.cpp                            divnode.hpp
 loopnode.cpp                            loopnode.hpp
 loopnode.cpp                            mulnode.hpp
 loopnode.cpp                            rootnode.hpp

@@ -841,11 +847,10 @@
 phaseX.cpp                              allocation.inline.hpp
 phaseX.cpp                              block.hpp
 phaseX.cpp                              callnode.hpp
 phaseX.cpp                              cfgnode.hpp
 phaseX.cpp                              connode.hpp
-phaseX.cpp                              escape.hpp
 phaseX.cpp                              loopnode.hpp
 phaseX.cpp                              machnode.hpp
 phaseX.cpp                              opcodes.hpp
 phaseX.cpp                              phaseX.hpp
 phaseX.cpp                              regalloc.hpp

@@ -914,13 +919,15 @@
 runtime.cpp                             compiledIC.hpp
 runtime.cpp                             compilerOracle.hpp
 runtime.cpp                             connode.hpp
 runtime.cpp                             copy.hpp
 runtime.cpp                             fprofiler.hpp
+runtime.cpp                             g1SATBCardTableModRefBS.hpp
 runtime.cpp                             gcLocker.inline.hpp
 runtime.cpp                             graphKit.hpp
 runtime.cpp                             handles.inline.hpp
+runtime.cpp                             heapRegion.hpp
 runtime.cpp                             icBuffer.hpp
 runtime.cpp                             interfaceSupport.hpp
 runtime.cpp                             interpreter.hpp
 runtime.cpp                             javaCalls.hpp
 runtime.cpp                             linkResolver.hpp

@@ -956,11 +963,11 @@
 runtime.hpp                             vframe.hpp
 
 runtime_<arch_model>.cpp                adGlobals_<arch_model>.hpp
 runtime_<arch_model>.cpp                ad_<arch_model>.hpp
 runtime_<arch_model>.cpp                assembler.hpp
-runtime_<arch_model>.cpp                assembler_<arch_model>.inline.hpp
+runtime_<arch_model>.cpp                assembler_<arch>.inline.hpp
 runtime_<arch_model>.cpp                globalDefinitions.hpp
 runtime_<arch_model>.cpp                interfaceSupport.hpp
 runtime_<arch_model>.cpp                interpreter.hpp
 runtime_<arch_model>.cpp                nativeInst_<arch>.hpp
 runtime_<arch_model>.cpp                runtime.hpp

@@ -988,10 +995,11 @@
 
 stubRoutines.cpp                        runtime.hpp
 
 subnode.cpp                             addnode.hpp
 subnode.cpp                             allocation.inline.hpp
+subnode.cpp                             callnode.hpp
 subnode.cpp                             cfgnode.hpp
 subnode.cpp                             compileLog.hpp
 subnode.cpp                             connode.hpp
 subnode.cpp                             loopnode.hpp
 subnode.cpp                             matcher.hpp

@@ -1082,10 +1090,11 @@
 
 idealGraphPrinter.hpp                   dict.hpp
 idealGraphPrinter.hpp                   vectset.hpp
 idealGraphPrinter.hpp                   growableArray.hpp
 idealGraphPrinter.hpp                   ostream.hpp
+idealGraphPrinter.hpp                   xmlstream.hpp
 
 idealGraphPrinter.cpp                   idealGraphPrinter.hpp
 idealGraphPrinter.cpp                   chaitin.hpp
 idealGraphPrinter.cpp                   machnode.hpp
 idealGraphPrinter.cpp                   parse.hpp