Commit cd9b6ec2 authored by paul.lind's avatar paul.lind Committed by Commit bot

MIPS: Support INTERNAL_REFERENCE_ENCODED in serializer.

Add mips support for the changes in https://codereview.chromium.org/1000373003. On mips, these support the long-branch mechanism.

TEST=test-serialize/SerializeToplevelLargeCodeObject
BUG=

Review URL: https://codereview.chromium.org/1014763003

Cr-Commit-Position: refs/heads/master@{#27244}
parent 86b391ec
...@@ -236,14 +236,42 @@ Address RelocInfo::target_external_reference() { ...@@ -236,14 +236,42 @@ Address RelocInfo::target_external_reference() {
Address RelocInfo::target_internal_reference() { Address RelocInfo::target_internal_reference() {
DCHECK(rmode_ == INTERNAL_REFERENCE); if (rmode_ == INTERNAL_REFERENCE) {
return Memory::Address_at(pc_); return Memory::Address_at(pc_);
} else {
DCHECK(rmode_ == INTERNAL_REFERENCE_ENCODED);
Instr instr_lui = Assembler::instr_at(pc_ + 0 * Assembler::kInstrSize);
Instr instr_ori = Assembler::instr_at(pc_ + 1 * Assembler::kInstrSize);
DCHECK(Assembler::IsLui(instr_lui));
DCHECK(Assembler::IsOri(instr_ori));
int32_t imm = (instr_lui & static_cast<int32_t>(kImm16Mask)) << kLuiShift;
imm |= (instr_ori & static_cast<int32_t>(kImm16Mask));
return reinterpret_cast<Address>(imm);
}
} }
void RelocInfo::set_target_internal_reference(Address target) { void RelocInfo::set_target_internal_reference(Address target) {
DCHECK(rmode_ == INTERNAL_REFERENCE); if (rmode_ == INTERNAL_REFERENCE) {
Memory::Address_at(pc_) = target; Memory::Address_at(pc_) = target;
} else {
// Encoded internal references are lui/ori load of 32-bit abolute address.
DCHECK(rmode_ == INTERNAL_REFERENCE_ENCODED);
Instr instr_lui = Assembler::instr_at(pc_ + 0 * Assembler::kInstrSize);
Instr instr_ori = Assembler::instr_at(pc_ + 1 * Assembler::kInstrSize);
DCHECK(Assembler::IsLui(instr_lui));
DCHECK(Assembler::IsOri(instr_ori));
instr_lui &= ~kImm16Mask;
instr_ori &= ~kImm16Mask;
int32_t imm = reinterpret_cast<int32_t>(target);
DCHECK((imm & 3) == 0);
Assembler::instr_at_put(pc_ + 0 * Assembler::kInstrSize,
instr_lui | ((imm >> kLuiShift) & kImm16Mask));
Assembler::instr_at_put(pc_ + 1 * Assembler::kInstrSize,
instr_ori | (imm & kImm16Mask));
// Currently used only by deserializer, and all code will be flushed
// after complete deserialization, no need to flush on each reference.
}
} }
......
...@@ -230,14 +230,50 @@ Address RelocInfo::target_external_reference() { ...@@ -230,14 +230,50 @@ Address RelocInfo::target_external_reference() {
Address RelocInfo::target_internal_reference() { Address RelocInfo::target_internal_reference() {
DCHECK(rmode_ == INTERNAL_REFERENCE); if (rmode_ == INTERNAL_REFERENCE) {
return Memory::Address_at(pc_); return Memory::Address_at(pc_);
} else {
DCHECK(rmode_ == INTERNAL_REFERENCE_ENCODED);
Instr instr_lui = Assembler::instr_at(pc_ + 0 * Assembler::kInstrSize);
Instr instr_ori = Assembler::instr_at(pc_ + 1 * Assembler::kInstrSize);
Instr instr_ori2 = Assembler::instr_at(pc_ + 3 * Assembler::kInstrSize);
DCHECK(Assembler::IsLui(instr_lui));
DCHECK(Assembler::IsOri(instr_ori));
DCHECK(Assembler::IsOri(instr_ori2));
int64_t imm = (instr_lui & static_cast<int64_t>(kImm16Mask)) << 32;
imm |= (instr_ori & static_cast<int64_t>(kImm16Mask)) << 16;
imm |= (instr_ori2 & static_cast<int64_t>(kImm16Mask));
return reinterpret_cast<Address>(imm);
}
} }
void RelocInfo::set_target_internal_reference(Address target) { void RelocInfo::set_target_internal_reference(Address target) {
DCHECK(rmode_ == INTERNAL_REFERENCE); if (rmode_ == INTERNAL_REFERENCE) {
Memory::Address_at(pc_) = target; Memory::Address_at(pc_) = target;
} else {
// Encoded internal references are lui/ori load of 48-bit abolute address.
DCHECK(rmode_ == INTERNAL_REFERENCE_ENCODED);
Instr instr_lui = Assembler::instr_at(pc_ + 0 * Assembler::kInstrSize);
Instr instr_ori = Assembler::instr_at(pc_ + 1 * Assembler::kInstrSize);
Instr instr_ori2 = Assembler::instr_at(pc_ + 3 * Assembler::kInstrSize);
DCHECK(Assembler::IsLui(instr_lui));
DCHECK(Assembler::IsOri(instr_ori));
DCHECK(Assembler::IsOri(instr_ori2));
instr_lui &= ~kImm16Mask;
instr_ori &= ~kImm16Mask;
instr_ori2 &= ~kImm16Mask;
int64_t imm = reinterpret_cast<int64_t>(target);
DCHECK((imm & 3) == 0);
Assembler::instr_at_put(pc_ + 0 * Assembler::kInstrSize,
instr_lui | ((imm >> 32) & kImm16Mask));
Assembler::instr_at_put(pc_ + 1 * Assembler::kInstrSize,
instr_ori | ((imm >> 16) & kImm16Mask));
Assembler::instr_at_put(pc_ + 3 * Assembler::kInstrSize,
instr_ori | (imm & kImm16Mask));
// Currently used only by deserializer, and all code will be flushed
// after complete deserialization, no need to flush on each reference.
}
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment