Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1119)

Unified Diff: src/trusted/service_runtime/arch/arm/sel_ldr_arm.h

Issue 11194045: Change BKPT and UDF encodings on ARM. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/trusted/service_runtime/arch/arm/sel_ldr_arm.h
diff --git a/src/trusted/service_runtime/arch/arm/sel_ldr_arm.h b/src/trusted/service_runtime/arch/arm/sel_ldr_arm.h
index 04e791e0127dacb92369ab4a97a7ea4302928faa..1d1875d9793930172f18ce28b2b5149f294120f9 100644
--- a/src/trusted/service_runtime/arch/arm/sel_ldr_arm.h
+++ b/src/trusted/service_runtime/arch/arm/sel_ldr_arm.h
@@ -24,7 +24,7 @@
#define NACL_HALT_LEN 2 /* length of halt instruction */
#else
#define NACL_NOOP_OPCODE 0xe1a00000 /* mov r0, r0 */
-#define NACL_HALT_OPCODE 0xe1266676 /* bkpt 6666 */
+#define NACL_HALT_OPCODE 0xE7FEDEFF /* UDF #0xEDEF */
#define NACL_HALT_LEN 4 /* length of halt instruction */
#endif /* defined(NACL_TARGET_ARM_THUMB2_MODE) */
#define NACL_HALT_WORD NACL_HALT_OPCODE

Powered by Google App Engine
This is Rietveld 408576698