Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-11-09 05:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

misc/wasm: fix passing large negative integers from JS to Go

Browse source 
This commit addresses a FIXME left in the code of wasm_exec.js to
properly get the upper 32 bit of a JS number to be stored as an
64-bit integer. A bitshift operation is not possible, because in
JavaScript bitshift operations only operate on the lower 32 bits.

Change-Id: I8f627fd604e592682d9d322942a4852db64a7f66
Reviewed-on: https://go-review.googlesource.com/113076
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Richard Musiol 2018-05-15 00:52:18 +02:00 • committed by Brad Fitzpatrick
parent db91ee3651
commit 73b5951391
2 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
misc/wasm/wasm_exec.js
View file

@ -77,11 +77,7 @@
const setInt64 = (addr, v) => { const setInt64 = (addr, v) => {
mem().setUint32(addr + 0, v, true); mem().setUint32(addr + 0, v, true);
if (v >= 0) { mem().setUint32(addr + 4, Math.floor(v / 4294967296), true);
mem().setUint32(addr + 4, v / 4294967296, true);
} else {
mem().setUint32(addr + 4, -1, true); // FIXME
}
} }
const getInt64 = (addr) => { const getInt64 = (addr) => {

18
src/syscall/js/js_test.go
View file

@ -58,6 +58,24 @@ func TestInt(t *testing.T) {
} }
} }
func TestIntConversion(t *testing.T) {
testIntConversion(t, 0)
testIntConversion(t, 1)
testIntConversion(t, -1)
testIntConversion(t, 1<<20)
testIntConversion(t, -1<<20)
testIntConversion(t, 1<<40)
testIntConversion(t, -1<<40)
testIntConversion(t, 1<<60)
testIntConversion(t, -1<<60)
}
func testIntConversion(t *testing.T, want int) {
if got := js.ValueOf(want).Int(); got != want {
t.Errorf("got %#v, want %#v", got, want)
}
}
func TestFloat(t *testing.T) { func TestFloat(t *testing.T) {
want := 42.123 want := 42.123
o := dummys.Get("someFloat") o := dummys.Get("someFloat")