Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1253)

Unified Diff: runtime/vm/intrinsifier_arm.cc

Issue 1304243008: Load predefined symbols address via Thread. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/intermediate_language_x64.cc ('k') | runtime/vm/intrinsifier_arm64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/intrinsifier_arm.cc
diff --git a/runtime/vm/intrinsifier_arm.cc b/runtime/vm/intrinsifier_arm.cc
index 4d37b8bbcc2e7730a761e0744d2dd84efa70ba2b..085c605fa8f42cac0c0e25661f39beb485381417 100644
--- a/runtime/vm/intrinsifier_arm.cc
+++ b/runtime/vm/intrinsifier_arm.cc
@@ -1660,14 +1660,7 @@ void Intrinsifier::StringBaseCharAt(Assembler* assembler) {
__ ldrb(R1, Address(R0, R1));
__ CompareImmediate(R1, Symbols::kNumberOfOneCharCodeSymbols);
__ b(&fall_through, GE);
- const ExternalLabel symbols_label(
- reinterpret_cast<uword>(Symbols::PredefinedAddress()));
- __ Push(PP);
- __ LoadPoolPointer();
- assembler->set_constant_pool_allowed(true);
- __ LoadExternalLabel(R0, &symbols_label, kNotPatchable);
- assembler->set_constant_pool_allowed(false);
- __ Pop(PP);
+ __ ldr(R0, Address(THR, Thread::predefined_symbols_address_offset()));
__ AddImmediate(R0, Symbols::kNullCharCodeSymbolOffset * kWordSize);
__ ldr(R0, Address(R0, R1, LSL, 2));
__ Ret();
@@ -1680,12 +1673,7 @@ void Intrinsifier::StringBaseCharAt(Assembler* assembler) {
__ ldrh(R1, Address(R0, R1));
__ CompareImmediate(R1, Symbols::kNumberOfOneCharCodeSymbols);
__ b(&fall_through, GE);
- __ Push(PP);
- __ LoadPoolPointer();
- assembler->set_constant_pool_allowed(true);
- __ LoadExternalLabel(R0, &symbols_label, kNotPatchable);
- assembler->set_constant_pool_allowed(false);
- __ Pop(PP);
+ __ ldr(R0, Address(THR, Thread::predefined_symbols_address_offset()));
__ AddImmediate(R0, Symbols::kNullCharCodeSymbolOffset * kWordSize);
__ ldr(R0, Address(R0, R1, LSL, 2));
__ Ret();
« no previous file with comments | « runtime/vm/intermediate_language_x64.cc ('k') | runtime/vm/intrinsifier_arm64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698