[EraVM] Remove RETURN and REVERT pseudos

Author: atrosinenko

llvm/lib/Target/EraVM/EraVMAsmPrinter.cpp

@@ -102,11 +102,7 @@ void EraVMAsmPrinter::emitInstruction(const MachineInstr *MI) {
 
   // Do some manual expansion
   unsigned Opc = MI->getOpcode();
-  switch (Opc) {
-  default:
-    // Change nothing by default
-    break;
-  case EraVM::J_s: {
+  if (Opc == EraVM::J_s) {
     MCOperand MCOp;
     TmpInst.setOpcode(EraVM::JCs);
     // Operand: dest
@@ -121,27 +117,6 @@ void EraVMAsmPrinter::emitInstruction(const MachineInstr *MI) {
     EmitToStreamer(*OutStreamer, TmpInst);
     return;
   }
-  case EraVM::DEFAULT_FAR_REVERT:
-  case EraVM::DEFAULT_FAR_RETURN: {
-    bool IsRevert = Opc == EraVM::DEFAULT_FAR_REVERT;
-    MCSymbol *DefaultFarReturnSym = OutContext.getOrCreateSymbol(
-        IsRevert ? "DEFAULT_FAR_REVERT" : "DEFAULT_FAR_RETURN");
-    // Expand to: ret/revert.to_label $rs0, @DEFAULT_FAR_RETURN
-    MCOperand MCOp;
-    TmpInst.setOpcode(IsRevert ? EraVM::REVERTrl : EraVM::RETrl);
-    // Operand: rs0
-    lowerOperand(MI->getOperand(0), MCOp);
-    TmpInst.addOperand(MCOp);
-    // Operand: default dest
-    TmpInst.addOperand(MCOperand::createExpr(
-        MCSymbolRefExpr::create(DefaultFarReturnSym, OutContext)));
-    // Operand: cc
-    lowerOperand(MI->getOperand(1), MCOp);
-    TmpInst.addOperand(MCOp);
-    EmitToStreamer(*OutStreamer, TmpInst);
-    return;
-  }
-  }
 
   if (MI->isPseudo()) {
 #ifndef NDEBUG

llvm/lib/Target/EraVM/EraVMInstrInfo.td

@@ -120,6 +120,17 @@ def constant_pool : SDNodeXForm<imm, [{
   return CurDAG->getTargetConstantPool(N->getConstantIntValue(), PtrVT);
 }]>;
 
+def default_far_return : SDNodeXForm<imm, [{
+  (void)N;
+  MVT PtrVT = getTargetLowering()->getPointerTy(CurDAG->getDataLayout());
+  return CurDAG->getExternalSymbol("DEFAULT_FAR_RETURN", PtrVT);
+}]>;
+def default_far_revert : SDNodeXForm<imm, [{
+  (void)N;
+  MVT PtrVT = getTargetLowering()->getPointerTy(CurDAG->getDataLayout());
+  return CurDAG->getExternalSymbol("DEFAULT_FAR_REVERT", PtrVT);
+}]>;
+
 //===----------------------------------------------------------------------===//
 // Complex Pattern Definitions.
 //===----------------------------------------------------------------------===//
@@ -1040,10 +1051,8 @@ def : InstAlias<"ret.ok.to_label${cc} $dest", (RETrl R1, jmptarget:$dest, pred:$
 def : InstAlias<"ret.revert.to_label${cc} $dest", (REVERTrl R1, jmptarget:$dest, pred:$cc)>;
 }
 
-let isTerminator = 1, isBarrier = 1, isReturn = 1 in {
-def DEFAULT_FAR_RETURN : Pseudo<(outs), (ins GR256:$rs0, pred:$cc), [(EraVMreturn GR256:$rs0)]>;
-def DEFAULT_FAR_REVERT : Pseudo<(outs), (ins GR256:$rs0, pred:$cc), [(EraVMrevert GR256:$rs0)]>;
-}
+def : Pat<(EraVMreturn GR256:$rs0), (RETrl GR256:$rs0, (default_far_return 0))>;
+def : Pat<(EraVMrevert GR256:$rs0), (REVERTrl GR256:$rs0, (default_far_revert 0))>;
 
 //===----------------------------------------------------------------------===//
 // Constants materialization