macroAssembler_aarch64.cpp (original) (raw)

@@ -33,22 +33,22 @@ #include "gc/shared/cardTableBarrierSet.hpp" #include "interpreter/interpreter.hpp" #include "compiler/disassembler.hpp" #include "memory/resourceArea.hpp" #include "nativeInst_aarch64.hpp" +#include "oops/compressedOops.inline.hpp" #include "oops/klass.inline.hpp" -#include "oops/oop.inline.hpp" +#include "oops/oop.hpp" #include "opto/compile.hpp" #include "opto/intrinsicnode.hpp" #include "opto/node.hpp" #include "runtime/biasedLocking.hpp" #include "runtime/icache.hpp" #include "runtime/interfaceSupport.inline.hpp" #include "runtime/jniHandles.inline.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/thread.hpp"

#if INCLUDE_ALL_GCS #include "gc/g1/g1BarrierSet.hpp" #include "gc/g1/g1CardTable.hpp" #include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/heapRegion.hpp"

@@ -171,11 +171,11 @@ // OOPs are either narrow (32 bits) or wide (48 bits). We encode // narrow OOPs by setting the upper 16 bits in the first // instruction. if (Instruction_aarch64::extract(insn, 31, 21) == 0b11010010101) { // Move narrow OOP

narrowOop n = oopDesc::encode_heap_oop((oop)o);

narrowOop n = CompressedOops::encode((oop)o); Instruction_aarch64::patch(insn_addr, 20, 5, n >> 16); Instruction_aarch64::patch(insn_addr+4, 20, 5, n & 0xffff); instructions = 2; } else { // Move wide OOP

@@ -3710,11 +3710,11 @@ // Store to klass gap in destination strw(src, Address(dst, oopDesc::klass_gap_offset_in_bytes())); } }

-// Algorithm must match oop.inline.hpp encode_heap_oop. +// Algorithm must match CompressedOops::encode. void MacroAssembler::encode_heap_oop(Register d, Register s) { #ifdef ASSERT verify_heapbase("MacroAssembler::encode_heap_oop: heap base corrupted?"); #endif verify_oop(s, "broken oop in encode_heap_oop");

< prev index next >