Change BKPT and UDF encodings on ARM.

src/trusted/validator_arm/validator_huge_tests.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.
  */
 
 #ifndef NACL_TRUSTED_BUT_NOT_TCB
 #error This file is not meant for use in the TCB
 #endif
 
@@ skipping 88 matching lines @@
         // cccc 0001 0010 1111 1111 1111 00L1 mmmm
         ((i & 0x0FFFFFD0) == 0x012FFF10);
     uint32_t expected_branch_target = !expect_b_or_bl ?
         kDefaultBaseAddr :
         // imm32 = SignExtend(imm24:'00', 32);
         // PC reads as the address of the current instruction plus 8.
         (kDefaultBaseAddr + 8 + (((int32_t)i << 8) >> 6));
     uint32_t expected_branch_target_register = expect_bx_or_blx ?
         (i & 0xF) :  // When present, always Rm(3:0).
         nacl_arm_dec::Register::kNone;
-    bool expect_literal_pool_head =
-        (i == nacl_arm_dec::kLiteralPoolHeadInstruction);
+    bool expect_literal_pool_head =(i == nacl_arm_dec::kLiteralPoolHead);
     bool expect_load_store_or_unsafe = expect_unconditional ?
         // Advanced SIMD element or structure load/store instructions.
         // 1111 0100 xx0x xxxx xxxx xxxx xxxx xxxx
         ((i & 0x0F100000) == 0x04000000) :
         (  // Conditional instructions:
             // Synchronization primitives.
             // cccc 0001 xxxx xxxx xxxx xxxx 1001 xxxx
             ((i & 0x0F0000F0) == 0x01000090) ||
             // Extra load/store instructions[, unprivileged].
             // cccc 000x xxxx xxxx xxxx xxxx 1011 xxxx
@@ skipping 127 matching lines @@
   } while (i++ != last_i);
 }
 
 }  // anonymous namespace
 
 // Test driver function.
 int main(int argc, char *argv[]) {
   testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }