1.1 --- a/src/share/vm/runtime/globals.hpp Thu Jan 27 16:11:27 2011 -0800
1.2 +++ b/src/share/vm/runtime/globals.hpp Wed Feb 02 11:35:26 2011 -0500
1.3 @@ -35,6 +35,12 @@
1.4 #ifdef TARGET_ARCH_zero
1.5 # include "globals_zero.hpp"
1.6 #endif
1.7 +#ifdef TARGET_ARCH_arm
1.8 +# include "globals_arm.hpp"
1.9 +#endif
1.10 +#ifdef TARGET_ARCH_ppc
1.11 +# include "globals_ppc.hpp"
1.12 +#endif
1.13 #ifdef TARGET_OS_FAMILY_linux
1.14 # include "globals_linux.hpp"
1.15 #endif
1.16 @@ -62,6 +68,12 @@
1.17 #ifdef TARGET_OS_ARCH_windows_x86
1.18 # include "globals_windows_x86.hpp"
1.19 #endif
1.20 +#ifdef TARGET_OS_ARCH_linux_arm
1.21 +# include "globals_linux_arm.hpp"
1.22 +#endif
1.23 +#ifdef TARGET_OS_ARCH_linux_ppc
1.24 +# include "globals_linux_ppc.hpp"
1.25 +#endif
1.26 #ifdef COMPILER1
1.27 #ifdef TARGET_ARCH_x86
1.28 # include "c1_globals_x86.hpp"
1.29 @@ -69,6 +81,12 @@
1.30 #ifdef TARGET_ARCH_sparc
1.31 # include "c1_globals_sparc.hpp"
1.32 #endif
1.33 +#ifdef TARGET_ARCH_arm
1.34 +# include "c1_globals_arm.hpp"
1.35 +#endif
1.36 +#ifdef TARGET_ARCH_ppc
1.37 +# include "c1_globals_ppc.hpp"
1.38 +#endif
1.39 #ifdef TARGET_OS_FAMILY_linux
1.40 # include "c1_globals_linux.hpp"
1.41 #endif
1.42 @@ -86,6 +104,9 @@
1.43 #ifdef TARGET_ARCH_sparc
1.44 # include "c2_globals_sparc.hpp"
1.45 #endif
1.46 +#ifdef TARGET_ARCH_arm
1.47 +# include "c2_globals_arm.hpp"
1.48 +#endif
1.49 #ifdef TARGET_OS_FAMILY_linux
1.50 # include "c2_globals_linux.hpp"
1.51 #endif
1.52 @@ -410,7 +431,14 @@
1.53 product_pd(bool, UseMembar, \
1.54 "(Unstable) Issues membars on thread state transitions") \
1.55 \
1.56 - /* Temporary: See 6948537 */ \
1.57 + /* Temp PPC Flag to allow disabling the use of lwsync on ppc platforms \
1.58 + * that don't support it. This will be replaced by processor detection \
1.59 + * logic. \
1.60 + */ \
1.61 + product(bool, UsePPCLWSYNC, true, \
1.62 + "Use lwsync instruction if true, else use slower sync") \
1.63 + \
1.64 + /* Temporary: See 6948537 */ \
1.65 experimental(bool, UseMemSetInBOT, true, \
1.66 "(Unstable) uses memset in BOT updates in GC code") \
1.67 \
1.68 @@ -1926,6 +1954,9 @@
1.69 product(bool, PrintRevisitStats, false, \
1.70 "Print revisit (klass and MDO) stack related information") \
1.71 \
1.72 + EMBEDDED_ONLY(product(bool, LowMemoryProtection, true, \
1.73 + "Enable LowMemoryProtection")) \
1.74 + \
1.75 product_pd(bool, NeverActAsServerClassMachine, \
1.76 "Never act like a server-class machine") \
1.77 \
1.78 @@ -2630,6 +2661,25 @@
1.79 product(bool, UseStringCache, false, \
1.80 "Enable String cache capabilities on String.java") \
1.81 \
1.82 + /* byte strings */ \
1.83 + product(bool, UseCompressedStrings, false, \
1.84 + "Enable byte-valued strings") \
1.85 + \
1.86 + product(bool, SpecialStringCompress, true, \
1.87 + "special version of string compress") \
1.88 + \
1.89 + product(bool, SpecialStringInflate, true, \
1.90 + "special version of string inflate") \
1.91 + \
1.92 + product(bool, SpecialStringCompareToCC, true, \
1.93 + "special version of string compareToCC") \
1.94 + \
1.95 + product(bool, SpecialStringIndexOfCC, true, \
1.96 + "special version of string indexOfCC") \
1.97 + \
1.98 + product(bool, SpecialStringEqualsCC, true, \
1.99 + "special version of string equalsCC") \
1.100 + \
1.101 /* statistics */ \
1.102 develop(bool, CountCompiledCalls, false, \
1.103 "counts method invocations") \
1.104 @@ -2851,9 +2901,13 @@
1.105 "Max. no. of lines in the stack trace for Java exceptions " \
1.106 "(0 means all)") \
1.107 \
1.108 - develop(intx, GuaranteedSafepointInterval, 1000, \
1.109 + NOT_EMBEDDED(develop(intx, GuaranteedSafepointInterval, 1000, \
1.110 "Guarantee a safepoint (at least) every so many milliseconds " \
1.111 - "(0 means none)") \
1.112 + "(0 means none)")) \
1.113 + \
1.114 + EMBEDDED_ONLY(product(intx, GuaranteedSafepointInterval, 0, \
1.115 + "Guarantee a safepoint (at least) every so many milliseconds " \
1.116 + "(0 means none)")) \
1.117 \
1.118 product(intx, SafepointTimeoutDelay, 10000, \
1.119 "Delay in milliseconds for option SafepointTimeout") \
1.120 @@ -3543,9 +3597,13 @@
1.121 \
1.122 /* flags for performance data collection */ \
1.123 \
1.124 - product(bool, UsePerfData, true, \
1.125 + NOT_EMBEDDED(product(bool, UsePerfData, true, \
1.126 "Flag to disable jvmstat instrumentation for performance testing" \
1.127 - "and problem isolation purposes.") \
1.128 + "and problem isolation purposes.")) \
1.129 + \
1.130 + EMBEDDED_ONLY(product(bool, UsePerfData, false, \
1.131 + "Flag to disable jvmstat instrumentation for performance testing" \
1.132 + "and problem isolation purposes.")) \
1.133 \
1.134 product(bool, PerfDataSaveToFile, false, \
1.135 "Save PerfData memory to hsperfdata_<pid> file on exit") \
