Stackable IRT

src/untrusted/nacl/start.c

 /*
  * 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 <unistd.h>
 
 #include "native_client/src/include/elf32.h"
+#include "native_client/src/untrusted/irt/irt_module.h"
 #include "native_client/src/untrusted/nacl/nacl_irt.h"
 #include "native_client/src/untrusted/nacl/nacl_startup.h"
 #include "native_client/src/untrusted/nacl/start.h"
 #include "native_client/src/untrusted/nacl/tls.h"
 
 
 void __libc_init_array(void);
 void __libc_fini_array(void);
 
 /*
@@ skipping 19 matching lines @@
 
   environ = envp;
 
   /*
    * Record the approximate address from which the stack grows
    * (usually downwards) so that libpthread can report it.  Taking the
    * address of any stack-allocated variable will work here.
    */
   __nacl_initial_thread_stack_end = &info;
 
-  __libnacl_irt_init(auxv);
+  __libnacl_irt_init(argc, argv, auxv);
 
   /*
    * If we were started by a dynamic linker, then it passed its finalizer
    * function here.  For static linking, this is always NULL.
    */
   if (fini != NULL)
     atexit(fini);
 
   atexit(&__libc_fini_array);
 
   __pthread_initialize();
 
   __libc_init_array();
 
+  /*
+  {
+    struct nacl_irt *irt = nacl_irt_new(NULL, __nacl_irt_query, NULL);
+    if (irt != NULL) {
+      nacl_irt_layer_init(irt->layer);
+    }
+  }
+  */
+
   int (*main_ptr)(int argc, char **argv, char **envp) = &__nacl_main;
   if (main_ptr == NULL)
     main_ptr = &main;
 
   exit(main_ptr(argc, argv, envp));
 
   /*NOTREACHED*/
   while (1) *(volatile int *) 0;  /* Crash.  */
 }