summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/wasm-interpreter.h158
-rw-r--r--src/wasm-js.cpp2
-rw-r--r--test/float_ops.post.js3
-rw-r--r--test/float_ops.txt12
4 files changed, 99 insertions, 76 deletions
diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h
index e429aa9f0..885835be1 100644
--- a/src/wasm-interpreter.h
+++ b/src/wasm-interpreter.h
@@ -303,47 +303,67 @@ public:
Literal right = flow.value;
NOTE_EVAL2(left, right);
if (left.type == i32) {
+ int32_t l = left.geti32(), r = right.geti32();
switch (curr->op) {
- case Add: return Flow(Literal(left.geti32() + right.geti32()));
- case Sub: return Flow(Literal(left.geti32() - right.geti32()));
- case Mul: return Flow(Literal(left.geti32() * right.geti32()));
- case DivS: return Flow(Literal(left.geti32() / right.geti32()));
- case DivU: return Flow(Literal(int32_t(uint32_t(left.geti32()) / uint32_t(right.geti32()))));
- case RemS: return Flow(Literal(left.geti32() % right.geti32()));
- case RemU: return Flow(Literal(int32_t(uint32_t(left.geti32()) % uint32_t(right.geti32()))));
- case And: return Flow(Literal(left.geti32() & right.geti32()));
- case Or: return Flow(Literal(left.geti32() | right.geti32()));
- case Xor: return Flow(Literal(left.geti32() ^ right.geti32()));
- case Shl: return Flow(Literal(left.geti32() << right.geti32()));
- case ShrU: return Flow(Literal(int32_t(uint32_t(left.geti32()) >> uint32_t(right.geti32()))));
- case ShrS: return Flow(Literal(left.geti32() >> right.geti32()));
+ case Add: return Flow(Literal(l + r));
+ case Sub: return Flow(Literal(l - r));
+ case Mul: return Flow(Literal(l * r));
+ case DivS: return Flow(Literal(l / r));
+ case DivU: return Flow(Literal(int32_t(uint32_t(l) / uint32_t(r))));
+ case RemS: return Flow(Literal(l % r));
+ case RemU: return Flow(Literal(int32_t(uint32_t(l) % uint32_t(r))));
+ case And: return Flow(Literal(l & r));
+ case Or: return Flow(Literal(l | r));
+ case Xor: return Flow(Literal(l ^ r));
+ case Shl: return Flow(Literal(l << r));
+ case ShrU: return Flow(Literal(int32_t(uint32_t(l) >> uint32_t(r))));
+ case ShrS: return Flow(Literal(l >> r));
default: abort();
}
} else if (left.type == i64) {
+ int64_t l = left.geti64(), r = right.geti64();
switch (curr->op) {
- case Add: return Flow(Literal(left.geti64() + right.geti64()));
- case Sub: return Flow(Literal(left.geti64() - right.geti64()));
- case Mul: return Flow(Literal(left.geti64() * right.geti64()));
- case DivS: return Flow(Literal(left.geti64() / right.geti64()));
- case DivU: return Flow(Literal(int64_t(uint64_t(left.geti64()) / uint64_t(right.geti64()))));
- case RemS: return Flow(Literal(left.geti64() % right.geti64()));
- case RemU: return Flow(Literal(int64_t(uint64_t(left.geti64()) % uint64_t(right.geti64()))));
- case And: return Flow(Literal(left.geti64() & right.geti64()));
- case Or: return Flow(Literal(left.geti64() | right.geti64()));
- case Xor: return Flow(Literal(left.geti64() ^ right.geti64()));
- case Shl: return Flow(Literal(left.geti64() << right.geti64()));
- case ShrU: return Flow(Literal(int64_t(uint64_t(left.geti64()) >> uint64_t(right.geti64()))));
- case ShrS: return Flow(Literal(left.geti64() >> right.geti64()));
+ case Add: return Flow(Literal(l + r));
+ case Sub: return Flow(Literal(l - r));
+ case Mul: return Flow(Literal(l * r));
+ case DivS: return Flow(Literal(l / r));
+ case DivU: return Flow(Literal(int64_t(uint64_t(l) / uint64_t(r))));
+ case RemS: return Flow(Literal(l % r));
+ case RemU: return Flow(Literal(int64_t(uint64_t(l) % uint64_t(r))));
+ case And: return Flow(Literal(l & r));
+ case Or: return Flow(Literal(l | r));
+ case Xor: return Flow(Literal(l ^ r));
+ case Shl: return Flow(Literal(l << r));
+ case ShrU: return Flow(Literal(int64_t(uint64_t(l) >> uint64_t(r))));
+ case ShrS: return Flow(Literal(l >> r));
+ default: abort();
+ }
+ } else if (left.type == f32) {
+ float l = left.getf32(), r = right.getf32();
+ switch (curr->op) {
+ case Add: return Flow(Literal(l + r));
+ case Sub: return Flow(Literal(l - r));
+ case Mul: return Flow(Literal(l * r));
+ case Div: return Flow(Literal(l / r));
+ case CopySign: return Flow(Literal(std::copysign(l, r)));
+ case Min: return Flow(Literal(std::min(l, r)));
+ case Max: return Flow(Literal(std::max(l, r)));
+ default: abort();
+ }
+ } else if (left.type == f64) {
+ double l = left.getf64(), r = right.getf64();
+ switch (curr->op) {
+ case Add: return Flow(Literal(l + r));
+ case Sub: return Flow(Literal(l - r));
+ case Mul: return Flow(Literal(l * r));
+ case Div: return Flow(Literal(l / r));
+ case CopySign: return Flow(Literal(std::copysign(l, r)));
+ case Min: return Flow(Literal(std::min(l, r)));
+ case Max: return Flow(Literal(std::max(l, r)));
default: abort();
}
}
- switch (curr->op) {
- case Div: return Flow(Literal(left.getf64() / right.getf64()));
- case CopySign: return Flow(Literal(std::copysign(left.getf64(), right.getf64())));
- case Min: return Flow(Literal(std::min(left.getf64(), right.getf64())));
- case Max: return Flow(Literal(std::max(left.getf64(), right.getf64())));
- default: abort();
- }
+ abort();
}
Flow visitCompare(Compare *curr) override {
NOTE_ENTER("Compare");
@@ -355,41 +375,59 @@ public:
Literal right = flow.value;
NOTE_EVAL2(left, right);
if (left.type == i32) {
+ int32_t l = left.geti32(), r = right.geti32();
switch (curr->op) {
- case Eq: return Flow(Literal(left.geti32() == right.geti32()));
- case Ne: return Flow(Literal(left.geti32() != right.geti32()));
- case LtS: return Flow(Literal(left.geti32() < right.geti32()));
- case LtU: return Flow(Literal(uint32_t(left.geti32()) < uint32_t(right.geti32())));
- case LeS: return Flow(Literal(left.geti32() <= right.geti32()));
- case LeU: return Flow(Literal(uint32_t(left.geti32()) <= uint32_t(right.geti32())));
- case GtS: return Flow(Literal(left.geti32() > right.geti32()));
- case GtU: return Flow(Literal(uint32_t(left.geti32()) > uint32_t(right.geti32())));
- case GeS: return Flow(Literal(left.geti32() >= right.geti32()));
- case GeU: return Flow(Literal(uint32_t(left.geti32()) >= uint32_t(right.geti32())));
+ case Eq: return Flow(Literal(l == r));
+ case Ne: return Flow(Literal(l != r));
+ case LtS: return Flow(Literal(l < r));
+ case LtU: return Flow(Literal(uint32_t(l) < uint32_t(r)));
+ case LeS: return Flow(Literal(l <= r));
+ case LeU: return Flow(Literal(uint32_t(l) <= uint32_t(r)));
+ case GtS: return Flow(Literal(l > r));
+ case GtU: return Flow(Literal(uint32_t(l) > uint32_t(r)));
+ case GeS: return Flow(Literal(l >= r));
+ case GeU: return Flow(Literal(uint32_t(l) >= uint32_t(r)));
default: abort();
}
} else if (left.type == i64) {
+ int64_t l = left.geti64(), r = right.geti64();
switch (curr->op) {
- case Eq: return Flow(Literal(left.getf64() == right.getf64()));
- case Ne: return Flow(Literal(left.getf64() != right.getf64()));
- case LtS: return Flow(Literal(left.geti64() < right.geti64()));
- case LtU: return Flow(Literal(uint64_t(left.geti64()) < uint64_t(right.geti64())));
- case LeS: return Flow(Literal(left.geti64() <= right.geti64()));
- case LeU: return Flow(Literal(uint64_t(left.geti64()) <= uint64_t(right.geti64())));
- case GtS: return Flow(Literal(left.geti64() > right.geti64()));
- case GtU: return Flow(Literal(uint64_t(left.geti64()) > uint64_t(right.geti64())));
- case GeS: return Flow(Literal(left.geti64() >= right.geti64()));
- case GeU: return Flow(Literal(uint64_t(left.geti64()) >= uint64_t(right.geti64())));
+ case Eq: return Flow(Literal(l == r));
+ case Ne: return Flow(Literal(l != r));
+ case LtS: return Flow(Literal(l < r));
+ case LtU: return Flow(Literal(uint64_t(l) < uint64_t(r)));
+ case LeS: return Flow(Literal(l <= r));
+ case LeU: return Flow(Literal(uint64_t(l) <= uint64_t(r)));
+ case GtS: return Flow(Literal(l > r));
+ case GtU: return Flow(Literal(uint64_t(l) > uint64_t(r)));
+ case GeS: return Flow(Literal(l >= r));
+ case GeU: return Flow(Literal(uint64_t(l) >= uint64_t(r)));
+ default: abort();
+ }
+ } else if (left.type == f32) {
+ float l = left.getf64(), r = right.getf64();
+ switch (curr->op) {
+ case Eq: return Flow(Literal(l == r));
+ case Ne: return Flow(Literal(l != r));
+ case Lt: return Flow(Literal(l < r));
+ case Le: return Flow(Literal(l <= r));
+ case Gt: return Flow(Literal(l > r));
+ case Ge: return Flow(Literal(l >= r));
+ default: abort();
+ }
+ } else if (left.type == f64) {
+ double l = left.getf64(), r = right.getf64();
+ switch (curr->op) {
+ case Eq: return Flow(Literal(l == r));
+ case Ne: return Flow(Literal(l != r));
+ case Lt: return Flow(Literal(l < r));
+ case Le: return Flow(Literal(l <= r));
+ case Gt: return Flow(Literal(l > r));
+ case Ge: return Flow(Literal(l >= r));
default: abort();
}
}
- switch (curr->op) {
- case Lt: return Flow(Literal(left.getf64() < right.getf64()));
- case Le: return Flow(Literal(left.getf64() <= right.getf64()));
- case Gt: return Flow(Literal(left.getf64() > right.getf64()));
- case Ge: return Flow(Literal(left.getf64() >= right.getf64()));
- default: abort();
- }
+ abort();
}
Flow visitConvert(Convert *curr) override {
NOTE_ENTER("Convert");
diff --git a/src/wasm-js.cpp b/src/wasm-js.cpp
index c45592f53..f26d1c4c1 100644
--- a/src/wasm-js.cpp
+++ b/src/wasm-js.cpp
@@ -175,7 +175,7 @@ extern "C" void EMSCRIPTEN_KEEPALIVE load_asm(char *input) {
void trap() override {
EM_ASM({
- throw "wasm trap!";
+ abort("wasm trap!");
});
}
};
diff --git a/test/float_ops.post.js b/test/float_ops.post.js
index 2b6ea075d..117175ffd 100644
--- a/test/float_ops.post.js
+++ b/test/float_ops.post.js
@@ -21,9 +21,6 @@ function testUnary(name) {
doTest(-1 | 0);
doTest((-1 | 0) + 1);
doTest((-1 | 0) - 1);
- doTest(-1 >>> 0);
- doTest((-1 >>> 0) + 1);
- doTest((-1 >>> 0) - 1);
}
testUnary('dfloor');
diff --git a/test/float_ops.txt b/test/float_ops.txt
index 768be6061..aa28b7eb6 100644
--- a/test/float_ops.txt
+++ b/test/float_ops.txt
@@ -15,9 +15,6 @@ dfloor
-1 ==> -1
0 ==> 0
-2 ==> -2
- 4294967295 ==> 4294967295
- 4294967296 ==> 4294967296
- 4294967294 ==> 4294967294
dadd
0,0 ==> 0
0,1 ==> 1
@@ -311,9 +308,6 @@ int_to_double
-1 ==> 0.22999999999999998
0 ==> 1.23
-2 ==> -0.77
- 4294967295 ==> 0.22999999999999998
- 4294967296 ==> 1.23
- 4294967294 ==> -0.77
uint_to_double
0 ==> 1.23
1 ==> 2.23
@@ -331,9 +325,6 @@ uint_to_double
-1 ==> 4294967296.23
0 ==> 1.23
-2 ==> 4294967295.23
- 4294967295 ==> 4294967296.23
- 4294967296 ==> 1.23
- 4294967294 ==> 4294967295.23
double_to_int
0 ==> 1
1 ==> 2
@@ -351,7 +342,4 @@ double_to_int
-1 ==> 0
0 ==> 1
-2 ==> 0
- 4294967295 ==> 0
- 4294967296 ==> 1
- 4294967294 ==> -1
done.
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-09 03:22:07 +0000