src/cpu/ppc/vm/macroAssembler_ppc.cpp
Print this page
rev 5185 : 8024379: Adapt PPC64 port to 8003424
@@ -2380,21 +2380,15 @@
}
void MacroAssembler::encode_klass_not_null(Register dst, Register src) {
if (src == noreg) src = dst;
- if (Universe::narrow_klass_base() != NULL) {
- // heapbased
- assert(Universe::narrow_klass_shift() != 0, "sanity");
- sub(dst, src, R30);
- srdi(dst, dst, Universe::narrow_klass_shift());
- } else if (Universe::narrow_klass_shift() != 0) {
- // zerobased
+ assert(Universe::narrow_klass_base() != NULL, "Base should be initialized");
+ load_const(R0, Universe::narrow_klass_base());
+ sub(dst, src, R0);
+ if (Universe::narrow_klass_shift() != 0) {
srdi(dst, src, Universe::narrow_klass_shift());
- } else if (src != dst) {
- // unscaled
- mr(dst, src);
}
}
void MacroAssembler::store_klass(Register dst_oop, Register klass, Register ck) {
if (UseCompressedKlassPointers) {
@@ -2405,22 +2399,18 @@
}
}
void MacroAssembler::decode_klass_not_null(Register dst, Register src) {
if (src == noreg) src = dst;
- if (Universe::narrow_klass_base() != NULL) {
- // heapbased
- assert(Universe::narrow_klass_shift() != 0, "sanity");
- sldi(dst, src, Universe::narrow_klass_shift());
- add(dst, dst, R30);
- } else if (Universe::narrow_klass_shift() != 0) {
- // zerobased
- sldi(dst, src, Universe::narrow_klass_shift());
- } else if (src != dst) {
- // unscaled
- mr(dst, src);
+ Register shifted_src = src;
+ assert(Universe::narrow_klass_base() != NULL, "Base should be initialized");
+ if (Universe::narrow_klass_shift() != 0) {
+ shifted_src = dst;
+ sldi(shifted_src, src, Universe::narrow_klass_shift());
}
+ load_const(R0, Universe::narrow_klass_base());
+ add(dst, shifted_src, R0);
}
void MacroAssembler::load_klass(Register dst, Register src) {
if (UseCompressedKlassPointers) {
lwz(dst, oopDesc::klass_offset_in_bytes(), src);
@@ -2439,11 +2429,17 @@
}
load_klass(dst, src);
}
void MacroAssembler::reinit_heapbase(Register d, Register tmp) {
- if (UseCompressedOops || UseCompressedKlassPointers) {
+ if (Universe::heap() != NULL) {
+ if (Universe::narrow_oop_base() == NULL) {
+ Assembler::xorr(R30, R30, R30);
+ } else {
+ load_const(R30, Universe::narrow_ptrs_base(), tmp);
+ }
+ } else {
load_const(R30, Universe::narrow_ptrs_base_addr(), tmp);
ld(R30, 0, R30);
}
}