Debugger: refactor reloc info.

src/debug.h

 // 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.
 
 #ifndef V8_DEBUG_H_
 #define V8_DEBUG_H_
 
 #include "src/allocation.h"
 #include "src/arguments.h"
 #include "src/assembler.h"
@@ skipping 62 matching lines @@
                                        BreakLocatorType type, Address pc,
                                        List<BreakLocation>* result_out);
 
   static BreakLocation FromPosition(Handle<DebugInfo> debug_info,
                                     BreakLocatorType type, int position,
                                     BreakPositionAlignment alignment);
 
   bool IsDebugBreak() const;
   inline bool IsExit() const { return RelocInfo::IsJSReturn(rmode_); }
   inline bool IsCall() const {
-    return IsDebugBreakSlot() && RelocInfo::DebugBreakIsCall(data_);
+    return RelocInfo::IsDebugBreakSlotAtCall(rmode_);
   }
   inline bool IsConstructCall() const {
-    return IsDebugBreakSlot() && RelocInfo::DebugBreakIsConstructCall(data_);
+    return RelocInfo::IsDebugBreakSlotAtConstructCall(rmode_);
   }
   inline int CallArgumentsCount() const {
     DCHECK(IsCall());
     return RelocInfo::DebugBreakCallArgumentsCount(data_);
   }
 
   bool IsStepInLocation() const;
   inline bool HasBreakPoint() const {
     return debug_info_->HasBreakPoint(pc_offset_);
   }
@@ skipping 49 matching lines @@
     inline RelocInfo* original_rinfo() {
       return reloc_iterator_original_.rinfo();
     }
 
     inline Address pc() { return rinfo()->pc(); }
     int break_index() const { return break_index_; }
     inline int position() const { return position_; }
     inline int statement_position() const { return statement_position_; }
 
    private:
+    static int GetModeMask(BreakLocatorType type);
+
     bool RinfoDone() const;
     void RinfoNext();
 
     Handle<DebugInfo> debug_info_;
-    BreakLocatorType type_;
     RelocIterator reloc_iterator_;
     RelocIterator reloc_iterator_original_;
     int break_index_;
     int position_;
     int statement_position_;
 
     DisallowHeapAllocation no_gc_;
 
     DISALLOW_COPY_AND_ASSIGN(Iterator);
   };
@@ skipping 640 matching lines @@
 
  private:
   static void RecordRelocInfo(MacroAssembler* masm, SlotLocation location,
                               int call_argc);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_DEBUG_H_