Support 64-bit reserved_at_zero value nacl-side

src/trusted/nonnacl_util/sel_ldr_launcher_standalone.cc

Index: src/trusted/nonnacl_util/sel_ldr_launcher_standalone.cc
diff --git a/src/trusted/nonnacl_util/sel_ldr_launcher_standalone.cc b/src/trusted/nonnacl_util/sel_ldr_launcher_standalone.cc
index 3797affdc171dd26e420043afb79a53945861174..f325d6876db1728e58eca09cb5fb340d2b14e892 100644
--- a/src/trusted/nonnacl_util/sel_ldr_launcher_standalone.cc
+++ b/src/trusted/nonnacl_util/sel_ldr_launcher_standalone.cc
@@ -59,8 +59,9 @@ void SelLdrLauncherStandalone::BuildCommandLine(vector<nacl::string>* command) {
     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.