From cb0b31a2d185f18662814c9f3c9158b2eea74760 Mon Sep 17 00:00:00 2001 From: Heejin Ahn Date: Tue, 27 Aug 2019 16:40:59 -0700 Subject: Add atomic.fence instruction (#2307) This adds `atomic.fence` instruction: https://github.com/WebAssembly/threads/blob/master/proposals/threads/Overview.md#fence-operator This also fix bugs in `atomic.wait` and `atomic.notify` instructions in binaryen.js and adds tests for them. --- src/binaryen-c.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'src/binaryen-c.cpp') diff --git a/src/binaryen-c.cpp b/src/binaryen-c.cpp index d8f8163c4..a06e32d87 100644 --- a/src/binaryen-c.cpp +++ b/src/binaryen-c.cpp @@ -331,6 +331,9 @@ BinaryenExpressionId BinaryenAtomicWaitId(void) { BinaryenExpressionId BinaryenAtomicNotifyId(void) { return Expression::Id::AtomicNotifyId; } +BinaryenExpressionId BinaryenAtomicFenceId(void) { + return Expression::Id::AtomicFenceId; +} BinaryenExpressionId BinaryenSIMDExtractId(void) { return Expression::Id::SIMDExtractId; } @@ -1466,6 +1469,15 @@ BinaryenExpressionRef BinaryenAtomicNotify(BinaryenModuleRef module, return static_cast(ret); } +BinaryenExpressionRef BinaryenAtomicFence(BinaryenModuleRef module) { + auto* ret = Builder(*(Module*)module).makeAtomicFence(); + + if (tracing) { + traceExpression(ret, "BinaryenAtomicFence"); + } + + return static_cast(ret); +} BinaryenExpressionRef BinaryenSIMDExtract(BinaryenModuleRef module, BinaryenOp op, BinaryenExpressionRef vec, @@ -2520,6 +2532,17 @@ BinaryenAtomicNotifyGetNotifyCount(BinaryenExpressionRef expr) { assert(expression->is()); return static_cast(expression)->notifyCount; } +// AtomicFence +uint8_t BinaryenAtomicFenceGetOrder(BinaryenExpressionRef expr) { + if (tracing) { + std::cout << " BinaryenAtomicFenceGetOrder(expressions[" + << expressions[expr] << "]);\n"; + } + + auto* expression = (Expression*)expr; + assert(expression->is()); + return static_cast(expression)->order; +} // SIMDExtract BinaryenOp BinaryenSIMDExtractGetOp(BinaryenExpressionRef expr) { if (tracing) { -- cgit v1.2.3