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

Unified Diff: tests/syscall_return_sandboxing/sandboxed_arm.S

Issue 11194045: Change BKPT and UDF encodings on ARM. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Update copyright. 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
« no previous file with comments | « tests/faulted_thread_queue/faultqueue_test_guest.c ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/syscall_return_sandboxing/sandboxed_arm.S
diff --git a/tests/syscall_return_sandboxing/sandboxed_arm.S b/tests/syscall_return_sandboxing/sandboxed_arm.S
index 9daaaa5be137e5323f895d7b3420941ff24fdf86..2f75cf819648e2dd1fd5618a7d0180835dee8cb3 100644
--- a/tests/syscall_return_sandboxing/sandboxed_arm.S
+++ b/tests/syscall_return_sandboxing/sandboxed_arm.S
@@ -1,9 +1,11 @@
/*
- * Copyright 2010 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.
+ * 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 "native_client/src/include/arm_sandbox.h"
+
/*
* assume 32-byte trampoline slots, 16-byte bundles.
*/
@@ -32,7 +34,7 @@ bad: pop {lr}
bx lr
- bkpt 0x7777
+ .word NACL_INSTR_LITERAL_POOL_HEAD
/*
* Put a disallowed instruction here to ensure that the bkpt
* data bundle marker works. If the marker does not work, then
« no previous file with comments | « tests/faulted_thread_queue/faultqueue_test_guest.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698