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

Unified Diff: tests/faulted_thread_queue/faultqueue_test_guest.c

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/dynamic_code_loading/templates_arm.S ('k') | tests/syscall_return_sandboxing/sandboxed_arm.S » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/faulted_thread_queue/faultqueue_test_guest.c
diff --git a/tests/faulted_thread_queue/faultqueue_test_guest.c b/tests/faulted_thread_queue/faultqueue_test_guest.c
index ecf9e814fbf4002e4c405a0f45a88a74ade1848c..eeec1db97a614530e76781cb2f1f41ce00429aea 100644
--- a/tests/faulted_thread_queue/faultqueue_test_guest.c
+++ b/tests/faulted_thread_queue/faultqueue_test_guest.c
@@ -8,6 +8,8 @@
#include <setjmp.h>
#include <stdio.h>
+#include "native_client/src/include/arm_sandbox.h"
+#include "native_client/src/include/nacl_macros.h"
#include "native_client/tests/common/register_set.h"
@@ -67,7 +69,7 @@ int main(int argc, char **argv) {
ASM_WITH_REGS(
expected_regs,
".p2align 4\n"
- "FaultAddr: bkpt 0x7777\n"
+ "FaultAddr: .word " NACL_TO_STRING(NACL_INSTR_HALT_FILL) "\n"
/*
* ARM does not provide hardware single-stepping so we do not
* test it here, unlike in the x86 case.
« no previous file with comments | « tests/dynamic_code_loading/templates_arm.S ('k') | tests/syscall_return_sandboxing/sandboxed_arm.S » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698