Simplify the processing of deferred code in the code generator. Our...

src/codegen-inl.h

Index: src/codegen-inl.h
===================================================================
--- src/codegen-inl.h	(revision 2099)
+++ src/codegen-inl.h	(working copy)
@@ -32,28 +32,22 @@
 #include "codegen.h"
 #include "register-allocator-inl.h"
 
+#if V8_TARGET_ARCH_IA32
+#include "ia32/codegen-ia32-inl.h"
+#elif V8_TARGET_ARCH_X64
+#include "x64/codegen-x64-inl.h"
+#elif V8_TARGET_ARCH_ARM
+#include "arm/codegen-arm-inl.h"
+#else
+#error Unsupported target architecture.
+#endif
+
+
 namespace v8 {
 namespace internal {
 
+#define __ ACCESS_MASM(masm_)
 
-void DeferredCode::SetEntryFrame(Result* arg) {
-  ASSERT(cgen()->has_valid_frame());
-  cgen()->frame()->Push(arg);
-  enter()->set_entry_frame(new VirtualFrame(cgen()->frame()));
-  *arg = cgen()->frame()->Pop();
-}
-
-
-void DeferredCode::SetEntryFrame(Result* arg0, Result* arg1) {
-  ASSERT(cgen()->has_valid_frame());
-  cgen()->frame()->Push(arg0);
-  cgen()->frame()->Push(arg1);
-  enter()->set_entry_frame(new VirtualFrame(cgen()->frame()));
-  *arg1 = cgen()->frame()->Pop();
-  *arg0 = cgen()->frame()->Pop();
-}
-
-
 // -----------------------------------------------------------------------------
 // Support for "structured" code comments.
 //
@@ -64,15 +58,12 @@
 
 class Comment BASE_EMBEDDED {
  public:
-  Comment(MacroAssembler* masm, const char* msg)
-    : masm_(masm),
-      msg_(msg) {
-    masm_->RecordComment(msg);
+  Comment(MacroAssembler* masm, const char* msg) : masm_(masm), msg_(msg) {
+    __ RecordComment(msg);
   }
 
   ~Comment() {
-    if (msg_[0] == '[')
-      masm_->RecordComment("]");
+    if (msg_[0] == '[') __ RecordComment("]");
   }
 
  private:
@@ -89,7 +80,9 @@
 
 #endif  // DEBUG
 
+#undef __
 
+
 } }  // namespace v8::internal
 
 #endif  // V8_CODEGEN_INL_H_