src/share/vm/runtime/frame.inline.hpp

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.
*** 29,45 ****
  #include "interpreter/bytecodeInterpreter.inline.hpp"
  #include "interpreter/interpreter.hpp"
  #include "oops/method.hpp"
  #include "runtime/frame.hpp"
  #include "runtime/signature.hpp"
! #ifdef TARGET_ARCH_zero
  # include "entryFrame_zero.hpp"
  # include "fakeStubFrame_zero.hpp"
  # include "interpreterFrame_zero.hpp"
  # include "sharkFrame_zero.hpp"
  #endif
  
  inline bool frame::is_entry_frame() const {
    return StubRoutines::returns_to_call_stub(pc());
  }
  
  inline bool frame::is_stub_frame() const {
--- 29,48 ----
  #include "interpreter/bytecodeInterpreter.inline.hpp"
  #include "interpreter/interpreter.hpp"
  #include "oops/method.hpp"
  #include "runtime/frame.hpp"
  #include "runtime/signature.hpp"
! #include "utilities/macros.hpp"
! #ifdef ZERO
  # include "entryFrame_zero.hpp"
  # include "fakeStubFrame_zero.hpp"
  # include "interpreterFrame_zero.hpp"
  # include "sharkFrame_zero.hpp"
  #endif
  
+ #include CPU_HEADER_INLINE(frame)
+ 
  inline bool frame::is_entry_frame() const {
    return StubRoutines::returns_to_call_stub(pc());
  }
  
  inline bool frame::is_stub_frame() const {
*** 48,75 ****
  
  inline bool frame::is_first_frame() const {
    return is_entry_frame() && entry_frame_is_first();
  }
  
- // here are the platform-dependent bodies:
- 
- #ifdef TARGET_ARCH_x86
- # include "frame_x86.inline.hpp"
- #endif
- #ifdef TARGET_ARCH_sparc
- # include "frame_sparc.inline.hpp"
- #endif
- #ifdef TARGET_ARCH_zero
- # include "frame_zero.inline.hpp"
- #endif
- #ifdef TARGET_ARCH_arm
- # include "frame_arm.inline.hpp"
- #endif
- #ifdef TARGET_ARCH_ppc
- # include "frame_ppc.inline.hpp"
- #endif
- #ifdef TARGET_ARCH_aarch64
- # include "frame_aarch64.inline.hpp"
- #endif
- 
- 
  #endif // SHARE_VM_RUNTIME_FRAME_INLINE_HPP
--- 51,56 ----