| Index: runtime/vm/intrinsifier_mips.cc
|
| diff --git a/runtime/vm/intrinsifier_mips.cc b/runtime/vm/intrinsifier_mips.cc
|
| index 71f0ab653088208c0c216eceab9c1edd4c532795..9f33f0580c5abd0cd61974ccaade25531cdcd335 100644
|
| --- a/runtime/vm/intrinsifier_mips.cc
|
| +++ b/runtime/vm/intrinsifier_mips.cc
|
| @@ -1767,8 +1767,16 @@ void Intrinsifier::StringBaseCharAt(Assembler* assembler) {
|
| __ lbu(T2, FieldAddress(T2, OneByteString::data_offset()));
|
| __ BranchUnsignedGreaterEqual(
|
| T2, Immediate(Symbols::kNumberOfOneCharCodeSymbols), &fall_through);
|
| - __ LoadImmediate(
|
| - V0, reinterpret_cast<uword>(Symbols::PredefinedAddress()));
|
| + const ExternalLabel symbols_label(
|
| + reinterpret_cast<uword>(Symbols::PredefinedAddress()));
|
| + __ Push(PP);
|
| + __ Push(RA);
|
| + __ LoadPoolPointer();
|
| + assembler->set_constant_pool_allowed(true);
|
| + __ LoadExternalLabel(V0, &symbols_label, kNotPatchable);
|
| + assembler->set_constant_pool_allowed(false);
|
| + __ Pop(RA);
|
| + __ Pop(PP);
|
| __ AddImmediate(V0, Symbols::kNullCharCodeSymbolOffset * kWordSize);
|
| __ sll(T2, T2, 2);
|
| __ addu(T2, T2, V0);
|
| @@ -1782,8 +1790,14 @@ void Intrinsifier::StringBaseCharAt(Assembler* assembler) {
|
| __ lhu(T2, FieldAddress(T2, TwoByteString::data_offset()));
|
| __ BranchUnsignedGreaterEqual(
|
| T2, Immediate(Symbols::kNumberOfOneCharCodeSymbols), &fall_through);
|
| - __ LoadImmediate(V0,
|
| - reinterpret_cast<uword>(Symbols::PredefinedAddress()));
|
| + __ Push(PP);
|
| + __ Push(RA);
|
| + __ LoadPoolPointer();
|
| + assembler->set_constant_pool_allowed(true);
|
| + __ LoadExternalLabel(V0, &symbols_label, kNotPatchable);
|
| + assembler->set_constant_pool_allowed(false);
|
| + __ Pop(RA);
|
| + __ Pop(PP);
|
| __ AddImmediate(V0, Symbols::kNullCharCodeSymbolOffset * kWordSize);
|
| __ sll(T2, T2, 2);
|
| __ addu(T2, T2, V0);
|
|
|