diff options
Diffstat (limited to 'lib/Target/WebAssembly/WebAssemblyInstrControl.td')
| -rw-r--r-- | lib/Target/WebAssembly/WebAssemblyInstrControl.td | 104 |
1 files changed, 50 insertions, 54 deletions
diff --git a/lib/Target/WebAssembly/WebAssemblyInstrControl.td b/lib/Target/WebAssembly/WebAssemblyInstrControl.td index d90244b90662..7eb6cbf4d249 100644 --- a/lib/Target/WebAssembly/WebAssemblyInstrControl.td +++ b/lib/Target/WebAssembly/WebAssemblyInstrControl.td @@ -12,8 +12,6 @@ /// //===----------------------------------------------------------------------===// -let Defs = [ARGUMENTS] in { - let isBranch = 1, isTerminator = 1, hasCtrlDep = 1 in { // The condition operand is a boolean value which WebAssembly represents as i32. defm BR_IF : I<(outs), (ins bb_op:$dst, I32:$cond), @@ -30,47 +28,37 @@ defm BR : NRI<(outs), (ins bb_op:$dst), } // isBarrier = 1 } // isBranch = 1, isTerminator = 1, hasCtrlDep = 1 -} // Defs = [ARGUMENTS] - def : Pat<(brcond (i32 (setne I32:$cond, 0)), bb:$dst), (BR_IF bb_op:$dst, I32:$cond)>; def : Pat<(brcond (i32 (seteq I32:$cond, 0)), bb:$dst), (BR_UNLESS bb_op:$dst, I32:$cond)>; -let Defs = [ARGUMENTS] in { +// A list of branch targets enclosed in {} and separated by comma. +// Used by br_table only. +def BrListAsmOperand : AsmOperandClass { let Name = "BrList"; } +let OperandNamespace = "WebAssembly" in { +let OperandType = "OPERAND_BRLIST" in { +def brlist : Operand<i32> { + let ParserMatchClass = BrListAsmOperand; + let PrintMethod = "printBrList"; +} +} // OPERAND_BRLIST +} // OperandNamespace = "WebAssembly" // TODO: SelectionDAG's lowering insists on using a pointer as the index for // jump tables, so in practice we don't ever use BR_TABLE_I64 in wasm32 mode // currently. -// Set TSFlags{0} to 1 to indicate that the variable_ops are immediates. -// Set TSFlags{1} to 1 to indicate that the immediates represent labels. -// FIXME: this can't inherit from I<> since there is no way to inherit from a -// multiclass and still have the let statements. let isTerminator = 1, hasCtrlDep = 1, isBarrier = 1 in { -def BR_TABLE_I32 : NI<(outs), (ins I32:$index, variable_ops), - [(WebAssemblybr_table I32:$index)], 0, - "br_table \t$index", 0x0e> { - let TSFlags{0} = 1; - let TSFlags{1} = 1; -} -def BR_TABLE_I32_S : NI<(outs), (ins I32:$index), - [], 1, - "br_table \t$index", 0x0e> { - let TSFlags{0} = 1; - let TSFlags{1} = 1; -} -def BR_TABLE_I64 : NI<(outs), (ins I64:$index, variable_ops), - [(WebAssemblybr_table I64:$index)], 0, - "br_table \t$index"> { - let TSFlags{0} = 1; - let TSFlags{1} = 1; -} -def BR_TABLE_I64_S : NI<(outs), (ins I64:$index), - [], 1, - "br_table \t$index"> { - let TSFlags{0} = 1; - let TSFlags{1} = 1; -} +defm BR_TABLE_I32 : I<(outs), (ins I32:$index, variable_ops), + (outs), (ins brlist:$brl), + [(WebAssemblybr_table I32:$index)], + "br_table \t$index", "br_table \t$brl", + 0x0e>; +defm BR_TABLE_I64 : I<(outs), (ins I64:$index, variable_ops), + (outs), (ins brlist:$brl), + [(WebAssemblybr_table I64:$index)], + "br_table \t$index", "br_table \t$brl", + 0x0e>; } // isTerminator = 1, hasCtrlDep = 1, isBarrier = 1 // This is technically a control-flow instruction, since all it affects is the @@ -81,13 +69,19 @@ defm NOP : NRI<(outs), (ins), [], "nop", 0x01>; // These use/clobber VALUE_STACK to prevent them from being moved into the // middle of an expression tree. let Uses = [VALUE_STACK], Defs = [VALUE_STACK] in { -defm BLOCK : NRI<(outs), (ins Signature:$sig), [], "block \t$sig", 0x02>; -defm LOOP : NRI<(outs), (ins Signature:$sig), [], "loop \t$sig", 0x03>; +defm BLOCK : NRI<(outs), (ins Signature:$sig), [], "block \t$sig", 0x02>; +defm LOOP : NRI<(outs), (ins Signature:$sig), [], "loop \t$sig", 0x03>; + +defm IF : I<(outs), (ins Signature:$sig, I32:$cond), + (outs), (ins Signature:$sig), + [], "if \t$sig, $cond", "if \t$sig", 0x04>; +defm ELSE : NRI<(outs), (ins), [], "else", 0x05>; -// END_BLOCK, END_LOOP, and END_FUNCTION are represented with the same opcode in -// wasm. +// END_BLOCK, END_LOOP, END_IF and END_FUNCTION are represented with the same +// opcode in wasm. defm END_BLOCK : NRI<(outs), (ins), [], "end_block", 0x0b>; defm END_LOOP : NRI<(outs), (ins), [], "end_loop", 0x0b>; +defm END_IF : NRI<(outs), (ins), [], "end_if", 0x0b>; let isTerminator = 1, isBarrier = 1 in defm END_FUNCTION : NRI<(outs), (ins), [], "end_function", 0x0b>; } // Uses = [VALUE_STACK], Defs = [VALUE_STACK] @@ -103,14 +97,16 @@ multiclass RETURN<WebAssemblyRegClass vt> { } multiclass SIMD_RETURN<ValueType vt> { - defm RETURN_#vt : SIMD_I<(outs), (ins V128:$val), (outs), (ins), - [(WebAssemblyreturn (vt V128:$val))], - "return \t$val", "return", 0x0f>; + defm RETURN_#vt : I<(outs), (ins V128:$val), (outs), (ins), + [(WebAssemblyreturn (vt V128:$val))], + "return \t$val", "return", 0x0f>, + Requires<[HasSIMD128]>; // Equivalent to RETURN_#vt, for use at the end of a function when wasm // semantics return by falling off the end of the block. let isCodeGenOnly = 1 in - defm FALLTHROUGH_RETURN_#vt : SIMD_I<(outs), (ins V128:$val), (outs), (ins), - []>; + defm FALLTHROUGH_RETURN_#vt : I<(outs), (ins V128:$val), (outs), (ins), + []>, + Requires<[HasSIMD128]>; } let isTerminator = 1, hasCtrlDep = 1, isBarrier = 1 in { @@ -124,7 +120,9 @@ let isReturn = 1 in { defm "": SIMD_RETURN<v16i8>; defm "": SIMD_RETURN<v8i16>; defm "": SIMD_RETURN<v4i32>; + defm "": SIMD_RETURN<v2i64>; defm "": SIMD_RETURN<v4f32>; + defm "": SIMD_RETURN<v2f64>; defm RETURN_VOID : NRI<(outs), (ins), [(WebAssemblyreturn)], "return", 0x0f>; @@ -144,14 +142,16 @@ let Predicates = [HasExceptionHandling] in { // Throwing an exception: throw / rethrow let isTerminator = 1, hasCtrlDep = 1, isBarrier = 1 in { -defm THROW_I32 : I<(outs), (ins i32imm:$tag, I32:$val), - (outs), (ins i32imm:$tag), - [(int_wasm_throw imm:$tag, I32:$val)], +defm THROW_I32 : I<(outs), (ins event_op:$tag, I32:$val), + (outs), (ins event_op:$tag), + [(WebAssemblythrow (WebAssemblywrapper texternalsym:$tag), + I32:$val)], "throw \t$tag, $val", "throw \t$tag", 0x08>; -defm THROW_I64 : I<(outs), (ins i32imm:$tag, I64:$val), - (outs), (ins i32imm:$tag), - [(int_wasm_throw imm:$tag, I64:$val)], +defm THROW_I64 : I<(outs), (ins event_op:$tag, I64:$val), + (outs), (ins event_op:$tag), + [(WebAssemblythrow (WebAssemblywrapper texternalsym:$tag), + I64:$val)], "throw \t$tag, $val", "throw \t$tag", 0x08>; defm RETHROW : NRI<(outs), (ins bb_op:$dst), [], "rethrow \t$dst", 0x09>; @@ -168,7 +168,7 @@ defm END_TRY : NRI<(outs), (ins), [], "end_try", 0x0b>; } // Uses = [VALUE_STACK], Defs = [VALUE_STACK] // Catching an exception: catch / catch_all -let hasCtrlDep = 1 in { +let hasCtrlDep = 1, hasSideEffects = 1 in { defm CATCH_I32 : I<(outs I32:$dst), (ins i32imm:$tag), (outs), (ins i32imm:$tag), [(set I32:$dst, (int_wasm_catch imm:$tag))], @@ -181,14 +181,10 @@ defm CATCH_ALL : NRI<(outs), (ins), [], "catch_all", 0x05>; } // Pseudo instructions: cleanupret / catchret -// They are not return instructions in wasm, but setting 'isReturn' to true as -// in X86 is necessary for computing EH scope membership. let isTerminator = 1, hasSideEffects = 1, isBarrier = 1, hasCtrlDep = 1, - isCodeGenOnly = 1, isReturn = 1 in { + isCodeGenOnly = 1, isEHScopeReturn = 1 in { defm CLEANUPRET : NRI<(outs), (ins), [(cleanupret)], "", 0>; defm CATCHRET : NRI<(outs), (ins bb_op:$dst, bb_op:$from), [(catchret bb:$dst, bb:$from)], "", 0>; } } - -} // Defs = [ARGUMENTS] |
