Provide metadata to validator to allow faster caching.

src/trusted/service_runtime/elf_util.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.
  */
 
 /*
  * NaCl helper functions to deal with elf images
  */
 
@@ skipping 14 matching lines @@
 #include "native_client/src/shared/gio/gio.h"
 #include "native_client/src/shared/platform/nacl_log.h"
 
 #include "native_client/src/trusted/service_runtime/elf_util.h"
 #include "native_client/src/trusted/service_runtime/include/bits/mman.h"
 #include "native_client/src/trusted/service_runtime/nacl_config.h"
 #include "native_client/src/trusted/service_runtime/nacl_syscall_common.h"
 #include "native_client/src/trusted/service_runtime/nacl_text.h"
 #include "native_client/src/trusted/service_runtime/nacl_valgrind_hooks.h"
 #include "native_client/src/trusted/service_runtime/sel_memory.h"
+#include "native_client/src/trusted/validator/validation_metadata.h"
 
 /* private */
 struct NaClElfImage {
   Elf_Ehdr  ehdr;
   Elf_Phdr  phdrs[NACL_MAX_PROGRAM_HEADERS];
   int       loadable[NACL_MAX_PROGRAM_HEADERS];
 };
 
 
 enum NaClPhdrCheckAction {
@@ skipping 571 matching lines @@
     /* region from p_filesz to p_memsz should already be zero filled */
 
     /* Tell Valgrind that we've mapped a segment of nacl_file. */
     NaClFileMappingForValgrind(paddr, filesz, offset);
   }
 
   return LOAD_OK;
 }
 
 
-NaClErrorCode NaClElfImageLoadDynamically(struct NaClElfImage *image,
-                                          struct NaClApp      *nap,
-                                          struct Gio          *gfile) {
+NaClErrorCode NaClElfImageLoadDynamically(
+    struct NaClElfImage *image,
+    struct NaClApp *nap,
+    struct Gio *gfile,
+    struct NaClValidationMetadata *metadata) {
   int segnum;
   for (segnum = 0; segnum < image->ehdr.e_phnum; ++segnum) {
     const Elf_Phdr *php = &image->phdrs[segnum];
     Elf_Addr vaddr = php->p_vaddr & ~(NACL_MAP_PAGESIZE - 1);
     Elf_Off offset = php->p_offset & ~(NACL_MAP_PAGESIZE - 1);
     Elf_Off filesz = php->p_offset + php->p_filesz - offset;
     Elf_Off memsz = php->p_offset + php->p_memsz - offset;
     int32_t result;
 
     /*
@@ skipping 32 matching lines @@
       if (NULL == code_copy) {
         NaClLog(LOG_ERROR, "NaClElfImageLoadDynamically: malloc failed\n");
         return LOAD_NO_MEMORY;
       }
       if ((Elf_Word) (*gfile->vtbl->Read)(gfile, code_copy, filesz) != filesz) {
         free(code_copy);
         NaClLog(LOG_ERROR, "NaClElfImageLoadDynamically: "
                 "failed to read code segment\n");
         return LOAD_READ_ERROR;
       }
+      if (NULL != metadata) {
+        metadata->code_offset = offset;
+      }
       result = NaClTextDyncodeCreate(nap, (uint32_t) vaddr,
-                                     code_copy, (uint32_t) filesz);
+                                     code_copy, (uint32_t) filesz, metadata);
       free(code_copy);
       if (0 != result) {
         NaClLog(LOG_ERROR, "NaClElfImageLoadDynamically: "
                 "failed to load code segment\n");
         return LOAD_UNLOADABLE;
       }
     } else {
       /* Load data segment. */
       void *paddr = (void *) NaClUserToSys(nap, vaddr);
       size_t mapping_size = NaClRoundAllocPage(memsz);
@@ skipping 50 matching lines @@
 
 
 void NaClElfImageDelete(struct NaClElfImage *image) {
   free(image);
 }
 
 
 uintptr_t NaClElfImageGetEntryPoint(struct NaClElfImage *image) {
   return image->ehdr.e_entry;
 }