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

Unified Diff: runtime/vm/intermediate_language_arm.cc

Issue 1295693002: Add ObjectPool tag for external labels. Use LoadExternalLabel for native calls... (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 4 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/assembler.cc ('k') | runtime/vm/intermediate_language_arm64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/intermediate_language_arm.cc
diff --git a/runtime/vm/intermediate_language_arm.cc b/runtime/vm/intermediate_language_arm.cc
index 1db4ad1b6c238ee93b4709cd9f2cc1af28d69990..254439720906956aab46822e693d2e151cc16f78 100644
--- a/runtime/vm/intermediate_language_arm.cc
+++ b/runtime/vm/intermediate_language_arm.cc
@@ -961,7 +961,8 @@ void NativeCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
}
#endif
}
- __ LoadImmediate(R5, entry);
+ ExternalLabel label(entry);
+ __ LoadExternalLabel(R5, &label, kNotPatchable);
__ LoadImmediate(R1, argc_tag);
compiler->GenerateCall(token_pos(),
*stub_entry,
@@ -986,8 +987,9 @@ void StringFromCharCodeInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
ASSERT(compiler->is_optimizing());
const Register char_code = locs()->in(0).reg();
const Register result = locs()->out(0).reg();
- __ LoadImmediate(result,
- reinterpret_cast<uword>(Symbols::PredefinedAddress()));
+
+ ExternalLabel label(reinterpret_cast<uword>(Symbols::PredefinedAddress()));
+ __ LoadExternalLabel(result, &label, kNotPatchable);
__ AddImmediate(result, Symbols::kNullCharCodeSymbolOffset * kWordSize);
__ ldr(result, Address(result, char_code, LSL, 1)); // Char code is a smi.
}
« no previous file with comments | « runtime/vm/assembler.cc ('k') | runtime/vm/intermediate_language_arm64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698