comparison src/share/vm/runtime/globals.hpp @ 17812:a7d4d4655766

Merge
author kvn
date Wed, 26 Mar 2014 18:21:05 -0700
parents 62c54fcc0a35
children f47fa50d9b9c
comparison
equal deleted inserted replaced
17789:6b207d038106 17812:a7d4d4655766
59 # include "globals_solaris.hpp" 59 # include "globals_solaris.hpp"
60 #endif 60 #endif
61 #ifdef TARGET_OS_FAMILY_windows 61 #ifdef TARGET_OS_FAMILY_windows
62 # include "globals_windows.hpp" 62 # include "globals_windows.hpp"
63 #endif 63 #endif
64 #ifdef TARGET_OS_FAMILY_aix
65 # include "globals_aix.hpp"
66 #endif
64 #ifdef TARGET_OS_FAMILY_bsd 67 #ifdef TARGET_OS_FAMILY_bsd
65 # include "globals_bsd.hpp" 68 # include "globals_bsd.hpp"
66 #endif 69 #endif
67 #ifdef TARGET_OS_ARCH_linux_x86 70 #ifdef TARGET_OS_ARCH_linux_x86
68 # include "globals_linux_x86.hpp" 71 # include "globals_linux_x86.hpp"
85 #ifdef TARGET_OS_ARCH_linux_arm 88 #ifdef TARGET_OS_ARCH_linux_arm
86 # include "globals_linux_arm.hpp" 89 # include "globals_linux_arm.hpp"
87 #endif 90 #endif
88 #ifdef TARGET_OS_ARCH_linux_ppc 91 #ifdef TARGET_OS_ARCH_linux_ppc
89 # include "globals_linux_ppc.hpp" 92 # include "globals_linux_ppc.hpp"
93 #endif
94 #ifdef TARGET_OS_ARCH_aix_ppc
95 # include "globals_aix_ppc.hpp"
90 #endif 96 #endif
91 #ifdef TARGET_OS_ARCH_bsd_x86 97 #ifdef TARGET_OS_ARCH_bsd_x86
92 # include "globals_bsd_x86.hpp" 98 # include "globals_bsd_x86.hpp"
93 #endif 99 #endif
94 #ifdef TARGET_OS_ARCH_bsd_zero 100 #ifdef TARGET_OS_ARCH_bsd_zero
114 # include "c1_globals_solaris.hpp" 120 # include "c1_globals_solaris.hpp"
115 #endif 121 #endif
116 #ifdef TARGET_OS_FAMILY_windows 122 #ifdef TARGET_OS_FAMILY_windows
117 # include "c1_globals_windows.hpp" 123 # include "c1_globals_windows.hpp"
118 #endif 124 #endif
125 #ifdef TARGET_OS_FAMILY_aix
126 # include "c1_globals_aix.hpp"
127 #endif
119 #ifdef TARGET_OS_FAMILY_bsd 128 #ifdef TARGET_OS_FAMILY_bsd
120 # include "c1_globals_bsd.hpp" 129 # include "c1_globals_bsd.hpp"
121 #endif 130 #endif
122 #endif 131 #endif
123 #ifdef COMPILER2 132 #ifdef COMPILER2
128 # include "c2_globals_sparc.hpp" 137 # include "c2_globals_sparc.hpp"
129 #endif 138 #endif
130 #ifdef TARGET_ARCH_arm 139 #ifdef TARGET_ARCH_arm
131 # include "c2_globals_arm.hpp" 140 # include "c2_globals_arm.hpp"
132 #endif 141 #endif
142 #ifdef TARGET_ARCH_ppc
143 # include "c2_globals_ppc.hpp"
144 #endif
133 #ifdef TARGET_OS_FAMILY_linux 145 #ifdef TARGET_OS_FAMILY_linux
134 # include "c2_globals_linux.hpp" 146 # include "c2_globals_linux.hpp"
135 #endif 147 #endif
136 #ifdef TARGET_OS_FAMILY_solaris 148 #ifdef TARGET_OS_FAMILY_solaris
137 # include "c2_globals_solaris.hpp" 149 # include "c2_globals_solaris.hpp"
138 #endif 150 #endif
139 #ifdef TARGET_OS_FAMILY_windows 151 #ifdef TARGET_OS_FAMILY_windows
140 # include "c2_globals_windows.hpp" 152 # include "c2_globals_windows.hpp"
153 #endif
154 #ifdef TARGET_OS_FAMILY_aix
155 # include "c2_globals_aix.hpp"
141 #endif 156 #endif
142 #ifdef TARGET_OS_FAMILY_bsd 157 #ifdef TARGET_OS_FAMILY_bsd
143 # include "c2_globals_bsd.hpp" 158 # include "c2_globals_bsd.hpp"
144 #endif 159 #endif
145 #endif 160 #endif
165 define_pd_global(intx, BackEdgeThreshold, 0); 180 define_pd_global(intx, BackEdgeThreshold, 0);
166 181
167 define_pd_global(intx, OnStackReplacePercentage, 0); 182 define_pd_global(intx, OnStackReplacePercentage, 0);
168 define_pd_global(bool, ResizeTLAB, false); 183 define_pd_global(bool, ResizeTLAB, false);
169 define_pd_global(intx, FreqInlineSize, 0); 184 define_pd_global(intx, FreqInlineSize, 0);
170 define_pd_global(intx, InlineSmallCode, 0);
171 define_pd_global(intx, NewSizeThreadIncrease, 4*K); 185 define_pd_global(intx, NewSizeThreadIncrease, 4*K);
172 define_pd_global(intx, InlineClassNatives, true); 186 define_pd_global(intx, InlineClassNatives, true);
173 define_pd_global(intx, InlineUnsafeOps, true); 187 define_pd_global(intx, InlineUnsafeOps, true);
174 define_pd_global(intx, InitialCodeCacheSize, 160*K); 188 define_pd_global(intx, InitialCodeCacheSize, 160*K);
175 define_pd_global(intx, ReservedCodeCacheSize, 32*M); 189 define_pd_global(intx, ReservedCodeCacheSize, 32*M);
2487 "Generate range checks for array accesses") \ 2501 "Generate range checks for array accesses") \
2488 \ 2502 \
2489 develop_pd(bool, ImplicitNullChecks, \ 2503 develop_pd(bool, ImplicitNullChecks, \
2490 "Generate code for implicit null checks") \ 2504 "Generate code for implicit null checks") \
2491 \ 2505 \
2506 product_pd(bool, TrapBasedNullChecks, \
2507 "Generate code for null checks that uses a cmp and trap " \
2508 "instruction raising SIGTRAP. This is only used if an access to" \
2509 "null (+offset) will not raise a SIGSEGV, i.e.," \
2510 "ImplicitNullChecks don't work (PPC64).") \
2511 \
2492 product(bool, PrintSafepointStatistics, false, \ 2512 product(bool, PrintSafepointStatistics, false, \
2493 "Print statistics about safepoint synchronization") \ 2513 "Print statistics about safepoint synchronization") \
2494 \ 2514 \
2495 product(intx, PrintSafepointStatisticsCount, 300, \ 2515 product(intx, PrintSafepointStatisticsCount, 300, \
2496 "Total number of safepoint statistics collected " \ 2516 "Total number of safepoint statistics collected " \
2796 develop_pd(bool, InlineIntrinsics, \ 2816 develop_pd(bool, InlineIntrinsics, \
2797 "Inline intrinsics that can be statically resolved") \ 2817 "Inline intrinsics that can be statically resolved") \
2798 \ 2818 \
2799 product_pd(bool, ProfileInterpreter, \ 2819 product_pd(bool, ProfileInterpreter, \
2800 "Profile at the bytecode level during interpretation") \ 2820 "Profile at the bytecode level during interpretation") \
2821 \
2822 develop(bool, TraceProfileInterpreter, false, \
2823 "Trace profiling at the bytecode level during interpretation. " \
2824 "This outputs the profiling information collected to improve " \
2825 "jit compilation.") \
2801 \ 2826 \
2802 develop_pd(bool, ProfileTraps, \ 2827 develop_pd(bool, ProfileTraps, \
2803 "Profile deoptimization traps at the bytecode level") \ 2828 "Profile deoptimization traps at the bytecode level") \
2804 \ 2829 \
2805 product(intx, ProfileMaturityPercentage, 20, \ 2830 product(intx, ProfileMaturityPercentage, 20, \
3267 "Thread safety margin is used on fixed-stack LinuxThreads (on " \ 3292 "Thread safety margin is used on fixed-stack LinuxThreads (on " \
3268 "Linux/x86 only) to prevent heap-stack collision. Set to 0 to " \ 3293 "Linux/x86 only) to prevent heap-stack collision. Set to 0 to " \
3269 "disable this feature") \ 3294 "disable this feature") \
3270 \ 3295 \
3271 /* code cache parameters */ \ 3296 /* code cache parameters */ \
3272 develop(uintx, CodeCacheSegmentSize, 64, \ 3297 /* ppc64 has large code-entry alignment. */ \
3298 develop(uintx, CodeCacheSegmentSize, 64 PPC64_ONLY(+64), \
3273 "Code cache segment size (in bytes) - smallest unit of " \ 3299 "Code cache segment size (in bytes) - smallest unit of " \
3274 "allocation") \ 3300 "allocation") \
3275 \ 3301 \
3276 develop_pd(intx, CodeEntryAlignment, \ 3302 develop_pd(intx, CodeEntryAlignment, \
3277 "Code entry alignment for generated code (in bytes)") \ 3303 "Code entry alignment for generated code (in bytes)") \