Skip to content

Commit e0c3a93

Browse files
deps: updates wazero to 1.0.0-pre.7 (#18)
Signed-off-by: Adrian Cole <[email protected]>
1 parent f7d9444 commit e0c3a93

File tree

13 files changed

+59
-59
lines changed

13 files changed

+59
-59
lines changed

examples/helloworld/greeting/greet_host.pb.go

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/host-functions/greeting/greet_host.pb.go

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/known-types/known/known_host.pb.go

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/wasi/cat/cat_host.pb.go

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/host.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func (gg *Generator) genHostFunctions(g *protogen.GeneratedFile, f *fileInfo) {
7676
g.QualifiedGoIdent(wazeroAPIPackage.Ident("Module")),
7777
))
7878
g.P("offset, size := uint32(stack[0]), uint32(stack[1])")
79-
g.P("buf, err := ", g.QualifiedGoIdent(pluginWasmPackage.Ident("ReadMemory")), "(ctx, m, offset, size)")
79+
g.P("buf, err := ", g.QualifiedGoIdent(pluginWasmPackage.Ident("ReadMemory")), "(m.Memory(), offset, size)")
8080
g.P(errorHandling)
8181

8282
g.P("var request ", g.QualifiedGoIdent(method.Input.GoIdent))
@@ -315,8 +315,8 @@ func genPluginMethod(g *protogen.GeneratedFile, f *fileInfo, method *protogen.Me
315315
defer p.free.Call(ctx, dataPtr)
316316
317317
// The pointer is a linear memory offset, which is where we write the name.
318-
if !p.module.Memory().Write(ctx, uint32(dataPtr), data) {
319-
return response, fmt.Errorf("Memory.Write(%d, %d) out of range of memory size %d", dataPtr, dataSize, p.module.Memory().Size(ctx))
318+
if !p.module.Memory().Write(uint32(dataPtr), data) {
319+
return response, fmt.Errorf("Memory.Write(%d, %d) out of range of memory size %d", dataPtr, dataSize, p.module.Memory().Size())
320320
}
321321
}
322322
`)
@@ -329,10 +329,10 @@ func genPluginMethod(g *protogen.GeneratedFile, f *fileInfo, method *protogen.Me
329329
resSize := uint32(ptrSize[0])
330330
331331
// The pointer is a linear memory offset, which is where we write the name.
332-
bytes, ok := p.module.Memory().Read(ctx, resPtr, resSize)
332+
bytes, ok := p.module.Memory().Read(resPtr, resSize)
333333
if !ok {
334334
return response, fmt.Errorf("Memory.Read(%d, %d) out of range of memory size %d",
335-
resPtr, resSize, p.module.Memory().Size(ctx))
335+
resPtr, resSize, p.module.Memory().Size())
336336
}
337337
338338
if err = response.UnmarshalVT(bytes); err != nil {

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.18
55
require (
66
github.com/planetscale/vtprotobuf v0.3.0
77
github.com/stretchr/testify v1.7.1
8-
github.com/tetratelabs/wazero v1.0.0-pre.4
8+
github.com/tetratelabs/wazero v1.0.0-pre.7
99
google.golang.org/protobuf v1.28.1
1010
)
1111

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
1010
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
1111
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
1212
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
13-
github.com/tetratelabs/wazero v1.0.0-pre.4 h1:RBJQT5OzmORkSp6MmZDWoFEr0zXjk4pmvMKAdeUnsaI=
14-
github.com/tetratelabs/wazero v1.0.0-pre.4/go.mod h1:u8wrFmpdrykiFK0DFPiFm5a4+0RzsdmXYVtijBKqUVo=
13+
github.com/tetratelabs/wazero v1.0.0-pre.7 h1:WI5N14XxoXw+ZWhcjSazJ6rEowhJbH/x8hglxC5gN7k=
14+
github.com/tetratelabs/wazero v1.0.0-pre.7/go.mod h1:u8wrFmpdrykiFK0DFPiFm5a4+0RzsdmXYVtijBKqUVo=
1515
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
1616
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
1717
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

tests/fields/proto/fields_host.pb.go

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/host-functions/proto/host_host.pb.go

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/import/proto/bar/bar_host.pb.go

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/import/proto/foo/foo_host.pb.go

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/well-known/proto/known_host.pb.go

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wasm/host.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"github.com/tetratelabs/wazero/api"
1313
)
1414

15-
func ReadMemory(ctx context.Context, m api.Module, offset, size uint32) ([]byte, error) {
16-
buf, ok := m.Memory().Read(ctx, offset, size)
15+
func ReadMemory(mem api.Memory, offset, size uint32) ([]byte, error) {
16+
buf, ok := mem.Read(offset, size)
1717
if !ok {
1818
return nil, fmt.Errorf("Memory.Read(%d, %d) out of range", offset, size)
1919
}
@@ -38,9 +38,9 @@ func WriteMemory(ctx context.Context, m api.Module, data []byte) (uint64, error)
3838
dataPtr := results[0]
3939

4040
// The pointer is a linear memory offset, which is where we write the name.
41-
if !m.Memory().Write(ctx, uint32(dataPtr), data) {
41+
if !m.Memory().Write(uint32(dataPtr), data) {
4242
return 0, fmt.Errorf("Memory.Write(%d, %d) out of range of memory size %d",
43-
dataPtr, len(data), m.Memory().Size(ctx))
43+
dataPtr, len(data), m.Memory().Size())
4444
}
4545

4646
return dataPtr, nil

0 commit comments

Comments
 (0)