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

Side by Side Diff: test/common/wasm/wasm-module-runner.cc

Issue 2490663002: [wasm] Move all heap-allocated WASM structures into wasm-objects.h. (Closed)
Patch Set: Created 4 years, 1 month 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
OLDNEW
1 // Copyright 2016 the V8 project authors. All rights reserved. 1 // Copyright 2016 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "test/common/wasm/wasm-module-runner.h" 5 #include "test/common/wasm/wasm-module-runner.h"
6 6
7 #include "src/handles.h" 7 #include "src/handles.h"
8 #include "src/isolate.h" 8 #include "src/isolate.h"
9 #include "src/objects.h" 9 #include "src/objects.h"
10 #include "src/property-descriptor.h" 10 #include "src/property-descriptor.h"
11 #include "src/wasm/module-decoder.h" 11 #include "src/wasm/module-decoder.h"
12 #include "src/wasm/wasm-interpreter.h" 12 #include "src/wasm/wasm-interpreter.h"
13 #include "src/wasm/wasm-js.h" 13 #include "src/wasm/wasm-js.h"
14 #include "src/wasm/wasm-module.h" 14 #include "src/wasm/wasm-module.h"
15 #include "src/wasm/wasm-objects.h"
15 #include "src/wasm/wasm-result.h" 16 #include "src/wasm/wasm-result.h"
16 17
17 namespace v8 { 18 namespace v8 {
18 namespace internal { 19 namespace internal {
19 namespace wasm { 20 namespace wasm {
20 namespace testing { 21 namespace testing {
21 22
22 uint32_t GetMinModuleMemSize(const WasmModule* module) { 23 uint32_t GetMinModuleMemSize(const WasmModule* module) {
23 return WasmModule::kPageSize * module->min_mem_pages; 24 return WasmModule::kPageSize * module->min_mem_pages;
24 } 25 }
(...skipping 30 matching lines...) Expand all
55 thrower->CompileError("Not supported: module has imports."); 56 thrower->CompileError("Not supported: module has imports.");
56 } 57 }
57 if (module->export_table.size() == 0) { 58 if (module->export_table.size() == 0) {
58 thrower->CompileError("Not supported: module has no exports."); 59 thrower->CompileError("Not supported: module has no exports.");
59 } 60 }
60 if (thrower->error()) return Handle<JSObject>::null(); 61 if (thrower->error()) return Handle<JSObject>::null();
61 62
62 // Although we decoded the module for some pre-validation, run the bytes 63 // Although we decoded the module for some pre-validation, run the bytes
63 // again through the normal pipeline. 64 // again through the normal pipeline.
64 // TODO(wasm): Use {module} instead of decoding the module bytes again. 65 // TODO(wasm): Use {module} instead of decoding the module bytes again.
65 MaybeHandle<JSObject> module_object = CreateModuleObjectFromBytes( 66 MaybeHandle<WasmModuleObject> module_object = CreateModuleObjectFromBytes(
66 isolate, module->module_start, module->module_end, thrower, 67 isolate, module->module_start, module->module_end, thrower,
67 ModuleOrigin::kWasmOrigin, Handle<Script>::null(), nullptr, nullptr); 68 ModuleOrigin::kWasmOrigin, Handle<Script>::null(), nullptr, nullptr);
68 if (module_object.is_null()) { 69 if (module_object.is_null()) {
69 thrower->CompileError("Module pre-validation failed."); 70 thrower->CompileError("Module pre-validation failed.");
70 return Handle<JSObject>::null(); 71 return Handle<JSObject>::null();
71 } 72 }
72 MaybeHandle<JSObject> maybe_instance = WasmModule::Instantiate( 73 MaybeHandle<JSObject> maybe_instance = WasmModule::Instantiate(
73 isolate, thrower, module_object.ToHandleChecked(), 74 isolate, thrower, module_object.ToHandleChecked(),
74 Handle<JSReceiver>::null(), Handle<JSArrayBuffer>::null()); 75 Handle<JSReceiver>::null(), Handle<JSArrayBuffer>::null());
75 Handle<JSObject> instance; 76 Handle<JSObject> instance;
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 224
224 void SetupIsolateForWasmModule(Isolate* isolate) { 225 void SetupIsolateForWasmModule(Isolate* isolate) {
225 WasmJs::InstallWasmMapsIfNeeded(isolate, isolate->native_context()); 226 WasmJs::InstallWasmMapsIfNeeded(isolate, isolate->native_context());
226 WasmJs::InstallWasmModuleSymbolIfNeeded(isolate, isolate->global_object(), 227 WasmJs::InstallWasmModuleSymbolIfNeeded(isolate, isolate->global_object(),
227 isolate->native_context()); 228 isolate->native_context());
228 } 229 }
229 } // namespace testing 230 } // namespace testing
230 } // namespace wasm 231 } // namespace wasm
231 } // namespace internal 232 } // namespace internal
232 } // namespace v8 233 } // namespace v8
OLDNEW
« src/wasm/wasm-objects.cc ('K') | « test/cctest/wasm/test-run-wasm-module.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698