OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The Native Client Authors. All rights reserved. | 2 * Copyright (c) 2012 The Native Client Authors. All rights reserved. |
3 * Use of this source code is governed by a BSD-style license that can be | 3 * Use of this source code is governed by a BSD-style license that can be |
4 * found in the LICENSE file. | 4 * found in the LICENSE file. |
5 */ | 5 */ |
6 | 6 |
7 #ifndef NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_ELF_UTIL_H__ | 7 #ifndef NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_ELF_UTIL_H__ |
8 #define NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_ELF_UTIL_H__ 1 | 8 #define NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_ELF_UTIL_H__ 1 |
9 | 9 |
10 #include "native_client/src/include/portability.h" | 10 #include "native_client/src/include/portability.h" |
11 #include "native_client/src/trusted/service_runtime/nacl_error_code.h" | 11 #include "native_client/src/trusted/service_runtime/nacl_error_code.h" |
12 #include "native_client/src/trusted/service_runtime/sel_ldr.h" | 12 #include "native_client/src/trusted/service_runtime/sel_ldr.h" |
13 | 13 |
14 struct NaClElfImage; | 14 struct NaClElfImage; |
| 15 struct NaClValidationMetadata; |
15 struct Gio; | 16 struct Gio; |
16 | 17 |
17 uintptr_t NaClElfImageGetEntryPoint(struct NaClElfImage *image); | 18 uintptr_t NaClElfImageGetEntryPoint(struct NaClElfImage *image); |
18 | 19 |
19 struct NaClElfImage *NaClElfImageNew(struct Gio *gp, NaClErrorCode *err_code); | 20 struct NaClElfImage *NaClElfImageNew(struct Gio *gp, NaClErrorCode *err_code); |
20 | 21 |
21 NaClErrorCode NaClElfImageValidateElfHeader(struct NaClElfImage *image); | 22 NaClErrorCode NaClElfImageValidateElfHeader(struct NaClElfImage *image); |
22 | 23 |
23 struct NaClElfImageInfo { | 24 struct NaClElfImageInfo { |
24 uintptr_t static_text_end; | 25 uintptr_t static_text_end; |
(...skipping 14 matching lines...) Expand all Loading... |
39 * protections have been set up by NaClMemoryProtection(). | 40 * protections have been set up by NaClMemoryProtection(). |
40 */ | 41 */ |
41 NaClErrorCode NaClElfImageLoad(struct NaClElfImage *image, | 42 NaClErrorCode NaClElfImageLoad(struct NaClElfImage *image, |
42 struct Gio *gp, | 43 struct Gio *gp, |
43 uint8_t addr_bits, | 44 uint8_t addr_bits, |
44 uintptr_t mem_start); | 45 uintptr_t mem_start); |
45 | 46 |
46 /* | 47 /* |
47 * Loads an ELF object after NaClMemoryProtection() has been called. | 48 * Loads an ELF object after NaClMemoryProtection() has been called. |
48 */ | 49 */ |
49 NaClErrorCode NaClElfImageLoadDynamically(struct NaClElfImage *image, | 50 NaClErrorCode NaClElfImageLoadDynamically( |
50 struct NaClApp *nap, | 51 struct NaClElfImage *image, |
51 struct Gio *gfile); | 52 struct NaClApp *nap, |
| 53 struct Gio *gfile, |
| 54 struct NaClValidationMetadata *metadata); |
52 | 55 |
53 void NaClElfImageDelete(struct NaClElfImage *image); | 56 void NaClElfImageDelete(struct NaClElfImage *image); |
54 | 57 |
55 | 58 |
56 #endif /* NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_ELF_UTIL_H__ */ | 59 #endif /* NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_ELF_UTIL_H__ */ |
OLD | NEW |