Skip to content

Commit dbd2fb0

Browse files
committed
8355473: Clean up x86 globals/VM_Version after 32-bit x86 removal
Reviewed-by: chagedorn, coleenp, jwaters
1 parent 70030ba commit dbd2fb0

File tree

4 files changed

+17
-167
lines changed

4 files changed

+17
-167
lines changed

src/hotspot/cpu/x86/globalDefinitions_x86.hpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,25 +34,19 @@ const bool CCallingConventionRequiresIntsAsLongs = false;
3434

3535
#define SUPPORTS_NATIVE_CX8
3636

37-
#ifdef _LP64
3837
#define SUPPORT_MONITOR_COUNT
39-
#endif
4038

4139
#define CPU_MULTI_COPY_ATOMIC
4240

4341
// The expected size in bytes of a cache line.
4442
#define DEFAULT_CACHE_LINE_SIZE 64
4543

4644
// The default padding size for data structures to avoid false sharing.
47-
#ifdef _LP64
4845
// The common wisdom is that adjacent cache line prefetchers on some hardware
4946
// may pull two cache lines on access, so we have to pessimistically assume twice
5047
// the cache line size for padding. TODO: Check if this is still true for modern
5148
// hardware. If not, DEFAULT_CACHE_LINE_SIZE might as well suffice.
5249
#define DEFAULT_PADDING_SIZE (DEFAULT_CACHE_LINE_SIZE*2)
53-
#else
54-
#define DEFAULT_PADDING_SIZE DEFAULT_CACHE_LINE_SIZE
55-
#endif
5650

5751
#if defined(LINUX) || defined(__APPLE__)
5852
#define SUPPORT_RESERVED_STACK_AREA

src/hotspot/cpu/x86/globals_x86.hpp

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,29 +61,19 @@ define_pd_global(intx, InlineSmallCode, 1000);
6161
#define MIN_STACK_RED_PAGES DEFAULT_STACK_RED_PAGES
6262
#define MIN_STACK_RESERVED_PAGES (0)
6363

64-
#ifdef _LP64
6564
// Java_java_net_SocketOutputStream_socketWrite0() uses a 64k buffer on the
66-
// stack if compiled for unix and LP64. To pass stack overflow tests we need
67-
// 20 shadow pages.
65+
// stack if compiled for unix. To pass stack overflow tests we need 20 shadow pages.
6866
#define DEFAULT_STACK_SHADOW_PAGES (NOT_WIN64(20) WIN64_ONLY(8) DEBUG_ONLY(+4))
6967
// For those clients that do not use write socket, we allow
7068
// the min range value to be below that of the default
7169
#define MIN_STACK_SHADOW_PAGES (NOT_WIN64(10) WIN64_ONLY(8) DEBUG_ONLY(+4))
72-
#else
73-
#define DEFAULT_STACK_SHADOW_PAGES (4 DEBUG_ONLY(+5))
74-
#define MIN_STACK_SHADOW_PAGES DEFAULT_STACK_SHADOW_PAGES
75-
#endif // _LP64
7670

7771
define_pd_global(intx, StackYellowPages, DEFAULT_STACK_YELLOW_PAGES);
7872
define_pd_global(intx, StackRedPages, DEFAULT_STACK_RED_PAGES);
7973
define_pd_global(intx, StackShadowPages, DEFAULT_STACK_SHADOW_PAGES);
8074
define_pd_global(intx, StackReservedPages, DEFAULT_STACK_RESERVED_PAGES);
8175

82-
#ifdef _LP64
8376
define_pd_global(bool, VMContinuations, true);
84-
#else
85-
define_pd_global(bool, VMContinuations, false);
86-
#endif
8777

8878
define_pd_global(bool, RewriteBytecodes, true);
8979
define_pd_global(bool, RewriteFrequentPairs, true);

0 commit comments

Comments
 (0)