1.1 --- a/src/share/vm/runtime/vmStructs.cpp Fri Jan 25 03:03:23 2013 -0800
1.2 +++ b/src/share/vm/runtime/vmStructs.cpp Sun Jan 27 01:07:09 2013 -0800
1.3 @@ -101,6 +101,7 @@
1.4 #include "utilities/array.hpp"
1.5 #include "utilities/globalDefinitions.hpp"
1.6 #include "utilities/hashtable.hpp"
1.7 +#include "utilities/macros.hpp"
1.8 #ifdef TARGET_ARCH_x86
1.9 # include "vmStructs_x86.hpp"
1.10 #endif
1.11 @@ -146,7 +147,7 @@
1.12 #ifdef TARGET_OS_ARCH_bsd_zero
1.13 # include "vmStructs_bsd_zero.hpp"
1.14 #endif
1.15 -#ifndef SERIALGC
1.16 +#if INCLUDE_ALL_GCS
1.17 #include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
1.18 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp"
1.19 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
1.20 @@ -161,7 +162,7 @@
1.21 #include "gc_implementation/parallelScavenge/psYoungGen.hpp"
1.22 #include "gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp"
1.23 #include "gc_implementation/g1/vmStructs_g1.hpp"
1.24 -#endif
1.25 +#endif // INCLUDE_ALL_GCS
1.26 #ifdef COMPILER2
1.27 #include "opto/addnode.hpp"
1.28 #include "opto/block.hpp"
1.29 @@ -2786,7 +2787,7 @@
1.30 GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY,
1.31 GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY)
1.32
1.33 -#ifndef SERIALGC
1.34 +#if INCLUDE_ALL_GCS
1.35 VM_STRUCTS_PARALLELGC(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
1.36 GENERATE_STATIC_VM_STRUCT_ENTRY)
1.37
1.38 @@ -2796,7 +2797,7 @@
1.39
1.40 VM_STRUCTS_G1(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
1.41 GENERATE_STATIC_VM_STRUCT_ENTRY)
1.42 -#endif // SERIALGC
1.43 +#endif // INCLUDE_ALL_GCS
1.44
1.45 VM_STRUCTS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
1.46 GENERATE_STATIC_VM_STRUCT_ENTRY,
1.47 @@ -2830,7 +2831,7 @@
1.48 GENERATE_C2_VM_TYPE_ENTRY,
1.49 GENERATE_C2_TOPLEVEL_VM_TYPE_ENTRY)
1.50
1.51 -#ifndef SERIALGC
1.52 +#if INCLUDE_ALL_GCS
1.53 VM_TYPES_PARALLELGC(GENERATE_VM_TYPE_ENTRY,
1.54 GENERATE_TOPLEVEL_VM_TYPE_ENTRY)
1.55
1.56 @@ -2841,7 +2842,7 @@
1.57
1.58 VM_TYPES_G1(GENERATE_VM_TYPE_ENTRY,
1.59 GENERATE_TOPLEVEL_VM_TYPE_ENTRY)
1.60 -#endif // SERIALGC
1.61 +#endif // INCLUDE_ALL_GCS
1.62
1.63 VM_TYPES_CPU(GENERATE_VM_TYPE_ENTRY,
1.64 GENERATE_TOPLEVEL_VM_TYPE_ENTRY,
1.65 @@ -2872,11 +2873,11 @@
1.66 GENERATE_C2_VM_INT_CONSTANT_ENTRY,
1.67 GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
1.68
1.69 -#ifndef SERIALGC
1.70 +#if INCLUDE_ALL_GCS
1.71 VM_INT_CONSTANTS_CMS(GENERATE_VM_INT_CONSTANT_ENTRY)
1.72
1.73 VM_INT_CONSTANTS_PARNEW(GENERATE_VM_INT_CONSTANT_ENTRY)
1.74 -#endif // SERIALGC
1.75 +#endif // INCLUDE_ALL_GCS
1.76
1.77 VM_INT_CONSTANTS_CPU(GENERATE_VM_INT_CONSTANT_ENTRY,
1.78 GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY,
1.79 @@ -2930,7 +2931,7 @@
1.80 CHECK_NO_OP,
1.81 CHECK_NO_OP);
1.82
1.83 -#ifndef SERIALGC
1.84 +#if INCLUDE_ALL_GCS
1.85 VM_STRUCTS_PARALLELGC(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
1.86 CHECK_STATIC_VM_STRUCT_ENTRY);
1.87
1.88 @@ -2940,7 +2941,7 @@
1.89
1.90 VM_STRUCTS_G1(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
1.91 CHECK_STATIC_VM_STRUCT_ENTRY);
1.92 -#endif // SERIALGC
1.93 +#endif // INCLUDE_ALL_GCS
1.94
1.95 VM_STRUCTS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
1.96 CHECK_STATIC_VM_STRUCT_ENTRY,
1.97 @@ -2969,7 +2970,7 @@
1.98 CHECK_C2_VM_TYPE_ENTRY,
1.99 CHECK_C2_TOPLEVEL_VM_TYPE_ENTRY);
1.100
1.101 -#ifndef SERIALGC
1.102 +#if INCLUDE_ALL_GCS
1.103 VM_TYPES_PARALLELGC(CHECK_VM_TYPE_ENTRY,
1.104 CHECK_SINGLE_ARG_VM_TYPE_NO_OP);
1.105
1.106 @@ -2980,7 +2981,7 @@
1.107
1.108 VM_TYPES_G1(CHECK_VM_TYPE_ENTRY,
1.109 CHECK_SINGLE_ARG_VM_TYPE_NO_OP);
1.110 -#endif // SERIALGC
1.111 +#endif // INCLUDE_ALL_GCS
1.112
1.113 VM_TYPES_CPU(CHECK_VM_TYPE_ENTRY,
1.114 CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
1.115 @@ -3035,7 +3036,7 @@
1.116 ENSURE_C2_FIELD_TYPE_PRESENT,
1.117 CHECK_NO_OP,
1.118 CHECK_NO_OP));
1.119 -#ifndef SERIALGC
1.120 +#if INCLUDE_ALL_GCS
1.121 debug_only(VM_STRUCTS_PARALLELGC(ENSURE_FIELD_TYPE_PRESENT,
1.122 ENSURE_FIELD_TYPE_PRESENT));
1.123 debug_only(VM_STRUCTS_CMS(ENSURE_FIELD_TYPE_PRESENT,
1.124 @@ -3043,7 +3044,7 @@
1.125 ENSURE_FIELD_TYPE_PRESENT));
1.126 debug_only(VM_STRUCTS_G1(ENSURE_FIELD_TYPE_PRESENT,
1.127 ENSURE_FIELD_TYPE_PRESENT));
1.128 -#endif // SERIALGC
1.129 +#endif // INCLUDE_ALL_GCS
1.130 debug_only(VM_STRUCTS_CPU(ENSURE_FIELD_TYPE_PRESENT,
1.131 ENSURE_FIELD_TYPE_PRESENT,
1.132 CHECK_NO_OP,
