Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8243205: Modularize JVM flags declaration #1608

Closed
wants to merge 3 commits into from
+336 −191
Closed

8243205: Modularize JVM flags declaration #1608

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc277fa
8243205: Modularize global variable declaration for JVM flag macros
iklam Dec 3, 2020
6b922fb
stefank comments
iklam Dec 8, 2020
c22614f
Merge branch 'master' into 8243205-modularize-globals-hpp
iklam Dec 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/hotspot/share/compiler/compiler_globals_pd.hpp
View file
Original file line number Diff line number Diff line change
@@ -22,8 +22,8 @@
*
*/

#ifndef SHARE_COMPILER_COMPILER_GLOBALS_DEF_HPP
#define SHARE_COMPILER_COMPILER_GLOBALS_DEF_HPP
#ifndef SHARE_COMPILER_COMPILER_GLOBALS_PD_HPP
#define SHARE_COMPILER_COMPILER_GLOBALS_PD_HPP

// Platform-specific Default values for VM flags used by the compiler.
//
@@ -41,7 +41,7 @@

// JVMCI has no platform-specific global definitions
//#if INCLUDE_JVMCI
//#include "jvmci/jvmci_globals_def.hpp"
//#include "jvmci/jvmci_globals_pd.hpp"
//#endif

#if !defined(COMPILER1) && !defined(COMPILER2) && !INCLUDE_JVMCI
@@ -84,4 +84,4 @@ define_pd_global(uint64_t,MaxRAM, 1ULL*G);

#endif // no compilers

#endif // SHARE_COMPILER_COMPILER_GLOBALS_DEF_HPP
#endif // SHARE_COMPILER_COMPILER_GLOBALS_PD_HPP
10 changes: 5 additions & 5 deletions src/hotspot/share/runtime/flags/allFlags.hpp
View file
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@
range, \
constraint) \
\
GC_FLAGS( \
RUNTIME_OS_FLAGS( \
develop, \
develop_pd, \
product, \
@@ -102,7 +102,7 @@
range, \
constraint) \
\
RUNTIME_OS_FLAGS( \
GC_FLAGS( \
develop, \
develop_pd, \
product, \
@@ -111,9 +111,9 @@
range, \
constraint)

#define ALL_CONSTRAINTS(f) \
COMPILER_CONSTRAINTS(f) \
RUNTIME_CONSTRAINTS(f) \
#define ALL_CONSTRAINTS(f) \
COMPILER_CONSTRAINTS(f) \
RUNTIME_CONSTRAINTS(f) \
GC_CONSTRAINTS(f)


4 changes: 2 additions & 2 deletions src/hotspot/share/runtime/globals.hpp
View file
Original file line number Diff line number Diff line change
@@ -2497,8 +2497,8 @@ const intx ObjectAlignmentInBytes = 8;
// end of RUNTIME_FLAGS

DECLARE_FLAGS(LP64_RUNTIME_FLAGS)
DECLARE_FLAGS(RUNTIME_OS_FLAGS)
DECLARE_FLAGS(RUNTIME_FLAGS)
DECLARE_ARCH_FLAGS(ARCH_FLAGS)
DECLARE_FLAGS(RUNTIME_FLAGS)
DECLARE_FLAGS(RUNTIME_OS_FLAGS)

#endif // SHARE_RUNTIME_GLOBALS_HPP
20 changes: 10 additions & 10 deletions src/hotspot/share/runtime/globals_shared.hpp
View file
Original file line number Diff line number Diff line change
@@ -91,19 +91,19 @@
#define DECLARE_NOTPRODUCT_FLAG(type, name, value, ...) extern "C" type name;
#endif // PRODUCT

#define DECLARE_FLAGS(flag_group) \
flag_group(DECLARE_DEVELOPER_FLAG, \
#define DECLARE_FLAGS(flag_group) \
flag_group(DECLARE_DEVELOPER_FLAG, \
DECLARE_PD_DEVELOPER_FLAG, \
DECLARE_PRODUCT_FLAG, \
DECLARE_PD_PRODUCT_FLAG, \
DECLARE_NOTPRODUCT_FLAG, \
IGNORE_RANGE, \
DECLARE_PRODUCT_FLAG, \
DECLARE_PD_PRODUCT_FLAG, \
DECLARE_NOTPRODUCT_FLAG, \
IGNORE_RANGE, \
IGNORE_CONSTRAINT)

#define DECLARE_ARCH_FLAGS(flag_group) \
flag_group(DECLARE_DEVELOPER_FLAG, \
DECLARE_PRODUCT_FLAG, \
DECLARE_NOTPRODUCT_FLAG, \
#define DECLARE_ARCH_FLAGS(flag_group) \
flag_group(DECLARE_DEVELOPER_FLAG, \
DECLARE_PRODUCT_FLAG, \
DECLARE_NOTPRODUCT_FLAG, \
IGNORE_RANGE, \
IGNORE_CONSTRAINT)