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

Unified Diff: src/trusted/service_runtime/arch/arm/nacl_text_pad_test.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 | « src/trusted/debug_stub/abi.cc ('k') | src/trusted/service_runtime/arch/arm/sel_ldr_arm.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/trusted/service_runtime/arch/arm/nacl_text_pad_test.S
diff --git a/src/trusted/service_runtime/arch/arm/nacl_text_pad_test.S b/src/trusted/service_runtime/arch/arm/nacl_text_pad_test.S
index 27ba76630138c6b20cf6d6394f3217bcfd1010bf..fd5c296b42c4df0acdfe365d6616a9a1359083f0 100644
--- a/src/trusted/service_runtime/arch/arm/nacl_text_pad_test.S
+++ b/src/trusted/service_runtime/arch/arm/nacl_text_pad_test.S
@@ -3,10 +3,10 @@
* 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/include/bits/nacl_syscalls.h"
#include "native_client/src/trusted/service_runtime/nacl_config.h"
-#define halt 0xe1266676
/* the macros below are used with movw/movt and absolute values */
/* llvm-mc does not like the use of :lower16:/:upper16: with absolute values */
/* c.f.: http://llvm.org/bugs/show_bug.cgi?id=8721 */
@@ -224,10 +224,11 @@ _start:
/* NOTE: unlike x86 the alignment directive on ARM takes
the logarithm of the alignment */
#define POW2_BIGGER_THAN_DOT 14
- .align32 POW2_BIGGER_THAN_DOT, halt
- .fill (TEXT_EXTEND - (1 << POW2_BIGGER_THAN_DOT))/4, 4, halt
+ .align32 POW2_BIGGER_THAN_DOT, NACL_INSTR_HALT_FILL
+ .fill (TEXT_EXTEND - (1 << POW2_BIGGER_THAN_DOT))/4, 4, \
+ NACL_INSTR_HALT_FILL
#else
- .fill (TEXT_EXTEND - (. - start_of_text))/4, 4, halt
+ .fill (TEXT_EXTEND - (. - start_of_text))/4, 4, NACL_INSTR_HALT_FILL
#endif
end_of_text:
« no previous file with comments | « src/trusted/debug_stub/abi.cc ('k') | src/trusted/service_runtime/arch/arm/sel_ldr_arm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698