Change BKPT and UDF encodings on ARM.

src/trusted/validator_arm/model.h

 /*
  * 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.
  */
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_ARM_V2_MODEL_H
 #define NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_ARM_V2_MODEL_H
 
 /*
@@ skipping 17 matching lines @@
  *    but anything nontrivial should go in model-inl.h.
  *  - Do not declare destructors.  A destructor causes an object to be passed
  *    on the stack, even when passed by value.  (This may be a GCC bug.)
  *    Adding a destructor to Instruction slowed the decoder down by 10% on
  *    gcc 4.3.3.
  */
 
 #include <stdint.h>
 #include <cstddef>
 #include <string>
+#include "native_client/src/include/arm_sandbox.h"
 #include "native_client/src/include/portability_bits.h"
 
 namespace nacl_arm_dec {
 
 class RegisterList;
 
 // Defines the architecture version of the ARM processor. Currently assumes
 // always 7.
 // TODO(karl): Generalize this to handle multiple versions, once we know how
 //             to do this.
@@ skipping 201 matching lines @@
   RegisterList& operator=(const RegisterList& r);  // Disallow assignment.
 };
 
 
 // The number of bits in an ARM instruction.
 static const int kArm32InstSize = 32;
 
 // The number of bits in a word of a THUMB instruction.
 static const int kThumbWordSize = 16;
 
-// BKPT #0x7777 is used as literal pool head.
-static const uint32_t kLiteralPoolHeadInstruction = 0xE1277777;
+// Special ARM instructions for sandboxing.
+static const uint32_t kLiteralPoolHead = NACL_INSTR_LITERAL_POOL_HEAD;
+static const uint32_t kBreakpoint = NACL_INSTR_BREAKPOINT;
+static const uint32_t kHaltFill = NACL_INSTR_HALT_FILL;
+static const uint32_t kAbortNow = NACL_INSTR_ABORT_NOW;
+static const uint32_t kFailValidation = NACL_INSTR_FAIL_VALIDATION;
 
 // Models an instruction, either a 32-bit ARM instruction of unspecified type,
 // or one word (16-bit) and two word (32-bit) THUMB instructions.
 //
 // This class is designed for efficiency:
 //  - Its public methods for bitfield extraction are short and inline.
 //  - It has no vtable, so on 32-bit platforms it's exactly the size of the
 //    instruction it models.
 //  - API's exist for accessing both ARM (32-bit) instructions and
 //    THUMB instructions (which are 1 or two (16-bit) words).
@@ skipping 219 matching lines @@
   }
 
  private:
   uint32_t bits_;
   Instruction& operator=(const Instruction& insn);  // Disallow assignment.
 };
 
 }  // namespace nacl_arm_dec
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_ARM_V2_MODEL_H