Skip to content

Commit f740058

Browse files
plidenpliden
committed
8231270: ZGC: Remove ZAddressSpace* and ZAddressReserved*
Reviewed-by: stefank, eosterlund
1 parent 68f811c commit f740058

File tree

10 files changed

+3
-92
lines changed

10 files changed

+3
-92
lines changed

‎src/hotspot/cpu/aarch64/gc/z/zGlobals_aarch64.cpp

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -135,26 +135,6 @@
135135
// * 63-48 Fixed (16-bits, always zero)
136136
//
137137

138-
uintptr_t ZPlatformAddressSpaceStart() {
139-
const uintptr_t first_heap_view_address = (uintptr_t)1 << (ZPlatformAddressMetadataShift() + 0);
140-
const size_t min_address_offset = 0;
141-
return first_heap_view_address + min_address_offset;
142-
}
143-
144-
uintptr_t ZPlatformAddressSpaceEnd() {
145-
const uintptr_t last_heap_view_address = (uintptr_t)1 << (ZPlatformAddressMetadataShift() + 2);
146-
const size_t max_address_offset = (size_t)1 << ZPlatformAddressOffsetBits();
147-
return last_heap_view_address + max_address_offset;
148-
}
149-
150-
uintptr_t ZPlatformAddressReservedStart() {
151-
return ZPlatformAddressSpaceStart();
152-
}
153-
154-
uintptr_t ZPlatformAddressReservedEnd() {
155-
return ZPlatformAddressSpaceEnd();
156-
}
157-
158138
uintptr_t ZPlatformAddressBase() {
159139
return 0;
160140
}

‎src/hotspot/cpu/aarch64/gc/z/zGlobals_aarch64.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ const size_t ZPlatformMaxHeapSizeShift = 46; // 16TB
4040
const size_t ZPlatformNMethodDisarmedOffset = 4;
4141
const size_t ZPlatformCacheLineSize = 64;
4242

43-
uintptr_t ZPlatformAddressSpaceStart();
44-
uintptr_t ZPlatformAddressSpaceEnd();
45-
uintptr_t ZPlatformAddressReservedStart();
46-
uintptr_t ZPlatformAddressReservedEnd();
4743
uintptr_t ZPlatformAddressBase();
4844
size_t ZPlatformAddressOffsetBits();
4945
size_t ZPlatformAddressMetadataShift();

‎src/hotspot/cpu/x86/gc/z/zGlobals_x86.cpp

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -135,26 +135,6 @@
135135
// * 63-48 Fixed (16-bits, always zero)
136136
//
137137

138-
uintptr_t ZPlatformAddressSpaceStart() {
139-
const uintptr_t first_heap_view_address = (uintptr_t)1 << (ZPlatformAddressMetadataShift() + 0);
140-
const size_t min_address_offset = 0;
141-
return first_heap_view_address + min_address_offset;
142-
}
143-
144-
uintptr_t ZPlatformAddressSpaceEnd() {
145-
const uintptr_t last_heap_view_address = (uintptr_t)1 << (ZPlatformAddressMetadataShift() + 2);
146-
const size_t max_address_offset = (size_t)1 << ZPlatformAddressOffsetBits();
147-
return last_heap_view_address + max_address_offset;
148-
}
149-
150-
uintptr_t ZPlatformAddressReservedStart() {
151-
return ZPlatformAddressSpaceStart();
152-
}
153-
154-
uintptr_t ZPlatformAddressReservedEnd() {
155-
return ZPlatformAddressSpaceEnd();
156-
}
157-
158138
uintptr_t ZPlatformAddressBase() {
159139
return 0;
160140
}

‎src/hotspot/cpu/x86/gc/z/zGlobals_x86.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ const size_t ZPlatformMaxHeapSizeShift = 46; // 16TB
4040
const size_t ZPlatformNMethodDisarmedOffset = 4;
4141
const size_t ZPlatformCacheLineSize = 64;
4242

43-
uintptr_t ZPlatformAddressSpaceStart();
44-
uintptr_t ZPlatformAddressSpaceEnd();
45-
uintptr_t ZPlatformAddressReservedStart();
46-
uintptr_t ZPlatformAddressReservedEnd();
4743
uintptr_t ZPlatformAddressBase();
4844
size_t ZPlatformAddressOffsetBits();
4945
size_t ZPlatformAddressMetadataShift();

‎src/hotspot/share/gc/z/vmStructs_z.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ typedef ZAttachedArray<ZForwarding, ZForwardingEntry> ZAttachedArrayForForwardin
104104
declare_constant(ZAddressOffsetShift) \
105105
declare_constant(ZAddressOffsetBits) \
106106
declare_constant(ZAddressOffsetMask) \
107-
declare_constant(ZAddressOffsetMax) \
108-
declare_constant(ZAddressSpaceStart)
107+
declare_constant(ZAddressOffsetMax)
109108

110109
#define VM_TYPES_ZGC(declare_type, declare_toplevel_type, declare_integer_type) \
111110
declare_toplevel_type(ZGlobalsForVMStructs) \

‎src/hotspot/share/gc/z/zAddress.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,6 @@ void ZAddress::set_good_mask(uintptr_t mask) {
3232
}
3333

