< prev index next >

src/share/vm/prims/methodHandles.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

*** 28,44 **** #include "classfile/javaClasses.hpp" #include "classfile/vmSymbols.hpp" #include "runtime/frame.inline.hpp" #include "runtime/globals.hpp" #include "runtime/interfaceSupport.hpp" ! #ifdef TARGET_ARCH_zero # include "entry_zero.hpp" #endif - class MacroAssembler; class Label; class MethodHandles: AllStatic { // JVM support for MethodHandle, MethodType, and related types --- 28,44 ---- #include "classfile/javaClasses.hpp" #include "classfile/vmSymbols.hpp" #include "runtime/frame.inline.hpp" #include "runtime/globals.hpp" #include "runtime/interfaceSupport.hpp" + #include "utilities/macros.hpp" ! #ifdef ZERO # include "entry_zero.hpp" #endif class MacroAssembler; class Label; class MethodHandles: AllStatic { // JVM support for MethodHandle, MethodType, and related types
*** 190,218 **** static bool ref_kind_does_dispatch(int ref_kind) { return (ref_kind == JVM_REF_invokeVirtual || ref_kind == JVM_REF_invokeInterface); } ! ! #ifdef TARGET_ARCH_x86 ! # include "methodHandles_x86.hpp" ! #endif ! #ifdef TARGET_ARCH_sparc ! # include "methodHandles_sparc.hpp" ! #endif ! #ifdef TARGET_ARCH_zero ! # include "methodHandles_zero.hpp" ! #endif ! #ifdef TARGET_ARCH_arm ! # include "methodHandles_arm.hpp" ! #endif ! #ifdef TARGET_ARCH_ppc ! # include "methodHandles_ppc.hpp" ! #endif ! #ifdef TARGET_ARCH_aarch64 ! # include "methodHandles_aarch64.hpp" ! #endif // Tracing static void trace_method_handle(MacroAssembler* _masm, const char* adaptername) PRODUCT_RETURN; static void trace_method_handle_interpreter_entry(MacroAssembler* _masm, vmIntrinsics::ID iid) { if (TraceMethodHandles) { --- 190,200 ---- static bool ref_kind_does_dispatch(int ref_kind) { return (ref_kind == JVM_REF_invokeVirtual || ref_kind == JVM_REF_invokeInterface); } ! #include CPU_HEADER(methodHandles) // Tracing static void trace_method_handle(MacroAssembler* _masm, const char* adaptername) PRODUCT_RETURN; static void trace_method_handle_interpreter_entry(MacroAssembler* _masm, vmIntrinsics::ID iid) { if (TraceMethodHandles) {
< prev index next >