Revert r252858: "[WebAssembly] Switch to MC for instruction printing."

[oota-llvm.git] / lib / Target / WebAssembly / WebAssemblyInstrCall.td

diff --git a/lib/Target/WebAssembly/WebAssemblyInstrCall.td b/lib/Target/WebAssembly/WebAssemblyInstrCall.td
index 3b9c015fb18c69c10c711e74afdd8942b3cc2865..82a42f564abe10ed489f5444b23cfddae9be7b97 100644 (file)
--- a/lib/Target/WebAssembly/WebAssemblyInstrCall.td
+++ b/lib/Target/WebAssembly/WebAssemblyInstrCall.td
@@ -14,31 +14,33 @@
 
 // The call sequence start/end LLVM-isms isn't useful to WebAssembly since it's
 // a virtual ISA.
+let isCodeGenOnly = 1 in {
+def : I<(outs), (ins i64imm:$amt),
+        [(WebAssemblycallseq_start timm:$amt)]>;
+def : I<(outs), (ins i64imm:$amt1, i64imm:$amt2),
+        [(WebAssemblycallseq_end timm:$amt1, timm:$amt2)]>;
+} // isCodeGenOnly = 1
 
-// FIXME make noop?
-//def : Pat<(WebAssemblycallseq_start timm), (i32 (IMPLICIT_DEF))>;
-//def : Pat<(WebAssemblycallseq_end timm, timm), (i32 (IMPLICIT_DEF))>;
+multiclass CALL<WebAssemblyRegClass vt> {
+  def CALL_#vt : I<(outs vt:$dst), (ins global:$callee, variable_ops),
+                   [(set vt:$dst, (WebAssemblycall1 (WebAssemblywrapper tglobaladdr:$callee)))]>;
+  def CALL_INDIRECT_#vt : I<(outs vt:$dst), (ins I32:$callee, variable_ops),
+                            [(set vt:$dst, (WebAssemblycall1 I32:$callee))]>;
+}
+let Uses = [SP32, SP64], isCall = 1 in {
+  defm : CALL<I32>;
+  defm : CALL<I64>;
+  defm : CALL<F32>;
+  defm : CALL<F64>;
 
-def SDT_WebAssemblyCallSeqStart : SDCallSeqStart<[SDTCisVT<0, iPTR>]>;
-def SDT_WebAssemblyCallSeqEnd :
-    SDCallSeqEnd<[SDTCisVT<0, iPTR>, SDTCisVT<1, iPTR>]>;
-def WebAssemblycallseq_start :
-    SDNode<"ISD::CALLSEQ_START", SDT_WebAssemblyCallSeqStart,
-           [SDNPHasChain, SDNPOutGlue]>;
-def WebAssemblycallseq_end :
-    SDNode<"ISD::CALLSEQ_END", SDT_WebAssemblyCallSeqEnd,
-           [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue]>;
-def : Pseudo<(outs), (ins i64imm:$amt),
-             [(WebAssemblycallseq_start timm:$amt)],
-             "#ADJCALLSTACKDOWN $amt">;
-def : Pseudo<(outs), (ins i64imm:$amt1, i64imm:$amt2),
-             [(WebAssemblycallseq_end timm:$amt1, timm:$amt2)],
-            "#ADJCALLSTACKUP $amt1 $amt2">;
+  def CALL_VOID : I<(outs), (ins global:$callee, variable_ops),
+                    [(WebAssemblycall0 (WebAssemblywrapper tglobaladdr:$callee))]>;
+  def CALL_INDIRECT_VOID : I<(outs), (ins I32:$callee, variable_ops),
+                             [(WebAssemblycall0 I32:$callee)]>;
+} // Uses = [SP32,SP64], isCall = 1
 
 /*
  * TODO(jfb): Add the following.
  *
- * call_direct: call function directly
- * call_indirect: call function indirectly
  * addressof: obtain a function pointer value for a given function
  */