3434
void ZAddress::initialize() {
35-
ZAddressSpaceStart = ZPlatformAddressSpaceStart();
36-
ZAddressSpaceEnd = ZPlatformAddressSpaceEnd();
37-
ZAddressSpaceSize = ZAddressSpaceEnd - ZAddressSpaceStart;
38-
39-
ZAddressReservedStart = ZPlatformAddressReservedStart();
40-
ZAddressReservedEnd = ZPlatformAddressReservedEnd();
41-
ZAddressReservedSize = ZAddressReservedEnd - ZAddressReservedStart;
42-
4335
ZAddressBase = ZPlatformAddressBase();
4436

4537
ZAddressOffsetBits = ZPlatformAddressOffsetBits();

‎src/hotspot/share/gc/z/zCollectedHeap.cpp

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ jint ZCollectedHeap::initialize() {
6868
return JNI_ENOMEM;
6969
}
7070

71-
Universe::calculate_verify_data((HeapWord*)ZAddressReservedStart,
72-
(HeapWord*)ZAddressReservedEnd);
71+
Universe::calculate_verify_data((HeapWord*)0, (HeapWord*)UINTPTR_MAX);
7372

7473
return JNI_OK;
7574
}
@@ -285,12 +284,7 @@ void ZCollectedHeap::gc_threads_do(ThreadClosure* tc) const {
285284
}
286285

287286
VirtualSpaceSummary ZCollectedHeap::create_heap_space_summary() {
288-
const size_t capacity_in_words = capacity() / HeapWordSize;
289-
const size_t max_capacity_in_words = max_capacity() / HeapWordSize;
290-
HeapWord* const heap_start = (HeapWord*)ZAddressReservedStart;
291-
return VirtualSpaceSummary(heap_start,
292-
heap_start + capacity_in_words,
293-
heap_start + max_capacity_in_words);
287+
return VirtualSpaceSummary((HeapWord*)0, (HeapWord*)capacity(), (HeapWord*)max_capacity());
294288
}
295289

296290
void ZCollectedHeap::safepoint_synchronize_begin() {
@@ -312,10 +306,6 @@ void ZCollectedHeap::print_on(outputStream* st) const {
312306
void ZCollectedHeap::print_on_error(outputStream* st) const {
313307
CollectedHeap::print_on_error(st);
314308

315-
st->print_cr("Address Space");
316-
st->print_cr( " Start: " PTR_FORMAT, ZAddressSpaceStart);
317-
st->print_cr( " End: " PTR_FORMAT, ZAddressSpaceEnd);
318-
st->print_cr( " Size: " SIZE_FORMAT_W(-15) " (" PTR_FORMAT ")", ZAddressSpaceSize, ZAddressSpaceSize);
319309
st->print_cr( "Heap");
320310
st->print_cr( " GlobalPhase: %u", ZGlobalPhase);
321311
st->print_cr( " GlobalSeqNum: %u", ZGlobalSeqNum);

‎src/hotspot/share/gc/z/zDebug.gdb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,6 @@ end
126126

127127
# Print heap information
128128
define zph
129-
printf "Address Space\n"
130-
printf " Start: 0x%llx\n", ZAddressSpaceStart
131-
printf " End: 0x%llx\n", ZAddressSpaceEnd
132-
printf " Size: %-15llu (0x%llx)\n", ZAddressSpaceSize, ZAddressSpaceSize
133129
printf "Heap\n"
134130
printf " GlobalPhase: %u\n", ZGlobalPhase
135131
printf " GlobalSeqNum: %u\n", ZGlobalSeqNum

‎src/hotspot/share/gc/z/zGlobals.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,3 @@ uintptr_t ZAddressMetadataMarked0;
4848
uintptr_t ZAddressMetadataMarked1;
4949
uintptr_t ZAddressMetadataRemapped;
5050
uintptr_t ZAddressMetadataFinalizable;
51-
52-
uintptr_t ZAddressSpaceStart;
53-
uintptr_t ZAddressSpaceEnd;
54-
size_t ZAddressSpaceSize;
55-
56-
uintptr_t ZAddressReservedStart;
57-
uintptr_t ZAddressReservedEnd;
58-
size_t ZAddressReservedSize;

‎src/hotspot/share/gc/z/zGlobals.hpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,6 @@ extern uintptr_t ZAddressMetadataMarked1;
112112
extern uintptr_t ZAddressMetadataRemapped;
113113
extern uintptr_t ZAddressMetadataFinalizable;
114114

115-
// Address space start/end/size
116-
extern uintptr_t ZAddressSpaceStart;
117-
extern uintptr_t ZAddressSpaceEnd;
118-
extern size_t ZAddressSpaceSize;
119-
120-
// Reserved space start/end
121-
extern uintptr_t ZAddressReservedStart;
122-
extern uintptr_t ZAddressReservedEnd;
123-
extern size_t ZAddressReservedSize;
124-
125115
// NMethod entry barrier
126116
const size_t ZNMethodDisarmedOffset = ZPlatformNMethodDisarmedOffset;
127117

0 commit comments

Comments
 (0)