[simulator] remove skips after debug break instructions.

Previously we used to add a string address after the stop instruction
for description. This has been removed, but the skip in the simulator
was not consistently removed in 0ca72de2.


BUG=chromium:703051

Change-Id: I3135d180bcef174bc5d9dd24f7737a4415732976
Reviewed-on: https://chromium-review.googlesource.com/457356Reviewed-by: Michael Starzinger <mstarzinger@chromium.org>
Commit-Queue: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#43931}

src/arm/simulator-arm.cc

@@ -75,7 +75,6 @@ void ArmDebugger::Stop(Instruction* instr) {
   } else {
     PrintF("Simulator hit\n");
   }
-  sim_->set_pc(sim_->get_pc() + 2 * Instruction::kInstrSize);
   Debug();
 }
 
@@ -1987,8 +1986,6 @@ void Simulator::SoftwareInterrupt(Instruction* instr) {
         if (isEnabledStop(code)) {
           ArmDebugger dbg(this);
           dbg.Stop(instr);
-        } else {
-          set_pc(get_pc() + 2 * Instruction::kInstrSize);
         }
       } else {
         // This is not a valid svc code.

src/mips/assembler-mips.cc

@@ -2019,7 +2019,6 @@ void Assembler::stop(const char* msg, uint32_t code) {
 #if V8_HOST_ARCH_MIPS
   break_(0x54321);
 #else  // V8_HOST_ARCH_MIPS
-  BlockTrampolinePoolFor(2);
   break_(code, true);
 #endif
 }

src/mips/simulator-mips.cc

@@ -91,7 +91,6 @@ void MipsDebugger::Stop(Instruction* instr) {
   // Get the stop code.
   uint32_t code = instr->Bits(25, 6);
   PrintF("Simulator hit (%u)\n", code);
-  sim_->set_pc(sim_->get_pc() + 2 * Instruction::kInstrSize);
   Debug();
 }
 
@@ -2335,8 +2334,6 @@ void Simulator::HandleStop(uint32_t code, Instruction* instr) {
   if (IsEnabledStop(code)) {
     MipsDebugger dbg(this);
     dbg.Stop(instr);
-  } else {
-    set_pc(get_pc() + 2 * Instruction::kInstrSize);
   }
 }
 

src/mips64/assembler-mips64.cc

@@ -2271,7 +2271,6 @@ void Assembler::stop(const char* msg, uint32_t code) {
 #if defined(V8_HOST_ARCH_MIPS) || defined(V8_HOST_ARCH_MIPS64)
   break_(0x54321);
 #else  // V8_HOST_ARCH_MIPS
-  BlockTrampolinePoolFor(3);
   break_(code, true);
 #endif
 }

src/mips64/simulator-mips64.cc

@@ -102,8 +102,6 @@ void MipsDebugger::Stop(Instruction* instr) {
   // Get the stop code.
   uint32_t code = instr->Bits(25, 6);
   PrintF("Simulator hit (%u)\n", code);
-  // TODO(yuyin): 2 -> 3?
-  sim_->set_pc(sim_->get_pc() + 3 * Instruction::kInstrSize);
   Debug();
 }
 
@@ -2282,8 +2280,6 @@ void Simulator::HandleStop(uint64_t code, Instruction* instr) {
   if (IsEnabledStop(code)) {
     MipsDebugger dbg(this);
     dbg.Stop(instr);
-  } else {
-    set_pc(get_pc() + 2 * Instruction::kInstrSize);
   }
 }