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

Unified Diff: runtime/vm/assembler_arm.cc

Issue 14362008: Implement catch on ARM. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 8 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_arm.h ('k') | runtime/vm/exceptions_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/assembler_arm.cc
===================================================================
--- runtime/vm/assembler_arm.cc (revision 21707)
+++ runtime/vm/assembler_arm.cc (working copy)
@@ -1261,6 +1261,14 @@
}
+void Assembler::LoadPoolPointer() {
+ const intptr_t object_pool_pc_dist =
+ Instructions::HeaderSize() - Instructions::object_pool_offset() +
+ CodeSize() + Instr::kPCReadOffset;
+ LoadFromOffset(kLoadWord, PP, PC, -object_pool_pc_dist);
+}
+
+
void Assembler::LoadObject(Register rd, const Object& object) {
// Smis and VM heap objects are never relocated; do not use object pool.
if (object.IsSmi()) {
@@ -1972,10 +1980,7 @@
}
// Setup pool pointer for this dart function.
- const intptr_t object_pool_pc_dist =
- Instructions::HeaderSize() - Instructions::object_pool_offset() +
- CodeSize() + Instr::kPCReadOffset;
- ldr(PP, Address(PC, -object_pool_pc_dist));
+ LoadPoolPointer();
// Reserve space for locals.
AddImmediate(SP, -frame_size);
@@ -2000,10 +2005,7 @@
EnterFrame(regs, 0);
if (uses_pp) {
// Setup pool pointer for this stub.
- const intptr_t object_pool_pc_dist =
- Instructions::HeaderSize() - Instructions::object_pool_offset() +
- CodeSize() + Instr::kPCReadOffset;
- ldr(PP, Address(PC, -object_pool_pc_dist));
+ LoadPoolPointer();
}
}
« no previous file with comments | « runtime/vm/assembler_arm.h ('k') | runtime/vm/exceptions_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698