| 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/arm_sandbox.h" |
| 11 #include "native_client/src/include/portability.h" | 11 #include "native_client/src/include/portability.h" |
| 12 #include "native_client/src/trusted/service_runtime/nacl_config.h" | 12 #include "native_client/src/trusted/service_runtime/nacl_config.h" |
| 13 | 13 |
| 14 /* NOTE: we hope to unify this among archtectures */ | 14 /* NOTE: we hope to unify this among archtectures */ |
| 15 #define NACL_MAX_ADDR_BITS 30 | 15 #define NACL_MAX_ADDR_BITS 30 |
| 16 | 16 |
| 17 #define NACL_ADDRSPACE_LOWER_GUARD_SIZE 0 | 17 #define NACL_ADDRSPACE_LOWER_GUARD_SIZE 0 |
| 18 #define NACL_ADDRSPACE_UPPER_GUARD_SIZE 0x2000 | 18 #define NACL_ADDRSPACE_UPPER_GUARD_SIZE 0x2000 |
| 19 | 19 |
| 20 #define NACL_THREAD_MAX 8192 /* arbitrary, can be larger */ | 20 #define NACL_THREAD_MAX 8192 /* arbitrary, can be larger */ |
| 21 | 21 |
| 22 #if defined(NACL_TARGET_ARM_THUMB2_MODE) | 22 #if defined(NACL_TARGET_ARM_THUMB2_MODE) |
| 23 #define NACL_NOOP_OPCODE 0x46c0 /* mov r8, r8 */ | 23 #define NACL_NOOP_OPCODE 0x46c0 /* mov r8, r8 */ |
| 24 #define NACL_HALT_OPCODE 0xbe00 /* bkpt 0x0000 */ | 24 #define NACL_HALT_OPCODE 0xbe00 /* bkpt 0x0000 */ |
| 25 #define NACL_HALT_LEN 2 /* length of halt instruction */ | 25 #define NACL_HALT_LEN 2 /* length of halt instruction */ |
| 26 #else | 26 #else |
| 27 #define NACL_NOOP_OPCODE 0xe1a00000 /* mov r0, r0 */ | 27 #define NACL_NOOP_OPCODE 0xe1a00000 /* mov r0, r0 */ |
| 28 #define NACL_HALT_OPCODE NACL_INSTR_HALT_FILL | 28 #define NACL_HALT_OPCODE NACL_INSTR_ARM_HALT_FILL |
| 29 #define NACL_HALT_LEN 4 /* length of halt instruction */ | 29 #define NACL_HALT_LEN 4 /* length of halt instruction */ |
| 30 #endif /* defined(NACL_TARGET_ARM_THUMB2_MODE) */ | 30 #endif /* defined(NACL_TARGET_ARM_THUMB2_MODE) */ |
| 31 #define NACL_HALT_WORD NACL_HALT_OPCODE | 31 #define NACL_HALT_WORD NACL_HALT_OPCODE |
| 32 | 32 |
| 33 #endif /* SERVICE_RUNTIME_ARCH_ARM_SEL_LDR_H__ */ | 33 #endif /* SERVICE_RUNTIME_ARCH_ARM_SEL_LDR_H__ */ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 11269063:
Fix the NACL_INSTR_* names that I just checked in to NACL_INSTR_ARM_*, as suggested by mseaborn. (Closed)
Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client