src/trusted/service_runtime/arch/arm/sel_ldr_arm.h - Issue 11194045: Change BKPT and UDF encodings on ARM.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Factor out special BKPT/UDF encodings in a separate header file instead of repeating them in a few … 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:

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..210aa037bee48c7f502f71e0cb0e6e3929110ede 100644

--- a/src/trusted/service_runtime/arch/arm/sel_ldr_arm.h

+++ b/src/trusted/service_runtime/arch/arm/sel_ldr_arm.h

@@ -7,6 +7,7 @@

#ifndef SERVICE_RUNTIME_ARCH_ARM_SEL_LDR_H__

#define SERVICE_RUNTIME_ARCH_ARM_SEL_LDR_H__ 1

+#include "native_client/src/include/arm_sandbox.h"

#include "native_client/src/include/portability.h"

#include "native_client/src/trusted/service_runtime/nacl_config.h"

@@ -24,7 +25,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 NACL_INSTR_HALT_FILL

#define NACL_HALT_LEN 4 /* length of halt instruction */

#endif /* defined(NACL_TARGET_ARM_THUMB2_MODE) */

#define NACL_HALT_WORD NACL_HALT_OPCODE