Support 64-bit reserved_at_zero value nacl-side

src/trusted/service_runtime/linux/nacl_bootstrap.c

 /*
  * Copyright (c) 2011 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  * This is a standalone program that loads and runs the dynamic linker.
  * This program itself must be linked statically.  To keep it small, it's
  * written to avoid all dependencies on libc and standard startup code.
  * Hence, this should be linked using -nostartfiles.  It must be compiled
  * with -fno-stack-protector to ensure the compiler won't emit code that
@@ skipping 26 matching lines @@
 
 typedef uintptr_t __attribute__((may_alias)) stack_val_t;
 
 /*
  * These exact magic argument strings are recognized in check_r_debug_arg
  * and check_reserved_at_zero_arg, below. Requiring the arguments to have
  * those Xs as a template both simplifies our argument matching code and saves
  * us from having to reformat the whole stack to find space for a string longer
  * than the original argument.
  */
+#define TEMPLATE_DIGITS "XXXXXXXXXXXXXXXX"
 #define R_DEBUG_TEMPLATE_PREFIX "--r_debug=0x"
-#define R_DEBUG_TEMPLATE_DIGITS "XXXXXXXXXXXXXXXX"
-static const char kRDebugTemplate[] =
-    R_DEBUG_TEMPLATE_PREFIX R_DEBUG_TEMPLATE_DIGITS;
+static const char kRDebugTemplate[] = R_DEBUG_TEMPLATE_PREFIX TEMPLATE_DIGITS;
 static const size_t kRDebugPrefixLen = sizeof(R_DEBUG_TEMPLATE_PREFIX) - 1;
 
 #define RESERVED_AT_ZERO_TEMPLATE_PREFIX "--reserved_at_zero=0x"
-#define RESERVED_AT_ZERO_TEMPLATE_DIGITS "XXXXXXXX"
 static const char kReservedAtZeroTemplate[] =
-    RESERVED_AT_ZERO_TEMPLATE_PREFIX RESERVED_AT_ZERO_TEMPLATE_DIGITS;
+    RESERVED_AT_ZERO_TEMPLATE_PREFIX TEMPLATE_DIGITS;
 static const size_t kReservedAtZeroPrefixLen =
     sizeof(RESERVED_AT_ZERO_TEMPLATE_PREFIX) - 1;
 extern size_t RESERVE_TOP;
 
 /*
  * We're not using <string.h> functions here, to avoid dependencies.
  * In the x86 libc, even "simple" functions like memset and strlen can
  * depend on complex startup code, because in newer libc
  * implementations they are defined using STT_GNU_IFUNC.
  */
@@ skipping 344 matching lines @@
  */
 struct r_debug _r_debug __attribute__((nocommon, section(".r_debug")));
 
 /*
  * If the argument matches the kRDebugTemplate string, then replace
  * the 16 Xs with the hexadecimal address of our _r_debug variable.
  */
 static int check_r_debug_arg(char *arg) {
   if (my_strcmp(arg, kRDebugTemplate) == 0) {
     fill_in_template_digits(arg + kRDebugPrefixLen,
-                            sizeof(R_DEBUG_TEMPLATE_DIGITS) - 1,
+                            sizeof(TEMPLATE_DIGITS) - 1,
                             (uintptr_t) &_r_debug);
     return 1;
   }
   return 0;
 }
 
 /*
  * If the argument matches the kReservedAtZeroTemplate string, then replace
  * the 8 Xs with the hexadecimal representation of the amount of
  * prereserved memory.
  */
 static int check_reserved_at_zero_arg(char *arg) {
   if (my_strcmp(arg, kReservedAtZeroTemplate) == 0) {
     fill_in_template_digits(arg + kReservedAtZeroPrefixLen,
-                            sizeof(RESERVED_AT_ZERO_TEMPLATE_DIGITS) - 1,
+                            sizeof(TEMPLATE_DIGITS) - 1,
                             (uintptr_t) &RESERVE_TOP);
     return 1;
   }
   return 0;
 }
 
 
 /*
  * This is the main loading code.  It's called with the starting stack pointer.
  * This points to a sequence of pointer-size words:
@@ skipping 177 matching lines @@
 
 #if defined(__arm__)
 /*
  * We may bring in __aeabi_* functions from libgcc that in turn
  * want to call raise.
  */
 int raise(int sig) {
   return sys_kill(sys_getpid(), sig);
 }
 #endif