--- a/src/hotspot/share/gc/shared/barrierSetConfig.hpp Wed May 30 10:29:41 2018 +0200
+++ b/src/hotspot/share/gc/shared/barrierSetConfig.hpp Wed May 30 10:47:43 2018 +0200
@@ -30,8 +30,8 @@
// Do something for each concrete barrier set part of the build.
#define FOR_EACH_CONCRETE_BARRIER_SET_DO(f) \
f(CardTableBarrierSet) \
- G1GC_ONLY(f(G1BarrierSet)) \
- EPSILONGC_ONLY(f(EpsilonBarrierSet))
+ EPSILONGC_ONLY(f(EpsilonBarrierSet)) \
+ G1GC_ONLY(f(G1BarrierSet))
#define FOR_EACH_ABSTRACT_BARRIER_SET_DO(f) \
f(ModRef)
--- a/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp Wed May 30 10:29:41 2018 +0200
+++ b/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp Wed May 30 10:47:43 2018 +0200
@@ -30,11 +30,11 @@
#include "gc/shared/modRefBarrierSet.inline.hpp"
#include "gc/shared/cardTableBarrierSet.inline.hpp"
+#if INCLUDE_EPSILONGC
+#include "gc/epsilon/epsilonBarrierSet.hpp" // Epsilon support
+#endif
#if INCLUDE_G1GC
#include "gc/g1/g1BarrierSet.inline.hpp" // G1 support
#endif
-#if INCLUDE_EPSILONGC
-#include "gc/epsilon/epsilonBarrierSet.hpp" // Epsilon support
-#endif
#endif // SHARE_VM_GC_SHARED_BARRIERSETCONFIG_INLINE_HPP
--- a/src/hotspot/share/gc/shared/gcConfig.cpp Wed May 30 10:29:41 2018 +0200
+++ b/src/hotspot/share/gc/shared/gcConfig.cpp Wed May 30 10:47:43 2018 +0200
@@ -31,6 +31,9 @@
#if INCLUDE_CMSGC
#include "gc/cms/cmsArguments.hpp"
#endif
+#if INCLUDE_EPSILONGC
+#include "gc/epsilon/epsilonArguments.hpp"
+#endif
#if INCLUDE_G1GC
#include "gc/g1/g1Arguments.hpp"
#endif
@@ -40,9 +43,6 @@
#if INCLUDE_SERIALGC
#include "gc/serial/serialArguments.hpp"
#endif
-#if INCLUDE_EPSILONGC
-#include "gc/epsilon/epsilonArguments.hpp"
-#endif
struct SupportedGC {
bool& _flag;
@@ -55,20 +55,20 @@
};
CMSGC_ONLY(static CMSArguments cmsArguments;)
+ EPSILONGC_ONLY(static EpsilonArguments epsilonArguments;)
G1GC_ONLY(static G1Arguments g1Arguments;)
PARALLELGC_ONLY(static ParallelArguments parallelArguments;)
SERIALGC_ONLY(static SerialArguments serialArguments;)
- EPSILONGC_ONLY(static EpsilonArguments epsilonArguments;)
// Table of supported GCs, for translating between command
// line flag, CollectedHeap::Name and GCArguments instance.
static const SupportedGC SupportedGCs[] = {
CMSGC_ONLY_ARG(SupportedGC(UseConcMarkSweepGC, CollectedHeap::CMS, cmsArguments, "concurrent mark sweep gc"))
+ EPSILONGC_ONLY_ARG(SupportedGC(UseEpsilonGC, CollectedHeap::Epsilon, epsilonArguments, "epsilon gc"))
G1GC_ONLY_ARG(SupportedGC(UseG1GC, CollectedHeap::G1, g1Arguments, "g1 gc"))
PARALLELGC_ONLY_ARG(SupportedGC(UseParallelGC, CollectedHeap::Parallel, parallelArguments, "parallel gc"))
PARALLELGC_ONLY_ARG(SupportedGC(UseParallelOldGC, CollectedHeap::Parallel, parallelArguments, "parallel gc"))
SERIALGC_ONLY_ARG(SupportedGC(UseSerialGC, CollectedHeap::Serial, serialArguments, "serial gc"))
- EPSILONGC_ONLY_ARG(SupportedGC(UseEpsilonGC, CollectedHeap::Epsilon, epsilonArguments, "epsilon gc"))
};
#define FOR_EACH_SUPPORTED_GC(var) \
@@ -93,11 +93,11 @@
}
NOT_CMSGC( UNSUPPORTED_OPTION(UseConcMarkSweepGC));
+ NOT_EPSILONGC( UNSUPPORTED_OPTION(UseEpsilonGC);)
NOT_G1GC( UNSUPPORTED_OPTION(UseG1GC);)
NOT_PARALLELGC(UNSUPPORTED_OPTION(UseParallelGC);)
NOT_PARALLELGC(UNSUPPORTED_OPTION(UseParallelOldGC));
NOT_SERIALGC( UNSUPPORTED_OPTION(UseSerialGC);)
- NOT_EPSILONGC( UNSUPPORTED_OPTION(UseEpsilonGC);)
}
bool GCConfig::is_no_gc_selected() {
--- a/src/hotspot/share/gc/shared/gc_globals.hpp Wed May 30 10:29:41 2018 +0200
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp Wed May 30 10:47:43 2018 +0200
@@ -29,6 +29,9 @@
#if INCLUDE_CMSGC
#include "gc/cms/cms_globals.hpp"
#endif
+#if INCLUDE_EPSILONGC
+#include "gc/epsilon/epsilon_globals.hpp"
+#endif
#if INCLUDE_G1GC
#include "gc/g1/g1_globals.hpp"
#endif
@@ -38,9 +41,6 @@
#if INCLUDE_SERIALGC
#include "gc/serial/serial_globals.hpp"
#endif
-#if INCLUDE_EPSILONGC
-#include "gc/epsilon/epsilon_globals.hpp"
-#endif
#define GC_FLAGS(develop, \
develop_pd, \
@@ -73,6 +73,22 @@
constraint, \
writeable)) \
\
+ EPSILONGC_ONLY(GC_EPSILON_FLAGS( \
+ develop, \
+ develop_pd, \
+ product, \
+ product_pd, \
+ diagnostic, \
+ diagnostic_pd, \
+ experimental, \
+ notproduct, \
+ manageable, \
+ product_rw, \
+ lp64_product, \
+ range, \
+ constraint, \
+ writeable)) \
+ \
G1GC_ONLY(GC_G1_FLAGS( \
develop, \
develop_pd, \
@@ -121,22 +137,6 @@
constraint, \
writeable)) \
\
- EPSILONGC_ONLY(GC_EPSILON_FLAGS( \
- develop, \
- develop_pd, \
- product, \
- product_pd, \
- diagnostic, \
- diagnostic_pd, \
- experimental, \
- notproduct, \
- manageable, \
- product_rw, \
- lp64_product, \
- range, \
- constraint, \
- writeable)) \
- \
/* gc */ \
\
product(bool, UseConcMarkSweepGC, false, \
--- a/src/hotspot/share/gc/shared/vmStructs_gc.hpp Wed May 30 10:29:41 2018 +0200
+++ b/src/hotspot/share/gc/shared/vmStructs_gc.hpp Wed May 30 10:47:43 2018 +0200
@@ -37,6 +37,9 @@
#if INCLUDE_CMSGC
#include "gc/cms/vmStructs_cms.hpp"
#endif
+#if INCLUDE_EPSILONGC
+#include "gc/epsilon/vmStructs_epsilon.hpp"
+#endif
#if INCLUDE_G1GC
#include "gc/g1/vmStructs_g1.hpp"
#endif
@@ -47,9 +50,6 @@
#include "gc/serial/defNewGeneration.hpp"
#include "gc/serial/vmStructs_serial.hpp"
#endif
-#if INCLUDE_EPSILONGC
-#include "gc/epsilon/vmStructs_epsilon.hpp"
-#endif
#define VM_STRUCTS_GC(nonstatic_field, \
volatile_nonstatic_field, \
@@ -58,6 +58,9 @@
CMSGC_ONLY(VM_STRUCTS_CMSGC(nonstatic_field, \
volatile_nonstatic_field, \
static_field)) \
+ EPSILONGC_ONLY(VM_STRUCTS_EPSILONGC(nonstatic_field, \
+ volatile_nonstatic_field, \
+ static_field)) \
G1GC_ONLY(VM_STRUCTS_G1GC(nonstatic_field, \
volatile_nonstatic_field, \
static_field)) \
@@ -67,9 +70,6 @@
SERIALGC_ONLY(VM_STRUCTS_SERIALGC(nonstatic_field, \
volatile_nonstatic_field, \
static_field)) \
- EPSILONGC_ONLY(VM_STRUCTS_EPSILONGC(nonstatic_field, \
- volatile_nonstatic_field, \
- static_field)) \
/**********************************************************************************/ \
/* Generation and Space hierarchies */ \
/**********************************************************************************/ \
@@ -159,6 +159,9 @@
CMSGC_ONLY(VM_TYPES_CMSGC(declare_type, \
declare_toplevel_type, \
declare_integer_type)) \
+ EPSILONGC_ONLY(VM_TYPES_EPSILONGC(declare_type, \
+ declare_toplevel_type, \
+ declare_integer_type)) \
G1GC_ONLY(VM_TYPES_G1GC(declare_type, \
declare_toplevel_type, \
declare_integer_type)) \
@@ -168,9 +171,6 @@
SERIALGC_ONLY(VM_TYPES_SERIALGC(declare_type, \
declare_toplevel_type, \
declare_integer_type)) \
- EPSILONGC_ONLY(VM_TYPES_EPSILONGC(declare_type, \
- declare_toplevel_type, \
- declare_integer_type)) \
/******************************************/ \
/* Generation and space hierarchies */ \
/* (needed for run-time type information) */ \
@@ -234,14 +234,14 @@
declare_constant_with_value) \
CMSGC_ONLY(VM_INT_CONSTANTS_CMSGC(declare_constant, \
declare_constant_with_value)) \
+ EPSILONGC_ONLY(VM_INT_CONSTANTS_EPSILONGC(declare_constant, \
+ declare_constant_with_value)) \
G1GC_ONLY(VM_INT_CONSTANTS_G1GC(declare_constant, \
declare_constant_with_value)) \
PARALLELGC_ONLY(VM_INT_CONSTANTS_PARALLELGC(declare_constant, \
declare_constant_with_value)) \
SERIALGC_ONLY(VM_INT_CONSTANTS_SERIALGC(declare_constant, \
declare_constant_with_value)) \
- EPSILONGC_ONLY(VM_INT_CONSTANTS_EPSILONGC(declare_constant, \
- declare_constant_with_value)) \
\
/********************************************/ \
/* Generation and Space Hierarchy Constants */ \
--- a/src/hotspot/share/utilities/macros.hpp Wed May 30 10:29:41 2018 +0200
+++ b/src/hotspot/share/utilities/macros.hpp Wed May 30 10:47:43 2018 +0200
@@ -149,6 +149,24 @@
#define NOT_CMSGC_RETURN_(code) { return code; }
#endif // INCLUDE_CMSGC
+#ifndef INCLUDE_EPSILONGC
+#define INCLUDE_EPSILONGC 1
+#endif // INCLUDE_EPSILONGC
+
+#if INCLUDE_EPSILONGC
+#define EPSILONGC_ONLY(x) x
+#define EPSILONGC_ONLY_ARG(arg) arg,
+#define NOT_EPSILONGC(x)
+#define NOT_EPSILONGC_RETURN /* next token must be ; */
+#define NOT_EPSILONGC_RETURN_(code) /* next token must be ; */
+#else
+#define EPSILONGC_ONLY(x)
+#define EPSILONGC_ONLY_ARG(arg)
+#define NOT_EPSILONGC(x) x
+#define NOT_EPSILONGC_RETURN {}
+#define NOT_EPSILONGC_RETURN_(code) { return code; }
+#endif // INCLUDE_EPSILONGC
+
#ifndef INCLUDE_G1GC
#define INCLUDE_G1GC 1
#endif // INCLUDE_G1GC
@@ -203,25 +221,7 @@
#define NOT_SERIALGC_RETURN_(code) { return code; }
#endif // INCLUDE_SERIALGC
-#ifndef INCLUDE_EPSILONGC
-#define INCLUDE_EPSILONGC 1
-#endif // INCLUDE_EPSILONGC
-
-#if INCLUDE_EPSILONGC
-#define EPSILONGC_ONLY(x) x
-#define EPSILONGC_ONLY_ARG(arg) arg,
-#define NOT_EPSILONGC(x)
-#define NOT_EPSILONGC_RETURN /* next token must be ; */
-#define NOT_EPSILONGC_RETURN_(code) /* next token must be ; */
-#else
-#define EPSILONGC_ONLY(x)
-#define EPSILONGC_ONLY_ARG(arg)
-#define NOT_EPSILONGC(x) x
-#define NOT_EPSILONGC_RETURN {}
-#define NOT_EPSILONGC_RETURN_(code) { return code; }
-#endif // INCLUDE_EPSILONGC
-
-#if INCLUDE_CMSGC || INCLUDE_G1GC || INCLUDE_PARALLELGC || INCLUDE_EPSILONGC
+#if INCLUDE_CMSGC || INCLUDE_EPSILONGC || INCLUDE_G1GC || INCLUDE_PARALLELGC
#define INCLUDE_NOT_ONLY_SERIALGC 1
#else
#define INCLUDE_NOT_ONLY_SERIALGC 0