archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8161258: Simplify including platform files

Browse source 
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
This commit is contained in:
Goetz Lindenmaier 2016-07-13 12:23:05 +02:00
parent e757151666
commit da3339948e
116 changed files with 427 additions and 1876 deletions
Download patch file Download diff file Expand all files Collapse all files

20
hotspot/src/share/vm/jvmci/vmStructs_jvmci.cpp
View file

@ -591,31 +591,31 @@
#endif // INCLUDE_ALL_GCS
#ifdef TARGET_OS_FAMILY_linux
#ifdef LINUX
#define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function) \
declare_preprocessor_address("RTLD_DEFAULT", RTLD_DEFAULT)
#endif // TARGET_OS_FAMILY_linux
#endif
#ifdef TARGET_OS_FAMILY_bsd
#ifdef BSD
#define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function) \
declare_preprocessor_address("RTLD_DEFAULT", RTLD_DEFAULT)
#endif // TARGET_OS_FAMILY_bsd
#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 // TARGET_ARCH_aarch64
#endif
#ifdef TARGET_ARCH_x86
#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*)
@ -661,10 +661,10 @@
declare_preprocessor_constant("VM_Version::CPU_AVX512VL", CPU_AVX512VL) \
declare_preprocessor_constant("VM_Version::CPU_SHA", CPU_SHA)
#endif // TARGET_ARCH_x86
#endif
#ifdef TARGET_ARCH_sparc
#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)
@ -694,7 +694,7 @@
declare_constant(VM_Version::sha256_instruction_m) \
declare_constant(VM_Version::sha512_instruction_m)
#endif // TARGET_ARCH_sparc
#endif
/*