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 abb7f21512a7915d47e537404132c6d2f72fcbf4..82a42f564abe10ed489f5444b23cfddae9be7b97 100644 (file)
--- a/lib/Target/WebAssembly/WebAssemblyInstrCall.td
+++ b/lib/Target/WebAssembly/WebAssemblyInstrCall.td
@@ -22,21 +22,25 @@ def : I<(outs), (ins i64imm:$amt1, i64imm:$amt2),
 } // isCodeGenOnly = 1
 
 multiclass CALL<WebAssemblyRegClass vt> {
-  def CALL_#vt : I<(outs vt:$dst), (ins Int32:$callee, variable_ops),
-                   [(set vt:$dst, (WebAssemblycall Int32:$callee))]>;
+  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<Int32>;
-  defm : CALL<Int64>;
-  defm : CALL<Float32>;
-  defm : CALL<Float64>;
-  // FIXME: void.
+  defm : CALL<I32>;
+  defm : CALL<I64>;
+  defm : CALL<F32>;
+  defm : CALL<F64>;
+
+  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
  */