Fixes some bugs with memory setup and halt-sled allocation and...

src/trusted/service_runtime/sel_ldr.c

 /*
  * Copyright 2008 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 <string.h>
 
 /*
  * NaCl Simple/secure ELF loader (NaCl SEL).
@@ skipping 343 matching lines @@
 }
 
 void  NaClMemRegionPrinter(void                   *state,
                            struct NaClVmmapEntry  *entry) {
   struct Gio *gp = (struct Gio *) state;
 
   gprintf(gp, "\nPage   %"NACL_PRIdPTR" (0x%"NACL_PRIxPTR")\n",
           entry->page_num, entry->page_num);
   gprintf(gp,   "npages %"NACL_PRIdS" (0x%"NACL_PRIxS")\n", entry->npages,
           entry->npages);
+  gprintf(gp,   "start vaddr 0x%"NACL_PRIxPTR"\n",
+          entry->page_num << NACL_PAGESHIFT);
+  gprintf(gp,   "end vaddr   0x%"NACL_PRIxPTR"\n",
+          (entry->page_num + entry->npages) << NACL_PAGESHIFT);
   gprintf(gp,   "prot   0x%08x\n", entry->prot);
   gprintf(gp,   "%sshared/backed by a file\n",
           (NULL == entry->nmop) ? "not " : "");
 }
 
 void  NaClAppPrintDetails(struct NaClApp  *nap,
                           struct Gio      *gp) {
   NaClXMutexLock(&nap->mu);
   gprintf(gp,
           "NaClAppPrintDetails((struct NaClApp *) 0x%08"NACL_PRIxPTR","
@@ skipping 85 matching lines @@
       return "Read-only data segment overlaps data segment";
     case LOAD_DATA_NOT_LAST_SEGMENT:
       return "Data segment exists, but is not last segment";
     case LOAD_NO_DATA_BUT_RODATA_NOT_LAST_SEGMENT:
       return ("No data segment, read-only data segment exists,"
               " but is not last segment");
     case LOAD_TEXT_OVERLAPS_RODATA:
       return "Text segment overlaps rodata segment";
     case LOAD_TEXT_OVERLAPS_DATA:
       return "No rodata segment, and text segment overlaps data segment";
+    case LOAD_BAD_RODATA_ALIGNMENT:
+      return "The rodata segment is not properly aligned";
+    case LOAD_BAD_DATA_ALIGNMENT:
+      return "The data segment is not properly aligned";
     case LOAD_UNLOADABLE:
       return "Error during loading";
     case LOAD_BAD_ELF_TEXT:
       return "ELF file contains no text segment";
     case LOAD_TEXT_SEG_TOO_BIG:
       return "ELF file text segment too large";
     case LOAD_DATA_SEG_TOO_BIG:
       return "ELF file data segment(s) too large";
     case LOAD_MPROTECT_FAIL:
       return "Cannot protect pages";
@@ skipping 674 matching lines @@
   nacl_global_xlate_base = mem_start;
 
 #ifdef __GNUC__
   _ovly_debug_event ();
 #endif
 }
 
 void NaClGdbHook(struct NaClApp const *nap) {
   StopForDebuggerInit(nap->mem_start);
 }