Debugger: refactor reloc info.

src/assembler.cc

 // Copyright (c) 1994-2006 Sun Microsystems Inc.
 // All Rights Reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 // - Redistributions of source code must retain the above copyright notice,
 // this list of conditions and the following disclaimer.
 //
@@ skipping 431 matching lines @@
       }
       next_position_candidate_flushed_ = false;
     }
     last_position_ = static_cast<int>(rinfo->data());
   } else {
     WriteModeAndPC(pc_delta, rmode);
     if (RelocInfo::IsComment(rmode)) {
       WriteData(rinfo->data());
     } else if (RelocInfo::IsConstPool(rmode) ||
                RelocInfo::IsVeneerPool(rmode) ||
-               RelocInfo::IsDebugBreakSlot(rmode)) {
+               RelocInfo::IsDebugBreakSlotAtCall(rmode)) {
       WriteIntData(static_cast<int>(rinfo->data()));
     }
   }
   last_pc_ = rinfo->pc();
   last_mode_ = rmode;
 #ifdef DEBUG
   DCHECK(begin_pos - pos_ <= kMaxSize);
 #endif
 }
 
@@ skipping 171 matching lines @@
           if (mode_mask_ & RelocInfo::kPositionMask) {
             // Always update the position if we are interested in either
             // statement positions or non-statement positions.
             AdvanceReadPosition();
             if (SetMode(rmode)) return;
           } else {
             Advance(kIntSize);
           }
         } else if (RelocInfo::IsConstPool(rmode) ||
                    RelocInfo::IsVeneerPool(rmode) ||
-                   RelocInfo::IsDebugBreakSlot(rmode)) {
+                   RelocInfo::IsDebugBreakSlotAtCall(rmode)) {
           if (SetMode(rmode)) {
             AdvanceReadInt();
             return;
           }
           Advance(kIntSize);
         } else if (SetMode(static_cast<RelocInfo::Mode>(rmode))) {
           return;
         }
       }
     }
@@ skipping 75 matching lines @@
 const char* RelocInfo::RelocModeName(RelocInfo::Mode rmode) {
   switch (rmode) {
     case NONE32:
       return "no reloc 32";
     case NONE64:
       return "no reloc 64";
     case EMBEDDED_OBJECT:
       return "embedded object";
     case CONSTRUCT_CALL:
       return "code target (js construct call)";
-    case DEBUG_BREAK:
-      return "debug break";
+    case DEBUGGER_STATEMENT:
+      return "debugger statement";
     case CODE_TARGET:
       return "code target";
     case CODE_TARGET_WITH_ID:
       return "code target with id";
     case CELL:
       return "property cell";
     case RUNTIME_ENTRY:
       return "runtime entry";
     case JS_RETURN:
       return "js return";
     case COMMENT:
       return "comment";
     case POSITION:
       return "position";
     case STATEMENT_POSITION:
       return "statement position";
     case EXTERNAL_REFERENCE:
       return "external reference";
     case INTERNAL_REFERENCE:
       return "internal reference";
     case INTERNAL_REFERENCE_ENCODED:
       return "encoded internal reference";
     case DEOPT_REASON:
       return "deopt reason";
     case CONST_POOL:
       return "constant pool";
     case VENEER_POOL:
       return "veneer pool";
-    case DEBUG_BREAK_SLOT:
-      return "debug break slot";
+    case DEBUG_BREAK_SLOT_AT_POSITION:
+      return "debug break slot at position";
+    case DEBUG_BREAK_SLOT_AT_CALL:
+      return "debug break slot at call";
+    case DEBUG_BREAK_SLOT_AT_CONSTRUCT_CALL:
+      return "debug break slot at construct call";
     case CODE_AGE_SEQUENCE:
       return "code_age_sequence";
     case NUMBER_OF_MODES:
     case PC_JUMP:
       UNREACHABLE();
       return "number_of_modes";
   }
   return "unknown relocation type";
 }
 
