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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side 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: 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 /*	1 /*

2 * Copyright (c) 2012 The Native Client Authors. All rights reserved.	2 * Copyright (c) 2012 The Native Client Authors. All rights reserved.

3 * Use of this source code is governed by a BSD-style license that can be	3 * Use of this source code is governed by a BSD-style license that can be

4 * found in the LICENSE file.	4 * found in the LICENSE file.

5 */	5 */

6	6

7 #ifndef SERVICE_RUNTIME_ARCH_ARM_SEL_LDR_H__	7 #ifndef SERVICE_RUNTIME_ARCH_ARM_SEL_LDR_H__

8 #define SERVICE_RUNTIME_ARCH_ARM_SEL_LDR_H__ 1	8 #define SERVICE_RUNTIME_ARCH_ARM_SEL_LDR_H__ 1

9	9

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

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

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

12	13

13 /* NOTE: we hope to unify this among archtectures */	14 /* NOTE: we hope to unify this among archtectures */

14 #define NACL_MAX_ADDR_BITS 30	15 #define NACL_MAX_ADDR_BITS 30

15	16

16 #define NACL_ADDRSPACE_LOWER_GUARD_SIZE 0	17 #define NACL_ADDRSPACE_LOWER_GUARD_SIZE 0

17 #define NACL_ADDRSPACE_UPPER_GUARD_SIZE 0x2000	18 #define NACL_ADDRSPACE_UPPER_GUARD_SIZE 0x2000

18	19

19 #define NACL_THREAD_MAX 8192 /* arbitrary, can be larger */	20 #define NACL_THREAD_MAX 8192 /* arbitrary, can be larger */

20	21

21 #if defined(NACL_TARGET_ARM_THUMB2_MODE)	22 #if defined(NACL_TARGET_ARM_THUMB2_MODE)

22 #define NACL_NOOP_OPCODE 0x46c0 /* mov r8, r8 */	23 #define NACL_NOOP_OPCODE 0x46c0 /* mov r8, r8 */

23 #define NACL_HALT_OPCODE 0xbe00 /* bkpt 0x0000 */	24 #define NACL_HALT_OPCODE 0xbe00 /* bkpt 0x0000 */

24 #define NACL_HALT_LEN 2 /* length of halt instruction */	25 #define NACL_HALT_LEN 2 /* length of halt instruction */

25 #else	26 #else

26 #define NACL_NOOP_OPCODE 0xe1a00000 /* mov r0, r0 */	27 #define NACL_NOOP_OPCODE 0xe1a00000 /* mov r0, r0 */

27 #define NACL_HALT_OPCODE 0xe1266676 /* bkpt 6666 */	28 #define NACL_HALT_OPCODE NACL_INSTR_HALT_FILL

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

29 #endif /* defined(NACL_TARGET_ARM_THUMB2_MODE) */	30 #endif /* defined(NACL_TARGET_ARM_THUMB2_MODE) */

30 #define NACL_HALT_WORD NACL_HALT_OPCODE	31 #define NACL_HALT_WORD NACL_HALT_OPCODE

31	32

32 #endif /* SERVICE_RUNTIME_ARCH_ARM_SEL_LDR_H__ */	33 #endif /* SERVICE_RUNTIME_ARCH_ARM_SEL_LDR_H__ */

OLD	NEW