Skip to content

Commit

Permalink
[test] Enable the i64 tests in imports.wast.
Browse files Browse the repository at this point in the history
Fixes #1514.
  • Loading branch information
Ms2ger committed Sep 20, 2022
1 parent 7fa5b41 commit 1a5a0a6
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
15 changes: 5 additions & 10 deletions test/core/imports.wast
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,9 @@
(type $func_f64 (func (param f64)))

(import "spectest" "print_i32" (func (param i32)))
;; JavaScript can't handle i64 yet.
;; (func (import "spectest" "print_i64") (param i64))
(func (import "spectest" "print_i64") (param i64))
(import "spectest" "print_i32" (func $print_i32 (param i32)))
;; JavaScript can't handle i64 yet.
;; (import "spectest" "print_i64" (func $print_i64 (param i64)))
(import "spectest" "print_i64" (func $print_i64 (param i64)))
(import "spectest" "print_f32" (func $print_f32 (param f32)))
(import "spectest" "print_f64" (func $print_f64 (param f64)))
(import "spectest" "print_i32_f32" (func $print_i32_f32 (param i32 f32)))
Expand Down Expand Up @@ -72,14 +70,12 @@
(func (export "print64") (param $i i64)
(local $x f64)
(local.set $x (f64.convert_i64_s (call $i64->i64 (local.get $i))))
;; JavaScript can't handle i64 yet.
;; (call 1 (local.get $i))
(call 1 (local.get $i))
(call $print_f64_f64
(f64.add (local.get $x) (f64.const 1))
(f64.const 53)
)
;; JavaScript can't handle i64 yet.
;; (call $print_i64 (local.get $i))
(call $print_i64 (local.get $i))
(call $print_f64 (local.get $x))
(call $print_f64-2 (local.get $x))
(call_indirect (type $func_f64) (local.get $x) (i32.const 1))
Expand Down Expand Up @@ -234,8 +230,7 @@
(import "spectest" "global_i32" (global $x i32))
(global $y (import "spectest" "global_i32") i32)

;; JavaScript can't handle i64 yet.
;; (import "spectest" "global_i64" (global i64))
(import "spectest" "global_i64" (global i64))
(import "spectest" "global_f32" (global f32))
(import "spectest" "global_f64" (global f64))

Expand Down
2 changes: 2 additions & 0 deletions test/harness/async_index.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,13 @@ function reinitializeRegistry() {
eq_funcref: eq_funcref,
print: console.log.bind(console),
print_i32: console.log.bind(console),
print_i64: console.log.bind(console),
print_i32_f32: console.log.bind(console),
print_f64_f64: console.log.bind(console),
print_f32: console.log.bind(console),
print_f64: console.log.bind(console),
global_i32: 666,
global_i64: 666n,
global_f32: 666,
global_f64: 666,
table: new WebAssembly.Table({
Expand Down
2 changes: 2 additions & 0 deletions test/harness/sync_index.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,13 @@ function reinitializeRegistry() {
eq_funcref: eq_funcref,
print: console.log.bind(console),
print_i32: console.log.bind(console),
print_i64: console.log.bind(console),
print_i32_f32: console.log.bind(console),
print_f64_f64: console.log.bind(console),
print_f32: console.log.bind(console),
print_f64: console.log.bind(console),
global_i32: 666,
global_i64: 666n,
global_f32: 666,
global_f64: 666,
table: new WebAssembly.Table({initial: 10, maximum: 20, element: 'anyfunc'}),
Expand Down

0 comments on commit 1a5a0a6

Please sign in to comment.