Remove the barely used macro assemblers after merging their contents to the base

runtime/vm/stub_code_arm.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"
 #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"
 #include "vm/stack_frame.h"
 #include "vm/stub_code.h"
 
 #define __ assembler->
 
 namespace dart {
 
@@ skipping 115 matching lines @@
 
 
 void StubCode::GenerateCallNativeCFunctionStub(Assembler* assembler) {
   __ Unimplemented("CallNativeCFunction stub");
 }
 
 
 // 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));
   __ CallRuntime(kPatchStaticCallRuntimeEntry);
   // 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);
   __ bx(R0);
 }
 
 
 void StubCode::GenerateFixCallersTargetStub(Assembler* assembler) {
   __ Unimplemented("FixCallersTarget stub");
 }
@@ skipping 31 matching lines @@
 
 // Called when invoking Dart code from C++ (VM code).
 // Input parameters:
 //   LR : points to return address.
 //   R0 : entrypoint of the Dart function to call.
 //   R1 : arguments descriptor array.
 //   R2 : arguments array.
 //   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 =
       -(1 + kAbiPreservedCpuRegCount) * kWordSize;
   __ PushList((1 << R3) | kAbiPreservedCpuRegs);
 
   // The new Context structure contains a pointer to the current Isolate
   // structure. Cache the Context pointer in the CTX register so that it is
   // available in generated code and calls to Isolate::Current() need not be
   // done. The assumption is that this register will never be clobbered by
@@ skipping 94 matching lines @@
     const intptr_t offset = Isolate::top_exit_frame_info_offset();
     const int32_t offset12_hi = offset & ~kOffset12Mask;  // signed
     const uint32_t offset12_lo = offset & kOffset12Mask;  // unsigned
     __ AddImmediate(R7, CTX, offset12_hi);
     __ str(R5, Address(R7, offset12_lo));
   }
 
   // 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();
 }
 
 
 void StubCode::GenerateAllocateContextStub(Assembler* assembler) {
   __ Unimplemented("AllocateContext stub");
 }
 
 
 void StubCode::GenerateUpdateStoreBufferStub(Assembler* assembler) {
@@ skipping 142 matching lines @@
 }
 
 
 void StubCode::GenerateIdenticalWithNumberCheckStub(Assembler* assembler) {
   __ Unimplemented("IdenticalWithNumberCheck stub");
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM