archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-17 17:44:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8205683: Refactor heap allocation to separate concerns

Browse source 
Reviewed-by: pliden, kbarrett
This commit is contained in:
Erik Österlund 2018-06-28 14:22:28 +02:00
parent 7f3a801cae
commit e4dbe9909f
22 changed files with 638 additions and 528 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/hotspot/share/oops/oop.inline.hpp
View file

@ -63,6 +63,10 @@ void oopDesc::set_mark_raw(volatile markOop m) {
_mark = m;
}
void oopDesc::set_mark_raw(HeapWord* mem, markOop m) {
*(markOop*)(((char*)mem) + mark_offset_in_bytes()) = m;
}
void oopDesc::release_set_mark(markOop m) {
HeapAccess<MO_RELEASE>::store_at(as_oop(), mark_offset_in_bytes(), m);
}
@ -110,16 +114,26 @@ Klass* oopDesc::klass_or_null_acquire() const volatile {
}
}
Klass** oopDesc::klass_addr() {
Klass** oopDesc::klass_addr(HeapWord* mem) {
// Only used internally and with CMS and will not work with
// UseCompressedOops
assert(!UseCompressedClassPointers, "only supported with uncompressed klass pointers");
return (Klass**) &_metadata._klass;
ByteSize offset = byte_offset_of(oopDesc, _metadata._klass);
return (Klass**) (((char*)mem) + in_bytes(offset));
}
narrowKlass* oopDesc::compressed_klass_addr(HeapWord* mem) {
assert(UseCompressedClassPointers, "only called by compressed klass pointers");
ByteSize offset = byte_offset_of(oopDesc, _metadata._compressed_klass);
return (narrowKlass*) (((char*)mem) + in_bytes(offset));
}
Klass** oopDesc::klass_addr() {
return klass_addr((HeapWord*)this);
}
narrowKlass* oopDesc::compressed_klass_addr() {
assert(UseCompressedClassPointers, "only called by compressed klass pointers");
return &_metadata._compressed_klass;
return compressed_klass_addr((HeapWord*)this);
}
#define CHECK_SET_KLASS(k) \
@ -137,13 +151,13 @@ void oopDesc::set_klass(Klass* k) {
}
}
void oopDesc::release_set_klass(Klass* k) {
CHECK_SET_KLASS(k);
void oopDesc::release_set_klass(HeapWord* mem, Klass* klass) {
CHECK_SET_KLASS(klass);
if (UseCompressedClassPointers) {
OrderAccess::release_store(compressed_klass_addr(),
Klass::encode_klass_not_null(k));
OrderAccess::release_store(compressed_klass_addr(mem),
Klass::encode_klass_not_null(klass));
} else {
OrderAccess::release_store(klass_addr(), k);
OrderAccess::release_store(klass_addr(mem), klass);
}
}
@ -153,12 +167,16 @@ int oopDesc::klass_gap() const {
return *(int*)(((intptr_t)this) + klass_gap_offset_in_bytes());
}
void oopDesc::set_klass_gap(int v) {
void oopDesc::set_klass_gap(HeapWord* mem, int v) {
if (UseCompressedClassPointers) {
*(int*)(((intptr_t)this) + klass_gap_offset_in_bytes()) = v;
*(int*)(((char*)mem) + klass_gap_offset_in_bytes()) = v;
}
}
void oopDesc::set_klass_gap(int v) {
set_klass_gap((HeapWord*)this, v);
}
void oopDesc::set_klass_to_list_ptr(oop k) {
// This is only to be used during GC, for from-space objects, so no
// barrier is needed.