diff options
Diffstat (limited to 'llvm/lib/Target/WebAssembly')
3 files changed, 13 insertions, 23 deletions
diff --git a/llvm/lib/Target/WebAssembly/InstPrinter/WebAssemblyInstPrinter.cpp b/llvm/lib/Target/WebAssembly/InstPrinter/WebAssemblyInstPrinter.cpp index 10fa798ac8d..d5763d83713 100644 --- a/llvm/lib/Target/WebAssembly/InstPrinter/WebAssemblyInstPrinter.cpp +++ b/llvm/lib/Target/WebAssembly/InstPrinter/WebAssemblyInstPrinter.cpp @@ -211,13 +211,7 @@ void WebAssemblyInstPrinter::printWebAssemblySignatureOperand( case WebAssembly::ExprType::I64: O << "i64"; break; case WebAssembly::ExprType::F32: O << "f32"; break; case WebAssembly::ExprType::F64: O << "f64"; break; - case WebAssembly::ExprType::I8x16: O << "i8x16"; break; - case WebAssembly::ExprType::I16x8: O << "i16x8"; break; - case WebAssembly::ExprType::I32x4: O << "i32x4"; break; - case WebAssembly::ExprType::F32x4: O << "f32x4"; break; - case WebAssembly::ExprType::B8x16: O << "b8x16"; break; - case WebAssembly::ExprType::B16x8: O << "b16x8"; break; - case WebAssembly::ExprType::B32x4: O << "b32x4"; break; + case WebAssembly::ExprType::V128: O << "v128"; break; case WebAssembly::ExprType::ExceptRef: O << "except_ref"; break; } } diff --git a/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCTargetDesc.h b/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCTargetDesc.h index 071e4586856..b4639b4afdc 100644 --- a/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCTargetDesc.h +++ b/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCTargetDesc.h @@ -312,18 +312,12 @@ static const unsigned StoreP2AlignOperandNo = 0; /// This is used to indicate block signatures. enum class ExprType : unsigned { - Void = 0x40, - I32 = 0x7F, - I64 = 0x7E, - F32 = 0x7D, - F64 = 0x7C, - I8x16 = 0x7B, - I16x8 = 0x7A, - I32x4 = 0x79, - F32x4 = 0x78, - B8x16 = 0x77, - B16x8 = 0x76, - B32x4 = 0x75, + Void = 0x40, + I32 = 0x7F, + I64 = 0x7E, + F32 = 0x7D, + F64 = 0x7C, + V128 = 0x7B, ExceptRef = 0x68 }; diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyCFGStackify.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyCFGStackify.cpp index 70ce40cefed..2ec595e999d 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyCFGStackify.cpp +++ b/llvm/lib/Target/WebAssembly/WebAssemblyCFGStackify.cpp @@ -253,10 +253,12 @@ static void FixEndsAtEndOfFunction( case MVT::i64: retType = WebAssembly::ExprType::I64; break; case MVT::f32: retType = WebAssembly::ExprType::F32; break; case MVT::f64: retType = WebAssembly::ExprType::F64; break; - case MVT::v16i8: retType = WebAssembly::ExprType::I8x16; break; - case MVT::v8i16: retType = WebAssembly::ExprType::I16x8; break; - case MVT::v4i32: retType = WebAssembly::ExprType::I32x4; break; - case MVT::v4f32: retType = WebAssembly::ExprType::F32x4; break; + case MVT::v16i8: + case MVT::v8i16: + case MVT::v4i32: + case MVT::v4f32: + retType = WebAssembly::ExprType::V128; + break; case MVT::ExceptRef: retType = WebAssembly::ExprType::ExceptRef; break; default: llvm_unreachable("unexpected return type"); } |
