Contribution of PowerPC port (continuation of 422063005) - currency

src/ppc/debug-ppc.cc

 // 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.
 
 #include "src/v8.h"
 
 #if V8_TARGET_ARCH_PPC
 
 #include "src/codegen.h"
 #include "src/debug.h"
@@ skipping 90 matching lines @@
 }
 
 
 #define __ ACCESS_MASM(masm)
 
 
 static void Generate_DebugBreakCallHelper(MacroAssembler* masm,
                                           RegList object_regs,
                                           RegList non_object_regs) {
   {
-    FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
+    FrameScope scope(masm, StackFrame::INTERNAL);
 
     // Load padding words on stack.
     __ LoadSmiLiteral(ip, Smi::FromInt(LiveEdit::kFramePaddingValue));
     for (int i = 0; i < LiveEdit::kFramePaddingInitialSize; i++) {
       __ push(ip);
     }
     __ LoadSmiLiteral(ip, Smi::FromInt(LiveEdit::kFramePaddingInitialSize));
     __ push(ip);
 
     // Store the registers containing live values on the expression stack to
@@ skipping 188 matching lines @@
       ExternalReference::debug_restarter_frame_function_pointer_address(
           masm->isolate());
   __ mov(ip, Operand(restarter_frame_function_slot));
   __ li(r4, Operand::Zero());
   __ StoreP(r4, MemOperand(ip, 0));
 
   // Load the function pointer off of our current stack frame.
   __ LoadP(r4, MemOperand(fp, StandardFrameConstants::kConstantPoolOffset -
                                   kPointerSize));
 
-  // Pop return address, frame and constant pool pointer (if
-  // FLAG_enable_ool_constant_pool).
+  // Pop return address and frame
   __ LeaveFrame(StackFrame::INTERNAL);
 
   // Load context from the function.
   __ LoadP(cp, FieldMemOperand(r4, JSFunction::kContextOffset));
 
   // Get function code.
   __ LoadP(ip, FieldMemOperand(r4, JSFunction::kSharedFunctionInfoOffset));
   __ LoadP(ip, FieldMemOperand(ip, SharedFunctionInfo::kCodeOffset));
   __ addi(ip, ip, Operand(Code::kHeaderSize - kHeapObjectTag));
 
   // Re-run JSFunction, r4 is function, cp is context.
   __ Jump(ip);
 }
 
 
 const bool LiveEdit::kFrameDropperSupported = true;
 
 #undef __
 }
 }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_PPC