summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2015-11-10 16:54:10 -0800
committerAlon Zakai <alonzakai@gmail.com>2015-11-10 17:01:17 -0800
commitf067c29c08a6f4299e68cc34bb8e4979730dd94d (patch)
tree3dbf8e19e818be61d5d0d1eba38c8a2c2ab5cedc /src
parent0afa7808bb7e791ba39c51f3d691a1192d8706a7 (diff)
downloadbinaryen-f067c29c08a6f4299e68cc34bb8e4979730dd94d.tar.gz
binaryen-f067c29c08a6f4299e68cc34bb8e4979730dd94d.tar.bz2
binaryen-f067c29c08a6f4299e68cc34bb8e4979730dd94d.zip
update tests, and update shift behavior for latest changes
Diffstat (limited to 'src')
-rw-r--r--src/wasm-interpreter.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h
index a3fe78666..8aeab2e97 100644
--- a/src/wasm-interpreter.h
+++ b/src/wasm-interpreter.h
@@ -418,15 +418,15 @@ private:
case Or: return Literal(l | r);
case Xor: return Literal(l ^ r);
case Shl: {
- if (uint32_t(r) >= 32) return Literal(int32_t(0));
+ r = r & 31;
return Literal(l << r);
}
case ShrU: {
- if (uint32_t(r) >= 32) return Literal(int32_t(0));
+ r = r & 31;
return Literal(int32_t(uint32_t(l) >> uint32_t(r)));
}
case ShrS: {
- if (uint32_t(r) >= 32) return Literal(int32_t(l < 0 ? -1 : 0));
+ r = r & 31;
return Literal(l >> r);
}
default: abort();
@@ -459,15 +459,15 @@ private:
case Or: return Literal(l | r);
case Xor: return Literal(l ^ r);
case Shl: {
- if (uint64_t(r) >= 64) return Literal(int64_t(0));
+ r = r & 63;
return Literal(l << r);
}
case ShrU: {
- if (uint64_t(r) >= 64) return Literal(int64_t(0));
+ r = r & 63;
return Literal(int64_t(uint64_t(l) >> uint64_t(r)));
}
case ShrS: {
- if (uint64_t(r) >= 64) return Literal(int64_t(l < 0 ? -1 : 0));
+ r = r & 63;
return Literal(l >> r);
}
default: abort();