diff options
| author | Ben Smith <binjimin@gmail.com> | 2017-11-21 14:51:34 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-21 14:51:34 -0800 |
| commit | a630c95d472dc1615640bfe7d33849d45631778c (patch) | |
| tree | e9b4e6b3568d70f1fa767c2cc0a5d2d0eca7263a /src/binary-reader-interp.cc | |
| parent | 49b7984544ddaf14d5e2f1ad9115dad7e9a2b299 (diff) | |
| download | wabt-a630c95d472dc1615640bfe7d33849d45631778c.tar.gz wabt-a630c95d472dc1615640bfe7d33849d45631778c.tar.bz2 wabt-a630c95d472dc1615640bfe7d33849d45631778c.zip | |
Rename {wake,wait} -> atomic.{wake,wait} (#672)
This was recently changed in the spec.
Diffstat (limited to 'src/binary-reader-interp.cc')
| -rw-r--r-- | src/binary-reader-interp.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/binary-reader-interp.cc b/src/binary-reader-interp.cc index a49a38ce..884ffe58 100644 --- a/src/binary-reader-interp.cc +++ b/src/binary-reader-interp.cc @@ -148,6 +148,12 @@ class BinaryReaderInterp : public BinaryReaderNop { wabt::Result OnAtomicRmwCmpxchgExpr(Opcode opcode, uint32_t alignment_log2, Address offset) override; + wabt::Result OnAtomicWaitExpr(Opcode opcode, + uint32_t alignment_log2, + Address offset) override; + wabt::Result OnAtomicWakeExpr(Opcode opcode, + uint32_t alignment_log2, + Address offset) override; wabt::Result OnBinaryExpr(wabt::Opcode opcode) override; wabt::Result OnBlockExpr(Index num_types, Type* sig_types) override; wabt::Result OnBrExpr(Index depth) override; @@ -186,12 +192,6 @@ class BinaryReaderInterp : public BinaryReaderNop { wabt::Result OnTeeLocalExpr(Index local_index) override; wabt::Result OnUnaryExpr(wabt::Opcode opcode) override; wabt::Result OnUnreachableExpr() override; - wabt::Result OnWaitExpr(Opcode opcode, - uint32_t alignment_log2, - Address offset) override; - wabt::Result OnWakeExpr(Opcode opcode, - uint32_t alignment_log2, - Address offset) override; wabt::Result EndFunctionBody(Index index) override; wabt::Result EndElemSegmentInitExpr(Index index) override; @@ -1486,24 +1486,24 @@ wabt::Result BinaryReaderInterp::OnUnreachableExpr() { return wabt::Result::Ok; } -wabt::Result BinaryReaderInterp::OnWaitExpr(Opcode opcode, - uint32_t alignment_log2, - Address offset) { +wabt::Result BinaryReaderInterp::OnAtomicWaitExpr(Opcode opcode, + uint32_t alignment_log2, + Address offset) { CHECK_RESULT(CheckHasMemory(opcode)); CHECK_RESULT(CheckAtomicAlign(alignment_log2, opcode.GetMemorySize())); - CHECK_RESULT(typechecker_.OnWait(opcode)); + CHECK_RESULT(typechecker_.OnAtomicWait(opcode)); CHECK_RESULT(EmitOpcode(opcode)); CHECK_RESULT(EmitI32(module_->memory_index)); CHECK_RESULT(EmitI32(offset)); return wabt::Result::Ok; } -wabt::Result BinaryReaderInterp::OnWakeExpr(Opcode opcode, - uint32_t alignment_log2, - Address offset) { +wabt::Result BinaryReaderInterp::OnAtomicWakeExpr(Opcode opcode, + uint32_t alignment_log2, + Address offset) { CHECK_RESULT(CheckHasMemory(opcode)); CHECK_RESULT(CheckAtomicAlign(alignment_log2, opcode.GetMemorySize())); - CHECK_RESULT(typechecker_.OnWake(opcode)); + CHECK_RESULT(typechecker_.OnAtomicWake(opcode)); CHECK_RESULT(EmitOpcode(opcode)); CHECK_RESULT(EmitI32(module_->memory_index)); CHECK_RESULT(EmitI32(offset)); |