Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / native_client / src / trusted / service_runtime / nacl_config.h

diff --git a/src/native_client/src/trusted/service_runtime/nacl_config.h b/src/native_client/src/trusted/service_runtime/nacl_config.h
index 1144a02..3d099aa 100644 (file)
--- a/src/native_client/src/trusted/service_runtime/nacl_config.h
+++ b/src/native_client/src/trusted/service_runtime/nacl_config.h
@@ -72,19 +72,11 @@
 /*
  * Macro for the start address of the trampolines.
  */
-#if defined(NACL_TARGET_ARM_THUMB2_MODE)
-/*
- * Defining the start of the trampolines to something less than 64k allows
- * better representation with thumb2 immediates.
- */
-#define NACL_SYSCALL_START_ADDR       0x8000
-#else
 /*
  * The first 64KB (16 pages) are inaccessible.  On x86, this is to prevent
  * addr16/data16 attacks.
  */
 #define NACL_SYSCALL_START_ADDR       (16 << NACL_PAGESHIFT)
-#endif
 /* Macro for the start address of a specific trampoline.  */
 #define NACL_SYSCALL_ADDR(syscall_number) \
     (NACL_SYSCALL_START_ADDR + (syscall_number << NACL_SYSCALL_BLOCK_SHIFT))
@@ -114,15 +106,10 @@
  * NACL_TRAMPOLINE_END gives the address of the first byte after the
  * trampolines.
  */
-#if defined(NACL_TARGET_ARM_THUMB2_MODE)
-#define NACL_TRAMPOLINE_START 0x8000
-#define NACL_TRAMPOLINE_SIZE 0x8000
-#else
 #define NACL_NULL_REGION_SHIFT  16
 #define NACL_TRAMPOLINE_START   (1 << NACL_NULL_REGION_SHIFT)
 #define NACL_TRAMPOLINE_SHIFT   16
 #define NACL_TRAMPOLINE_SIZE    (1 << NACL_TRAMPOLINE_SHIFT)
-#endif  /* defined(NACL_TARGET_ARM_THUMB2_MODE) */
 #define NACL_TRAMPOLINE_END     (NACL_TRAMPOLINE_START + NACL_TRAMPOLINE_SIZE)
 
 /*
@@ -233,17 +220,10 @@
 # define NACL_ELF_E_MACHINE       EM_ARM
 # define NACL_BLOCK_SHIFT         (4)
 
-# if defined(NACL_TARGET_ARM_THUMB2_MODE)
-#  define NACL_NOOP_OPCODE        0x46c0      /* mov r8, r8 */
-#  define NACL_HALT_OPCODE        0xbe00      /* bkpt 0x0000 */
-#  define NACL_HALT_LEN           2           /* length of halt instruction */
-#  define NACL_HALT_WORD          0xbe00be00
-# else
-#  define NACL_NOOP_OPCODE        0xe1a00000  /* mov r0, r0 */
-#  define NACL_HALT_OPCODE        NACL_INSTR_ARM_HALT_FILL
-#  define NACL_HALT_LEN           4           /* length of halt instruction */
-#  define NACL_HALT_WORD          NACL_HALT_OPCODE
-# endif  /* defined(NACL_TARGET_ARM_THUMB2_MODE) */
+# define NACL_NOOP_OPCODE         0xe1a00000  /* mov r0, r0 */
+# define NACL_HALT_OPCODE         NACL_INSTR_ARM_HALT_FILL
+# define NACL_HALT_LEN            4           /* length of halt instruction */
+# define NACL_HALT_WORD           NACL_HALT_OPCODE
 
 /* 16-byte bundles, 1G address space */
 # define NACL_CONTROL_FLOW_MASK      0xC000000F