Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Side by Side Diff: src/trusted/service_runtime/sel_main_chrome.c

Issue 10070010: validator_ragel: Link into TCB, use under env var (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: revert introducing extra empty line Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 #include "native_client/src/trusted/service_runtime/sel_main_chrome.h" 7 #include "native_client/src/trusted/service_runtime/sel_main_chrome.h"
8 8
9 #include "native_client/src/include/portability.h" 9 #include "native_client/src/include/portability.h"
10 #include "native_client/src/include/portability_io.h" 10 #include "native_client/src/include/portability_io.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 NaClSetCreateMemoryObjectFunc(args->create_memory_object_func); 123 NaClSetCreateMemoryObjectFunc(args->create_memory_object_func);
124 124
125 /* Inject the validation caching interface, if it exists. */ 125 /* Inject the validation caching interface, if it exists. */
126 nap->validation_cache = args->validation_cache; 126 nap->validation_cache = args->validation_cache;
127 127
128 #if NACL_WINDOWS 128 #if NACL_WINDOWS
129 if (args->broker_duplicate_handle_func != NULL) 129 if (args->broker_duplicate_handle_func != NULL)
130 NaClSetBrokerDuplicateHandleFunc(args->broker_duplicate_handle_func); 130 NaClSetBrokerDuplicateHandleFunc(args->broker_duplicate_handle_func);
131 #endif 131 #endif
132 132
133 if (getenv("NACL_DANGEROUS_USE_DFA_VALIDATOR") != NULL) {
134 fprintf(stderr, "DANGER! USING THE UNSTABLE DFA VALIDATOR!\n");
135 nap->enable_dfa_validator = 1;
136 }
137
133 NaClAppInitialDescriptorHookup(nap); 138 NaClAppInitialDescriptorHookup(nap);
134 139
135 /* 140 /*
136 * NACL_SERVICE_PORT_DESCRIPTOR and NACL_SERVICE_ADDRESS_DESCRIPTOR 141 * NACL_SERVICE_PORT_DESCRIPTOR and NACL_SERVICE_ADDRESS_DESCRIPTOR
137 * are 3 and 4. 142 * are 3 and 4.
138 */ 143 */
139 144
140 /* import IMC handle - used to be "-i" */ 145 /* import IMC handle - used to be "-i" */
141 NaClAddImcHandle(nap, args->imc_bootstrap_handle, export_addr_to); 146 NaClAddImcHandle(nap, args->imc_bootstrap_handle, export_addr_to);
142 147
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 if (LOAD_OK != errcode) { 319 if (LOAD_OK != errcode) {
315 NaClBlockIfCommandChannelExists(nap); 320 NaClBlockIfCommandChannelExists(nap);
316 } 321 }
317 322
318 done_ctor: 323 done_ctor:
319 324
320 NaClAllModulesFini(); 325 NaClAllModulesFini();
321 326
322 NaClExit(ret_code); 327 NaClExit(ret_code);
323 } 328 }
OLDNEW
« no previous file with comments | « src/trusted/service_runtime/sel_main.c ('k') | src/trusted/service_runtime/sel_validate_image.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698