Complete and clean up breakpoint support in all 3 debuggers embedded in MIPS,

runtime/vm/constants_mips.h

 // 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.
 
 #ifndef VM_CONSTANTS_MIPS_H_
 #define VM_CONSTANTS_MIPS_H_
 
 #include "platform/assert.h"
 
 namespace dart {
@@ skipping 441 matching lines @@
 
 class Instr {
  public:
   enum {
     kInstrSize = 4,
   };
 
   static const int32_t kNopInstruction = 0;
 
   // Reserved break instruction codes.
-  static const int32_t kStopMessageCode = 1 << 16;  // For Stop(message).
-  static const int32_t kRedirectCode = 2 << 16;  // For call redirection in sim.
-  static const int32_t kMsgMessageCode = 3 << 16;  // For trace message in sim.
-  static const int32_t kSimulatorBreakCode = 4 << 16;  // For breakpoint in sim.
+  static const int32_t kBreakPointCode = 0xdeb0;  // For breakpoint.
+  static const int32_t kStopMessageCode = 0xdeb1;  // For Stop(message).
+  static const int32_t kSimulatorMessageCode = 0xdeb2;  // For trace msg in sim.
+  static const int32_t kSimulatorBreakCode = 0xdeb3;  // For breakpoint in sim.
+  static const int32_t kSimulatorRedirectCode = 0xca11;  // For redirection.
 
-  // General breakpoint instruction: break(0), for user breakpoint and to fill
-  // assembler code buffers in debug mode.
+  static const int32_t kBreakPointZeroInstruction =
+      (SPECIAL << kOpcodeShift) | (BREAK << kFunctionShift);
+
+  // Breakpoint instruction filling assembler code buffers in debug mode.
   static const int32_t kBreakPointInstruction =
-      (SPECIAL << kOpcodeShift) | (BREAK << kFunctionShift);
+      kBreakPointZeroInstruction | (kBreakPointCode << kBreakCodeShift);
+
+  // Breakpoint instruction used by the simulator.
+  // Should be distinct from kBreakPointInstruction and from a typical user
+  // breakpoint inserted in generated code for debugging, e.g. break_(0).
+  static const int32_t kSimulatorBreakpointInstruction =
+      kBreakPointZeroInstruction | (kSimulatorBreakCode << kBreakCodeShift);
+
+  // Runtime call redirection instruction used by the simulator.
+  static const int32_t kSimulatorRedirectInstruction =
+      kBreakPointZeroInstruction | (kSimulatorRedirectCode << kBreakCodeShift);
 
   // Get the raw instruction bits.
   inline int32_t InstructionBits() const {
     return *reinterpret_cast<const int32_t*>(this);
   }
 
   // Set the raw instruction bits to value.
   inline void SetInstructionBits(int32_t value) {
     *reinterpret_cast<int32_t*>(this) = value;
   }
@@ skipping 139 matching lines @@
 #endif  // defined(DEBUG)
 
  private:
   DISALLOW_ALLOCATION();
   DISALLOW_IMPLICIT_CONSTRUCTORS(Instr);
 };
 
 }  // namespace dart
 
 #endif  // VM_CONSTANTS_MIPS_H_