Support 64-bit reserved_at_zero value nacl-side

src/trusted/nonnacl_util/sel_ldr_launcher_standalone.cc

 /*
  * Copyright (c) 2012 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.
  */
 
 #include <assert.h>
 
 #include <algorithm>
 #include <iterator>
@@ skipping 41 matching lines @@
 
 void SelLdrLauncherStandalone::BuildCommandLine(vector<nacl::string>* command) {
   assert(sel_ldr_ != NACL_NO_FILE_PATH);  // Set by InitCommandLine().
   if (!command_prefix_.empty())
     command->insert(command->end(),
                     command_prefix_.begin(), command_prefix_.end());
   if (!sel_ldr_bootstrap_.empty())
     command->push_back(sel_ldr_bootstrap_);
   command->push_back(sel_ldr_);
   if (!sel_ldr_bootstrap_.empty()) {
-    command->push_back("--r_debug=0xXXXXXXXXXXXXXXXX");
-    command->push_back("--reserved_at_zero=0xXXXXXXXX");
+    static const nacl::string kTemplateDigits = "XXXXXXXXXXXXXXXX";
+    command->push_back("--r_debug=0x" + kTemplateDigits);

[Mark Seaborn, 2012/07/30 18:51:12]

You could avoid a runtime concatenation by inlining kTemplateDigits into this
string, or by #defining this as you do in nacl_bootstrap.c.

[Austin Benson, 2012/07/31 23:24:12]

Inlined.

+    command->push_back("--reserved_at_zero=0x" + kTemplateDigits);
   }
   command->push_back("-R");  // RPC will be used to point to the nexe.
 
   command->insert(command->end(), sel_ldr_argv_.begin(), sel_ldr_argv_.end());
 
   struct NaClEnvCleanser env_cleanser;
   NaClEnvCleanserCtor(&env_cleanser, 1);
   if (!NaClEnvCleanserInit(&env_cleanser, GetEnviron(), NULL)) {
     NaClLog(LOG_FATAL, "Failed to initialise env cleanser\n");
   }
@@ skipping 68 matching lines @@
     args_for_sel_ldr.push_back("-B");
     args_for_sel_ldr.push_back(irt_library_path);
   }
   if (!StartViaCommandLine(prefix, args_for_sel_ldr, args_for_nexe)) {
     return false;
   }
   return true;
 }
 
 }  // namespace nacl