diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2018-10-12 13:57:23 -0700 |
|---|---|---|
| committer | Ben Smith <binjimin@gmail.com> | 2018-10-12 13:57:23 -0700 |
| commit | 27d833c6c8bbb041c43e5f67e1049d6c0095bd56 (patch) | |
| tree | 417f5c3be444e1031b4e43e63962e1b160155cfd /src/binary-reader-logging.cc | |
| parent | 2cf0904a8b0c8fac067a10838121f8e0e35359de (diff) | |
| download | wabt-27d833c6c8bbb041c43e5f67e1049d6c0095bd56.tar.gz wabt-27d833c6c8bbb041c43e5f67e1049d6c0095bd56.tar.bz2 wabt-27d833c6c8bbb041c43e5f67e1049d6c0095bd56.zip | |
Add bulk memory opcode definitions (#927)
This commit starts to add support in wabt's various tools for the
upcoming [bulk memory proposal][1]. This is based off the current
proposal's overview, although these may get tweaked over time!
This is also the first time I've significantly contributed to wabt, and
what I thought would be a relatively simple addition ended up being much
larger than I imagined! I didn't add many negative tests yet but if more
tests are desired please let me know!
[1]: https://github.com/webassembly/bulk-memory-operations
Diffstat (limited to 'src/binary-reader-logging.cc')
| -rw-r--r-- | src/binary-reader-logging.cc | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/binary-reader-logging.cc b/src/binary-reader-logging.cc index 7edebdd1..7fea7da3 100644 --- a/src/binary-reader-logging.cc +++ b/src/binary-reader-logging.cc @@ -581,6 +581,14 @@ Result BinaryReaderLogging::OnInitFunction(uint32_t priority, return reader_->name(value0, value1); \ } +#define DEFINE_INDEX_INDEX_BOOL(name, desc0, desc1, desc2) \ + Result BinaryReaderLogging::name(Index value0, Index value1, bool value2) { \ + LOGF(#name "(" desc0 ": %" PRIindex ", " desc1 ": %" PRIindex \ + ", " desc2 ": %s)\n", \ + value0, value1, value2 ? "true" : "false"); \ + return reader_->name(value0, value1, value2); \ + } + #define DEFINE_OPCODE(name) \ Result BinaryReaderLogging::name(Opcode opcode) { \ LOGF(#name "(\"%s\" (%u))\n", opcode.GetName(), opcode.GetCode()); \ @@ -665,8 +673,15 @@ DEFINE0(OnEndExpr) DEFINE_INDEX_DESC(OnGetGlobalExpr, "index") DEFINE_INDEX_DESC(OnGetLocalExpr, "index") DEFINE_LOAD_STORE_OPCODE(OnLoadExpr); +DEFINE0(OnMemoryCopyExpr) +DEFINE_INDEX(OnMemoryDropExpr) +DEFINE0(OnMemoryFillExpr) DEFINE0(OnMemoryGrowExpr) +DEFINE_INDEX(OnMemoryInitExpr) DEFINE0(OnMemorySizeExpr) +DEFINE0(OnTableCopyExpr) +DEFINE_INDEX(OnTableDropExpr) +DEFINE_INDEX(OnTableInitExpr) DEFINE0(OnNopExpr) DEFINE0(OnRethrowExpr); DEFINE0(OnReturnExpr) @@ -683,7 +698,7 @@ DEFINE_END(EndCodeSection) DEFINE_BEGIN(BeginElemSection) DEFINE_INDEX(OnElemSegmentCount) -DEFINE_INDEX_INDEX(BeginElemSegment, "index", "table_index") +DEFINE_INDEX_INDEX_BOOL(BeginElemSegment, "index", "table_index", "passive") DEFINE_INDEX(BeginElemSegmentInitExpr) DEFINE_INDEX(EndElemSegmentInitExpr) DEFINE_INDEX_INDEX(OnElemSegmentFunctionIndexCount, "index", "count") @@ -693,7 +708,7 @@ DEFINE_END(EndElemSection) DEFINE_BEGIN(BeginDataSection) DEFINE_INDEX(OnDataSegmentCount) -DEFINE_INDEX_INDEX(BeginDataSegment, "index", "memory_index") +DEFINE_INDEX_INDEX_BOOL(BeginDataSegment, "index", "memory_index", "passive") DEFINE_INDEX(BeginDataSegmentInitExpr) DEFINE_INDEX(EndDataSegmentInitExpr) DEFINE_INDEX(EndDataSegment) |