comparison src/share/vm/runtime/arguments.cpp @ 1069:fb4c00faa9da

Merge
author kamg
date Wed, 11 Nov 2009 09:13:12 -0500
parents 473cce303f13 323bd24c6520
children 84cb6f20afb3
comparison
equal deleted inserted replaced
1068:db0d21039f34 1069:fb4c00faa9da
1238 #ifndef ZERO 1238 #ifndef ZERO
1239 #ifdef _LP64 1239 #ifdef _LP64
1240 // Check that UseCompressedOops can be set with the max heap size allocated 1240 // Check that UseCompressedOops can be set with the max heap size allocated
1241 // by ergonomics. 1241 // by ergonomics.
1242 if (MaxHeapSize <= max_heap_for_compressed_oops()) { 1242 if (MaxHeapSize <= max_heap_for_compressed_oops()) {
1243 #ifndef COMPILER1
1243 if (FLAG_IS_DEFAULT(UseCompressedOops) && !UseG1GC) { 1244 if (FLAG_IS_DEFAULT(UseCompressedOops) && !UseG1GC) {
1244 FLAG_SET_ERGO(bool, UseCompressedOops, true); 1245 FLAG_SET_ERGO(bool, UseCompressedOops, true);
1245 } 1246 }
1247 #endif
1246 #ifdef _WIN64 1248 #ifdef _WIN64
1247 if (UseLargePages && UseCompressedOops) { 1249 if (UseLargePages && UseCompressedOops) {
1248 // Cannot allocate guard pages for implicit checks in indexed addressing 1250 // Cannot allocate guard pages for implicit checks in indexed addressing
1249 // mode, when large pages are specified on windows. 1251 // mode, when large pages are specified on windows.
1250 // This flag could be switched ON if narrow oop base address is set to 0, 1252 // This flag could be switched ON if narrow oop base address is set to 0,
2702 if (FLAG_IS_DEFAULT(TraceClassUnloading)) { 2704 if (FLAG_IS_DEFAULT(TraceClassUnloading)) {
2703 TraceClassUnloading = true; 2705 TraceClassUnloading = true;
2704 } 2706 }
2705 } 2707 }
2706 2708
2709 #if defined(_LP64) && defined(COMPILER1)
2710 UseCompressedOops = false;
2711 #endif
2712
2707 #ifdef SERIALGC 2713 #ifdef SERIALGC
2708 force_serial_gc(); 2714 force_serial_gc();
2709 #endif // SERIALGC 2715 #endif // SERIALGC
2710 #ifdef KERNEL 2716 #ifdef KERNEL
2711 no_shared_spaces(); 2717 no_shared_spaces();