[cleanup] Minor cleanups concerning assemblers and code generation.

src/codegen.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/codegen.h"
 
 #if defined(V8_OS_AIX)
 #include <fenv.h>  // NOLINT(build/c++11)
 #endif
 
@@ skipping 51 matching lines @@
   }                                                                      \
   double fast_##name(double x, Isolate* isolate) {                       \
     return (*fast_##name##_function)(x, isolate);                        \
   }
 
 UNARY_MATH_FUNCTION(sqrt, CreateSqrtFunction)
 
 #undef UNARY_MATH_FUNCTION
 
 
-#define __ ACCESS_MASM(masm_)
-
 #ifdef DEBUG
 
-Comment::Comment(MacroAssembler* masm, const char* msg)
-    : masm_(masm), msg_(msg) {
-  __ RecordComment(msg);
+Comment::Comment(Assembler* assembler, const char* msg)
+    : assembler_(assembler), msg_(msg) {
+  assembler_->RecordComment(msg);
 }
 
 
 Comment::~Comment() {
-  if (msg_[0] == '[') __ RecordComment("]");
+  if (msg_[0] == '[') assembler_->RecordComment("]");
 }
 
 #endif  // DEBUG
 
-#undef __
-
 
 void CodeGenerator::MakeCodePrologue(CompilationInfo* info, const char* kind) {
   bool print_ast = false;
   const char* ftype;
 
   if (info->isolate()->bootstrapper()->IsActive()) {
     print_ast = FLAG_print_builtin_ast;
     ftype = "builtin";
   } else {
     print_ast = FLAG_print_ast;
@@ skipping 184 matching lines @@
       os << "source_position = " << shared->start_position() << "\n";
     }
     code->Disassemble(debug_name.get(), os);
     os << "--- End code ---\n";
   }
 #endif  // ENABLE_DISASSEMBLER
 }
 
 }  // namespace internal
 }  // namespace v8