src/share/vm/runtime/stubRoutines.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

*** 28,37 ****
--- 28,38 ----
  #include "code/codeBlob.hpp"
  #include "memory/allocation.hpp"
  #include "runtime/frame.hpp"
  #include "runtime/mutexLocker.hpp"
  #include "runtime/stubCodeGenerator.hpp"
+ #include "utilities/macros.hpp"
  
  // StubRoutines provides entry points to assembly routines used by
  // compiled code and the run-time system. Platform-specific entry
  // points are defined in the platform-specific inner class.
  //
*** 81,105 ****
      max_size_of_parameters = 256                           // max. parameter size supported by megamorphic lookups
    };
  
    // Dependencies
    friend class StubGenerator;
! #if defined STUBROUTINES_MD_HPP
! # include STUBROUTINES_MD_HPP
! #elif defined TARGET_ARCH_MODEL_x86_32
! # include "stubRoutines_x86_32.hpp"
! #elif defined TARGET_ARCH_MODEL_x86_64
! # include "stubRoutines_x86_64.hpp"
! #elif defined TARGET_ARCH_MODEL_sparc
! # include "stubRoutines_sparc.hpp"
! #elif defined TARGET_ARCH_MODEL_zero
! # include "stubRoutines_zero.hpp"
! #elif defined TARGET_ARCH_MODEL_ppc_64
! # include "stubRoutines_ppc_64.hpp"
! #elif defined TARGET_ARCH_MODEL_aarch64
! # include "stubRoutines_aarch64.hpp"
! #endif
  
    static jint    _verify_oop_count;
    static address _verify_oop_subroutine_entry;
  
    static address _call_stub_return_address;                // the return PC, when returning to a call stub
--- 82,93 ----
      max_size_of_parameters = 256                           // max. parameter size supported by megamorphic lookups
    };
  
    // Dependencies
    friend class StubGenerator;
! 
! #include CPU_HEADER(stubRoutines)
  
    static jint    _verify_oop_count;
    static address _verify_oop_subroutine_entry;
  
    static address _call_stub_return_address;                // the return PC, when returning to a call stub