X87: Refactor BreakLocationIterator

src/x87/debug-x87.cc

 // Copyright 2012 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_X87
 
 #include "src/codegen.h"
 #include "src/debug.h"
 
 
 namespace v8 {
 namespace internal {
 
 // Patch the code at the current PC with a call to the target address.
 // Additional guard int3 instructions can be added if required.
-void RelocInfo::PatchCodeWithCall(Address pc, Address target, int guard_bytes) {
+void PatchCodeWithCall(Address pc, Address target, int guard_bytes) {
   // Call instruction takes up 5 bytes and int3 takes up one byte.
   static const int kCallCodeSize = 5;
   int code_size = kCallCodeSize + guard_bytes;
 
   // Create a code patcher.
   CodePatcher patcher(pc, code_size);
 
 // Add a label for checking the size of the code used for returning.
 #ifdef DEBUG
   Label check_codesize;
@@ skipping 22 matching lines @@
 // for the precise return instructions sequence.
 void BreakLocation::SetDebugBreakAtReturn() {
   DCHECK(Assembler::kJSReturnSequenceLength >=
          Assembler::kCallInstructionLength);
   PatchCodeWithCall(
       pc(), debug_info_->GetIsolate()->builtins()->Return_DebugBreak()->entry(),
       Assembler::kJSReturnSequenceLength - Assembler::kCallInstructionLength);
 }
 
 
-void BreakLocationIterator::SetDebugBreakAtSlot() {
+void BreakLocation::SetDebugBreakAtSlot() {
   DCHECK(IsDebugBreakSlot());
   Isolate* isolate = debug_info_->GetIsolate();
-  rinfo().PatchCodeWithCall(
+  PatchCodeWithCall(
       pc(), isolate->builtins()->Slot_DebugBreak()->entry(),
       Assembler::kDebugBreakSlotLength - Assembler::kCallInstructionLength);
 }
 
 
 #define __ ACCESS_MASM(masm)
 
 static void Generate_DebugBreakCallHelper(MacroAssembler* masm,
                                           RegList object_regs,
                                           RegList non_object_regs,
@@ skipping 246 matching lines @@
 }
 
 
 const bool LiveEdit::kFrameDropperSupported = true;
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_X87