Intial Thumb2 Sandbox (naclrev 6680)

src/trusted/service_runtime/elf_util.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.
  */
 
 /*
  * NaCl helper functions to deal with elf images
  */
 
@@ skipping 249 matching lines @@
     }
 
     /*
      * We will load this segment later.  Do the sanity checks.
      */
     if (0 != nacl_phdr_check_data[j].p_vaddr
         && (nacl_phdr_check_data[j].p_vaddr != php->p_vaddr)) {
       NaClLog(2,
               ("Segment %d: bad virtual address: 0x%08"
                NACL_PRIxElf_Addr","
-               " expected 0x%08"NACL_PRIxElf_Addr"\n"),
+               " expected 0x%08"NACL_PRIxElf_Addr", reference segment %d\n"),
               segnum,
               php->p_vaddr,
-              nacl_phdr_check_data[j].p_vaddr);
+              nacl_phdr_check_data[j].p_vaddr, (int) j);

[bsy, 2011/09/27 23:27:28]

use NACL_PRIdS in the format string as in other NaClLog statement above (L250)
and omit this cast.

       return LOAD_SEGMENT_BAD_LOC;
     }
     if (php->p_vaddr < NACL_TRAMPOLINE_END) {
       NaClLog(2,
               ("Segment %d: virtual address (0x%08"NACL_PRIxElf_Addr
                ") too low\n"),
               segnum,
               php->p_vaddr);
       return LOAD_SEGMENT_OUTSIDE_ADDRSPACE;
     }
@@ skipping 368 matching lines @@
 
 
 void NaClElfImageDelete(struct NaClElfImage *image) {
   free(image);
 }
 
 
 uintptr_t NaClElfImageGetEntryPoint(struct NaClElfImage *image) {
   return image->ehdr.e_entry;
 }