< prev index next >

src/share/vm/interpreter/templateTable.hpp

Print this page
rev 11647 : 8161258: Simplify including platform files.
Summary: Include patform files with macros cpu_header() etc. Do various cleanups of macro usages. Remove _64/_32 from adlc generated files and platform .hpp files. Merge stubRoutines_x86*.hpp. Remove empty mutex_<os>* files.
Reviewed-by: dholmes, coleenp, kbarrett

*** 1,7 **** /* ! * Copyright (c) 1997, 2015, 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 * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. --- 1,7 ---- /* ! * Copyright (c) 1997, 2016, 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 * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation.
*** 26,35 **** --- 26,36 ---- #define SHARE_VM_INTERPRETER_TEMPLATETABLE_HPP #include "interpreter/bytecodes.hpp" #include "memory/allocation.hpp" #include "runtime/frame.hpp" + #include "utilities/macros.hpp" #ifndef CC_INTERP // All the necessary definitions used for (bytecode) template generation. Instead of // spreading the implementation functionality for each bytecode in the interpreter // and the snippet generator, a template is assigned to each bytecode which can be
*** 347,367 **** // Templates static Template* template_for (Bytecodes::Code code) { Bytecodes::check (code); return &_template_table [code]; } static Template* template_for_wide(Bytecodes::Code code) { Bytecodes::wide_check(code); return &_template_table_wide[code]; } // Platform specifics ! #if defined TEMPLATETABLE_MD_HPP ! # include TEMPLATETABLE_MD_HPP ! #elif defined (TARGET_ARCH_MODEL_x86_32) || defined (TARGET_ARCH_MODEL_x86_64) ! # include "templateTable_x86.hpp" ! #elif defined TARGET_ARCH_MODEL_sparc ! # include "templateTable_sparc.hpp" ! #elif defined TARGET_ARCH_MODEL_ppc_64 ! # include "templateTable_ppc_64.hpp" ! #elif defined TARGET_ARCH_MODEL_aarch64 ! # include "templateTable_aarch64.hpp" ! #endif }; #endif /* !CC_INTERP */ #endif // SHARE_VM_INTERPRETER_TEMPLATETABLE_HPP --- 348,358 ---- // Templates static Template* template_for (Bytecodes::Code code) { Bytecodes::check (code); return &_template_table [code]; } static Template* template_for_wide(Bytecodes::Code code) { Bytecodes::wide_check(code); return &_template_table_wide[code]; } // Platform specifics ! #include CPU_HEADER(templateTable) }; #endif /* !CC_INTERP */ #endif // SHARE_VM_INTERPRETER_TEMPLATETABLE_HPP
< prev index next >