AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[wasm] Allocate memory for the wasm interpreter in the fuzzer.

Browse Source 
R=titzer@chromium.org
BUG=chromium:646258

Review-Url: https://codereview.chromium.org/2341673002
Cr-Commit-Position: refs/heads/master@{#39419}
This commit is contained in:
ahaas 2016-09-14 05:55:43 -07:00 committed by Commit bot
parent 0bcef939dc
commit 6d89f8a7fc
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
test/common/wasm/wasm-module-runner.cc
View File

@ -110,34 +110,43 @@ int32_t InterpretWasmModule(Isolate* isolate, ErrorThrower& thrower,
if (thrower.error()) return -1;
ModuleEnv module_env;
module_env.module = module;
module_env.origin = module->origin;
for (size_t i = 0; i < module->functions.size(); i++) {
FunctionBody body = {
&module_env, module->functions[i].sig, module->module_start,
module->module_start + module->functions[i].code_start_offset,
module->module_start + module->functions[i].code_end_offset};
DecodeResult result = VerifyWasmCode(isolate->allocator(), body);
if (result.failed()) {
thrower.Error("Function did not verify");
return -1;
}
}
// The code verifies, we create an instance to run it in the interpreter.
WasmModuleInstance instance(module);
instance.context = isolate->native_context();
instance.mem_size = GetMinModuleMemSize(module);
instance.mem_start = nullptr;
// TODO(ahaas): Move memory allocation to wasm-module.cc for better
// encapsulation.
instance.mem_start =
static_cast<byte*>(calloc(GetMinModuleMemSize(module), 1));
instance.globals_start = nullptr;
ModuleEnv module_env;
module_env.module = module;
module_env.instance = &instance;
module_env.origin = module->origin;
const WasmFunction* function = &(module->functions[function_index]);
FunctionBody body = {&module_env, function->sig, module->module_start,
module->module_start + function->code_start_offset,
module->module_start + function->code_end_offset};
DecodeResult result = VerifyWasmCode(isolate->allocator(), body);
if (result.failed()) {
thrower.Error("Function did not verify");
return -1;
}
WasmInterpreter interpreter(&instance, isolate->allocator());
WasmInterpreter::Thread* thread = interpreter.GetThread(0);
thread->Reset();
thread->PushFrame(function, args);
if (thread->Run() == WasmInterpreter::FINISHED) {
thread->PushFrame(&(module->functions[function_index]), args);
WasmInterpreter::State interpreter_result = thread->Run();
if (instance.mem_start) {
free(instance.mem_start);
}
if (interpreter_result == WasmInterpreter::FINISHED) {
WasmVal val = thread->GetReturnValue();
return val.to<int32_t>();
} else if (thread->state() == WasmInterpreter::TRAPPED) {