mleku/wazero
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Supports mix of wasm and go funcs in the same module (#707)

Browse Source 
This removes the constraint of a module being exclusively wasm or host
functions. Later pull requests can optimize special imports to be
implemented in wasm, particularly useful for disabled logging callbacks.

Signed-off-by: Adrian Cole <adrian@tetrate.io>
This commit is contained in:
Crypt Keeper
2022-07-19 11:55:37 +08:00
committed by GitHub
parent 0d76b11d66
commit 0da1af2d51
19 changed files with 131 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/testing/enginetest/enginetest.go
View File

@@ -329,15 +329,15 @@ func runTestModuleEngine_Call_HostFn_ModuleContext(t *testing.T, et EngineTester
})
m := &wasm.Module{
HostFunctionSection: []*reflect.Value{&host},
FunctionSection: []wasm.Index{0},
TypeSection: []*wasm.FunctionType{sig},
TypeSection: []*wasm.FunctionType{sig},
FunctionSection: []wasm.Index{0},
CodeSection: []*wasm.Code{{GoFunc: &host}},
}
m.BuildFunctionDefinitions()
err := e.CompileModule(testCtx, m)
require.NoError(t, err)
module := &wasm.ModuleInstance{Memory: memory}
module := &wasm.ModuleInstance{Memory: memory, TypeIDs: []wasm.FunctionTypeID{0}}
_, ns := wasm.NewStore(features, e)
modCtx := wasm.NewCallContext(ns, module, nil)
@@ -672,10 +672,10 @@ func setupCallTests(t *testing.T, e wasm.Engine) (*wasm.ModuleInstance, *wasm.Mo
hostFnVal := reflect.ValueOf(divBy)
hostModule := &wasm.Module{
HostFunctionSection: []*reflect.Value{&hostFnVal},
TypeSection: []*wasm.FunctionType{ft},
FunctionSection: []wasm.Index{0},
ExportSection: []*wasm.Export{{Name: hostFnName, Type: wasm.ExternTypeFunc, Index: 0}},
TypeSection: []*wasm.FunctionType{ft},
FunctionSection: []wasm.Index{0},
CodeSection: []*wasm.Code{{GoFunc: &hostFnVal}},
ExportSection: []*wasm.Export{{Name: hostFnName, Type: wasm.ExternTypeFunc, Index: 0}},
NameSection: &wasm.NameSection{
ModuleName: "host",
FunctionNames: wasm.NameMap{{Index: wasm.Index(0), Name: hostFnName}},