mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-21 03:24:38 +02:00
8049325: Introduce and clean up umbrella headers for the files in the cpu subdirectories
Introduce and clean up umbrella headers for the files in the cpu subdirectories. Reviewed-by: lfoltan, coleenp, dholmes
This commit is contained in:
Goetz Lindenmaier
parent
6db67f9317
commit
25f33c005d
154 changed files with 637 additions and 1175 deletions
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2014, 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
|
||||
|
|
@ -25,29 +25,12 @@
|
|||
#ifndef SHARE_VM_INTERPRETER_ABSTRACTINTERPRETER_HPP
|
||||
#define SHARE_VM_INTERPRETER_ABSTRACTINTERPRETER_HPP
|
||||
|
||||
#include "asm/macroAssembler.hpp"
|
||||
#include "code/stubs.hpp"
|
||||
#include "interpreter/bytecodes.hpp"
|
||||
#include "runtime/thread.inline.hpp"
|
||||
#include "runtime/vmThread.hpp"
|
||||
#include "utilities/top.hpp"
|
||||
#ifdef TARGET_ARCH_x86
|
||||
# include "interp_masm_x86.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_MODEL_sparc
|
||||
# include "interp_masm_sparc.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_MODEL_zero
|
||||
# include "interp_masm_zero.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_MODEL_arm
|
||||
# include "interp_masm_arm.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_MODEL_ppc_32
|
||||
# include "interp_masm_ppc_32.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_MODEL_ppc_64
|
||||
# include "interp_masm_ppc_64.hpp"
|
||||
#endif
|
||||
|
||||
// This file contains the platform-independent parts
|
||||
// of the abstract interpreter and the abstract interpreter generator.
|
||||
|
|
@ -75,6 +58,8 @@
|
|||
//------------------------------------------------------------------------------------------------------------------------
|
||||
// The C++ interface to the bytecode interpreter(s).
|
||||
|
||||
class InterpreterMacroAssembler;
|
||||
|
||||
class AbstractInterpreter: AllStatic {
|
||||
friend class VMStructs;
|
||||
friend class Interpreter;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2014, 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
|
||||
|
|
@ -28,21 +28,7 @@
|
|||
#include "interpreter/bytecodes.hpp"
|
||||
#include "memory/allocation.hpp"
|
||||
#include "oops/method.hpp"
|
||||
#ifdef TARGET_ARCH_x86
|
||||
# include "bytes_x86.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_sparc
|
||||
# include "bytes_sparc.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_zero
|
||||
# include "bytes_zero.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_arm
|
||||
# include "bytes_arm.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_ppc
|
||||
# include "bytes_ppc.hpp"
|
||||
#endif
|
||||
#include "utilities/bytes.hpp"
|
||||
|
||||
class ciBytecodeStream;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2002, 2014, 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
|
||||
|
|
@ -32,21 +32,6 @@
|
|||
#include "runtime/frame.hpp"
|
||||
#include "runtime/globals.hpp"
|
||||
#include "utilities/globalDefinitions.hpp"
|
||||
#ifdef TARGET_ARCH_x86
|
||||
# include "bytes_x86.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_sparc
|
||||
# include "bytes_sparc.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_zero
|
||||
# include "bytes_zero.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_arm
|
||||
# include "bytes_arm.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_ppc
|
||||
# include "bytes_ppc.hpp"
|
||||
#endif
|
||||
|
||||
#ifdef CC_INTERP
|
||||
|
||||
|
|
@ -56,6 +41,8 @@
|
|||
|
||||
// CVM definitions find hotspot equivalents...
|
||||
|
||||
class InterpreterMacroAssembler;
|
||||
|
||||
union VMJavaVal64 {
|
||||
jlong l;
|
||||
jdouble d;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2014, 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
|
||||
|
|
@ -29,21 +29,7 @@
|
|||
#include "memory/allocation.hpp"
|
||||
#include "oops/method.hpp"
|
||||
#include "runtime/handles.inline.hpp"
|
||||
#ifdef TARGET_ARCH_x86
|
||||
# include "bytes_x86.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_sparc
|
||||
# include "bytes_sparc.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_zero
|
||||
# include "bytes_zero.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_arm
|
||||
# include "bytes_arm.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_ppc
|
||||
# include "bytes_ppc.hpp"
|
||||
#endif
|
||||
#include "utilities/bytes.hpp"
|
||||
|
||||
// A BytecodeStream is used for fast iteration over the bytecodes
|
||||
// of a Method*.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2014, 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
|
||||
|
|
@ -26,21 +26,7 @@
|
|||
#include "interpreter/bytecodes.hpp"
|
||||
#include "memory/resourceArea.hpp"
|
||||
#include "oops/method.hpp"
|
||||
#ifdef TARGET_ARCH_x86
|
||||
# include "bytes_x86.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_sparc
|
||||
# include "bytes_sparc.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_zero
|
||||
# include "bytes_zero.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_arm
|
||||
# include "bytes_arm.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_ppc
|
||||
# include "bytes_ppc.hpp"
|
||||
#endif
|
||||
#include "utilities/bytes.hpp"
|
||||
|
||||
|
||||
#if defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER < 1600))
|
||||
|
|
|
|||
49
hotspot/src/share/vm/interpreter/interp_masm.hpp
Normal file
49
hotspot/src/share/vm/interpreter/interp_masm.hpp
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
/*
|
||||
* Copyright (c) 2014, 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.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef SHARE_VM_INTERPRETER_INTERP_MASM_HPP
|
||||
#define SHARE_VM_INTERPRETER_INTERP_MASM_HPP
|
||||
|
||||
#include "asm/macroAssembler.hpp"
|
||||
|
||||
#ifdef TARGET_ARCH_x86
|
||||
# include "interp_masm_x86.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_MODEL_sparc
|
||||
# include "interp_masm_sparc.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_MODEL_zero
|
||||
# include "interp_masm_zero.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_MODEL_arm
|
||||
# include "interp_masm_arm.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_MODEL_ppc_32
|
||||
# include "interp_masm_ppc_32.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_MODEL_ppc_64
|
||||
# include "interp_masm_ppc_64.hpp"
|
||||
#endif
|
||||
|
||||
#endif // SHARE_VM_INTERPRETER_INTERP_MASM_HPP
|
||||
|
|
@ -30,6 +30,7 @@
|
|||
#include "interpreter/bytecodeInterpreter.hpp"
|
||||
#include "interpreter/interpreter.hpp"
|
||||
#include "interpreter/interpreterRuntime.hpp"
|
||||
#include "interpreter/interp_masm.hpp"
|
||||
#include "interpreter/templateTable.hpp"
|
||||
#include "memory/allocation.inline.hpp"
|
||||
#include "memory/resourceArea.hpp"
|
||||
|
|
@ -80,9 +81,35 @@ void InterpreterCodelet::print_on(outputStream* st) const {
|
|||
}
|
||||
}
|
||||
|
||||
CodeletMark::CodeletMark(InterpreterMacroAssembler*& masm,
|
||||
const char* description,
|
||||
Bytecodes::Code bytecode) :
|
||||
_clet((InterpreterCodelet*)AbstractInterpreter::code()->request(codelet_size())),
|
||||
_cb(_clet->code_begin(), _clet->code_size()) {
|
||||
// Request all space (add some slack for Codelet data).
|
||||
assert(_clet != NULL, "we checked not enough space already");
|
||||
|
||||
// Initialize Codelet attributes.
|
||||
_clet->initialize(description, bytecode);
|
||||
// Create assembler for code generation.
|
||||
masm = new InterpreterMacroAssembler(&_cb);
|
||||
_masm = &masm;
|
||||
}
|
||||
|
||||
CodeletMark::~CodeletMark() {
|
||||
// Align so printing shows nop's instead of random code at the end (Codelets are aligned).
|
||||
(*_masm)->align(wordSize);
|
||||
// Make sure all code is in code buffer.
|
||||
(*_masm)->flush();
|
||||
|
||||
// Commit Codelet.
|
||||
AbstractInterpreter::code()->commit((*_masm)->code()->pure_insts_size(), (*_masm)->code()->strings());
|
||||
// Make sure nobody can use _masm outside a CodeletMark lifespan.
|
||||
*_masm = NULL;
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------------------------------------------------
|
||||
// Implementation of platform independent aspects of Interpreter
|
||||
// Implementation of platform independent aspects of Interpreter
|
||||
|
||||
void AbstractInterpreter::initialize() {
|
||||
if (_code != NULL) return;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2014, 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
|
||||
|
|
@ -37,6 +37,8 @@
|
|||
// This file contains the platform-independent parts
|
||||
// of the interpreter and the interpreter generator.
|
||||
|
||||
class InterpreterMacroAssembler;
|
||||
|
||||
//------------------------------------------------------------------------------------------------------------------------
|
||||
// An InterpreterCodelet is a piece of interpreter code. All
|
||||
// interpreter code is generated into little codelets which
|
||||
|
|
@ -99,42 +101,17 @@ class CodeletMark: ResourceMark {
|
|||
int codelet_size = AbstractInterpreter::code()->available_space() - 2*K;
|
||||
|
||||
// Guarantee there's a little bit of code space left.
|
||||
guarantee (codelet_size > 0 && (size_t)codelet_size > 2*K,
|
||||
"not enough space for interpreter generation");
|
||||
guarantee(codelet_size > 0 && (size_t)codelet_size > 2*K,
|
||||
"not enough space for interpreter generation");
|
||||
|
||||
return codelet_size;
|
||||
}
|
||||
|
||||
public:
|
||||
CodeletMark(
|
||||
InterpreterMacroAssembler*& masm,
|
||||
const char* description,
|
||||
Bytecodes::Code bytecode = Bytecodes::_illegal):
|
||||
_clet((InterpreterCodelet*)AbstractInterpreter::code()->request(codelet_size())),
|
||||
_cb(_clet->code_begin(), _clet->code_size())
|
||||
|
||||
{ // request all space (add some slack for Codelet data)
|
||||
assert (_clet != NULL, "we checked not enough space already");
|
||||
|
||||
// initialize Codelet attributes
|
||||
_clet->initialize(description, bytecode);
|
||||
// create assembler for code generation
|
||||
masm = new InterpreterMacroAssembler(&_cb);
|
||||
_masm = &masm;
|
||||
}
|
||||
|
||||
~CodeletMark() {
|
||||
// align so printing shows nop's instead of random code at the end (Codelets are aligned)
|
||||
(*_masm)->align(wordSize);
|
||||
// make sure all code is in code buffer
|
||||
(*_masm)->flush();
|
||||
|
||||
|
||||
// commit Codelet
|
||||
AbstractInterpreter::code()->commit((*_masm)->code()->pure_insts_size(), (*_masm)->code()->strings());
|
||||
// make sure nobody can use _masm outside a CodeletMark lifespan
|
||||
*_masm = NULL;
|
||||
}
|
||||
CodeletMark(InterpreterMacroAssembler*& masm,
|
||||
const char* description,
|
||||
Bytecodes::Code bytecode = Bytecodes::_illegal);
|
||||
~CodeletMark();
|
||||
};
|
||||
|
||||
// Wrapper classes to produce Interpreter/InterpreterGenerator from either
|
||||
|
|
@ -142,9 +119,10 @@ class CodeletMark: ResourceMark {
|
|||
|
||||
class Interpreter: public CC_INTERP_ONLY(CppInterpreter) NOT_CC_INTERP(TemplateInterpreter) {
|
||||
|
||||
public:
|
||||
public:
|
||||
// Debugging/printing
|
||||
static InterpreterCodelet* codelet_containing(address pc) { return (InterpreterCodelet*)_code->stub_containing(pc); }
|
||||
static InterpreterCodelet* codelet_containing(address pc) { return (InterpreterCodelet*)_code->stub_containing(pc); }
|
||||
|
||||
#ifdef TARGET_ARCH_x86
|
||||
# include "interpreter_x86.hpp"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@
|
|||
#include "runtime/deoptimization.hpp"
|
||||
#include "runtime/fieldDescriptor.hpp"
|
||||
#include "runtime/handles.inline.hpp"
|
||||
#include "runtime/icache.hpp"
|
||||
#include "runtime/interfaceSupport.hpp"
|
||||
#include "runtime/java.hpp"
|
||||
#include "runtime/jfieldIDWorkaround.hpp"
|
||||
|
|
@ -57,21 +58,6 @@
|
|||
#include "runtime/synchronizer.hpp"
|
||||
#include "runtime/threadCritical.hpp"
|
||||
#include "utilities/events.hpp"
|
||||
#ifdef TARGET_ARCH_x86
|
||||
# include "vm_version_x86.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_sparc
|
||||
# include "vm_version_sparc.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_zero
|
||||
# include "vm_version_zero.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_arm
|
||||
# include "vm_version_arm.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_ppc
|
||||
# include "vm_version_ppc.hpp"
|
||||
#endif
|
||||
#ifdef COMPILER2
|
||||
#include "opto/runtime.hpp"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -26,6 +26,8 @@
|
|||
#include "interpreter/interpreter.hpp"
|
||||
#include "interpreter/interpreterGenerator.hpp"
|
||||
#include "interpreter/interpreterRuntime.hpp"
|
||||
#include "interpreter/interp_masm.hpp"
|
||||
#include "interpreter/templateInterpreter.hpp"
|
||||
#include "interpreter/templateTable.hpp"
|
||||
|
||||
#ifndef CC_INTERP
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2014, 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
|
||||
|
|
@ -33,6 +33,8 @@
|
|||
|
||||
#ifndef CC_INTERP
|
||||
|
||||
class InterpreterMacroAssembler;
|
||||
|
||||
//------------------------------------------------------------------------------------------------------------------------
|
||||
// A little wrapper class to group tosca-specific entry points into a unit.
|
||||
// (tosca = Top-Of-Stack CAche)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2014, 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
|
||||
|
|
@ -24,6 +24,7 @@
|
|||
|
||||
#include "precompiled.hpp"
|
||||
#include "gc_interface/collectedHeap.hpp"
|
||||
#include "interpreter/interp_masm.hpp"
|
||||
#include "interpreter/templateTable.hpp"
|
||||
#include "runtime/timer.hpp"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2014, 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
|
||||
|
|
@ -28,24 +28,6 @@
|
|||
#include "interpreter/bytecodes.hpp"
|
||||
#include "memory/allocation.hpp"
|
||||
#include "runtime/frame.hpp"
|
||||
#ifdef TARGET_ARCH_x86
|
||||
# include "interp_masm_x86.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_MODEL_sparc
|
||||
# include "interp_masm_sparc.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_MODEL_zero
|
||||
# include "interp_masm_zero.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_MODEL_arm
|
||||
# include "interp_masm_arm.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_MODEL_ppc_32
|
||||
# include "interp_masm_ppc_32.hpp"
|
||||
#endif
|
||||
#ifdef TARGET_ARCH_MODEL_ppc_64
|
||||
# include "interp_masm_ppc_64.hpp"
|
||||
#endif
|
||||
|
||||
#ifndef CC_INTERP
|
||||
// All the necessary definitions used for (bytecode) template generation. Instead of
|
||||
|
|
@ -53,6 +35,7 @@
|
|||
// and the snippet generator, a template is assigned to each bytecode which can be
|
||||
// used to generate the bytecode's implementation if needed.
|
||||
|
||||
class InterpreterMacroAssembler;
|
||||
|
||||
// A Template describes the properties of a code template for a given bytecode
|
||||
// and provides a generator to generate the code template.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue