Refactor MacroAssembler::Prologue.

R=titzer@chromium.org

Review URL: https://codereview.chromium.org/288213002

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@21329 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

src/arm/full-codegen-arm.cc

@@ -171,8 +171,7 @@ void FullCodeGenerator::Generate() {
   FrameScope frame_scope(masm_, StackFrame::MANUAL);
 
   info->set_prologue_offset(masm_->pc_offset());
-  ASSERT(!info->IsStub());
+  __ Prologue(info->IsCodePreAgingActive());
-  __ Prologue(info);
   info->AddNoFrameRange(0, masm_->pc_offset());
 
   { Comment cmnt(masm_, "[ Allocate locals");

src/arm/lithium-codegen-arm.cc

@@ -140,7 +140,11 @@ bool LCodeGen::GeneratePrologue() {
 
   info()->set_prologue_offset(masm_->pc_offset());
   if (NeedsEagerFrame()) {
-    __ Prologue(info());
+    if (info()->IsStub()) {
+      __ StubPrologue();
+    } else {
+      __ Prologue(info()->IsCodePreAgingActive());
+    }
     frame_is_built_ = true;
     info_->AddNoFrameRange(0, masm_->pc_offset());
   }

src/arm/macro-assembler-arm.cc

@@ -902,18 +902,24 @@ void MacroAssembler::LoadConstantPoolPointerRegister() {
 }
 
 
-void MacroAssembler::Prologue(CompilationInfo* info) {
+void MacroAssembler::StubPrologue() {
-  if (info->IsStub()) {
   PushFixedFrame();
   Push(Smi::FromInt(StackFrame::STUB));
   // Adjust FP to point to saved FP.
   add(fp, sp, Operand(StandardFrameConstants::kFixedFrameSizeFromFp));
-  } else {
+  if (FLAG_enable_ool_constant_pool) {
+    LoadConstantPoolPointerRegister();
+    set_constant_pool_available(true);
+  }
+}
+
+
+void MacroAssembler::Prologue(bool code_pre_aging) {
   PredictableCodeSizeScope predictible_code_size_scope(
       this, kNoCodeAgeSequenceLength);
   // The following three instructions must remain together and unmodified
   // for code aging to work properly.
-    if (info->IsCodePreAgingActive()) {
+  if (code_pre_aging) {
     // Pre-age the code.
     Code* stub = Code::GetPreAgedCodeAgeStub(isolate());
     add(r0, pc, Operand(-8));
@@ -925,7 +931,6 @@ void MacroAssembler::Prologue(CompilationInfo* info) {
     // Adjust FP to point to saved FP.
     add(fp, sp, Operand(StandardFrameConstants::kFixedFrameSizeFromFp));
   }
-  }
   if (FLAG_enable_ool_constant_pool) {
     LoadConstantPoolPointerRegister();
     set_constant_pool_available(true);

src/arm/macro-assembler-arm.h

@@ -519,7 +519,8 @@ class MacroAssembler: public Assembler {
                          Label* not_int32);
 
   // Generates function and stub prologue code.
-  void Prologue(CompilationInfo* info);
+  void StubPrologue();
+  void Prologue(bool code_pre_aging);
 
   // Enter exit frame.
   // stack_space - extra stack space, used for alignment before call to C.

src/arm64/full-codegen-arm64.cc

@@ -170,8 +170,7 @@ void FullCodeGenerator::Generate() {
   //  Push(lr, fp, cp, x1);
   //  Add(fp, jssp, 2 * kPointerSize);
   info->set_prologue_offset(masm_->pc_offset());
-  ASSERT(!info->IsStub());
+  __ Prologue(info->IsCodePreAgingActive());
-  __ Prologue(info);
   info->AddNoFrameRange(0, masm_->pc_offset());
 
   // Reserve space on the stack for locals.

src/arm64/lithium-codegen-arm64.cc

@@ -671,7 +671,11 @@ bool LCodeGen::GeneratePrologue() {
   ASSERT(__ StackPointer().Is(jssp));
   info()->set_prologue_offset(masm_->pc_offset());
   if (NeedsEagerFrame()) {
-    __ Prologue(info());
+    if (info()->IsStub()) {
+      __ StubPrologue();
+    } else {
+      __ Prologue(info()->IsCodePreAgingActive());
+    }
     frame_is_built_ = true;
     info_->AddNoFrameRange(0, masm_->pc_offset());
   }

src/arm64/macro-assembler-arm64.cc

@@ -2992,8 +2992,7 @@ void MacroAssembler::TruncateHeapNumberToI(Register result,
 }
 
 
-void MacroAssembler::Prologue(CompilationInfo* info) {
+void MacroAssembler::StubPrologue() {
-  if (info->IsStub()) {
   ASSERT(StackPointer().Is(jssp));
   UseScratchRegisterScope temps(this);
   Register temp = temps.AcquireX();
@@ -3002,14 +3001,16 @@ void MacroAssembler::Prologue(CompilationInfo* info) {
   // ageing sequence.
   __ Push(lr, fp, cp, temp);
   __ Add(fp, jssp, StandardFrameConstants::kFixedFrameSizeFromFp);
-  } else {
+}
-    if (info->IsCodePreAgingActive()) {
+
+
+void MacroAssembler::Prologue(bool code_pre_aging) {
+  if (code_pre_aging) {
     Code* stub = Code::GetPreAgedCodeAgeStub(isolate());
     __ EmitCodeAgeSequence(stub);
   } else {
     __ EmitFrameSetupForCodeAgePatching();
   }
-  }
 }
 
 

src/arm64/macro-assembler-arm64.h

@@ -1652,7 +1652,8 @@ class MacroAssembler : public Assembler {
   void ExitFrameRestoreFPRegs();
 
   // Generates function and stub prologue code.
-  void Prologue(CompilationInfo* info);
+  void StubPrologue();
+  void Prologue(bool code_pre_aging);
 
   // Enter exit frame. Exit frames are used when calling C code from generated
   // (JavaScript) code.

src/full-codegen.h

@@ -74,6 +74,7 @@ class FullCodeGenerator: public AstVisitor {
                          info->zone()),
         back_edges_(2, info->zone()),
         ic_total_count_(0) {
+    ASSERT(!info->IsStub());
     Initialize();
   }
 

src/ia32/full-codegen-ia32.cc

@@ -157,8 +157,7 @@ void FullCodeGenerator::Generate() {
   FrameScope frame_scope(masm_, StackFrame::MANUAL);
 
   info->set_prologue_offset(masm_->pc_offset());
-  ASSERT(!info->IsStub());
+  __ Prologue(info->IsCodePreAgingActive());
-  __ Prologue(info);
   info->AddNoFrameRange(0, masm_->pc_offset());
 
   { Comment cmnt(masm_, "[ Allocate locals");

src/ia32/lithium-codegen-ia32.cc

@@ -188,7 +188,11 @@ bool LCodeGen::GeneratePrologue() {
   if (NeedsEagerFrame()) {
     ASSERT(!frame_is_built_);
     frame_is_built_ = true;
-    __ Prologue(info());
+    if (info()->IsStub()) {
+      __ StubPrologue();
+    } else {
+      __ Prologue(info()->IsCodePreAgingActive());
+    }
     info()->AddNoFrameRange(0, masm_->pc_offset());
   }
 

src/ia32/macro-assembler-ia32.cc

@@ -900,16 +900,18 @@ void MacroAssembler::AssertNotSmi(Register object) {
 }
 
 
-void MacroAssembler::Prologue(CompilationInfo* info) {
+void MacroAssembler::StubPrologue() {
-  if (info->IsStub()) {
   push(ebp);  // Caller's frame pointer.
   mov(ebp, esp);
   push(esi);  // Callee's context.
   push(Immediate(Smi::FromInt(StackFrame::STUB)));
-  } else {
+}
+
+
+void MacroAssembler::Prologue(bool code_pre_aging) {
   PredictableCodeSizeScope predictible_code_size_scope(this,
       kNoCodeAgeSequenceLength);
-    if (info->IsCodePreAgingActive()) {
+  if (code_pre_aging) {
       // Pre-age the code.
     call(isolate()->builtins()->MarkCodeAsExecutedOnce(),
         RelocInfo::CODE_AGE_SEQUENCE);
@@ -920,7 +922,6 @@ void MacroAssembler::Prologue(CompilationInfo* info) {
     push(esi);  // Callee's context.
     push(edi);  // Callee's JS function.
   }
-  }
 }
 
 

src/ia32/macro-assembler-ia32.h

@@ -204,7 +204,8 @@ class MacroAssembler: public Assembler {
   void DebugBreak();
 
   // Generates function and stub prologue code.
-  void Prologue(CompilationInfo* info);
+  void StubPrologue();
+  void Prologue(bool code_pre_aging);
 
   // Enter specific kind of exit frame. Expects the number of
   // arguments in register eax and sets up the number of arguments in

src/mips/full-codegen-mips.cc

@@ -176,8 +176,7 @@ void FullCodeGenerator::Generate() {
   FrameScope frame_scope(masm_, StackFrame::MANUAL);
 
   info->set_prologue_offset(masm_->pc_offset());
-  ASSERT(!info->IsStub());
+  __ Prologue(info->IsCodePreAgingActive());
-  __ Prologue(info);
   info->AddNoFrameRange(0, masm_->pc_offset());
 
   { Comment cmnt(masm_, "[ Allocate locals");

src/mips/lithium-codegen-mips.cc

@@ -162,7 +162,11 @@ bool LCodeGen::GeneratePrologue() {
 
   info()->set_prologue_offset(masm_->pc_offset());
   if (NeedsEagerFrame()) {
-    __ Prologue(info());
+    if (info()->IsStub()) {
+      __ StubPrologue();
+    } else {
+      __ Prologue(info()->IsCodePreAgingActive());
+    }
     frame_is_built_ = true;
     info_->AddNoFrameRange(0, masm_->pc_offset());
   }

src/mips/macro-assembler-mips.cc

@@ -4452,18 +4452,20 @@ void MacroAssembler::LoadGlobalFunctionInitialMap(Register function,
 }
 
 
-void MacroAssembler::Prologue(CompilationInfo* info) {
+void MacroAssembler::StubPrologue() {
-  if (info->IsStub()) {
     Push(ra, fp, cp);
     Push(Smi::FromInt(StackFrame::STUB));
     // Adjust FP to point to saved FP.
     Addu(fp, sp, Operand(StandardFrameConstants::kFixedFrameSizeFromFp));
-  } else {
+}
+
+
+void MacroAssembler::Prologue(bool code_pre_aging) {
   PredictableCodeSizeScope predictible_code_size_scope(
       this, kNoCodeAgeSequenceLength);
   // The following three instructions must remain together and unmodified
   // for code aging to work properly.
-    if (info->IsCodePreAgingActive()) {
+  if (code_pre_aging) {
     // Pre-age the code.
     Code* stub = Code::GetPreAgedCodeAgeStub(isolate());
     nop(Assembler::CODE_AGE_MARKER_NOP);
@@ -4482,7 +4484,6 @@ void MacroAssembler::Prologue(CompilationInfo* info) {
     // Adjust fp to point to caller's fp.
     Addu(fp, sp, Operand(StandardFrameConstants::kFixedFrameSizeFromFp));
   }
-  }
 }
 
 

src/mips/macro-assembler-mips.h

@@ -1492,7 +1492,8 @@ const Operand& rt = Operand(zero_reg), BranchDelaySlot bd = PROTECT
   }
 
   // Generates function and stub prologue code.
-  void Prologue(CompilationInfo* info);
+  void StubPrologue();
+  void Prologue(bool code_pre_aging);
 
   // Activation support.
   void EnterFrame(StackFrame::Type type);

src/x64/full-codegen-x64.cc

@@ -157,8 +157,7 @@ void FullCodeGenerator::Generate() {
   FrameScope frame_scope(masm_, StackFrame::MANUAL);
 
   info->set_prologue_offset(masm_->pc_offset());
-  ASSERT(!info->IsStub());
+  __ Prologue(info->IsCodePreAgingActive());
-  __ Prologue(info);
   info->AddNoFrameRange(0, masm_->pc_offset());
 
   { Comment cmnt(masm_, "[ Allocate locals");

src/x64/lithium-codegen-x64.cc

@@ -149,7 +149,11 @@ bool LCodeGen::GeneratePrologue() {
   if (NeedsEagerFrame()) {
     ASSERT(!frame_is_built_);
     frame_is_built_ = true;
-    __ Prologue(info());
+    if (info()->IsStub()) {
+      __ StubPrologue();
+    } else {
+      __ Prologue(info()->IsCodePreAgingActive());
+    }
     info()->AddNoFrameRange(0, masm_->pc_offset());
   }
 

src/x64/macro-assembler-x64.cc

@@ -3889,16 +3889,18 @@ void MacroAssembler::InvokePrologue(const ParameterCount& expected,
 }
 
 
-void MacroAssembler::Prologue(CompilationInfo* info) {
+void MacroAssembler::StubPrologue() {
-  if (info->IsStub()) {
     pushq(rbp);  // Caller's frame pointer.
     movp(rbp, rsp);
     Push(rsi);  // Callee's context.
     Push(Smi::FromInt(StackFrame::STUB));
-  } else {
+}
+
+
+void MacroAssembler::Prologue(bool code_pre_aging) {
   PredictableCodeSizeScope predictible_code_size_scope(this,
       kNoCodeAgeSequenceLength);
-    if (info->IsCodePreAgingActive()) {
+  if (code_pre_aging) {
       // Pre-age the code.
     Call(isolate()->builtins()->MarkCodeAsExecutedOnce(),
          RelocInfo::CODE_AGE_SEQUENCE);
@@ -3909,7 +3911,6 @@ void MacroAssembler::Prologue(CompilationInfo* info) {
     Push(rsi);  // Callee's context.
     Push(rdi);  // Callee's JS function.
   }
-  }
 }
 
 

src/x64/macro-assembler-x64.h

@@ -274,7 +274,8 @@ class MacroAssembler: public Assembler {
   void DebugBreak();
 
   // Generates function and stub prologue code.
-  void Prologue(CompilationInfo* info);
+  void StubPrologue();
+  void Prologue(bool code_pre_aging);
 
   // Enter specific kind of exit frame; either in normal or
   // debug mode. Expects the number of arguments in register rax and