@@ skipping 25 matching lines @@
   } else if (IsRuntimeEntry(rmode_) &&
              isolate->deoptimizer_data() != NULL) {
     // Depotimization bailouts are stored as runtime entries.
     int id = Deoptimizer::GetDeoptimizationId(
         isolate, target_address(), Deoptimizer::EAGER);
     if (id != Deoptimizer::kNotDeoptimizationEntry) {
       os << "  (deoptimization bailout " << id << ")";
     }
   } else if (IsConstPool(rmode_)) {
     os << " (size " << static_cast<int>(data_) << ")";
-  } else if (IsDebugBreakSlot(rmode_)) {
-    if (DebugBreakIsCall(data_)) {
-      os << " (call with " << DebugBreakCallArgumentsCount(data_) << " args)";
-    } else if (DebugBreakIsConstructCall(data_)) {
-      os << " (construct call)";
-    } else {
-      os << " (slot)";
-    }
   }
 
   os << "\n";
 }
 #endif  // ENABLE_DISASSEMBLER
 
 
 #ifdef VERIFY_HEAP
 void RelocInfo::Verify(Isolate* isolate) {
   switch (rmode_) {
     case EMBEDDED_OBJECT:
       Object::VerifyPointer(target_object());
       break;
     case CELL:
       Object::VerifyPointer(target_cell());
       break;
-    case DEBUG_BREAK:
+    case DEBUGGER_STATEMENT:
     case CONSTRUCT_CALL:
     case CODE_TARGET_WITH_ID:
     case CODE_TARGET: {
       // convert inline target address to code object
       Address addr = target_address();
       CHECK(addr != NULL);
       // Check that we can find the right code object.
       Code* code = Code::GetCodeFromTargetAddress(addr);
       Object* found = isolate->FindCodeObject(addr);
       CHECK(found->IsCode());
@@ skipping 11 matching lines @@
     }
     case RUNTIME_ENTRY:
     case JS_RETURN:
     case COMMENT:
     case POSITION:
     case STATEMENT_POSITION:
     case EXTERNAL_REFERENCE:
     case DEOPT_REASON:
     case CONST_POOL:
     case VENEER_POOL:
-    case DEBUG_BREAK_SLOT:
+    case DEBUG_BREAK_SLOT_AT_POSITION:
+    case DEBUG_BREAK_SLOT_AT_CALL:
+    case DEBUG_BREAK_SLOT_AT_CONSTRUCT_CALL:
     case NONE32:
     case NONE64:
       break;
     case NUMBER_OF_MODES:
     case PC_JUMP:
       UNREACHABLE();
       break;
     case CODE_AGE_SEQUENCE:
       DCHECK(Code::IsYoungSequence(isolate, pc_) || code_age_stub()->IsCode());
       break;
   }
 }
 #endif  // VERIFY_HEAP
 
 
-bool RelocInfo::DebugBreakIsConstructCall(intptr_t data) {
-  return data == static_cast<intptr_t>(kDebugBreakConstructCallSentinel);
-}
-
-
-bool RelocInfo::DebugBreakIsCall(intptr_t data) { return data >= 0; }
-
-
 int RelocInfo::DebugBreakCallArgumentsCount(intptr_t data) {
-  DCHECK(DebugBreakIsCall(data));
   return static_cast<int>(data);
 }
 
 
 // -----------------------------------------------------------------------------
 // Implementation of ExternalReference
 
 void ExternalReference::SetUp() {
   double_constants.min_int = kMinInt;
   double_constants.one_half = 0.5;
@@ skipping 907 matching lines @@
 
 void Assembler::RecordJSReturn() {
   positions_recorder()->WriteRecordedPositions();
   EnsureSpace ensure_space(this);
   RecordRelocInfo(RelocInfo::JS_RETURN);
 }
 
 
 void Assembler::RecordDebugBreakSlot() {
   EnsureSpace ensure_space(this);
-  intptr_t data = static_cast<intptr_t>(RelocInfo::kDebugBreakNonCallSentinel);
-  RecordRelocInfo(RelocInfo::DEBUG_BREAK_SLOT, data);
+  RecordRelocInfo(RelocInfo::DEBUG_BREAK_SLOT_AT_POSITION);
 }
 
 
 void Assembler::RecordDebugBreakSlotForCall(int argc) {
   EnsureSpace ensure_space(this);
   intptr_t data = static_cast<intptr_t>(argc);
-  RecordRelocInfo(RelocInfo::DEBUG_BREAK_SLOT, data);
+  RecordRelocInfo(RelocInfo::DEBUG_BREAK_SLOT_AT_CALL, data);
 }
 
 
 void Assembler::RecordDebugBreakSlotForConstructCall() {
   EnsureSpace ensure_space(this);
-  intptr_t data =
-      static_cast<intptr_t>(RelocInfo::kDebugBreakConstructCallSentinel);
-  RecordRelocInfo(RelocInfo::DEBUG_BREAK_SLOT, data);
+  RecordRelocInfo(RelocInfo::DEBUG_BREAK_SLOT_AT_CONSTRUCT_CALL);
 }
 
 
 void Assembler::DataAlign(int m) {
   DCHECK(m >= 2 && base::bits::IsPowerOfTwo32(m));
   while ((pc_offset() & (m - 1)) != 0) {
     db(0);
   }
 }
 }  // namespace internal
 }  // namespace v8