summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWouter van Oortmerssen <aardappel@gmail.com>2019-02-20 00:55:59 +0000
committerWouter van Oortmerssen <aardappel@gmail.com>2019-02-20 00:55:59 +0000
commit8a28ce1a123a79b6de86a0870c130f6db7e19e7e (patch)
treeea1ad9653985977c57b512daf7efecb7669346e3
parenta875b9b32bd160e6549664ab8f77d49f50cde16d (diff)
downloadbcm5719-llvm-8a28ce1a123a79b6de86a0870c130f6db7e19e7e.tar.gz
bcm5719-llvm-8a28ce1a123a79b6de86a0870c130f6db7e19e7e.zip
[WebAssembly] Fixed disassembler not knowing about OPERAND_EVENT
Reviewers: aheejin Subscribers: dschuff, sbc100, jgravelle-google, sunfish, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D58414 llvm-svn: 354416
-rw-r--r--llvm/lib/Target/WebAssembly/Disassembler/WebAssemblyDisassembler.cpp1
-rw-r--r--llvm/test/MC/Disassembler/WebAssembly/wasm.txt3
2 files changed, 4 insertions, 0 deletions
diff --git a/llvm/lib/Target/WebAssembly/Disassembler/WebAssemblyDisassembler.cpp b/llvm/lib/Target/WebAssembly/Disassembler/WebAssemblyDisassembler.cpp
index 23cf60c1877..c79411e1474 100644
--- a/llvm/lib/Target/WebAssembly/Disassembler/WebAssemblyDisassembler.cpp
+++ b/llvm/lib/Target/WebAssembly/Disassembler/WebAssemblyDisassembler.cpp
@@ -199,6 +199,7 @@ MCDisassembler::DecodeStatus WebAssemblyDisassembler::getInstruction(
case WebAssembly::OPERAND_OFFSET32:
case WebAssembly::OPERAND_P2ALIGN:
case WebAssembly::OPERAND_TYPEINDEX:
+ case WebAssembly::OPERAND_EVENT:
case MCOI::OPERAND_IMMEDIATE: {
if (!parseLEBImmediate(MI, Size, Bytes, false))
return MCDisassembler::Fail;
diff --git a/llvm/test/MC/Disassembler/WebAssembly/wasm.txt b/llvm/test/MC/Disassembler/WebAssembly/wasm.txt
index 8a119fb6b0f..e979bac6912 100644
--- a/llvm/test/MC/Disassembler/WebAssembly/wasm.txt
+++ b/llvm/test/MC/Disassembler/WebAssembly/wasm.txt
@@ -55,3 +55,6 @@
# This can mean end_block/end_loop/end_if/end_function/end_try..
# CHECK: end
0x0B
+
+# CHECK: br_on_exn 0, 0
+0x0A 0x00 0x00
OpenPOWER on IntegriCloud