src/share/vm/jvmci/vmStructs_jvmci.cpp

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

*** 589,623 ****
    declare_constant_with_value("G1SATBCardTableModRefBS::g1_young_gen", G1SATBCardTableModRefBS::g1_young_card_val())
  
  #endif // INCLUDE_ALL_GCS
  
  
! #ifdef TARGET_OS_FAMILY_linux
  
  #define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function) \
    declare_preprocessor_address("RTLD_DEFAULT", RTLD_DEFAULT)
  
! #endif // TARGET_OS_FAMILY_linux
  
  
! #ifdef TARGET_OS_FAMILY_bsd
  
  #define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function) \
    declare_preprocessor_address("RTLD_DEFAULT", RTLD_DEFAULT)
  
! #endif // TARGET_OS_FAMILY_bsd
! 
  
  #ifdef TARGET_ARCH_aarch64
  
  #define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
    volatile_nonstatic_field(JavaFrameAnchor, _last_Java_fp, intptr_t*)
  
! #endif // TARGET_ARCH_aarch64
  
  
! #ifdef TARGET_ARCH_x86
  
  #define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
    volatile_nonstatic_field(JavaFrameAnchor, _last_Java_fp, intptr_t*)
  
  #define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) \
--- 589,623 ----
    declare_constant_with_value("G1SATBCardTableModRefBS::g1_young_gen", G1SATBCardTableModRefBS::g1_young_card_val())
  
  #endif // INCLUDE_ALL_GCS
  
  
! #ifdef LINUX
  
  #define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function) \
    declare_preprocessor_address("RTLD_DEFAULT", RTLD_DEFAULT)
  
! #endif
  
  
! #ifdef BSD
  
  #define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function) \
    declare_preprocessor_address("RTLD_DEFAULT", RTLD_DEFAULT)
  
! #endif
  
+ // AARCH64 is defined in closed port, too. TARGET_ARCH_aarch64 is not.
  #ifdef TARGET_ARCH_aarch64
  
  #define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
    volatile_nonstatic_field(JavaFrameAnchor, _last_Java_fp, intptr_t*)
  
! #endif
  
  
! #ifdef X86
  
  #define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
    volatile_nonstatic_field(JavaFrameAnchor, _last_Java_fp, intptr_t*)
  
  #define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) \
*** 659,672 ****
  #define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) \
    declare_preprocessor_constant("VM_Version::CPU_AVX512BW", CPU_AVX512BW) \
    declare_preprocessor_constant("VM_Version::CPU_AVX512VL", CPU_AVX512VL) \
    declare_preprocessor_constant("VM_Version::CPU_SHA", CPU_SHA)
  
! #endif // TARGET_ARCH_x86
  
  
! #ifdef TARGET_ARCH_sparc
  
  #define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
    volatile_nonstatic_field(JavaFrameAnchor, _flags, int)
  
  #define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) \
--- 659,672 ----
  #define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) \
    declare_preprocessor_constant("VM_Version::CPU_AVX512BW", CPU_AVX512BW) \
    declare_preprocessor_constant("VM_Version::CPU_AVX512VL", CPU_AVX512VL) \
    declare_preprocessor_constant("VM_Version::CPU_SHA", CPU_SHA)
  
! #endif
  
  
! #ifdef SPARC
  
  #define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
    volatile_nonstatic_field(JavaFrameAnchor, _flags, int)
  
  #define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) \
*** 692,702 ****
    declare_constant(VM_Version::aes_instructions_m)                        \
    declare_constant(VM_Version::sha1_instruction_m)                        \
    declare_constant(VM_Version::sha256_instruction_m)                      \
    declare_constant(VM_Version::sha512_instruction_m)
  
! #endif // TARGET_ARCH_sparc
  
  
  /*
   * Dummy defines for architectures that don't use these.
   */
--- 692,702 ----
    declare_constant(VM_Version::aes_instructions_m)                        \
    declare_constant(VM_Version::sha1_instruction_m)                        \
    declare_constant(VM_Version::sha256_instruction_m)                      \
    declare_constant(VM_Version::sha512_instruction_m)
  
! #endif
  
  
  /*
   * Dummy defines for architectures that don't use these.
   */