Use a breakpoint instruction for a stop message on arm instead of

runtime/vm/simulator_arm.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include <setjmp.h>  // NOLINT
 #include <stdlib.h>
 
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_ARM)
 
@@ skipping 1488 matching lines @@
 typedef double (*SimulatorLeafFloatRuntimeCall)(double d0, double d1);
 
 // Calls to native Dart functions are based on this interface.
 typedef void (*SimulatorBootstrapNativeCall)(NativeArguments* arguments);
 typedef void (*SimulatorNativeCall)(NativeArguments* arguments, uword target);
 
 
 void Simulator::SupervisorCall(Instr* instr) {
   int svc = instr->SvcField();
   switch (svc) {
-    case kRedirectionSvcCode: {
+    case Instr::kSimulatorRedirectCode: {
       SimulatorSetjmpBuffer buffer(this);
 
       if (!setjmp(buffer.buffer_)) {
         int32_t saved_lr = get_register(LR);
         Redirection* redirection = Redirection::FromSvcInstruction(instr);
         uword external = redirection->external_function();
         if (IsTracingExecution()) {
           OS::Print("Call to host function at 0x%" Pd "\n", external);
         }
 
@@ skipping 100 matching lines @@
 
         // Return.
         set_pc(saved_lr);
       } else {
         // Coming via long jump from a throw. Continue to exception handler.
         set_top_exit_frame_info(0);
       }
 
       break;
     }
-    case kBreakpointSvcCode: {
+    case Instr::kSimulatorBreakCode: {
       SimulatorDebugger dbg(this);
       dbg.Stop(instr, "breakpoint");
       break;
     }
-    case kStopMessageSvcCode: {
-      SimulatorDebugger dbg(this);
-      const char* message = *reinterpret_cast<const char**>(
-          reinterpret_cast<intptr_t>(instr) - Instr::kInstrSize);
-      set_pc(get_pc() + Instr::kInstrSize);
-      dbg.Stop(instr, message);
-      break;
-    }
     default: {
       UNREACHABLE();
       break;
     }
   }
 }
 
 
 // Handle execution based on instruction types.
 
@@ skipping 36 matching lines @@
           int32_t rm_val = get_register(rm);
           intptr_t pc = get_pc();
           set_register(LR, pc + Instr::kInstrSize);
           set_pc(rm_val);
           break;
         }
         case 7: {
           if ((instr->Bits(21, 2) == 0x1) && (instr->ConditionField() == AL)) {
             // Format(instr, "bkpt #'imm12_4");
             SimulatorDebugger dbg(this);
-            set_pc(get_pc() + Instr::kInstrSize);
-            char buffer[32];
-            snprintf(buffer, sizeof(buffer), "bkpt #0x%x", instr->BkptField());
-            dbg.Stop(instr, buffer);
+            int32_t imm = instr->BkptField();
+            if (imm == Instr::kStopMessageCode) {
+              const char* message = *reinterpret_cast<const char**>(
+                  reinterpret_cast<intptr_t>(instr) - Instr::kInstrSize);
+              set_pc(get_pc() + Instr::kInstrSize);
+              dbg.Stop(instr, message);
+            } else {
+              char buffer[32];
+              snprintf(buffer, sizeof(buffer), "bkpt #0x%x", imm);
+              set_pc(get_pc() + Instr::kInstrSize);
+              dbg.Stop(instr, buffer);
+            }
           } else {
              // Format(instr, "smc'cond");
             UnimplementedInstruction(instr);
           }
           break;
         }
         default: {
           UnimplementedInstruction(instr);
           break;
         }
@@ skipping 2160 matching lines @@
   set_register(kExceptionObjectReg, bit_cast<int32_t>(raw_exception));
   set_register(kStackTraceObjectReg, bit_cast<int32_t>(raw_stacktrace));
   buf->Longjmp();
 }
 
 }  // namespace dart
 
 #endif  // !defined(HOST_ARCH_ARM)
 
 #endif  // defined TARGET_ARCH_ARM