< prev index next >
src/share/vm/runtime/globals.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
*** 24,33 ****
--- 24,35 ----
#ifndef SHARE_VM_RUNTIME_GLOBALS_HPP
#define SHARE_VM_RUNTIME_GLOBALS_HPP
#include "utilities/debug.hpp"
+ #include "utilities/macros.hpp"
+
#include <float.h> // for DBL_MAX
// use this for flags that are true per default in the tiered build
// but false in non-tiered builds, and vice versa
#ifdef TIERED
*** 36,180 ****
#else
#define trueInTiered false
#define falseInTiered true
#endif
! #ifdef TARGET_ARCH_x86
! # include "globals_x86.hpp"
! #endif
! #ifdef TARGET_ARCH_sparc
! # include "globals_sparc.hpp"
! #endif
! #ifdef TARGET_ARCH_zero
! # include "globals_zero.hpp"
! #endif
! #ifdef TARGET_ARCH_arm
! # include "globals_arm.hpp"
! #endif
! #ifdef TARGET_ARCH_ppc
! # include "globals_ppc.hpp"
! #endif
! #ifdef TARGET_ARCH_aarch64
! # include "globals_aarch64.hpp"
! #endif
! #ifdef TARGET_OS_FAMILY_linux
! # include "globals_linux.hpp"
! #endif
! #ifdef TARGET_OS_FAMILY_solaris
! # include "globals_solaris.hpp"
! #endif
! #ifdef TARGET_OS_FAMILY_windows
! # include "globals_windows.hpp"
! #endif
! #ifdef TARGET_OS_FAMILY_aix
! # include "globals_aix.hpp"
! #endif
! #ifdef TARGET_OS_FAMILY_bsd
! # include "globals_bsd.hpp"
! #endif
! #ifdef TARGET_OS_ARCH_linux_x86
! # include "globals_linux_x86.hpp"
! #endif
! #ifdef TARGET_OS_ARCH_linux_sparc
! # include "globals_linux_sparc.hpp"
! #endif
! #ifdef TARGET_OS_ARCH_linux_zero
! # include "globals_linux_zero.hpp"
! #endif
! #ifdef TARGET_OS_ARCH_solaris_x86
! # include "globals_solaris_x86.hpp"
! #endif
! #ifdef TARGET_OS_ARCH_solaris_sparc
! # include "globals_solaris_sparc.hpp"
! #endif
! #ifdef TARGET_OS_ARCH_windows_x86
! # include "globals_windows_x86.hpp"
! #endif
! #ifdef TARGET_OS_ARCH_linux_arm
! # include "globals_linux_arm.hpp"
! #endif
! #ifdef TARGET_OS_ARCH_linux_ppc
! # include "globals_linux_ppc.hpp"
! #endif
! #ifdef TARGET_OS_ARCH_linux_aarch64
! # include "globals_linux_aarch64.hpp"
! #endif
! #ifdef TARGET_OS_ARCH_aix_ppc
! # include "globals_aix_ppc.hpp"
! #endif
! #ifdef TARGET_OS_ARCH_bsd_x86
! # include "globals_bsd_x86.hpp"
! #endif
! #ifdef TARGET_OS_ARCH_bsd_zero
! # include "globals_bsd_zero.hpp"
! #endif
#ifdef COMPILER1
! #ifdef TARGET_ARCH_x86
! # include "c1_globals_x86.hpp"
! #endif
! #ifdef TARGET_ARCH_sparc
! # include "c1_globals_sparc.hpp"
! #endif
! #ifdef TARGET_ARCH_arm
! # include "c1_globals_arm.hpp"
! #endif
! #ifdef TARGET_ARCH_aarch64
! # include "c1_globals_aarch64.hpp"
! #endif
! #ifdef TARGET_OS_FAMILY_linux
! # include "c1_globals_linux.hpp"
! #endif
! #ifdef TARGET_OS_FAMILY_solaris
! # include "c1_globals_solaris.hpp"
! #endif
! #ifdef TARGET_OS_FAMILY_windows
! # include "c1_globals_windows.hpp"
! #endif
! #ifdef TARGET_OS_FAMILY_aix
! # include "c1_globals_aix.hpp"
! #endif
! #ifdef TARGET_OS_FAMILY_bsd
! # include "c1_globals_bsd.hpp"
! #endif
! #ifdef TARGET_ARCH_ppc
! # include "c1_globals_ppc.hpp"
! #endif
#endif
#ifdef COMPILER2
! #ifdef TARGET_ARCH_x86
! # include "c2_globals_x86.hpp"
! #endif
! #ifdef TARGET_ARCH_sparc
! # include "c2_globals_sparc.hpp"
! #endif
! #ifdef TARGET_ARCH_arm
! # include "c2_globals_arm.hpp"
! #endif
! #ifdef TARGET_ARCH_ppc
! # include "c2_globals_ppc.hpp"
! #endif
! #ifdef TARGET_ARCH_aarch64
! # include "c2_globals_aarch64.hpp"
! #endif
! #ifdef TARGET_OS_FAMILY_linux
! # include "c2_globals_linux.hpp"
! #endif
! #ifdef TARGET_OS_FAMILY_solaris
! # include "c2_globals_solaris.hpp"
! #endif
! #ifdef TARGET_OS_FAMILY_windows
! # include "c2_globals_windows.hpp"
! #endif
! #ifdef TARGET_OS_FAMILY_aix
! # include "c2_globals_aix.hpp"
! #endif
! #ifdef TARGET_OS_FAMILY_bsd
! # include "c2_globals_bsd.hpp"
! #endif
#endif
#ifdef SHARK
! #ifdef TARGET_ARCH_zero
# include "shark_globals_zero.hpp"
#endif
#endif
#if !defined(COMPILER1) && !defined(COMPILER2) && !defined(SHARK) && !INCLUDE_JVMCI
--- 38,60 ----
#else
#define trueInTiered false
#define falseInTiered true
#endif
! #include CPU_HEADER(globals)
! #include OS_HEADER(globals)
! #include OS_CPU_HEADER(globals)
#ifdef COMPILER1
! #include CPU_HEADER(c1_globals)
! #include OS_HEADER(c1_globals)
#endif
#ifdef COMPILER2
! #include CPU_HEADER(c2_globals)
! #include OS_HEADER(c2_globals)
#endif
#ifdef SHARK
! #ifdef ZERO
# include "shark_globals_zero.hpp"
#endif
#endif
#if !defined(COMPILER1) && !defined(COMPILER2) && !defined(SHARK) && !INCLUDE_JVMCI
< prev index next >