[runtime] Unify and simplify how frames are marked

src/compiler/ia32/code-generator-ia32.cc

 // Copyright 2013 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/compiler/code-generator.h"
 
 #include "src/ast/scopes.h"
 #include "src/compiler/code-generator-impl.h"
 #include "src/compiler/gap-resolver.h"
 #include "src/compiler/node-matchers.h"
@@ skipping 1437 matching lines @@
 //                                       | FP | RET | args |  caller frame |
 //                                       ^ esp,ebp
 
 // --{ pop ebp }----------------------------------------------------------------
 //                                            | RET | args |  caller frame |
 //                                            ^ esp                        ^ ebp
 
 
 void CodeGenerator::AssemblePrologue() {
   CallDescriptor* descriptor = linkage()->GetIncomingDescriptor();
-  if (descriptor->IsCFunctionCall()) {
+  if (this->info()->GeneratePreagedPrologue()) {
+    // TODO(turbofan): this prologue is redundant with OSR, but still needed for
+    // code aging.
+    DCHECK(frame()->needs_frame());
+    DCHECK((descriptor->flags() & CallDescriptor::kHasStandardFrameHeader) !=
+           0);
+    __ call(isolate()->builtins()->MarkCodeAsExecutedOnce(),
+            RelocInfo::CODE_AGE_SEQUENCE);
+    __ Nop(kNoCodeAgeSequenceLength -
+           v8::internal::Assembler::kCallInstructionLength);
+  } else if (frame()->needs_frame()) {
     // Assemble a prologue similar the to cdecl calling convention.

[Michael Starzinger, 2016/02/23 10:57:33]

nit: Comment is outdated, it follows our internal calling convection.

[danno, 2016/03/07 09:33:38]

Done.

     __ push(ebp);
     __ mov(ebp, esp);
-  } else if (descriptor->IsJSFunctionCall()) {
-    // TODO(turbofan): this prologue is redundant with OSR, but still needed for
-    // code aging.
-    __ Prologue(this->info()->GeneratePreagedPrologue());
-  } else if (frame()->needs_frame()) {
-    __ StubPrologue();
+    if ((descriptor->flags() & CallDescriptor::kHasStandardFrameHeader) != 0) {
+      __ push(esi);
+      __ push(edi);
+    } else {
+      __ push(Immediate(Smi::FromInt(StackFrame::STUB)));
+    }
   } else {
     frame()->SetElidedFrameSizeInSlots(kPCOnStackSize / kPointerSize);
   }
   frame_access_state()->SetFrameAccessToDefault();
 
   int stack_shrink_slots = frame()->GetSpillSlotCount();
   if (info()->is_osr()) {
     // TurboFan OSR-compiled functions cannot be entered directly.
     __ Abort(kShouldNotDirectlyEnterOsrFunction);
 
@@ skipping 257 matching lines @@
     int padding_size = last_lazy_deopt_pc_ + space_needed - current_pc;
     __ Nop(padding_size);
   }
 }
 
 #undef __
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8