Skip to content

[wasm2js] Fix atomic notify to take an unsigned count #5525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tlively merged 1 commit into from
Feb 27, 2023
Merged

[wasm2js] Fix atomic notify to take an unsigned count #5525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/wasm2js.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2135,8 +2135,9 @@ Ref Wasm2JSBuilder::processFunctionBody(Module* m,
ValueBuilder::appendToCall(
call,
ValueBuilder::makePtrShift(makePointer(curr->ptr, curr->offset), 2));
ValueBuilder::appendToCall(call,
visit(curr->notifyCount, EXPRESSION_RESULT));
ValueBuilder::appendToCall(
call,
makeSigning(visit(curr->notifyCount, EXPRESSION_RESULT), JS_UNSIGNED));
return call;
}

Expand Down
4 changes: 2 additions & 2 deletions test/wasm2js/atomics_32.2asm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ function asmFunc(imports) {
wasm2js_atomic_wait_i32(4 | 0, 8 | 0, 16 | 0, -1 | 0, i64toi32_i32$0 | 0) | 0;
wasm2js_memory_init(0, 512, 0, 4);
wasm2js_memory_init(1, 1024, 4, 2);
Atomics.notify(HEAP32, 4 >> 2, 2);
Atomics.notify(HEAP32, (4 + 20 | 0) >> 2, 2);
Atomics.notify(HEAP32, 4 >> 2, 2 >>> 0);
Atomics.notify(HEAP32, (4 + 20 | 0) >> 2, -1 >>> 0);
Atomics.add(HEAP32, 8 >> 2, 12);
Atomics.sub(HEAP32, 8 >> 2, 12);
Atomics.and(HEAP32, 8 >> 2, 12);
Expand Down
2 changes: 1 addition & 1 deletion test/wasm2js/atomics_32.2asm.js.opt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ function asmFunc(imports) {
wasm2js_memory_init(0, 512, 0, 4);
wasm2js_memory_init(1, 1024, 4, 2);
Atomics.notify(HEAP32, 1, 2);
Atomics.notify(HEAP32, 4 + 20 >> 2, 2);
Atomics.notify(HEAP32, 4 + 20 >> 2, 4294967295);
Atomics.add(HEAP32, 2, 12);
Atomics.sub(HEAP32, 2, 12);
Atomics.and(HEAP32, 2, 12);
Expand Down
2 changes: 1 addition & 1 deletion test/wasm2js/atomics_32.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
(memory.init 0 (i32.const 512) (i32.const 0) (i32.const 4))
(memory.init 1 (i32.const 1024) (i32.const 4) (i32.const 2))
(local.set $x (memory.atomic.notify (i32.const 4) (i32.const 2)))
(local.set $x (memory.atomic.notify offset=20 (i32.const 4) (i32.const 2)))
(local.set $x (memory.atomic.notify offset=20 (i32.const 4) (i32.const -1)))
(local.set $x (i32.atomic.rmw.add (i32.const 8) (i32.const 12)))
(local.set $x (i32.atomic.rmw.sub (i32.const 8) (i32.const 12)))
(local.set $x (i32.atomic.rmw.and (i32.const 8) (i32.const 12)))
Expand Down