Change BKPT and UDF encodings on ARM.

src/trusted/debug_stub/abi.cc

 /*
  * Copyright (c) 2012 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <assert.h>
 
 #include <map>
 #include <string>
 
+#include "native_client/src/include/arm_sandbox.h"
 #include "native_client/src/shared/platform/nacl_log.h"
 #include "native_client/src/trusted/debug_stub/abi.h"
 #include "native_client/src/trusted/debug_stub/platform.h"
 
 using port::IPlatform;
 
 namespace gdb_rsp {
 
 #define MINIDEF(x, name, purpose) { #name, sizeof(x), Abi::purpose, 0, 0 }
 
@@ skipping 100 matching lines @@
 //     a fault.  INT3 leaves %eip/%rip pointing to the address after
 //     the INT3 instruction, which makes it harder to tell
 //     unambiguously whether a fault was produced by an INT3 or the
 //     instruction after it.
 static uint8_t breakpoint_code_x86[] = { 0xf4 /* HLT */ };
 static Abi::BPDef breakpoint_x86 = {
   sizeof(breakpoint_code_x86),
   breakpoint_code_x86
 };
 
-static uint32_t breakpoint_code_arm[] = { 0xe1277777 /* bkpt 0x7777 */ };
+static uint32_t breakpoint_code_arm[] = { NACL_INSTR_BREAKPOINT };
 static Abi::BPDef breakpoint_arm = {
   sizeof(breakpoint_code_arm),
   (uint8_t *) breakpoint_code_arm
 };
 
 static AbiMap_t *GetAbis() {
   static AbiMap_t *_abis = new AbiMap_t();
   return _abis;
 }
 
@@ skipping 107 matching lines @@
   if (index >= regCnt_) return NULL;
 
   return &regDefs_[index];
 }
 
 const Abi::RegDef *Abi::GetInstPtrDef() const {
   return GetRegisterDef(ipIndex_);
 }
 
 }  // namespace gdb_rsp