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

Unified Diff: runtime/vm/stub_code_arm.cc

Issue 12398029: Remove the barely used macro assemblers after merging their contents to the base (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 10 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/stack_frame.cc ('k') | runtime/vm/stub_code_ia32.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/stub_code_arm.cc
===================================================================
--- runtime/vm/stub_code_arm.cc (revision 19430)
+++ runtime/vm/stub_code_arm.cc (working copy)
@@ -6,7 +6,6 @@
#if defined(TARGET_ARCH_ARM)
#include "vm/assembler.h"
-#include "vm/assembler_macros.h"
#include "vm/code_generator.h"
#include "vm/dart_entry.h"
#include "vm/instructions.h"
@@ -142,7 +141,7 @@
// Input parameters:
// R4: arguments descriptor array.
void StubCode::GenerateCallStaticFunctionStub(Assembler* assembler) {
- AssemblerMacros::EnterStubFrame(assembler);
+ __ EnterStubFrame();
// Setup space on stack for return value and preserve arguments descriptor.
__ LoadImmediate(R0, reinterpret_cast<intptr_t>(Object::null()));
__ PushList((1 << R0) | (1 << R4));
@@ -150,7 +149,7 @@
// Get Code object result and restore arguments descriptor array.
__ PopList((1 << R0) | (1 << R4));
// Remove the stub frame as we are about to jump to the dart function.
- AssemblerMacros::LeaveStubFrame(assembler);
+ __ LeaveStubFrame();
__ ldr(R0, FieldAddress(R0, Code::instructions_offset()));
__ AddImmediate(R0, R0, Instructions::HeaderSize() - kHeapObjectTag);
@@ -202,7 +201,7 @@
// R3 : new context containing the current isolate pointer.
void StubCode::GenerateInvokeDartCodeStub(Assembler* assembler) {
// Save frame pointer coming in.
- AssemblerMacros::EnterStubFrame(assembler);
+ __ EnterStubFrame();
// Save new context and C++ ABI callee-saved registers.
const intptr_t kNewContextOffset =
@@ -317,9 +316,8 @@
// Restore C++ ABI callee-saved registers.
__ PopList((1 << R3) | kAbiPreservedCpuRegs); // Ignore restored R3.
- // Restore the frame pointer.
- AssemblerMacros::LeaveStubFrame(assembler);
-
+ // Restore the frame pointer and return.
+ __ LeaveStubFrame();
__ Ret();
}
« no previous file with comments | « runtime/vm/stack_frame.cc ('k') | runtime/vm/stub_code_ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698