PPC: [runtime] Unify and simplify how frames are marked

src/ppc/macro-assembler-ppc.h

 // Copyright 2014 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.
 
 #ifndef V8_PPC_MACRO_ASSEMBLER_PPC_H_
 #define V8_PPC_MACRO_ASSEMBLER_PPC_H_
 
 #include "src/assembler.h"
 #include "src/bailout-reason.h"
 #include "src/frames.h"
@@ skipping 320 matching lines @@
   void Pop(Register src1, Register src2, Register src3, Register src4,
            Register src5) {
     LoadP(src5, MemOperand(sp, 0));
     LoadP(src4, MemOperand(sp, kPointerSize));
     LoadP(src3, MemOperand(sp, 2 * kPointerSize));
     LoadP(src2, MemOperand(sp, 3 * kPointerSize));
     LoadP(src1, MemOperand(sp, 4 * kPointerSize));
     addi(sp, sp, Operand(5 * kPointerSize));
   }
 
-  // Push a fixed frame, consisting of lr, fp, context and
-  // JS function / marker id if marker_reg is a valid register.
-  void PushFixedFrame(Register marker_reg = no_reg);
-  void PopFixedFrame(Register marker_reg = no_reg);
+  // Push a fixed frame, consisting of lr, fp, constant pool.
+  void PushCommonFrame(Register marker_reg = no_reg);
+
+  // Push a standard frame, consisting of lr, fp, constant pool,
+  // context and JS function
+  void PushStandardFrame(Register function_reg);
+
+  void PopCommonFrame(Register marker_reg = no_reg);
 
   // Restore caller's frame pointer and return address prior to being
   // overwritten by tail call stack preparation.
   void RestoreFrameStateForTailCall();
 
   // Push and pop the registers that can hold pointers, as defined by the
   // RegList constant kSafepointSavedRegisters.
   void PushSafepointRegisters();
   void PopSafepointRegisters();
   // Store value in register src in the safepoint stack slot for
@@ skipping 56 matching lines @@
 #endif
 
 #if !V8_TARGET_ARCH_PPC64
   void PairShiftLeft(Register dst_low, Register dst_high, Register src_low,
                      Register src_high, Register scratch, Register shift);
   void PairShiftLeft(Register dst_low, Register dst_high, Register src_low,
                      Register src_high, uint32_t shift);
 #endif
 
   // Generates function and stub prologue code.
-  void StubPrologue(Register base = no_reg, int prologue_offset = 0);
+  void StubPrologue(StackFrame::Type type, Register base = no_reg,
+                    int prologue_offset = 0);
   void Prologue(bool code_pre_aging, Register base, int prologue_offset = 0);
 
   // Enter exit frame.
   // stack_space - extra stack space, used for parameters before call to C.
   // At least one slot (for the return address) should be provided.
   void EnterExitFrame(bool save_doubles, int stack_space = 1);
 
   // Leave the current exit frame. Expects the return value in r0.
   // Expect the number of values, pushed prior to the exit frame, to
   // remove in a register (or no_reg, if there is nothing to remove).
@@ skipping 1188 matching lines @@
 #define ACCESS_MASM(masm)    \
   masm->stop(__FILE_LINE__); \
   masm->
 #else
 #define ACCESS_MASM(masm) masm->
 #endif
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_PPC_MACRO_ASSEMBLER_PPC_H_