summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/example/c-api-hello-world.c2
-rw-r--r--test/example/c-api-kitchen-sink.c74
-rw-r--r--test/example/find_div0s.cpp2
-rw-r--r--test/example/relooper-fuzz.c26
4 files changed, 52 insertions, 52 deletions
diff --git a/test/example/c-api-hello-world.c b/test/example/c-api-hello-world.c
index 016c2404b..e4a8a1cad 100644
--- a/test/example/c-api-hello-world.c
+++ b/test/example/c-api-hello-world.c
@@ -13,7 +13,7 @@ int main() {
// Get the 0 and 1 arguments, and add them
BinaryenExpressionRef x = BinaryenGetLocal(module, 0, BinaryenInt32()),
y = BinaryenGetLocal(module, 1, BinaryenInt32());
- BinaryenExpressionRef add = BinaryenBinary(module, BinaryenAdd(), x, y);
+ BinaryenExpressionRef add = BinaryenBinary(module, BinaryenAddInt32(), x, y);
// Create the add function
// Note: no additional local variables
diff --git a/test/example/c-api-kitchen-sink.c b/test/example/c-api-kitchen-sink.c
index dcf1e78ff..4e0bd5af4 100644
--- a/test/example/c-api-kitchen-sink.c
+++ b/test/example/c-api-kitchen-sink.c
@@ -91,7 +91,7 @@ void test_core() {
makeUnary(module, BinaryenCeilFloat32(), 3),
makeUnary(module, BinaryenFloorFloat64(), 4),
makeUnary(module, BinaryenTruncFloat32(), 3),
- makeUnary(module, BinaryenNearestFloat64(), 3),
+ makeUnary(module, BinaryenNearestFloat32(), 3),
makeUnary(module, BinaryenSqrtFloat64(), 4),
makeUnary(module, BinaryenEqZInt32(), 1),
makeUnary(module, BinaryenExtendSInt32(), 1),
@@ -120,38 +120,38 @@ void test_core() {
makeUnary(module, BinaryenReinterpretInt32(), 1),
makeUnary(module, BinaryenReinterpretInt64(), 2),
// Binary
- makeBinary(module, BinaryenAdd(), 1),
- makeBinary(module, BinaryenSub(), 4),
- makeBinary(module, BinaryenDivS(), 1),
- makeBinary(module, BinaryenDivU(), 2),
- makeBinary(module, BinaryenRemS(), 2),
- makeBinary(module, BinaryenRemU(), 1),
- makeBinary(module, BinaryenAnd(), 1),
- makeBinary(module, BinaryenOr(), 2),
- makeBinary(module, BinaryenXor(), 1),
- makeBinary(module, BinaryenShl(), 2),
- makeBinary(module, BinaryenShrU(), 2),
- makeBinary(module, BinaryenShrS(), 1),
- makeBinary(module, BinaryenRotL(), 1),
- makeBinary(module, BinaryenRotR(), 2),
- makeBinary(module, BinaryenDiv(), 3),
- makeBinary(module, BinaryenCopySign(), 4),
- makeBinary(module, BinaryenMin(), 3),
- makeBinary(module, BinaryenMax(), 4),
- makeBinary(module, BinaryenEq(), 1),
- makeBinary(module, BinaryenNe(), 3),
- makeBinary(module, BinaryenLtS(), 1),
- makeBinary(module, BinaryenLtU(), 2),
- makeBinary(module, BinaryenLeS(), 2),
- makeBinary(module, BinaryenLeU(), 1),
- makeBinary(module, BinaryenGtS(), 2),
- makeBinary(module, BinaryenGtU(), 1),
- makeBinary(module, BinaryenGeS(), 1),
- makeBinary(module, BinaryenGeU(), 2),
- makeBinary(module, BinaryenLt(), 3),
- makeBinary(module, BinaryenLe(), 4),
- makeBinary(module, BinaryenGt(), 4),
- makeBinary(module, BinaryenGe(), 3),
+ makeBinary(module, BinaryenAddInt32(), 1),
+ makeBinary(module, BinaryenSubFloat64(), 4),
+ makeBinary(module, BinaryenDivSInt32(), 1),
+ makeBinary(module, BinaryenDivUInt64(), 2),
+ makeBinary(module, BinaryenRemSInt64(), 2),
+ makeBinary(module, BinaryenRemUInt32(), 1),
+ makeBinary(module, BinaryenAndInt32(), 1),
+ makeBinary(module, BinaryenOrInt64(), 2),
+ makeBinary(module, BinaryenXorInt32(), 1),
+ makeBinary(module, BinaryenShlInt64(), 2),
+ makeBinary(module, BinaryenShrUInt64(), 2),
+ makeBinary(module, BinaryenShrSInt32(), 1),
+ makeBinary(module, BinaryenRotLInt32(), 1),
+ makeBinary(module, BinaryenRotRInt64(), 2),
+ makeBinary(module, BinaryenDivFloat32(), 3),
+ makeBinary(module, BinaryenCopySignFloat64(), 4),
+ makeBinary(module, BinaryenMinFloat32(), 3),
+ makeBinary(module, BinaryenMaxFloat64(), 4),
+ makeBinary(module, BinaryenEqInt32(), 1),
+ makeBinary(module, BinaryenNeFloat32(), 3),
+ makeBinary(module, BinaryenLtSInt32(), 1),
+ makeBinary(module, BinaryenLtUInt64(), 2),
+ makeBinary(module, BinaryenLeSInt64(), 2),
+ makeBinary(module, BinaryenLeUInt32(), 1),
+ makeBinary(module, BinaryenGtSInt64(), 2),
+ makeBinary(module, BinaryenGtUInt32(), 1),
+ makeBinary(module, BinaryenGeSInt32(), 1),
+ makeBinary(module, BinaryenGeUInt64(), 2),
+ makeBinary(module, BinaryenLtFloat32(), 3),
+ makeBinary(module, BinaryenLeFloat64(), 4),
+ makeBinary(module, BinaryenGtFloat64(), 4),
+ makeBinary(module, BinaryenGeFloat32(), 3),
// All the rest
BinaryenBlock(module, NULL, NULL, 0), // block with no name
BinaryenIf(module, makeInt32(module, 1), makeInt32(module, 2), makeInt32(module, 3)),
@@ -165,16 +165,16 @@ void test_core() {
BinaryenBreak(module, "the-nothing", NULL, NULL),
BinaryenSwitch(module, switchValueNames, 1, "the-value", makeInt32(module, 0), makeInt32(module, 1)),
BinaryenSwitch(module, switchBodyNames, 1, "the-nothing", makeInt32(module, 2), NULL),
- BinaryenUnary(module, BinaryenEqZ(), // check the output type of the call node
+ BinaryenUnary(module, BinaryenEqZInt32(), // check the output type of the call node
BinaryenCall(module, "kitchen-sinker", callOperands4, 4, BinaryenInt32())
),
- BinaryenUnary(module, BinaryenEqZ(), // check the output type of the call node
+ BinaryenUnary(module, BinaryenEqZInt32(), // check the output type of the call node
BinaryenUnary(module,
BinaryenTruncSFloat32ToInt32(),
BinaryenCallImport(module, "an-imported", callOperands2, 2, BinaryenFloat32())
)
),
- BinaryenUnary(module, BinaryenEqZ(), // check the output type of the call node
+ BinaryenUnary(module, BinaryenEqZInt32(), // check the output type of the call node
BinaryenCallIndirect(module, makeInt32(module, 2449), callOperands4, 4, iiIfF)
),
BinaryenGetLocal(module, 0, BinaryenInt32()),
@@ -401,7 +401,7 @@ void test_binaries() {
BinaryenFunctionTypeRef iii = BinaryenAddFunctionType(module, "iii", BinaryenInt32(), params, 2);
BinaryenExpressionRef x = BinaryenGetLocal(module, 0, BinaryenInt32()),
y = BinaryenGetLocal(module, 1, BinaryenInt32());
- BinaryenExpressionRef add = BinaryenBinary(module, BinaryenAdd(), x, y);
+ BinaryenExpressionRef add = BinaryenBinary(module, BinaryenAddInt32(), x, y);
BinaryenFunctionRef adder = BinaryenAddFunction(module, "adder", iii, NULL, 0, add);
size = BinaryenModuleWrite(module, buffer, 1024); // write out the module
BinaryenModuleDispose(module);
diff --git a/test/example/find_div0s.cpp b/test/example/find_div0s.cpp
index c3a2c0750..45e7f4633 100644
--- a/test/example/find_div0s.cpp
+++ b/test/example/find_div0s.cpp
@@ -42,7 +42,7 @@ int main() {
struct DivZeroSeeker : public PostWalker<DivZeroSeeker, Visitor<DivZeroSeeker>> {
void visitBinary(Binary* curr) {
// In every Binary, look for integer divisions
- if (curr->op == BinaryOp::DivS || curr->op == BinaryOp::DivU) {
+ if (curr->op == BinaryOp::DivSInt32 || curr->op == BinaryOp::DivUInt32) {
// Check if the right operand is a constant, and if it is 0
auto right = curr->right->dynCast<Const>();
if (right && right->value.getInteger() == 0) {
diff --git a/test/example/relooper-fuzz.c b/test/example/relooper-fuzz.c
index cfd10a9b3..ecb204347 100644
--- a/test/example/relooper-fuzz.c
+++ b/test/example/relooper-fuzz.c
@@ -16,7 +16,7 @@ int main() {
// if the end, halt
BinaryenExpressionRef halter = BinaryenIf(module,
BinaryenBinary(module,
- BinaryenEq(),
+ BinaryenEqInt32(),
BinaryenLoad(module, 4, 0, 0, 0, BinaryenInt32(), BinaryenConst(module, BinaryenLiteralInt32(4))),
BinaryenConst(module, BinaryenLiteralInt32(4 * 27)) // jumps of 4 bytes
),
@@ -28,7 +28,7 @@ int main() {
4, 0, 0,
BinaryenConst(module, BinaryenLiteralInt32(4)),
BinaryenBinary(module,
- BinaryenAdd(),
+ BinaryenAddInt32(),
BinaryenLoad(module, 4, 0, 0, 0, BinaryenInt32(), BinaryenConst(module, BinaryenLiteralInt32(4))),
BinaryenConst(module, BinaryenLiteralInt32(4))
)
@@ -37,7 +37,7 @@ int main() {
// optionally, print the return value
BinaryenExpressionRef args[] = {
BinaryenBinary(module,
- BinaryenSub(),
+ BinaryenSubInt32(),
BinaryenConst(module, BinaryenLiteralInt32(0)),
BinaryenLoad(module,
4, 0, 4, 0, BinaryenInt32(),
@@ -155,9 +155,9 @@ int main() {
}
RelooperAddBranch(b0, b5, BinaryenBinary(module,
- BinaryenEq(),
+ BinaryenEqInt32(),
BinaryenBinary(module,
- BinaryenRemU(),
+ BinaryenRemUInt32(),
BinaryenGetLocal(module, 0, BinaryenInt32()),
BinaryenConst(module, BinaryenLiteralInt32(2))
),
@@ -171,9 +171,9 @@ int main() {
RelooperAddBranch(b2, b5, NULL, NULL);
RelooperAddBranch(b3, b5, BinaryenBinary(module,
- BinaryenEq(),
+ BinaryenEqInt32(),
BinaryenBinary(module,
- BinaryenRemU(),
+ BinaryenRemUInt32(),
BinaryenGetLocal(module, 0, BinaryenInt32()),
BinaryenConst(module, BinaryenLiteralInt32(2))
),
@@ -183,9 +183,9 @@ int main() {
RelooperAddBranch(b3, b8, NULL, NULL);
RelooperAddBranch(b4, b4, BinaryenBinary(module,
- BinaryenEq(),
+ BinaryenEqInt32(),
BinaryenBinary(module,
- BinaryenRemU(),
+ BinaryenRemUInt32(),
BinaryenGetLocal(module, 0, BinaryenInt32()),
BinaryenConst(module, BinaryenLiteralInt32(3))
),
@@ -193,9 +193,9 @@ int main() {
), NULL);
RelooperAddBranch(b4, b5, BinaryenBinary(module,
- BinaryenEq(),
+ BinaryenEqInt32(),
BinaryenBinary(module,
- BinaryenRemU(),
+ BinaryenRemUInt32(),
BinaryenGetLocal(module, 0, BinaryenInt32()),
BinaryenConst(module, BinaryenLiteralInt32(3))
),
@@ -205,9 +205,9 @@ int main() {
RelooperAddBranch(b4, b2, NULL, NULL);
RelooperAddBranch(b5, b4, BinaryenBinary(module,
- BinaryenEq(),
+ BinaryenEqInt32(),
BinaryenBinary(module,
- BinaryenRemU(),
+ BinaryenRemUInt32(),
BinaryenGetLocal(module, 0, BinaryenInt32()),
BinaryenConst(module, BinaryenLiteralInt32(2))
),