diff options
| author | stefank <none@none> | 2010-11-23 13:22:55 -0800 |
|---|---|---|
| committer | stefank <none@none> | 2010-11-23 13:22:55 -0800 |
| commit | 8ab8d32ae3f2b4a9ea9cb79079ef402c1241b2c5 (patch) | |
| tree | cd2f2252bf37499ed57b7bcbf68329e4250c462d /src/share/vm/opto | |
| parent | 41c8986d5742a2d8018c5a5b5bc02a261863a313 (diff) | |
6989984: Use standard include model for Hospot
Summary: Replaced MakeDeps and the includeDB files with more standardized solutions.
Reviewed-by: coleenp, kvn, kamg
--HG--
rename : make/windows/makefiles/makedeps.make => make/windows/makefiles/projectcreator.make
rename : src/share/tools/MakeDeps/ArgsParser.java => src/share/tools/ProjectCreator/ArgsParser.java
rename : src/share/tools/MakeDeps/BuildConfig.java => src/share/tools/ProjectCreator/BuildConfig.java
rename : src/share/tools/MakeDeps/DirectoryTree.java => src/share/tools/ProjectCreator/DirectoryTree.java
rename : src/share/tools/MakeDeps/DirectoryTreeNode.java => src/share/tools/ProjectCreator/DirectoryTreeNode.java
rename : src/share/tools/MakeDeps/FileFormatException.java => src/share/tools/ProjectCreator/FileFormatException.java
rename : src/share/tools/MakeDeps/Macro.java => src/share/tools/ProjectCreator/Macro.java
rename : src/share/tools/MakeDeps/MacroDefinitions.java => src/share/tools/ProjectCreator/MacroDefinitions.java
rename : src/share/tools/MakeDeps/MakeDeps.java => src/share/tools/ProjectCreator/ProjectCreator.java
rename : src/share/tools/MakeDeps/Util.java => src/share/tools/ProjectCreator/Util.java
rename : src/share/tools/MakeDeps/WinGammaPlatform.java => src/share/tools/ProjectCreator/WinGammaPlatform.java
rename : src/share/tools/MakeDeps/WinGammaPlatformVC6.java => src/share/tools/ProjectCreator/WinGammaPlatformVC6.java
rename : src/share/tools/MakeDeps/WinGammaPlatformVC7.java => src/share/tools/ProjectCreator/WinGammaPlatformVC7.java
rename : src/share/tools/MakeDeps/WinGammaPlatformVC8.java => src/share/tools/ProjectCreator/WinGammaPlatformVC8.java
rename : src/share/tools/MakeDeps/WinGammaPlatformVC9.java => src/share/tools/ProjectCreator/WinGammaPlatformVC9.java
Diffstat (limited to 'src/share/vm/opto')
104 files changed, 1370 insertions, 209 deletions
diff --git a/src/share/vm/opto/addnode.cpp b/src/share/vm/opto/addnode.cpp index b6d073d5b..33ecf15ba 100644 --- a/src/share/vm/opto/addnode.cpp +++ b/src/share/vm/opto/addnode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,10 +22,17 @@ * */ -// Portions of code courtesy of Clifford Click +#include "precompiled.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/addnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/connode.hpp" +#include "opto/machnode.hpp" +#include "opto/mulnode.hpp" +#include "opto/phaseX.hpp" +#include "opto/subnode.hpp" -#include "incls/_precompiled.incl" -#include "incls/_addnode.cpp.incl" +// Portions of code courtesy of Clifford Click #define MAXFLOAT ((float)3.40282346638528860e+38) diff --git a/src/share/vm/opto/addnode.hpp b/src/share/vm/opto/addnode.hpp index cd84acb8f..31aed490e 100644 --- a/src/share/vm/opto/addnode.hpp +++ b/src/share/vm/opto/addnode.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_OPTO_ADDNODE_HPP +#define SHARE_VM_OPTO_ADDNODE_HPP + +#include "opto/node.hpp" +#include "opto/opcodes.hpp" +#include "opto/type.hpp" + // Portions of code courtesy of Clifford Click class PhaseTransform; @@ -241,3 +248,5 @@ public: virtual uint ideal_reg() const { return Op_RegI; } virtual Node *Ideal(PhaseGVN *phase, bool can_reshape); }; + +#endif // SHARE_VM_OPTO_ADDNODE_HPP diff --git a/src/share/vm/opto/adlcVMDeps.hpp b/src/share/vm/opto/adlcVMDeps.hpp index 6ff5e5107..299728480 100644 --- a/src/share/vm/opto/adlcVMDeps.hpp +++ b/src/share/vm/opto/adlcVMDeps.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,15 @@ * */ +#ifndef SHARE_VM_OPTO_ADLCVMDEPS_HPP +#define SHARE_VM_OPTO_ADLCVMDEPS_HPP + +// adlcVMDeps.hpp is used by both adlc and vm builds. +// Only include allocation.hpp when we're not building adlc. +#ifndef SHARE_VM_ADLC_ARENA_HPP +#include "memory/allocation.hpp" +#endif + // Declare commonly known constant and data structures between the // ADLC and the VM // @@ -42,3 +51,5 @@ class AdlcVMDeps : public AllStatic { static const char* oop_reloc_type() { return "relocInfo::oop_type"; } static const char* none_reloc_type() { return "relocInfo::none"; } }; + +#endif // SHARE_VM_OPTO_ADLCVMDEPS_HPP diff --git a/src/share/vm/opto/block.cpp b/src/share/vm/opto/block.cpp index 1d7a84048..5514b97f8 100644 --- a/src/share/vm/opto/block.cpp +++ b/src/share/vm/opto/block.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,10 +22,20 @@ * */ -// Optimization - Graph Style +#include "precompiled.hpp" +#include "libadt/vectset.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/block.hpp" +#include "opto/cfgnode.hpp" +#include "opto/chaitin.hpp" +#include "opto/loopnode.hpp" +#include "opto/machnode.hpp" +#include "opto/matcher.hpp" +#include "opto/opcodes.hpp" +#include "opto/rootnode.hpp" +#include "utilities/copy.hpp" -#include "incls/_precompiled.incl" -#include "incls/_block.cpp.incl" +// Optimization - Graph Style //----------------------------------------------------------------------------- diff --git a/src/share/vm/opto/block.hpp b/src/share/vm/opto/block.hpp index cc06263f1..bb8781221 100644 --- a/src/share/vm/opto/block.hpp +++ b/src/share/vm/opto/block.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_OPTO_BLOCK_HPP +#define SHARE_VM_OPTO_BLOCK_HPP + +#include "opto/multnode.hpp" +#include "opto/node.hpp" +#include "opto/phase.hpp" + // Optimization - Graph Style class Block; @@ -716,3 +723,5 @@ class PhaseBlockLayout : public Phase { void reorder_traces(int count); void union_traces(Trace* from, Trace* to); }; + +#endif // SHARE_VM_OPTO_BLOCK_HPP diff --git a/src/share/vm/opto/buildOopMap.cpp b/src/share/vm/opto/buildOopMap.cpp index eea0813f2..564fd369a 100644 --- a/src/share/vm/opto/buildOopMap.cpp +++ b/src/share/vm/opto/buildOopMap.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,25 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_buildOopMap.cpp.incl" +#include "precompiled.hpp" +#include "compiler/oopMap.hpp" +#include "opto/addnode.hpp" +#include "opto/callnode.hpp" +#include "opto/compile.hpp" +#include "opto/machnode.hpp" +#include "opto/matcher.hpp" +#include "opto/phase.hpp" +#include "opto/regalloc.hpp" +#include "opto/rootnode.hpp" +#ifdef TARGET_ARCH_x86 +# include "vmreg_x86.inline.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "vmreg_sparc.inline.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "vmreg_zero.inline.hpp" +#endif // The functions in this file builds OopMaps after all scheduling is done. // diff --git a/src/share/vm/opto/bytecodeInfo.cpp b/src/share/vm/opto/bytecodeInfo.cpp index ca0a3260f..bb511eb8f 100644 --- a/src/share/vm/opto/bytecodeInfo.cpp +++ b/src/share/vm/opto/bytecodeInfo.cpp @@ -22,8 +22,15 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_bytecodeInfo.cpp.incl" +#include "precompiled.hpp" +#include "classfile/systemDictionary.hpp" +#include "classfile/vmSymbols.hpp" +#include "compiler/compileLog.hpp" +#include "interpreter/linkResolver.hpp" +#include "oops/objArrayKlass.hpp" +#include "opto/callGenerator.hpp" +#include "opto/parse.hpp" +#include "runtime/handles.inline.hpp" //============================================================================= //------------------------------InlineTree------------------------------------- diff --git a/src/share/vm/opto/c2_globals.cpp b/src/share/vm/opto/c2_globals.cpp index 06becbad9..f2925f90e 100644 --- a/src/share/vm/opto/c2_globals.cpp +++ b/src/share/vm/opto/c2_globals.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. 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 @@ -22,7 +22,7 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_c2_globals.cpp.incl" +#include "precompiled.hpp" +#include "opto/c2_globals.hpp" C2_FLAGS(MATERIALIZE_DEVELOPER_FLAG, MATERIALIZE_PD_DEVELOPER_FLAG, MATERIALIZE_PRODUCT_FLAG, MATERIALIZE_PD_PRODUCT_FLAG, MATERIALIZE_DIAGNOSTIC_FLAG, MATERIALIZE_EXPERIMENTAL_FLAG, MATERIALIZE_NOTPRODUCT_FLAG) diff --git a/src/share/vm/opto/c2_globals.hpp b/src/share/vm/opto/c2_globals.hpp index 9b35d5be8..2bdc1a04a 100644 --- a/src/share/vm/opto/c2_globals.hpp +++ b/src/share/vm/opto/c2_globals.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,26 @@ * */ +#ifndef SHARE_VM_OPTO_C2_GLOBALS_HPP +#define SHARE_VM_OPTO_C2_GLOBALS_HPP + +#include "runtime/globals.hpp" +#ifdef TARGET_ARCH_x86 +# include "c2_globals_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "c2_globals_sparc.hpp" +#endif +#ifdef TARGET_OS_FAMILY_linux +# include "c2_globals_linux.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "c2_globals_solaris.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "c2_globals_windows.hpp" +#endif + // // Defines all globals flags used by the server compiler. // @@ -438,3 +458,5 @@ "Allow back branches to be fall throughs in the block layour") \ C2_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_EXPERIMENTAL_FLAG, DECLARE_NOTPRODUCT_FLAG) + +#endif // SHARE_VM_OPTO_C2_GLOBALS_HPP diff --git a/src/share/vm/opto/c2compiler.cpp b/src/share/vm/opto/c2compiler.cpp index 142273b26..889fc4295 100644 --- a/src/share/vm/opto/c2compiler.cpp +++ b/src/share/vm/opto/c2compiler.cpp @@ -22,8 +22,21 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c2compiler.cpp.incl" +#include "precompiled.hpp" +#include "opto/c2compiler.hpp" +#include "opto/runtime.hpp" +#ifdef TARGET_ARCH_MODEL_x86_32 +# include "adfiles/ad_x86_32.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_x86_64 +# include "adfiles/ad_x86_64.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_sparc +# include "adfiles/ad_sparc.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_zero +# include "adfiles/ad_zero.hpp" +#endif volatile int C2Compiler::_runtimes = uninitialized; diff --git a/src/share/vm/opto/c2compiler.hpp b/src/share/vm/opto/c2compiler.hpp index 382fc1633..c25f2ea92 100644 --- a/src/share/vm/opto/c2compiler.hpp +++ b/src/share/vm/opto/c2compiler.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_OPTO_C2COMPILER_HPP +#define SHARE_VM_OPTO_C2COMPILER_HPP + +#include "compiler/abstractCompiler.hpp" + class C2Compiler : public AbstractCompiler { private: @@ -55,3 +60,5 @@ public: // Print compilation timers and statistics void print_timers(); }; + +#endif // SHARE_VM_OPTO_C2COMPILER_HPP diff --git a/src/share/vm/opto/callGenerator.cpp b/src/share/vm/opto/callGenerator.cpp index 6dc9e5c23..5b861bfb2 100644 --- a/src/share/vm/opto/callGenerator.cpp +++ b/src/share/vm/opto/callGenerator.cpp @@ -22,8 +22,21 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_callGenerator.cpp.incl" +#include "precompiled.hpp" +#include "ci/bcEscapeAnalyzer.hpp" +#include "ci/ciCPCache.hpp" +#include "ci/ciMethodHandle.hpp" +#include "classfile/javaClasses.hpp" +#include "compiler/compileLog.hpp" +#include "opto/addnode.hpp" +#include "opto/callGenerator.hpp" +#include "opto/callnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/connode.hpp" +#include "opto/parse.hpp" +#include "opto/rootnode.hpp" +#include "opto/runtime.hpp" +#include "opto/subnode.hpp" CallGenerator::CallGenerator(ciMethod* method) { _method = method; diff --git a/src/share/vm/opto/callGenerator.hpp b/src/share/vm/opto/callGenerator.hpp index bc704f756..75e8ba004 100644 --- a/src/share/vm/opto/callGenerator.hpp +++ b/src/share/vm/opto/callGenerator.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_OPTO_CALLGENERATOR_HPP +#define SHARE_VM_OPTO_CALLGENERATOR_HPP + +#include "opto/callnode.hpp" +#include "opto/compile.hpp" +#include "opto/type.hpp" +#include "runtime/deoptimization.hpp" + //---------------------------CallGenerator------------------------------------- // The subclasses of this class handle generation of ideal nodes for // call sites and method entry points. @@ -281,3 +289,5 @@ class WarmCallInfo : public ResourceObj { int count_all() const; #endif }; + +#endif // SHARE_VM_OPTO_CALLGENERATOR_HPP diff --git a/src/share/vm/opto/callnode.cpp b/src/share/vm/opto/callnode.cpp index df29e482f..34ce61503 100644 --- a/src/share/vm/opto/callnode.cpp +++ b/src/share/vm/opto/callnode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,13 +22,24 @@ * */ +#include "precompiled.hpp" +#include "ci/bcEscapeAnalyzer.hpp" +#include "compiler/oopMap.hpp" +#include "opto/callnode.hpp" +#include "opto/escape.hpp" +#include "opto/locknode.hpp" +#include "opto/machnode.hpp" +#include "opto/matcher.hpp" +#include "opto/parse.hpp" +#include "opto/regalloc.hpp" +#include "opto/regmask.hpp" +#include "opto/rootnode.hpp" +#include "opto/runtime.hpp" + // Portions of code courtesy of Clifford Click // Optimization - Graph Style -#include "incls/_precompiled.incl" -#include "incls/_callnode.cpp.incl" - //============================================================================= uint StartNode::size_of() const { return sizeof(*this); } uint StartNode::cmp( const Node &n ) const diff --git a/src/share/vm/opto/callnode.hpp b/src/share/vm/opto/callnode.hpp index d2788a407..774b4b8dd 100644 --- a/src/share/vm/opto/callnode.hpp +++ b/src/share/vm/opto/callnode.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,16 @@ * */ +#ifndef SHARE_VM_OPTO_CALLNODE_HPP +#define SHARE_VM_OPTO_CALLNODE_HPP + +#include "opto/connode.hpp" +#include "opto/mulnode.hpp" +#include "opto/multnode.hpp" +#include "opto/opcodes.hpp" +#include "opto/phaseX.hpp" +#include "opto/type.hpp" + // Portions of code courtesy of Clifford Click // Optimization - Graph Style @@ -938,3 +948,5 @@ public: // unlock is never a safepoint virtual bool guaranteed_safepoint() { return false; } }; + +#endif // SHARE_VM_OPTO_CALLNODE_HPP diff --git a/src/share/vm/opto/cfgnode.cpp b/src/share/vm/opto/cfgnode.cpp index ee4ccc4dd..f6ca3ce7f 100644 --- a/src/share/vm/opto/cfgnode.cpp +++ b/src/share/vm/opto/cfgnode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,13 +22,25 @@ * */ +#include "precompiled.hpp" +#include "classfile/systemDictionary.hpp" +#include "memory/allocation.inline.hpp" +#include "oops/objArrayKlass.hpp" +#include "opto/addnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/connode.hpp" +#include "opto/loopnode.hpp" +#include "opto/machnode.hpp" +#include "opto/mulnode.hpp" +#include "opto/phaseX.hpp" +#include "opto/regmask.hpp" +#include "opto/runtime.hpp" +#include "opto/subnode.hpp" + // Portions of code courtesy of Clifford Click // Optimization - Graph Style -#include "incls/_precompiled.incl" -#include "incls/_cfgnode.cpp.incl" - //============================================================================= //------------------------------Value------------------------------------------ // Compute the type of the RegionNode. diff --git a/src/share/vm/opto/cfgnode.hpp b/src/share/vm/opto/cfgnode.hpp index eae5cd093..71bc2ab75 100644 --- a/src/share/vm/opto/cfgnode.hpp +++ b/src/share/vm/opto/cfgnode.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_OPTO_CFGNODE_HPP +#define SHARE_VM_OPTO_CFGNODE_HPP + +#include "opto/multnode.hpp" +#include "opto/node.hpp" +#include "opto/opcodes.hpp" +#include "opto/type.hpp" + // Portions of code courtesy of Clifford Click // Optimization - Graph Style @@ -519,3 +527,5 @@ public: virtual void format( PhaseRegAlloc *, outputStream *st ) const; #endif }; + +#endif // SHARE_VM_OPTO_CFGNODE_HPP diff --git a/src/share/vm/opto/chaitin.cpp b/src/share/vm/opto/chaitin.cpp index 4a8e0e3f5..a7ab061fc 100644 --- a/src/share/vm/opto/chaitin.cpp +++ b/src/share/vm/opto/chaitin.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,23 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_chaitin.cpp.incl" +#include "precompiled.hpp" +#include "compiler/compileLog.hpp" +#include "compiler/oopMap.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/addnode.hpp" +#include "opto/block.hpp" +#include "opto/callnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/chaitin.hpp" +#include "opto/coalesce.hpp" +#include "opto/connode.hpp" +#include "opto/idealGraphPrinter.hpp" +#include "opto/indexSet.hpp" +#include "opto/machnode.hpp" +#include "opto/memnode.hpp" +#include "opto/opcodes.hpp" +#include "opto/rootnode.hpp" //============================================================================= diff --git a/src/share/vm/opto/chaitin.hpp b/src/share/vm/opto/chaitin.hpp index 208a3a6df..0e184caac 100644 --- a/src/share/vm/opto/chaitin.hpp +++ b/src/share/vm/opto/chaitin.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,19 @@ * */ +#ifndef SHARE_VM_OPTO_CHAITIN_HPP +#define SHARE_VM_OPTO_CHAITIN_HPP + +#include "code/vmreg.hpp" +#include "libadt/port.hpp" +#include "memory/resourceArea.hpp" +#include "opto/connode.hpp" +#include "opto/live.hpp" +#include "opto/matcher.hpp" +#include "opto/phase.hpp" +#include "opto/regalloc.hpp" +#include "opto/regmask.hpp" + class LoopTree; class MachCallNode; class MachSafePointNode; @@ -519,3 +532,5 @@ private: friend class PhaseAggressiveCoalesce; friend class PhaseConservativeCoalesce; }; + +#endif // SHARE_VM_OPTO_CHAITIN_HPP diff --git a/src/share/vm/opto/classes.cpp b/src/share/vm/opto/classes.cpp index f57841d95..0dbe9a7e9 100644 --- a/src/share/vm/opto/classes.cpp +++ b/src/share/vm/opto/classes.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,22 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_classes.cpp.incl" +#include "precompiled.hpp" +#include "opto/addnode.hpp" +#include "opto/callnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/connode.hpp" +#include "opto/divnode.hpp" +#include "opto/locknode.hpp" +#include "opto/loopnode.hpp" +#include "opto/machnode.hpp" +#include "opto/memnode.hpp" +#include "opto/mulnode.hpp" +#include "opto/multnode.hpp" +#include "opto/node.hpp" +#include "opto/rootnode.hpp" +#include "opto/subnode.hpp" +#include "opto/vectornode.hpp" // ---------------------------------------------------------------------------- // Build a table of virtual functions to map from Nodes to dense integer diff --git a/src/share/vm/opto/coalesce.cpp b/src/share/vm/opto/coalesce.cpp index 2144b59ec..bc4d1fdcf 100644 --- a/src/share/vm/opto/coalesce.cpp +++ b/src/share/vm/opto/coalesce.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,17 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_coalesce.cpp.incl" +#include "precompiled.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/block.hpp" +#include "opto/cfgnode.hpp" +#include "opto/chaitin.hpp" +#include "opto/coalesce.hpp" +#include "opto/connode.hpp" +#include "opto/indexSet.hpp" +#include "opto/machnode.hpp" +#include "opto/matcher.hpp" +#include "opto/regmask.hpp" //============================================================================= //------------------------------reset_uf_map----------------------------------- diff --git a/src/share/vm/opto/coalesce.hpp b/src/share/vm/opto/coalesce.hpp index 26847fbf4..904ce7f67 100644 --- a/src/share/vm/opto/coalesce.hpp +++ b/src/share/vm/opto/coalesce.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_OPTO_COALESCE_HPP +#define SHARE_VM_OPTO_COALESCE_HPP + +#include "opto/phase.hpp" + class LoopTree; class LRG; class LRG_List; @@ -107,3 +112,5 @@ public: void update_ifg(uint lr1, uint lr2, IndexSet *n_lr1, IndexSet *n_lr2); }; + +#endif // SHARE_VM_OPTO_COALESCE_HPP diff --git a/src/share/vm/opto/compile.cpp b/src/share/vm/opto/compile.cpp index 7289cc2b8..677279c5d 100644 --- a/src/share/vm/opto/compile.cpp +++ b/src/share/vm/opto/compile.cpp @@ -22,8 +22,58 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_compile.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "classfile/systemDictionary.hpp" +#include "code/exceptionHandlerTable.hpp" +#include "code/nmethod.hpp" +#include "compiler/compileLog.hpp" +#include "compiler/oopMap.hpp" +#include "opto/addnode.hpp" +#include "opto/block.hpp" +#include "opto/c2compiler.hpp" +#include "opto/callGenerator.hpp" +#include "opto/callnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/chaitin.hpp" +#include "opto/compile.hpp" +#include "opto/connode.hpp" +#include "opto/divnode.hpp" +#include "opto/escape.hpp" +#include "opto/idealGraphPrinter.hpp" +#include "opto/loopnode.hpp" +#include "opto/machnode.hpp" +#include "opto/macro.hpp" +#include "opto/matcher.hpp" +#include "opto/memnode.hpp" +#include "opto/mulnode.hpp" +#include "opto/node.hpp" +#include "opto/opcodes.hpp" +#include "opto/output.hpp" +#include "opto/parse.hpp" +#include "opto/phaseX.hpp" +#include "opto/rootnode.hpp" +#include "opto/runtime.hpp" +#include "opto/stringopts.hpp" +#include "opto/type.hpp" +#include "opto/vectornode.hpp" +#include "runtime/arguments.hpp" +#include "runtime/signature.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/timer.hpp" +#include "utilities/copy.hpp" +#ifdef TARGET_ARCH_MODEL_x86_32 +# include "adfiles/ad_x86_32.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_x86_64 +# include "adfiles/ad_x86_64.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_sparc +# include "adfiles/ad_sparc.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_zero +# include "adfiles/ad_zero.hpp" +#endif /// Support for intrinsics. diff --git a/src/share/vm/opto/compile.hpp b/src/share/vm/opto/compile.hpp index ce4f4298f..9ec26ac70 100644 --- a/src/share/vm/opto/compile.hpp +++ b/src/share/vm/opto/compile.hpp @@ -22,6 +22,24 @@ * */ +#ifndef SHARE_VM_OPTO_COMPILE_HPP +#define SHARE_VM_OPTO_COMPILE_HPP + +#include "asm/codeBuffer.hpp" +#include "ci/compilerInterface.hpp" +#include "code/debugInfoRec.hpp" +#include "code/exceptionHandlerTable.hpp" +#include "compiler/compilerOracle.hpp" +#include "libadt/dict.hpp" +#include "libadt/port.hpp" +#include "libadt/vectset.hpp" +#include "memory/resourceArea.hpp" +#include "opto/idealGraphPrinter.hpp" +#include "opto/phase.hpp" +#include "opto/regmask.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/vmThread.hpp" + class Block; class Bundle; class C2Compiler; @@ -777,3 +795,5 @@ class Compile : public Phase { // Definitions of pd methods static void pd_compiler2_init(); }; + +#endif // SHARE_VM_OPTO_COMPILE_HPP diff --git a/src/share/vm/opto/connode.cpp b/src/share/vm/opto/connode.cpp index 3fd660a9f..db36c6dd4 100644 --- a/src/share/vm/opto/connode.cpp +++ b/src/share/vm/opto/connode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,10 +22,19 @@ * */ -// Optimization - Graph Style +#include "precompiled.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/addnode.hpp" +#include "opto/compile.hpp" +#include "opto/connode.hpp" +#include "opto/machnode.hpp" +#include "opto/matcher.hpp" +#include "opto/memnode.hpp" +#include "opto/phaseX.hpp" +#include "opto/subnode.hpp" +#include "runtime/sharedRuntime.hpp" -#include "incls/_precompiled.incl" -#include "incls/_connode.cpp.incl" +// Optimization - Graph Style //============================================================================= //------------------------------hash------------------------------------------- diff --git a/src/share/vm/opto/connode.hpp b/src/share/vm/opto/connode.hpp index 7b00b61bc..9d3e094c1 100644 --- a/src/share/vm/opto/connode.hpp +++ b/src/share/vm/opto/connode.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_OPTO_CONNODE_HPP +#define SHARE_VM_OPTO_CONNODE_HPP + +#include "opto/node.hpp" +#include "opto/opcodes.hpp" +#include "opto/type.hpp" + class PhaseTransform; class MachNode; @@ -695,3 +702,5 @@ public: PopCountLNode(Node* in1) : CountBitsNode(in1) {} virtual int Opcode() const; }; + +#endif // SHARE_VM_OPTO_CONNODE_HPP diff --git a/src/share/vm/opto/divnode.cpp b/src/share/vm/opto/divnode.cpp index 496e3a38d..553941007 100644 --- a/src/share/vm/opto/divnode.cpp +++ b/src/share/vm/opto/divnode.cpp @@ -22,12 +22,21 @@ * */ +#include "precompiled.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/addnode.hpp" +#include "opto/connode.hpp" +#include "opto/divnode.hpp" +#include "opto/machnode.hpp" +#include "opto/matcher.hpp" +#include "opto/mulnode.hpp" +#include "opto/phaseX.hpp" +#include "opto/subnode.hpp" + // Portions of code courtesy of Clifford Click // Optimization - Graph Style -#include "incls/_precompiled.incl" -#include "incls/_divnode.cpp.incl" #include <math.h> //----------------------magic_int_divide_constants----------------------------- diff --git a/src/share/vm/opto/divnode.hpp b/src/share/vm/opto/divnode.hpp index dd61be4a3..03f5be546 100644 --- a/src/share/vm/opto/divnode.hpp +++ b/src/share/vm/opto/divnode.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_OPTO_DIVNODE_HPP +#define SHARE_VM_OPTO_DIVNODE_HPP + +#include "opto/multnode.hpp" +#include "opto/node.hpp" +#include "opto/opcodes.hpp" +#include "opto/type.hpp" + // Portions of code courtesy of Clifford Click // Optimization - Graph Style @@ -175,3 +183,5 @@ public: // Make a divmod and associated projections from a div or mod. static DivModLNode* make(Compile* C, Node* div_or_mod); }; + +#endif // SHARE_VM_OPTO_DIVNODE_HPP diff --git a/src/share/vm/opto/doCall.cpp b/src/share/vm/opto/doCall.cpp index bfe52483a..4c19678ea 100644 --- a/src/share/vm/opto/doCall.cpp +++ b/src/share/vm/opto/doCall.cpp @@ -22,8 +22,23 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_doCall.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciCPCache.hpp" +#include "ci/ciCallSite.hpp" +#include "ci/ciMethodHandle.hpp" +#include "classfile/vmSymbols.hpp" +#include "compiler/compileLog.hpp" +#include "interpreter/linkResolver.hpp" +#include "opto/addnode.hpp" +#include "opto/callGenerator.hpp" +#include "opto/cfgnode.hpp" +#include "opto/mulnode.hpp" +#include "opto/parse.hpp" +#include "opto/rootnode.hpp" +#include "opto/runtime.hpp" +#include "opto/subnode.hpp" +#include "prims/nativeLookup.hpp" +#include "runtime/sharedRuntime.hpp" #ifndef PRODUCT void trace_type_profile(ciMethod *method, int depth, int bci, ciMethod *prof_method, ciKlass *prof_klass, int site_count, int receiver_count) { diff --git a/src/share/vm/opto/domgraph.cpp b/src/share/vm/opto/domgraph.cpp index eb6e0b7b4..ef4e1b17d 100644 --- a/src/share/vm/opto/domgraph.cpp +++ b/src/share/vm/opto/domgraph.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,13 +22,18 @@ * */ +#include "precompiled.hpp" +#include "libadt/vectset.hpp" +#include "memory/allocation.hpp" +#include "opto/block.hpp" +#include "opto/machnode.hpp" +#include "opto/phaseX.hpp" +#include "opto/rootnode.hpp" + // Portions of code courtesy of Clifford Click // Optimization - Graph Style -#include "incls/_precompiled.incl" -#include "incls/_domgraph.cpp.incl" - //------------------------------Tarjan----------------------------------------- // A data structure that holds all the information needed to find dominators. struct Tarjan { diff --git a/src/share/vm/opto/escape.cpp b/src/share/vm/opto/escape.cpp index 23d90d7da..c53c4ae6e 100644 --- a/src/share/vm/opto/escape.cpp +++ b/src/share/vm/opto/escape.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,17 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_escape.cpp.incl" +#include "precompiled.hpp" +#include "ci/bcEscapeAnalyzer.hpp" +#include "libadt/vectset.hpp" +#include "memory/allocation.hpp" +#include "opto/c2compiler.hpp" +#include "opto/callnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/compile.hpp" +#include "opto/escape.hpp" +#include "opto/phaseX.hpp" +#include "opto/rootnode.hpp" void PointsToNode::add_edge(uint targIdx, PointsToNode::EdgeType et) { uint v = (targIdx << EdgeShift) + ((uint) et); diff --git a/src/share/vm/opto/escape.hpp b/src/share/vm/opto/escape.hpp index a7d47ba67..51198305b 100644 --- a/src/share/vm/opto/escape.hpp +++ b/src/share/vm/opto/escape.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_OPTO_ESCAPE_HPP +#define SHARE_VM_OPTO_ESCAPE_HPP + +#include "opto/addnode.hpp" +#include "opto/node.hpp" +#include "utilities/growableArray.hpp" + // // Adaptation for C2 of the escape analysis algorithm described in: // @@ -364,3 +371,5 @@ public: void dump(); #endif }; + +#endif // SHARE_VM_OPTO_ESCAPE_HPP diff --git a/src/share/vm/opto/gcm.cpp b/src/share/vm/opto/gcm.cpp index f222001d3..6a6a18e73 100644 --- a/src/share/vm/opto/gcm.cpp +++ b/src/share/vm/opto/gcm.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,13 +22,36 @@ * */ +#include "precompiled.hpp" +#include "libadt/vectset.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/block.hpp" +#include "opto/c2compiler.hpp" +#include "opto/callnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/machnode.hpp" +#include "opto/opcodes.hpp" +#include "opto/phaseX.hpp" +#include "opto/rootnode.hpp" +#include "opto/runtime.hpp" +#include "runtime/deoptimization.hpp" +#ifdef TARGET_ARCH_MODEL_x86_32 +# include "adfiles/ad_x86_32.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_x86_64 +# include "adfiles/ad_x86_64.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_sparc +# include "adfiles/ad_sparc.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_zero +# include "adfiles/ad_zero.hpp" +#endif + // Portions of code courtesy of Clifford Click // Optimization - Graph Style -#include "incls/_precompiled.incl" -#include "incls/_gcm.cpp.incl" - // To avoid float value underflow #define MIN_BLOCK_FREQUENCY 1.e-35f diff --git a/src/share/vm/opto/generateOptoStub.cpp b/src/share/vm/opto/generateOptoStub.cpp index 111a33289..31600a749 100644 --- a/src/share/vm/opto/generateOptoStub.cpp +++ b/src/share/vm/opto/generateOptoStub.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,21 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_generateOptoStub.cpp.incl" +#include "precompiled.hpp" +#include "opto/addnode.hpp" +#include "opto/callnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/compile.hpp" +#include "opto/connode.hpp" +#include "opto/locknode.hpp" +#include "opto/memnode.hpp" +#include "opto/mulnode.hpp" +#include "opto/node.hpp" +#include "opto/parse.hpp" +#include "opto/phaseX.hpp" +#include "opto/rootnode.hpp" +#include "opto/runtime.hpp" +#include "opto/type.hpp" //--------------------gen_stub------------------------------- void GraphKit::gen_stub(address C_function, diff --git a/src/share/vm/opto/graphKit.cpp b/src/share/vm/opto/graphKit.cpp index 493af5cea..1a3333db7 100644 --- a/src/share/vm/opto/graphKit.cpp +++ b/src/share/vm/opto/graphKit.cpp @@ -22,8 +22,23 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_graphKit.cpp.incl" +#include "precompiled.hpp" +#include "compiler/compileLog.hpp" +#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" +#include "gc_implementation/g1/heapRegion.hpp" +#include "gc_interface/collectedHeap.hpp" +#include "memory/barrierSet.hpp" +#include "memory/cardTableModRefBS.hpp" +#include "opto/addnode.hpp" +#include "opto/graphKit.hpp" +#include "opto/idealKit.hpp" +#include "opto/locknode.hpp" +#include "opto/machnode.hpp" +#include "opto/parse.hpp" +#include "opto/rootnode.hpp" +#include "opto/runtime.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/sharedRuntime.hpp" //----------------------------GraphKit----------------------------------------- // Main utility constructor. diff --git a/src/share/vm/opto/graphKit.hpp b/src/share/vm/opto/graphKit.hpp index 3d15fe826..721bd8640 100644 --- a/src/share/vm/opto/graphKit.hpp +++ b/src/share/vm/opto/graphKit.hpp @@ -22,6 +22,22 @@ * */ +#ifndef SHARE_VM_OPTO_GRAPHKIT_HPP +#define SHARE_VM_OPTO_GRAPHKIT_HPP + +#include "ci/ciEnv.hpp" +#include "ci/ciMethodData.hpp" +#include "opto/addnode.hpp" +#include "opto/callnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/compile.hpp" +#include "opto/divnode.hpp" +#include "opto/mulnode.hpp" +#include "opto/phaseX.hpp" +#include "opto/subnode.hpp" +#include "opto/type.hpp" +#include "runtime/deoptimization.hpp" + class FastLockNode; class FastUnlockNode; class IdealKit; @@ -824,3 +840,5 @@ class PreserveReexecuteState: public StackObj { PreserveReexecuteState(GraphKit* kit); ~PreserveReexecuteState(); }; + +#endif // SHARE_VM_OPTO_GRAPHKIT_HPP diff --git a/src/share/vm/opto/idealGraphPrinter.cpp b/src/share/vm/opto/idealGraphPrinter.cpp index 923759a53..212880c07 100644 --- a/src/share/vm/opto/idealGraphPrinter.cpp +++ b/src/share/vm/opto/idealGraphPrinter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,12 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_idealGraphPrinter.cpp.incl" +#include "precompiled.hpp" +#include "opto/chaitin.hpp" +#include "opto/idealGraphPrinter.hpp" +#include "opto/machnode.hpp" +#include "opto/parse.hpp" +#include "runtime/threadCritical.hpp" #ifndef PRODUCT diff --git a/src/share/vm/opto/idealGraphPrinter.hpp b/src/share/vm/opto/idealGraphPrinter.hpp index 5080200b1..9c8807a47 100644 --- a/src/share/vm/opto/idealGraphPrinter.hpp +++ b/src/share/vm/opto/idealGraphPrinter.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,15 @@ * */ +#ifndef SHARE_VM_OPTO_IDEALGRAPHPRINTER_HPP +#define SHARE_VM_OPTO_IDEALGRAPHPRINTER_HPP + +#include "libadt/dict.hpp" +#include "libadt/vectset.hpp" +#include "utilities/growableArray.hpp" +#include "utilities/ostream.hpp" +#include "utilities/xmlstream.hpp" + #ifndef PRODUCT class Compile; @@ -140,3 +149,5 @@ public: }; #endif + +#endif // SHARE_VM_OPTO_IDEALGRAPHPRINTER_HPP diff --git a/src/share/vm/opto/idealKit.cpp b/src/share/vm/opto/idealKit.cpp index f2a17b3e7..5cd6f9bde 100644 --- a/src/share/vm/opto/idealKit.cpp +++ b/src/share/vm/opto/idealKit.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,12 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_idealKit.cpp.incl" +#include "precompiled.hpp" +#include "opto/addnode.hpp" +#include "opto/callnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/idealKit.hpp" +#include "opto/runtime.hpp" // Static initialization diff --git a/src/share/vm/opto/idealKit.hpp b/src/share/vm/opto/idealKit.hpp index 2fe5dbc5d..b5d894ca2 100644 --- a/src/share/vm/opto/idealKit.hpp +++ b/src/share/vm/opto/idealKit.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,18 @@ * */ +#ifndef SHARE_VM_OPTO_IDEALKIT_HPP +#define SHARE_VM_OPTO_IDEALKIT_HPP + +#include "opto/addnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/connode.hpp" +#include "opto/divnode.hpp" +#include "opto/mulnode.hpp" +#include "opto/phaseX.hpp" +#include "opto/subnode.hpp" +#include "opto/type.hpp" + //----------------------------------------------------------------------------- //----------------------------IdealKit----------------------------------------- // Set of utilities for creating control flow and scalar SSA data flow. @@ -228,3 +240,5 @@ class IdealKit: public StackObj { Node* parm1 = NULL, Node* parm2 = NULL); }; + +#endif // SHARE_VM_OPTO_IDEALKIT_HPP diff --git a/src/share/vm/opto/ifg.cpp b/src/share/vm/opto/ifg.cpp index caae38314..3a2254565 100644 --- a/src/share/vm/opto/ifg.cpp +++ b/src/share/vm/opto/ifg.cpp @@ -22,8 +22,20 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ifg.cpp.incl" +#include "precompiled.hpp" +#include "compiler/oopMap.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/addnode.hpp" +#include "opto/block.hpp" +#include "opto/callnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/chaitin.hpp" +#include "opto/coalesce.hpp" +#include "opto/connode.hpp" +#include "opto/indexSet.hpp" +#include "opto/machnode.hpp" +#include "opto/memnode.hpp" +#include "opto/opcodes.hpp" #define EXACT_PRESSURE 1 diff --git a/src/share/vm/opto/ifnode.cpp b/src/share/vm/opto/ifnode.cpp index 590e1379e..25f2e3151 100644 --- a/src/share/vm/opto/ifnode.cpp +++ b/src/share/vm/opto/ifnode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. 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 @@ -22,13 +22,19 @@ * */ +#include "precompiled.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/addnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/connode.hpp" +#include "opto/phaseX.hpp" +#include "opto/runtime.hpp" +#include "opto/subnode.hpp" + // Portions of code courtesy of Clifford Click // Optimization - Graph Style -#include "incls/_precompiled.incl" -#include "incls/_ifnode.cpp.incl" - extern int explicit_null_checks_elided; diff --git a/src/share/vm/opto/indexSet.cpp b/src/share/vm/opto/indexSet.cpp index b1fc43f4e..efbb4e3c3 100644 --- a/src/share/vm/opto/indexSet.cpp +++ b/src/share/vm/opto/indexSet.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 @@ -22,13 +22,17 @@ * */ +#include "precompiled.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/chaitin.hpp" +#include "opto/compile.hpp" +#include "opto/indexSet.hpp" +#include "opto/regmask.hpp" + // This file defines the IndexSet class, a set of sparse integer indices. // This data structure is used by the compiler in its liveness analysis and // during register allocation. It also defines an iterator for this class. -#include "incls/_precompiled.incl" -#include "incls/_indexSet.cpp.incl" - //-------------------------------- Initializations ------------------------------ IndexSet::BitBlock IndexSet::_empty_block = IndexSet::BitBlock(); diff --git a/src/share/vm/opto/indexSet.hpp b/src/share/vm/opto/indexSet.hpp index ba2183981..0c4119c2d 100644 --- a/src/share/vm/opto/indexSet.hpp +++ b/src/share/vm/opto/indexSet.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_OPTO_INDEXSET_HPP +#define SHARE_VM_OPTO_INDEXSET_HPP + +#include "memory/allocation.hpp" +#include "memory/resourceArea.hpp" +#include "opto/compile.hpp" +#include "opto/regmask.hpp" + // This file defines the IndexSet class, a set of sparse integer indices. // This data structure is used by the compiler in its liveness analysis and // during register allocation. @@ -459,3 +467,5 @@ class IndexSetIterator VALUE_OBJ_CLASS_SPEC { } } }; + +#endif // SHARE_VM_OPTO_INDEXSET_HPP diff --git a/src/share/vm/opto/lcm.cpp b/src/share/vm/opto/lcm.cpp index c93b53eb9..3d84f6baf 100644 --- a/src/share/vm/opto/lcm.cpp +++ b/src/share/vm/opto/lcm.cpp @@ -22,10 +22,28 @@ * */ -// Optimization - Graph Style +#include "precompiled.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/block.hpp" +#include "opto/c2compiler.hpp" +#include "opto/callnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/machnode.hpp" +#include "opto/runtime.hpp" +#ifdef TARGET_ARCH_MODEL_x86_32 +# include "adfiles/ad_x86_32.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_x86_64 +# include "adfiles/ad_x86_64.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_sparc +# include "adfiles/ad_sparc.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_zero +# include "adfiles/ad_zero.hpp" +#endif -#include "incls/_precompiled.incl" -#include "incls/_lcm.cpp.incl" +// Optimization - Graph Style //------------------------------implicit_null_check---------------------------- // Detect implicit-null-check opportunities. Basically, find NULL checks diff --git a/src/share/vm/opto/library_call.cpp b/src/share/vm/opto/library_call.cpp index 053707b70..c64cbfeb5 100644 --- a/src/share/vm/opto/library_call.cpp +++ b/src/share/vm/opto/library_call.cpp @@ -22,8 +22,21 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_library_call.cpp.incl" +#include "precompiled.hpp" +#include "classfile/systemDictionary.hpp" +#include "classfile/vmSymbols.hpp" +#include "compiler/compileLog.hpp" +#include "oops/objArrayKlass.hpp" +#include "opto/addnode.hpp" +#include "opto/callGenerator.hpp" +#include "opto/cfgnode.hpp" +#include "opto/idealKit.hpp" +#include "opto/mulnode.hpp" +#include "opto/parse.hpp" +#include "opto/runtime.hpp" +#include "opto/subnode.hpp" +#include "prims/nativeLookup.hpp" +#include "runtime/sharedRuntime.hpp" class LibraryIntrinsic : public InlineCallGenerator { // Extend the set of intrinsics known to the runtime: diff --git a/src/share/vm/opto/live.cpp b/src/share/vm/opto/live.cpp index efe106b47..cdeed3b1f 100644 --- a/src/share/vm/opto/live.cpp +++ b/src/share/vm/opto/live.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,12 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_live.cpp.incl" +#include "precompiled.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/callnode.hpp" +#include "opto/chaitin.hpp" +#include "opto/live.hpp" +#include "opto/machnode.hpp" diff --git a/src/share/vm/opto/live.hpp b/src/share/vm/opto/live.hpp index 15c9f11b4..c7714fecc 100644 --- a/src/share/vm/opto/live.hpp +++ b/src/share/vm/opto/live.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,16 @@ * */ +#ifndef SHARE_VM_OPTO_LIVE_HPP +#define SHARE_VM_OPTO_LIVE_HPP + +#include "libadt/port.hpp" +#include "libadt/vectset.hpp" +#include "opto/block.hpp" +#include "opto/indexSet.hpp" +#include "opto/phase.hpp" +#include "opto/regmask.hpp" + class Block; class LRG_List; class PhaseCFG; @@ -72,3 +82,5 @@ public: void stats(uint iters) const; #endif }; + +#endif // SHARE_VM_OPTO_LIVE_HPP diff --git a/src/share/vm/opto/locknode.cpp b/src/share/vm/opto/locknode.cpp index a4c59deda..23a594e13 100644 --- a/src/share/vm/opto/locknode.cpp +++ b/src/share/vm/opto/locknode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,11 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_locknode.cpp.incl" +#include "precompiled.hpp" +#include "opto/locknode.hpp" +#include "opto/parse.hpp" +#include "opto/rootnode.hpp" +#include "opto/runtime.hpp" //============================================================================= const RegMask &BoxLockNode::in_RegMask(uint i) const { diff --git a/src/share/vm/opto/locknode.hpp b/src/share/vm/opto/locknode.hpp index 7b746e075..3858a038f 100644 --- a/src/share/vm/opto/locknode.hpp +++ b/src/share/vm/opto/locknode.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,25 @@ * */ +#ifndef SHARE_VM_OPTO_LOCKNODE_HPP +#define SHARE_VM_OPTO_LOCKNODE_HPP + +#include "opto/node.hpp" +#include "opto/opcodes.hpp" +#include "opto/subnode.hpp" +#ifdef TARGET_ARCH_MODEL_x86_32 +# include "adfiles/ad_x86_32.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_x86_64 +# include "adfiles/ad_x86_64.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_sparc +# include "adfiles/ad_sparc.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_zero +# include "adfiles/ad_zero.hpp" +#endif + //------------------------------BoxLockNode------------------------------------ class BoxLockNode : public Node { public: @@ -100,3 +119,5 @@ public: const Type *sub(const Type *t1, const Type *t2) const { return TypeInt::CC;} }; + +#endif // SHARE_VM_OPTO_LOCKNODE_HPP diff --git a/src/share/vm/opto/loopTransform.cpp b/src/share/vm/opto/loopTransform.cpp index c4fce2d98..9de938d25 100644 --- a/src/share/vm/opto/loopTransform.cpp +++ b/src/share/vm/opto/loopTransform.cpp @@ -22,8 +22,18 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_loopTransform.cpp.incl" +#include "precompiled.hpp" +#include "compiler/compileLog.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/addnode.hpp" +#include "opto/callnode.hpp" +#include "opto/connode.hpp" +#include "opto/divnode.hpp" +#include "opto/loopnode.hpp" +#include "opto/mulnode.hpp" +#include "opto/rootnode.hpp" +#include "opto/runtime.hpp" +#include "opto/subnode.hpp" //------------------------------is_loop_exit----------------------------------- // Given an IfNode, return the loop-exiting projection or NULL if both diff --git a/src/share/vm/opto/loopUnswitch.cpp b/src/share/vm/opto/loopUnswitch.cpp index 251089c00..8cfd5fb6b 100644 --- a/src/share/vm/opto/loopUnswitch.cpp +++ b/src/share/vm/opto/loopUnswitch.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,11 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_loopUnswitch.cpp.incl" +#include "precompiled.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/connode.hpp" +#include "opto/loopnode.hpp" +#include "opto/rootnode.hpp" //================= Loop Unswitching ===================== // diff --git a/src/share/vm/opto/loopnode.cpp b/src/share/vm/opto/loopnode.cpp index 17277fa57..785ef4439 100644 --- a/src/share/vm/opto/loopnode.cpp +++ b/src/share/vm/opto/loopnode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,20 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_loopnode.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciMethodData.hpp" +#include "compiler/compileLog.hpp" +#include "libadt/vectset.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/addnode.hpp" +#include "opto/callnode.hpp" +#include "opto/connode.hpp" +#include "opto/divnode.hpp" +#include "opto/idealGraphPrinter.hpp" +#include "opto/loopnode.hpp" +#include "opto/mulnode.hpp" +#include "opto/rootnode.hpp" +#include "opto/superword.hpp" //============================================================================= //------------------------------is_loop_iv------------------------------------- diff --git a/src/share/vm/opto/loopnode.hpp b/src/share/vm/opto/loopnode.hpp index 3b3b42053..f11b7c942 100644 --- a/src/share/vm/opto/loopnode.hpp +++ b/src/share/vm/opto/loopnode.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,15 @@ * */ +#ifndef SHARE_VM_OPTO_LOOPNODE_HPP +#define SHARE_VM_OPTO_LOOPNODE_HPP + +#include "opto/cfgnode.hpp" +#include "opto/multnode.hpp" +#include "opto/phaseX.hpp" +#include "opto/subnode.hpp" +#include "opto/type.hpp" + class CmpNode; class CountedLoopEndNode; class CountedLoopNode; @@ -1015,3 +1024,5 @@ public: IdealLoopTree* current() { return _curnt; } // Return current value of iterator. }; + +#endif // SHARE_VM_OPTO_LOOPNODE_HPP diff --git a/src/share/vm/opto/loopopts.cpp b/src/share/vm/opto/loopopts.cpp index 5457abec9..9f5669286 100644 --- a/src/share/vm/opto/loopopts.cpp +++ b/src/share/vm/opto/loopopts.cpp @@ -22,8 +22,15 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_loopopts.cpp.incl" +#include "precompiled.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/addnode.hpp" +#include "opto/connode.hpp" +#include "opto/divnode.hpp" +#include "opto/loopnode.hpp" +#include "opto/mulnode.hpp" +#include "opto/rootnode.hpp" +#include "opto/subnode.hpp" //============================================================================= //------------------------------split_thru_phi--------------------------------- diff --git a/src/share/vm/opto/machnode.cpp b/src/share/vm/opto/machnode.cpp index 0230b51ac..179116287 100644 --- a/src/share/vm/opto/machnode.cpp +++ b/src/share/vm/opto/machnode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,10 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_machnode.cpp.incl" +#include "precompiled.hpp" +#include "gc_interface/collectedHeap.hpp" +#include "opto/machnode.hpp" +#include "opto/regalloc.hpp" //============================================================================= // Return the value requested diff --git a/src/share/vm/opto/machnode.hpp b/src/share/vm/opto/machnode.hpp index d4af4a9bc..633a9b143 100644 --- a/src/share/vm/opto/machnode.hpp +++ b/src/share/vm/opto/machnode.hpp @@ -22,6 +22,15 @@ * */ +#ifndef SHARE_VM_OPTO_MACHNODE_HPP +#define SHARE_VM_OPTO_MACHNODE_HPP + +#include "opto/callnode.hpp" +#include "opto/matcher.hpp" +#include "opto/multnode.hpp" +#include "opto/node.hpp" +#include "opto/regmask.hpp" + class BufferBlob; class CodeBuffer; class JVMState; @@ -828,3 +837,5 @@ public: virtual void ext_format(PhaseRegAlloc *ra, const MachNode *node, int idx, outputStream *st) const { int_format( ra, node, st ); } #endif }; + +#endif // SHARE_VM_OPTO_MACHNODE_HPP diff --git a/src/share/vm/opto/macro.cpp b/src/share/vm/opto/macro.cpp index 214c3150e..3c95bf0ea 100644 --- a/src/share/vm/opto/macro.cpp +++ b/src/share/vm/opto/macro.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,25 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_macro.cpp.incl" +#include "precompiled.hpp" +#include "compiler/compileLog.hpp" +#include "libadt/vectset.hpp" +#include "opto/addnode.hpp" +#include "opto/callnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/compile.hpp" +#include "opto/connode.hpp" +#include "opto/locknode.hpp" +#include "opto/loopnode.hpp" +#include "opto/macro.hpp" +#include "opto/memnode.hpp" +#include "opto/node.hpp" +#include "opto/phaseX.hpp" +#include "opto/rootnode.hpp" +#include "opto/runtime.hpp" +#include "opto/subnode.hpp" +#include "opto/type.hpp" +#include "runtime/sharedRuntime.hpp" // diff --git a/src/share/vm/opto/macro.hpp b/src/share/vm/opto/macro.hpp index c18973aef..430d47c35 100644 --- a/src/share/vm/opto/macro.hpp +++ b/src/share/vm/opto/macro.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_OPTO_MACRO_HPP +#define SHARE_VM_OPTO_MACRO_HPP + +#include "opto/phase.hpp" + class AllocateNode; class AllocateArrayNode; class CallNode; @@ -116,3 +121,5 @@ public: bool expand_macro_nodes(); }; + +#endif // SHARE_VM_OPTO_MACRO_HPP diff --git a/src/share/vm/opto/matcher.cpp b/src/share/vm/opto/matcher.cpp index 94178813e..ba48f8f83 100644 --- a/src/share/vm/opto/matcher.cpp +++ b/src/share/vm/opto/matcher.cpp @@ -22,8 +22,34 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_matcher.cpp.incl" +#include "precompiled.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/addnode.hpp" +#include "opto/callnode.hpp" +#include "opto/connode.hpp" +#include "opto/idealGraphPrinter.hpp" +#include "opto/matcher.hpp" +#include "opto/memnode.hpp" +#include "opto/opcodes.hpp" +#include "opto/regmask.hpp" +#include "opto/rootnode.hpp" +#include "opto/runtime.hpp" +#include "opto/type.hpp" +#include "runtime/atomic.hpp" +#include "runtime/hpi.hpp" +#include "runtime/os.hpp" +#ifdef TARGET_ARCH_MODEL_x86_32 +# include "adfiles/ad_x86_32.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_x86_64 +# include "adfiles/ad_x86_64.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_sparc +# include "adfiles/ad_sparc.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_zero +# include "adfiles/ad_zero.hpp" +#endif OptoReg::Name OptoReg::c_frame_pointer; diff --git a/src/share/vm/opto/matcher.hpp b/src/share/vm/opto/matcher.hpp index 014d00368..6e8f04c5c 100644 --- a/src/share/vm/opto/matcher.hpp +++ b/src/share/vm/opto/matcher.hpp @@ -22,6 +22,15 @@ * */ +#ifndef SHARE_VM_OPTO_MATCHER_HPP +#define SHARE_VM_OPTO_MATCHER_HPP + +#include "libadt/vectset.hpp" +#include "memory/resourceArea.hpp" +#include "opto/node.hpp" +#include "opto/phaseX.hpp" +#include "opto/regmask.hpp" + class Compile; class Node; class MachNode; @@ -447,3 +456,5 @@ public: } #endif }; + +#endif // SHARE_VM_OPTO_MATCHER_HPP diff --git a/src/share/vm/opto/memnode.cpp b/src/share/vm/opto/memnode.cpp index d425ae6d1..bbdcaa551 100644 --- a/src/share/vm/opto/memnode.cpp +++ b/src/share/vm/opto/memnode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,13 +22,27 @@ * */ +#include "precompiled.hpp" +#include "classfile/systemDictionary.hpp" +#include "compiler/compileLog.hpp" +#include "memory/allocation.inline.hpp" +#include "oops/objArrayKlass.hpp" +#include "opto/addnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/compile.hpp" +#include "opto/connode.hpp" +#include "opto/loopnode.hpp" +#include "opto/machnode.hpp" +#include "opto/matcher.hpp" +#include "opto/memnode.hpp" +#include "opto/mulnode.hpp" +#include "opto/phaseX.hpp" +#include "opto/regmask.hpp" + // Portions of code courtesy of Clifford Click // Optimization - Graph Style -#include "incls/_precompiled.incl" -#include "incls/_memnode.cpp.incl" - static Node *step_through_mergemem(PhaseGVN *phase, MergeMemNode *mmem, const TypePtr *tp, const TypePtr *adr_check, outputStream *st); //============================================================================= diff --git a/src/share/vm/opto/memnode.hpp b/src/share/vm/opto/memnode.hpp index a3faceda0..dec1b0ab1 100644 --- a/src/share/vm/opto/memnode.hpp +++ b/src/share/vm/opto/memnode.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_OPTO_MEMNODE_HPP +#define SHARE_VM_OPTO_MEMNODE_HPP + +#include "opto/multnode.hpp" +#include "opto/node.hpp" +#include "opto/opcodes.hpp" +#include "opto/type.hpp" + // Portions of code courtesy of Clifford Click class MultiNode; @@ -1250,3 +1258,5 @@ public: virtual uint match_edge(uint idx) const { return idx==2; } virtual const Type *bottom_type() const { return ( AllocatePrefetchStyle == 3 ) ? Type::MEMORY : Type::ABIO; } }; + +#endif // SHARE_VM_OPTO_MEMNODE_HPP diff --git a/src/share/vm/opto/mulnode.cpp b/src/share/vm/opto/mulnode.cpp index 32fb6e42d..cf838c769 100644 --- a/src/share/vm/opto/mulnode.cpp +++ b/src/share/vm/opto/mulnode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,10 +22,16 @@ * */ -// Portions of code courtesy of Clifford Click +#include "precompiled.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/addnode.hpp" +#include "opto/connode.hpp" +#include "opto/memnode.hpp" +#include "opto/mulnode.hpp" +#include "opto/phaseX.hpp" +#include "opto/subnode.hpp" -#include "incls/_precompiled.incl" -#include "incls/_mulnode.cpp.incl" +// Portions of code courtesy of Clifford Click //============================================================================= diff --git a/src/share/vm/opto/mulnode.hpp b/src/share/vm/opto/mulnode.hpp index 1128d7bd2..a674940b5 100644 --- a/src/share/vm/opto/mulnode.hpp +++ b/src/share/vm/opto/mulnode.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_OPTO_MULNODE_HPP +#define SHARE_VM_OPTO_MULNODE_HPP + +#include "opto/node.hpp" +#include "opto/opcodes.hpp" +#include "opto/type.hpp" + // Portions of code courtesy of Clifford Click class PhaseTransform; @@ -255,3 +262,5 @@ public: const Type *bottom_type() const { return TypeLong::LONG; } virtual uint ideal_reg() const { return Op_RegL; } }; + +#endif // SHARE_VM_OPTO_MULNODE_HPP diff --git a/src/share/vm/opto/multnode.cpp b/src/share/vm/opto/multnode.cpp index f2d09489f..fb29e1ea4 100644 --- a/src/share/vm/opto/multnode.cpp +++ b/src/share/vm/opto/multnode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,13 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_multnode.cpp.incl" +#include "precompiled.hpp" +#include "opto/matcher.hpp" +#include "opto/multnode.hpp" +#include "opto/opcodes.hpp" +#include "opto/phaseX.hpp" +#include "opto/regmask.hpp" +#include "opto/type.hpp" //============================================================================= //------------------------------MultiNode-------------------------------------- diff --git a/src/share/vm/opto/multnode.hpp b/src/share/vm/opto/multnode.hpp index a6a5d3d9b..fba94e5b4 100644 --- a/src/share/vm/opto/multnode.hpp +++ b/src/share/vm/opto/multnode.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_OPTO_MULTNODE_HPP +#define SHARE_VM_OPTO_MULTNODE_HPP + +#include "opto/node.hpp" + class Matcher; class ProjNode; @@ -82,3 +87,5 @@ public: virtual void dump_spec(outputStream *st) const; #endif }; + +#endif // SHARE_VM_OPTO_MULTNODE_HPP diff --git a/src/share/vm/opto/node.cpp b/src/share/vm/opto/node.cpp index 7591a193e..70f809b29 100644 --- a/src/share/vm/opto/node.cpp +++ b/src/share/vm/opto/node.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,18 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_node.cpp.incl" +#include "precompiled.hpp" +#include "libadt/vectset.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/cfgnode.hpp" +#include "opto/connode.hpp" +#include "opto/machnode.hpp" +#include "opto/matcher.hpp" +#include "opto/node.hpp" +#include "opto/opcodes.hpp" +#include "opto/regmask.hpp" +#include "opto/type.hpp" +#include "utilities/copy.hpp" class RegMask; // #include "phase.hpp" diff --git a/src/share/vm/opto/node.hpp b/src/share/vm/opto/node.hpp index 1921ae12d..c1aaf3600 100644 --- a/src/share/vm/opto/node.hpp +++ b/src/share/vm/opto/node.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_OPTO_NODE_HPP +#define SHARE_VM_OPTO_NODE_HPP + +#include "libadt/port.hpp" +#include "libadt/vectset.hpp" +#include "opto/compile.hpp" +#include "opto/type.hpp" + // Portions of code courtesy of Clifford Click // Optimization - Graph Style @@ -1554,3 +1562,5 @@ public: virtual void dump_spec(outputStream *st) const; #endif }; + +#endif // SHARE_VM_OPTO_NODE_HPP diff --git a/src/share/vm/opto/opcodes.cpp b/src/share/vm/opto/opcodes.cpp index b8325a046..58489db0a 100644 --- a/src/share/vm/opto/opcodes.cpp +++ b/src/share/vm/opto/opcodes.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,8 @@ * */ +// no precompiled headers + // ---------------------------------------------------------------------------- // Build a table of class names as strings. Used both for debugging printouts // and in the ADL machine descriptions. diff --git a/src/share/vm/opto/opcodes.hpp b/src/share/vm/opto/opcodes.hpp index c6ac7636b..9eb5b8a7c 100644 --- a/src/share/vm/opto/opcodes.hpp +++ b/src/share/vm/opto/opcodes.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,9 @@ * */ +#ifndef SHARE_VM_OPTO_OPCODES_HPP +#define SHARE_VM_OPTO_OPCODES_HPP + // Build a big enum of class names to give them dense integer indices #define macro(x) Op_##x, enum Opcodes { @@ -42,3 +45,5 @@ enum Opcodes { // Table of names, indexed by Opcode extern const char *NodeClassNames[]; + +#endif // SHARE_VM_OPTO_OPCODES_HPP diff --git a/src/share/vm/opto/optoreg.hpp b/src/share/vm/opto/optoreg.hpp index aa19f1baf..58c9f1c69 100644 --- a/src/share/vm/opto/optoreg.hpp +++ b/src/share/vm/opto/optoreg.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,9 @@ * */ +#ifndef SHARE_VM_OPTO_OPTOREG_HPP +#define SHARE_VM_OPTO_OPTOREG_HPP + //------------------------------OptoReg---------------------------------------- // We eventually need Registers for the Real World. Registers are essentially // non-SSA names. A Register is represented as a number. Non-regular values @@ -192,3 +195,5 @@ public: OptoRegPair(OptoReg::Name f) { _second = OptoReg::Bad; _first = f; } OptoRegPair() { _second = OptoReg::Bad; _first = OptoReg::Bad; } }; + +#endif // SHARE_VM_OPTO_OPTOREG_HPP diff --git a/src/share/vm/opto/output.cpp b/src/share/vm/opto/output.cpp index 959f4c8c8..015b8f69a 100644 --- a/src/share/vm/opto/output.cpp +++ b/src/share/vm/opto/output.cpp @@ -22,8 +22,24 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_output.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.inline.hpp" +#include "code/debugInfo.hpp" +#include "code/debugInfoRec.hpp" +#include "compiler/compileBroker.hpp" +#include "compiler/oopMap.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/callnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/locknode.hpp" +#include "opto/machnode.hpp" +#include "opto/output.hpp" +#include "opto/regalloc.hpp" +#include "opto/runtime.hpp" +#include "opto/subnode.hpp" +#include "opto/type.hpp" +#include "runtime/handles.inline.hpp" +#include "utilities/xmlstream.hpp" extern uint size_java_to_interp(); extern uint reloc_java_to_interp(); diff --git a/src/share/vm/opto/output.hpp b/src/share/vm/opto/output.hpp index 27275c495..7e3237198 100644 --- a/src/share/vm/opto/output.hpp +++ b/src/share/vm/opto/output.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,24 @@ * */ +#ifndef SHARE_VM_OPTO_OUTPUT_HPP +#define SHARE_VM_OPTO_OUTPUT_HPP + +#include "opto/block.hpp" +#include "opto/node.hpp" +#ifdef TARGET_ARCH_MODEL_x86_32 +# include "adfiles/ad_x86_32.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_x86_64 +# include "adfiles/ad_x86_64.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_sparc +# include "adfiles/ad_sparc.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_zero +# include "adfiles/ad_zero.hpp" +#endif + class Arena; class Bundle; class Block; @@ -213,3 +231,5 @@ public: #endif }; + +#endif // SHARE_VM_OPTO_OUTPUT_HPP diff --git a/src/share/vm/opto/parse.hpp b/src/share/vm/opto/parse.hpp index 871d1e96b..a8d63b55d 100644 --- a/src/share/vm/opto/parse.hpp +++ b/src/share/vm/opto/parse.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,17 @@ * */ +#ifndef SHARE_VM_OPTO_PARSE_HPP +#define SHARE_VM_OPTO_PARSE_HPP + +#include "ci/ciMethodData.hpp" +#include "ci/ciTypeFlow.hpp" +#include "compiler/methodLiveness.hpp" +#include "libadt/vectset.hpp" +#include "oops/generateOopMap.hpp" +#include "opto/graphKit.hpp" +#include "opto/subnode.hpp" + class BytecodeParseHistogram; class InlineTree; class Parse; @@ -567,3 +578,5 @@ class Parse : public GraphKit { void dump_bci(int bci); #endif }; + +#endif // SHARE_VM_OPTO_PARSE_HPP diff --git a/src/share/vm/opto/parse1.cpp b/src/share/vm/opto/parse1.cpp index d0b551838..3729c38b4 100644 --- a/src/share/vm/opto/parse1.cpp +++ b/src/share/vm/opto/parse1.cpp @@ -22,8 +22,21 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_parse1.cpp.incl" +#include "precompiled.hpp" +#include "compiler/compileLog.hpp" +#include "interpreter/linkResolver.hpp" +#include "oops/methodOop.hpp" +#include "opto/addnode.hpp" +#include "opto/idealGraphPrinter.hpp" +#include "opto/locknode.hpp" +#include "opto/memnode.hpp" +#include "opto/parse.hpp" +#include "opto/rootnode.hpp" +#include "opto/runtime.hpp" +#include "runtime/arguments.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/sharedRuntime.hpp" +#include "utilities/copy.hpp" // Static array so we can figure out which bytecodes stop us from compiling // the most. Some of the non-static variables are needed in bytecodeInfo.cpp diff --git a/src/share/vm/opto/parse2.cpp b/src/share/vm/opto/parse2.cpp index 86a1f0928..a9f42eb7a 100644 --- a/src/share/vm/opto/parse2.cpp +++ b/src/share/vm/opto/parse2.cpp @@ -22,8 +22,23 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_parse2.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciMethodData.hpp" +#include "classfile/systemDictionary.hpp" +#include "classfile/vmSymbols.hpp" +#include "compiler/compileLog.hpp" +#include "interpreter/linkResolver.hpp" +#include "memory/universe.inline.hpp" +#include "opto/addnode.hpp" +#include "opto/divnode.hpp" +#include "opto/idealGraphPrinter.hpp" +#include "opto/matcher.hpp" +#include "opto/memnode.hpp" +#include "opto/mulnode.hpp" +#include "opto/parse.hpp" +#include "opto/runtime.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/sharedRuntime.hpp" extern int explicit_null_checks_inserted, explicit_null_checks_elided; diff --git a/src/share/vm/opto/parse3.cpp b/src/share/vm/opto/parse3.cpp index c8f4a8ec2..827633670 100644 --- a/src/share/vm/opto/parse3.cpp +++ b/src/share/vm/opto/parse3.cpp @@ -22,8 +22,19 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_parse3.cpp.incl" +#include "precompiled.hpp" +#include "compiler/compileLog.hpp" +#include "interpreter/linkResolver.hpp" +#include "memory/universe.inline.hpp" +#include "oops/objArrayKlass.hpp" +#include "opto/addnode.hpp" +#include "opto/memnode.hpp" +#include "opto/parse.hpp" +#include "opto/rootnode.hpp" +#include "opto/runtime.hpp" +#include "opto/subnode.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/handles.inline.hpp" //============================================================================= // Helper methods for _get* and _put* bytecodes diff --git a/src/share/vm/opto/parseHelper.cpp b/src/share/vm/opto/parseHelper.cpp index 3e50e5429..5a9d7e146 100644 --- a/src/share/vm/opto/parseHelper.cpp +++ b/src/share/vm/opto/parseHelper.cpp @@ -22,8 +22,17 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_parseHelper.cpp.incl" +#include "precompiled.hpp" +#include "classfile/systemDictionary.hpp" +#include "compiler/compileLog.hpp" +#include "oops/objArrayKlass.hpp" +#include "opto/addnode.hpp" +#include "opto/memnode.hpp" +#include "opto/mulnode.hpp" +#include "opto/parse.hpp" +#include "opto/rootnode.hpp" +#include "opto/runtime.hpp" +#include "runtime/sharedRuntime.hpp" //------------------------------make_dtrace_method_entry_exit ---------------- // Dtrace -- record entry or exit of a method if compiled with dtrace support diff --git a/src/share/vm/opto/phase.cpp b/src/share/vm/opto/phase.cpp index ce0e2bb67..7bf7e6aec 100644 --- a/src/share/vm/opto/phase.cpp +++ b/src/share/vm/opto/phase.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,12 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_phase.cpp.incl" +#include "precompiled.hpp" +#include "code/nmethod.hpp" +#include "compiler/compileBroker.hpp" +#include "opto/compile.hpp" +#include "opto/node.hpp" +#include "opto/phase.hpp" #ifndef PRODUCT int Phase::_total_bytes_compiled = 0; diff --git a/src/share/vm/opto/phase.hpp b/src/share/vm/opto/phase.hpp index 5fc2279fe..c52fda3cb 100644 --- a/src/share/vm/opto/phase.hpp +++ b/src/share/vm/opto/phase.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_OPTO_PHASE_HPP +#define SHARE_VM_OPTO_PHASE_HPP + +#include "libadt/port.hpp" +#include "runtime/timer.hpp" + class Compile; //------------------------------Phase------------------------------------------ @@ -109,3 +115,5 @@ public: static void print_timers(); #endif }; + +#endif // SHARE_VM_OPTO_PHASE_HPP diff --git a/src/share/vm/opto/phaseX.cpp b/src/share/vm/opto/phaseX.cpp index 164d1afb9..7b5d6cddc 100644 --- a/src/share/vm/opto/phaseX.cpp +++ b/src/share/vm/opto/phaseX.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,19 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_phaseX.cpp.incl" +#include "precompiled.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/block.hpp" +#include "opto/callnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/connode.hpp" +#include "opto/idealGraphPrinter.hpp" +#include "opto/loopnode.hpp" +#include "opto/machnode.hpp" +#include "opto/opcodes.hpp" +#include "opto/phaseX.hpp" +#include "opto/regalloc.hpp" +#include "opto/rootnode.hpp" //============================================================================= #define NODE_HASH_MINIMUM_SIZE 255 diff --git a/src/share/vm/opto/phaseX.hpp b/src/share/vm/opto/phaseX.hpp index 9a4535cb2..7f1060c05 100644 --- a/src/share/vm/opto/phaseX.hpp +++ b/src/share/vm/opto/phaseX.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,17 @@ * */ +#ifndef SHARE_VM_OPTO_PHASEX_HPP +#define SHARE_VM_OPTO_PHASEX_HPP + +#include "libadt/dict.hpp" +#include "libadt/vectset.hpp" +#include "memory/resourceArea.hpp" +#include "opto/memnode.hpp" +#include "opto/node.hpp" +#include "opto/phase.hpp" +#include "opto/type.hpp" + class Compile; class ConINode; class ConLNode; @@ -535,3 +546,5 @@ public: static void print_statistics(); #endif }; + +#endif // SHARE_VM_OPTO_PHASEX_HPP diff --git a/src/share/vm/opto/postaloc.cpp b/src/share/vm/opto/postaloc.cpp index db888b2f4..c901f611f 100644 --- a/src/share/vm/opto/postaloc.cpp +++ b/src/share/vm/opto/postaloc.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,10 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_postaloc.cpp.incl" +#include "precompiled.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/chaitin.hpp" +#include "opto/machnode.hpp" // see if this register kind does not requires two registers static bool is_single_register(uint x) { diff --git a/src/share/vm/opto/reg_split.cpp b/src/share/vm/opto/reg_split.cpp index 9e3967e36..605e3d3b3 100644 --- a/src/share/vm/opto/reg_split.cpp +++ b/src/share/vm/opto/reg_split.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,16 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_reg_split.cpp.incl" +#include "precompiled.hpp" +#include "libadt/vectset.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/addnode.hpp" +#include "opto/c2compiler.hpp" +#include "opto/callnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/chaitin.hpp" +#include "opto/loopnode.hpp" +#include "opto/machnode.hpp" //------------------------------Split-------------------------------------- // Walk the graph in RPO and for each lrg which spills, propagate reaching diff --git a/src/share/vm/opto/regalloc.cpp b/src/share/vm/opto/regalloc.cpp index d7ed6f0f1..79dde4066 100644 --- a/src/share/vm/opto/regalloc.cpp +++ b/src/share/vm/opto/regalloc.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,8 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_regalloc.cpp.incl" +#include "precompiled.hpp" +#include "opto/regalloc.hpp" static const int NodeRegsOverflowSize = 200; diff --git a/src/share/vm/opto/regalloc.hpp b/src/share/vm/opto/regalloc.hpp index 540e6a7c2..71f4defc2 100644 --- a/src/share/vm/opto/regalloc.hpp +++ b/src/share/vm/opto/regalloc.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_OPTO_REGALLOC_HPP +#define SHARE_VM_OPTO_REGALLOC_HPP + +#include "code/vmreg.hpp" +#include "opto/block.hpp" +#include "opto/matcher.hpp" +#include "opto/phase.hpp" + class Node; class Matcher; class PhaseCFG; @@ -131,3 +139,5 @@ public: static void print_statistics(); #endif }; + +#endif // SHARE_VM_OPTO_REGALLOC_HPP diff --git a/src/share/vm/opto/regmask.cpp b/src/share/vm/opto/regmask.cpp index 1916431e3..b1ba93801 100644 --- a/src/share/vm/opto/regmask.cpp +++ b/src/share/vm/opto/regmask.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,21 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_regmask.cpp.incl" +#include "precompiled.hpp" +#include "opto/compile.hpp" +#include "opto/regmask.hpp" +#ifdef TARGET_ARCH_MODEL_x86_32 +# include "adfiles/ad_x86_32.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_x86_64 +# include "adfiles/ad_x86_64.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_sparc +# include "adfiles/ad_sparc.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_zero +# include "adfiles/ad_zero.hpp" +#endif #define RM_SIZE _RM_SIZE /* a constant private to the class RegMask */ diff --git a/src/share/vm/opto/regmask.hpp b/src/share/vm/opto/regmask.hpp index 5be294074..b1c280da2 100644 --- a/src/share/vm/opto/regmask.hpp +++ b/src/share/vm/opto/regmask.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,25 @@ * */ +#ifndef SHARE_VM_OPTO_REGMASK_HPP +#define SHARE_VM_OPTO_REGMASK_HPP + +#include "code/vmreg.hpp" +#include "libadt/port.hpp" +#include "opto/optoreg.hpp" +#ifdef TARGET_ARCH_MODEL_x86_32 +# include "adfiles/adGlobals_x86_32.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_x86_64 +# include "adfiles/adGlobals_x86_64.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_sparc +# include "adfiles/adGlobals_sparc.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_zero +# include "adfiles/adGlobals_zero.hpp" +#endif + // Some fun naming (textual) substitutions: // // RegMask::get_low_elem() ==> RegMask::find_first_elem() @@ -262,3 +281,5 @@ public: // Do not use this constant directly in client code! #undef RM_SIZE + +#endif // SHARE_VM_OPTO_REGMASK_HPP diff --git a/src/share/vm/opto/rootnode.cpp b/src/share/vm/opto/rootnode.cpp index b27fb43d8..56775ed7e 100644 --- a/src/share/vm/opto/rootnode.cpp +++ b/src/share/vm/opto/rootnode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,8 +22,15 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_rootnode.cpp.incl" +#include "precompiled.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/callnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/phaseX.hpp" +#include "opto/regmask.hpp" +#include "opto/rootnode.hpp" +#include "opto/subnode.hpp" +#include "opto/type.hpp" //------------------------------Ideal------------------------------------------ // Remove dead inputs diff --git a/src/share/vm/opto/rootnode.hpp b/src/share/vm/opto/rootnode.hpp index e92aa2a77..cef207d64 100644 --- a/src/share/vm/opto/rootnode.hpp +++ b/src/share/vm/opto/rootnode.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_OPTO_ROOTNODE_HPP +#define SHARE_VM_OPTO_ROOTNODE_HPP + +#include "opto/loopnode.hpp" + //------------------------------RootNode--------------------------------------- // The one-and-only before-all-else and after-all-else RootNode. The RootNode // represents what happens if the user runs the whole program repeatedly. The @@ -60,3 +65,5 @@ public: virtual uint ideal_reg() const { return NotAMachineReg; } virtual uint match_edge(uint idx) const { return 0; } }; + +#endif // SHARE_VM_OPTO_ROOTNODE_HPP diff --git a/src/share/vm/opto/runtime.cpp b/src/share/vm/opto/runtime.cpp index 62a0c7871..c549b1ba4 100644 --- a/src/share/vm/opto/runtime.cpp +++ b/src/share/vm/opto/runtime.cpp @@ -22,8 +22,64 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_runtime.cpp.incl" +#include "precompiled.hpp" +#include "classfile/systemDictionary.hpp" +#include "classfile/vmSymbols.hpp" +#include "code/compiledIC.hpp" +#include "code/icBuffer.hpp" +#include "code/nmethod.hpp" +#include "code/pcDesc.hpp" +#include "code/scopeDesc.hpp" +#include "code/vtableStubs.hpp" +#include "compiler/compileBroker.hpp" +#include "compiler/compilerOracle.hpp" +#include "compiler/oopMap.hpp" +#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" +#include "gc_implementation/g1/heapRegion.hpp" +#include "gc_interface/collectedHeap.hpp" +#include "interpreter/bytecode.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/linkResolver.hpp" +#include "memory/barrierSet.hpp" +#include "memory/gcLocker.inline.hpp" +#include "memory/oopFactory.hpp" +#include "oops/objArrayKlass.hpp" +#include "oops/oop.inline.hpp" +#include "opto/addnode.hpp" +#include "opto/callnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/connode.hpp" +#include "opto/graphKit.hpp" +#include "opto/machnode.hpp" +#include "opto/matcher.hpp" +#include "opto/memnode.hpp" +#include "opto/mulnode.hpp" +#include "opto/runtime.hpp" +#include "opto/subnode.hpp" +#include "runtime/fprofiler.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/javaCalls.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/signature.hpp" +#include "runtime/threadCritical.hpp" +#include "runtime/vframe.hpp" +#include "runtime/vframeArray.hpp" +#include "runtime/vframe_hp.hpp" +#include "utilities/copy.hpp" +#include "utilities/preserveException.hpp" +#ifdef TARGET_ARCH_MODEL_x86_32 +# include "adfiles/ad_x86_32.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_x86_64 +# include "adfiles/ad_x86_64.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_sparc +# include "adfiles/ad_sparc.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_zero +# include "adfiles/ad_zero.hpp" +#endif // For debugging purposes: diff --git a/src/share/vm/opto/runtime.hpp b/src/share/vm/opto/runtime.hpp index c50538530..4d0d21111 100644 --- a/src/share/vm/opto/runtime.hpp +++ b/src/share/vm/opto/runtime.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,16 @@ * */ +#ifndef SHARE_VM_OPTO_RUNTIME_HPP +#define SHARE_VM_OPTO_RUNTIME_HPP + +#include "code/codeBlob.hpp" +#include "opto/machnode.hpp" +#include "opto/type.hpp" +#include "runtime/biasedLocking.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/vframe.hpp" + //------------------------------OptoRuntime------------------------------------ // Opto compiler runtime routines // @@ -298,3 +308,5 @@ private: static void print_named_counters(); }; + +#endif // SHARE_VM_OPTO_RUNTIME_HPP diff --git a/src/share/vm/opto/split_if.cpp b/src/share/vm/opto/split_if.cpp index 3008ac75a..91792368f 100644 --- a/src/share/vm/opto/split_if.cpp +++ b/src/share/vm/opto/split_if.cpp @@ -22,8 +22,11 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_split_if.cpp.incl" +#include "precompiled.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/callnode.hpp" +#include "opto/connode.hpp" +#include "opto/loopnode.hpp" //------------------------------split_thru_region------------------------------ diff --git a/src/share/vm/opto/stringopts.cpp b/src/share/vm/opto/stringopts.cpp index 29df07f46..93516d5d0 100644 --- a/src/share/vm/opto/stringopts.cpp +++ b/src/share/vm/opto/stringopts.cpp @@ -22,8 +22,18 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_stringopts.cpp.incl" +#include "precompiled.hpp" +#include "compiler/compileLog.hpp" +#include "opto/addnode.hpp" +#include "opto/callGenerator.hpp" +#include "opto/callnode.hpp" +#include "opto/divnode.hpp" +#include "opto/graphKit.hpp" +#include "opto/idealKit.hpp" +#include "opto/rootnode.hpp" +#include "opto/runtime.hpp" +#include "opto/stringopts.hpp" +#include "opto/subnode.hpp" #define __ kit. diff --git a/src/share/vm/opto/stringopts.hpp b/src/share/vm/opto/stringopts.hpp index b93f8925a..1ffe6c309 100644 --- a/src/share/vm/opto/stringopts.hpp +++ b/src/share/vm/opto/stringopts.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_OPTO_STRINGOPTS_HPP +#define SHARE_VM_OPTO_STRINGOPTS_HPP + +#include "opto/node.hpp" +#include "opto/phaseX.hpp" + class StringConcat; class PhaseStringOpts : public Phase { @@ -81,3 +87,5 @@ class PhaseStringOpts : public Phase { public: PhaseStringOpts(PhaseGVN* gvn, Unique_Node_List* worklist); }; + +#endif // SHARE_VM_OPTO_STRINGOPTS_HPP diff --git a/src/share/vm/opto/subnode.cpp b/src/share/vm/opto/subnode.cpp index 5696c6883..670b62972 100644 --- a/src/share/vm/opto/subnode.cpp +++ b/src/share/vm/opto/subnode.cpp @@ -22,12 +22,25 @@ * */ +#include "precompiled.hpp" +#include "compiler/compileLog.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/addnode.hpp" +#include "opto/callnode.hpp" +#include "opto/cfgnode.hpp" +#include "opto/connode.hpp" +#include "opto/loopnode.hpp" +#include "opto/matcher.hpp" +#include "opto/mulnode.hpp" +#include "opto/opcodes.hpp" +#include "opto/phaseX.hpp" +#include "opto/subnode.hpp" +#include "runtime/sharedRuntime.hpp" + // Portions of code courtesy of Clifford Click // Optimization - Graph Style -#include "incls/_precompiled.incl" -#include "incls/_subnode.cpp.incl" #include "math.h" //============================================================================= diff --git a/src/share/vm/opto/subnode.hpp b/src/share/vm/opto/subnode.hpp index cf7fb560b..aea3d5dfe 100644 --- a/src/share/vm/opto/subnode.hpp +++ b/src/share/vm/opto/subnode.hpp @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_OPTO_SUBNODE_HPP +#define SHARE_VM_OPTO_SUBNODE_HPP + +#include "opto/node.hpp" +#include "opto/opcodes.hpp" +#include "opto/type.hpp" + // Portions of code courtesy of Clifford Click //------------------------------SUBNode---------------------------------------- @@ -529,3 +536,5 @@ public: const Type *bottom_type() const { return TypeInt::SHORT; } virtual uint ideal_reg() const { return Op_RegI; } }; + +#endif // SHARE_VM_OPTO_SUBNODE_HPP diff --git a/src/share/vm/opto/superword.cpp b/src/share/vm/opto/superword.cpp index fcb8f927f..1230ebe51 100644 --- a/src/share/vm/opto/superword.cpp +++ b/src/share/vm/opto/superword.cpp @@ -21,8 +21,19 @@ * questions. */ -#include "incls/_precompiled.incl" -#include "incls/_superword.cpp.incl" +#include "precompiled.hpp" +#include "compiler/compileLog.hpp" +#include "libadt/vectset.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/addnode.hpp" +#include "opto/callnode.hpp" +#include "opto/divnode.hpp" +#include "opto/matcher.hpp" +#include "opto/memnode.hpp" +#include "opto/mulnode.hpp" +#include "opto/opcodes.hpp" +#include "opto/superword.hpp" +#include "opto/vectornode.hpp" // // S U P E R W O R D T R A N S F O R M diff --git a/src/share/vm/opto/superword.hpp b/src/share/vm/opto/superword.hpp index 59f245145..50ab3d43e 100644 --- a/src/share/vm/opto/superword.hpp +++ b/src/share/vm/opto/superword.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. 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 @@ -21,6 +21,16 @@ * questions. */ +#ifndef SHARE_VM_OPTO_SUPERWORD_HPP +#define SHARE_VM_OPTO_SUPERWORD_HPP + +#include "opto/connode.hpp" +#include "opto/loopnode.hpp" +#include "opto/node.hpp" +#include "opto/phaseX.hpp" +#include "opto/vectornode.hpp" +#include "utilities/growableArray.hpp" + // // S U P E R W O R D T R A N S F O R M // @@ -507,3 +517,5 @@ class OrderedPair VALUE_OBJ_CLASS_SPEC { static const OrderedPair initial; }; + +#endif // SHARE_VM_OPTO_SUPERWORD_HPP diff --git a/src/share/vm/opto/type.cpp b/src/share/vm/opto/type.cpp index 284159974..ac09b95c9 100644 --- a/src/share/vm/opto/type.cpp +++ b/src/share/vm/opto/type.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,13 +22,28 @@ * */ +#include "precompiled.hpp" +#include "ci/ciTypeFlow.hpp" +#include "classfile/symbolTable.hpp" +#include "classfile/systemDictionary.hpp" +#include "compiler/compileLog.hpp" +#include "libadt/dict.hpp" +#include "memory/gcLocker.hpp" +#include "memory/oopFactory.hpp" +#include "memory/resourceArea.hpp" +#include "oops/instanceKlass.hpp" +#include "oops/klassKlass.hpp" +#include "oops/objArrayKlass.hpp" +#include "oops/typeArrayKlass.hpp" +#include "opto/matcher.hpp" +#include "opto/node.hpp" +#include "opto/opcodes.hpp" +#include "opto/type.hpp" + // Portions of code courtesy of Clifford Click // Optimization - Graph Style -#include "incls/_precompiled.incl" -#include "incls/_type.cpp.incl" - // Dictionary of types shared among compilations. Dict* Type::_shared_type_dict = NULL; diff --git a/src/share/vm/opto/type.hpp b/src/share/vm/opto/type.hpp index 779280237..d1c647fd1 100644 --- a/src/share/vm/opto/type.hpp +++ b/src/share/vm/opto/type.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. 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 @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_OPTO_TYPE_HPP +#define SHARE_VM_OPTO_TYPE_HPP + +#include "libadt/port.hpp" +#include "opto/adlcVMDeps.hpp" +#include "runtime/handles.hpp" + // Portions of code courtesy of Clifford Click // Optimization - Graph Style @@ -1288,3 +1295,5 @@ inline bool Type::is_floatingpoint() const { #define ConvX2L(x) ConvI2L(x) #endif + +#endif // SHARE_VM_OPTO_TYPE_HPP diff --git a/src/share/vm/opto/vectornode.cpp b/src/share/vm/opto/vectornode.cpp index c237fc3da..4d72b73a0 100644 --- a/src/share/vm/opto/vectornode.cpp +++ b/src/share/vm/opto/vectornode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. 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 @@ -21,8 +21,10 @@ * questions. */ -#include "incls/_precompiled.incl" -#include "incls/_vectornode.cpp.incl" +#include "precompiled.hpp" +#include "memory/allocation.inline.hpp" +#include "opto/connode.hpp" +#include "opto/vectornode.hpp" //------------------------------VectorNode-------------------------------------- diff --git a/src/share/vm/opto/vectornode.hpp b/src/share/vm/opto/vectornode.hpp index a503aec6f..b4915ddfd 100644 --- a/src/share/vm/opto/vectornode.hpp +++ b/src/share/vm/opto/vectornode.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. 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 @@ -21,6 +21,14 @@ * questions. */ +#ifndef SHARE_VM_OPTO_VECTORNODE_HPP +#define SHARE_VM_OPTO_VECTORNODE_HPP + +#include "opto/matcher.hpp" +#include "opto/memnode.hpp" +#include "opto/node.hpp" +#include "opto/opcodes.hpp" + //------------------------------VectorNode-------------------------------------- // Vector Operation class VectorNode : public Node { @@ -1132,3 +1140,5 @@ class ExtractDNode : public ExtractNode { virtual const Type *bottom_type() const { return Type::DOUBLE; } virtual uint ideal_reg() const { return Op_RegD; } }; + +#endif // SHARE_VM_OPTO_VECTORNODE_HPP |