Skip to content

Commit 53f3544

Browse files
committed
Backport 4618374269e8636c772d921ad0c2c2d9e5e3e643
1 parent 27b6284 commit 53f3544

File tree

4 files changed

+21
-15
lines changed

4 files changed

+21
-15
lines changed

src/hotspot/cpu/ppc/gc/x/xGlobals_ppc.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@
8282
// Maximum value as per spec (Power ISA v2.07): 2 ^ 60 bytes, i.e. 1 EiB (exbibyte)
8383
static const unsigned int MAXIMUM_MAX_ADDRESS_BIT = 60;
8484

85-
// Most modern power processors provide an address space with not more than 45 bit addressable bit,
86-
// that is an address space of 32 TiB in size.
87-
static const unsigned int DEFAULT_MAX_ADDRESS_BIT = 45;
88-
89-
// Minimum value returned, if probing fails: 64 GiB
90-
static const unsigned int MINIMUM_MAX_ADDRESS_BIT = 36;
85+
// Default value if probing is not implemented for a certain platform
86+
// Max address bit is restricted by implicit assumptions in the code, for instance
87+
// the bit layout of XForwardingEntry or Partial array entry (see XMarkStackEntry) in mark stack
88+
static const size_t DEFAULT_MAX_ADDRESS_BIT = 46;
89+
// Minimum value returned, if probing fails
90+
static const size_t MINIMUM_MAX_ADDRESS_BIT = 36;
9191

9292
// Determines the highest addressable bit of the virtual address space (depends on platform)
9393
// by trying to interact with memory in that address range,

src/hotspot/cpu/ppc/gc/z/zAddress_ppc.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,11 @@
3535
#include <sys/mman.h>
3636
#endif // LINUX
3737

38-
// Default value if probing is not implemented for a certain platform: 128TB
39-
static const size_t DEFAULT_MAX_ADDRESS_BIT = 47;
40-
// Minimum value returned, if probing fails: 64GB
38+
// Default value if probing is not implemented for a certain platform
39+
// Max address bit is restricted by implicit assumptions in the code, for instance
40+
// the bit layout of ZForwardingEntry or Partial array entry (see ZMarkStackEntry) in mark stack
41+
static const size_t DEFAULT_MAX_ADDRESS_BIT = 46;
42+
// Minimum value returned, if probing fail
4143
static const size_t MINIMUM_MAX_ADDRESS_BIT = 36;
4244

4345
static size_t probe_valid_max_address_bit() {

src/hotspot/cpu/riscv/gc/x/xGlobals_riscv.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,11 @@
144144
// * 63-48 Fixed (16-bits, always zero)
145145
//
146146

147-
// Default value if probing is not implemented for a certain platform: 128TB
148-
static const size_t DEFAULT_MAX_ADDRESS_BIT = 47;
149-
// Minimum value returned, if probing fails: 64GB
147+
// Default value if probing is not implemented for a certain platform
148+
// Max address bit is restricted by implicit assumptions in the code, for instance
149+
// the bit layout of XForwardingEntry or Partial array entry (see XMarkStackEntry) in mark stack
150+
static const size_t DEFAULT_MAX_ADDRESS_BIT = 46;
151+
// Minimum value returned, if probing fails
150152
static const size_t MINIMUM_MAX_ADDRESS_BIT = 36;
151153

152154
static size_t probe_valid_max_address_bit() {

src/hotspot/cpu/riscv/gc/z/zAddress_riscv.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@
3737
#include <sys/mman.h>
3838
#endif // LINUX
3939

40-
// Default value if probe is not implemented for a certain platform: 128TB
41-
static const size_t DEFAULT_MAX_ADDRESS_BIT = 47;
42-
// Minimum value returned, if probing fails: 64GB
40+
// Default value if probing is not implemented for a certain platform
41+
// Max address bit is restricted by implicit assumptions in the code, for instance
42+
// the bit layout of ZForwardingEntry or Partial array entry (see ZMarkStackEntry) in mark stack
43+
static const size_t DEFAULT_MAX_ADDRESS_BIT = 46;
44+
// Minimum value returned, if probing fail
4345
static const size_t MINIMUM_MAX_ADDRESS_BIT = 36;
4446

4547
static size_t probe_valid_max_address_bit() {

0 commit comments

Comments
 (0)