Debugger: use debug break slot to break on call.

src/mips64/debug-mips64.cc

Index: src/mips64/debug-mips64.cc
diff --git a/src/mips64/debug-mips64.cc b/src/mips64/debug-mips64.cc
index 75e37c5e779f97e066553ae881bd07fa5ea46559..2762e0beb5e7f837a90f68e0bc4ec3ded8c9a7d0 100644
--- a/src/mips64/debug-mips64.cc
+++ b/src/mips64/debug-mips64.cc
@@ -63,10 +63,8 @@ void BreakLocation::SetDebugBreakAtSlot() {
 #define __ ACCESS_MASM(masm)
 
 
-
 static void Generate_DebugBreakCallHelper(MacroAssembler* masm,
-                                          RegList object_regs,
-                                          RegList non_object_regs) {
+                                          RegList object_regs) {
   {
     FrameScope scope(masm, StackFrame::INTERNAL);
 
@@ -88,17 +86,12 @@ static void Generate_DebugBreakCallHelper(MacroAssembler* masm,
     // make sure that these are correctly updated during GC. Non object values
     // are stored as a smi causing it to be untouched by GC.
     DCHECK((object_regs & ~kJSCallerSaved) == 0);
-    DCHECK((non_object_regs & ~kJSCallerSaved) == 0);
-    DCHECK((object_regs & non_object_regs) == 0);
     for (int i = 0; i < kNumJSCallerSaved; i++) {
       int r = JSCallerSavedCode(i);
       Register reg = { r };
       if ((object_regs & (1 << r)) != 0) {
         __ push(reg);
       }
-      if ((non_object_regs & (1 << r)) != 0) {
-        __ PushRegisterAsTwoSmis(reg);
-      }
     }
 
 #ifdef DEBUG
@@ -114,14 +107,10 @@ static void Generate_DebugBreakCallHelper(MacroAssembler* masm,
     for (int i = kNumJSCallerSaved - 1; i >= 0; i--) {
       int r = JSCallerSavedCode(i);
       Register reg = { r };
-      if ((non_object_regs & (1 << r)) != 0) {
-        __ PopRegisterAsTwoSmis(reg, at);
-      }
       if ((object_regs & (1 << r)) != 0) {
         __ pop(reg);
       }
-      if (FLAG_debug_code &&
-          (((object_regs |non_object_regs) & (1 << r)) == 0)) {
+      if (FLAG_debug_code && ((object_regs & (1 << r)) == 0)) {
         __ li(reg, kDebugZapValue);
       }
     }
@@ -143,54 +132,11 @@ static void Generate_DebugBreakCallHelper(MacroAssembler* masm,
 }
 
 
-void DebugCodegen::GenerateCallICStubDebugBreak(MacroAssembler* masm) {
-  // Register state for CallICStub
-  // ----------- S t a t e -------------
-  //  -- a1 : function
-  //  -- a3 : slot in feedback array (smi)
-  // -----------------------------------
-  Generate_DebugBreakCallHelper(masm, a1.bit() | a3.bit(), 0);
-}
-
-
 void DebugCodegen::GenerateReturnDebugBreak(MacroAssembler* masm) {
   // In places other than IC call sites it is expected that v0 is TOS which
   // is an object - this is not generally the case so this should be used with
   // care.
-  Generate_DebugBreakCallHelper(masm, v0.bit(), 0);
-}
-
-
-void DebugCodegen::GenerateCallFunctionStubDebugBreak(MacroAssembler* masm) {
-  // Register state for CallFunctionStub (from code-stubs-mips.cc).
-  // ----------- S t a t e -------------
-  //  -- a1 : function
-  // -----------------------------------
-  Generate_DebugBreakCallHelper(masm, a1.bit(), 0);
-}
-
-
-void DebugCodegen::GenerateCallConstructStubDebugBreak(MacroAssembler* masm) {
-  // Calling convention for CallConstructStub (from code-stubs-mips.cc).
-  // ----------- S t a t e -------------
-  //  -- a0     : number of arguments (not smi)
-  //  -- a1     : constructor function
-  // -----------------------------------
-  Generate_DebugBreakCallHelper(masm, a1.bit() , a0.bit());
-}
-
-
-
-void DebugCodegen::GenerateCallConstructStubRecordDebugBreak(
-    MacroAssembler* masm) {
-  // Calling convention for CallConstructStub (from code-stubs-mips.cc).
-  // ----------- S t a t e -------------
-  //  -- a0     : number of arguments (not smi)
-  //  -- a1     : constructor function
-  //  -- a2     : feedback array
-  //  -- a3     : feedback slot (smi)
-  // -----------------------------------
-  Generate_DebugBreakCallHelper(masm, a1.bit() | a2.bit() | a3.bit(), a0.bit());
+  Generate_DebugBreakCallHelper(masm, v0.bit());
 }
 
 
@@ -200,7 +146,6 @@ void DebugCodegen::GenerateSlot(MacroAssembler* masm) {
   Assembler::BlockTrampolinePoolScope block_trampoline_pool(masm);
   Label check_codesize;
   __ bind(&check_codesize);
-  __ RecordDebugBreakSlot();
   for (int i = 0; i < Assembler::kDebugBreakSlotInstructions; i++) {
     __ nop(MacroAssembler::DEBUG_BREAK_NOP);
   }
@@ -212,7 +157,7 @@ void DebugCodegen::GenerateSlot(MacroAssembler* masm) {
 void DebugCodegen::GenerateSlotDebugBreak(MacroAssembler* masm) {
   // In the places where a debug break slot is inserted no registers can contain
   // object pointers.
-  Generate_DebugBreakCallHelper(masm, 0, 0);
+  Generate_DebugBreakCallHelper(masm, 0);
 }