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

Unified Diff: tests/dynamic_code_loading/templates_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
Index: tests/dynamic_code_loading/templates_arm.S
diff --git a/tests/dynamic_code_loading/templates_arm.S b/tests/dynamic_code_loading/templates_arm.S
index 66b3e75808e984d070b864d9a29731041e580b66..0d6855386613a076793db8f8eab01576fa64af84 100644
--- a/tests/dynamic_code_loading/templates_arm.S
+++ b/tests/dynamic_code_loading/templates_arm.S
@@ -3,6 +3,7 @@
* 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"
#include "native_client/src/trusted/service_runtime/nacl_config.h"
#include "templates.h"
@@ -56,10 +57,10 @@ template_func_nonreplacement_end:
.global hlts_end
.p2align 4
hlts:
- bkpt 0x7777
- bkpt 0x7777
- bkpt 0x7777
- bkpt 0x7777
+ .word NACL_INSTR_HALT_FILL
+ .word NACL_INSTR_HALT_FILL
+ .word NACL_INSTR_HALT_FILL
+ .word NACL_INSTR_HALT_FILL
hlts_end:
« no previous file with comments | « tests/dynamic_code_loading/dyncode_demand_alloc_test.c ('k') | tests/faulted_thread_queue/faultqueue_test_guest.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698