fix z80 Target

Author: adriweb

llvm/lib/Target/Z80/GISel/Z80CallLowering.cpp

@@ -23,6 +23,7 @@
 #include "llvm/CodeGen/Analysis.h"
 #include "llvm/CodeGen/GlobalISel/MIPatternMatch.h"
 #include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h"
+#include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Target/TargetMachine.h"
 using namespace llvm;

llvm/lib/Target/Z80/GISel/Z80InstructionSelector.cpp

@@ -22,6 +22,8 @@
 #include "llvm/CodeGen/GlobalISel/InstructionSelector.h"
 #include "llvm/CodeGen/GlobalISel/InstructionSelectorImpl.h"
 #include "llvm/CodeGen/GlobalISel/MIPatternMatch.h"
+#include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h"
+#include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineJumpTableInfo.h"
 #include "llvm/Support/Debug.h"
 
@@ -810,8 +812,8 @@ bool Z80InstructionSelector::selectLoadStore(MachineInstr &I,
     }
   }
 
-  I.RemoveOperand(1);
-  I.RemoveOperand(0);
+  I.removeOperand(1);
+  I.removeOperand(0);
   MachineInstrBuilder MIB(MF, I);
   SmallVector<MachineOperand, 2> MOs;
   int32_t Off = 0;
@@ -976,7 +978,7 @@ bool Z80InstructionSelector::selectLoadStore(MachineInstr &I,
       MachineInstr &LoadMI = *MemMOs[1];
       LoadMI.setDesc(TII.get(TargetOpcode::IMPLICIT_DEF));
       while (LoadMI.getNumOperands() > 1)
-        LoadMI.RemoveOperand(1);
+        LoadMI.removeOperand(1);
       LoadMI.dropMemRefs(MF);
     }
   }
@@ -1012,7 +1014,7 @@ bool Z80InstructionSelector::selectFrameIndexOrGep(MachineInstr &I,
   if (I.getOpcode() == TargetOpcode::G_PTR_ADD) {
     auto OffConst = getIConstantVRegVal(I.getOperand(2).getReg(), MRI);
     if (OffConst && OffConst->sge(-1) && OffConst->sle(1)) {
-      I.RemoveOperand(2);
+      I.removeOperand(2);
       if (OffConst->isNullValue()) {
         I.setDesc(TII.get(TargetOpcode::COPY));
         return selectCopy(I, MRI);

llvm/lib/Target/Z80/GISel/Z80RegisterBankInfo.cpp

@@ -13,8 +13,7 @@
 #include "Z80RegisterBankInfo.h"
 #include "Z80RegisterInfo.h"
 #include "MCTargetDesc/Z80MCTargetDesc.h"
-#include "llvm/CodeGen/GlobalISel/RegisterBank.h"
-#include "llvm/CodeGen/GlobalISel/RegisterBankInfo.h"
+#include "llvm/CodeGen/RegisterBankInfo.h"
 #include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/CodeGen/TargetRegisterInfo.h"
 

llvm/lib/Target/Z80/GISel/Z80RegisterBankInfo.h

@@ -13,7 +13,7 @@
 #ifndef LLVM_LIB_TARGET_Z80_Z80REGISTERBANKINFO_H
 #define LLVM_LIB_TARGET_Z80_Z80REGISTERBANKINFO_H
 
-#include "llvm/CodeGen/GlobalISel/RegisterBankInfo.h"
+#include "llvm/CodeGen/RegisterBankInfo.h"
 
 #define GET_REGBANK_DECLARATIONS
 #include "Z80GenRegisterBank.inc"

llvm/lib/Target/Z80/MCTargetDesc/EZ80InstPrinter.h

@@ -16,6 +16,8 @@
 
 #include "Z80InstPrinterCommon.h"
 
+#include <llvm/MC/MCRegister.h>
+
 namespace llvm {
   class Z80EInstPrinter final : public Z80InstPrinterCommon {
   public:
@@ -27,10 +29,10 @@ namespace llvm {
     std::pair<const char *, uint64_t> getMnemonic(const MCInst *MI) override;
     void printInstruction(const MCInst *MI, uint64_t Address,
                           raw_ostream &OS) override;
-    static const char *getRegisterName(unsigned RegNo);
+    static const char *getRegisterName(MCRegister Reg);
 
-    StringRef getRegName(unsigned RegNo) const override {
-      return getRegisterName(RegNo);
+    StringRef getRegName(MCRegister Reg) const override {
+      return getRegisterName(Reg);
     }
   };
 }

llvm/lib/Target/Z80/MCTargetDesc/Z80InstPrinter.h

@@ -16,6 +16,8 @@
 
 #include "Z80InstPrinterCommon.h"
 
+#include "llvm/MC/MCRegister.h"
+
 namespace llvm {
   class Z80InstPrinter final : public Z80InstPrinterCommon {
   public:
@@ -27,10 +29,10 @@ namespace llvm {
     std::pair<const char *, uint64_t> getMnemonic(const MCInst *MI) override;
     void printInstruction(const MCInst *MI, uint64_t Address,
                           raw_ostream &OS) override;
-    static const char *getRegisterName(unsigned RegNo);
+    static const char *getRegisterName(MCRegister Reg);
 
-    StringRef getRegName(unsigned RegNo) const override {
-      return getRegisterName(RegNo);
+    StringRef getRegName(MCRegister Reg) const override {
+      return getRegisterName(Reg);
     }
   };
 }

llvm/lib/Target/Z80/MCTargetDesc/Z80InstPrinterCommon.cpp

@@ -16,9 +16,11 @@
 #include "Z80InstPrinter.h"
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCInst.h"
+#include "llvm/MC/MCRegister.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/FormattedStream.h"
+
 using namespace llvm;
 
 #define DEBUG_TYPE "asm-printer"
@@ -60,8 +62,8 @@ bool Z80InstPrinterCommon::applyTargetSpecificCLOption(StringRef Opt) {
   return false;
 }
 
-void Z80InstPrinterCommon::printRegName(raw_ostream &OS, unsigned RegNo) const {
-  OS << markup("<reg:") << getRegName(RegNo) << markup(">");
+void Z80InstPrinterCommon::printRegName(raw_ostream &OS, MCRegister Reg) const {
+  OS << markup("<reg:") << getRegName(Reg) << markup(">");
 }
 
 void Z80InstPrinterCommon::printInst(const MCInst *MI, uint64_t Address,

llvm/lib/Target/Z80/MCTargetDesc/Z80InstPrinterCommon.h

@@ -25,14 +25,14 @@ class Z80InstPrinterCommon : public MCInstPrinter {
 
   bool applyTargetSpecificCLOption(StringRef Opt) override;
 
-  void printRegName(raw_ostream &OS, unsigned RegNo) const override;
+  void printRegName(raw_ostream &OS, MCRegister Reg) const override;
   void printInst(const MCInst *MI, uint64_t Address, StringRef Annot,
                  const MCSubtargetInfo &STI, raw_ostream &OS) override;
 
   // Autogenerated by tblgen.
   virtual void printInstruction(const MCInst *MI, uint64_t Address,
                                 raw_ostream &OS) = 0;
-  virtual StringRef getRegName(unsigned RegNo) const = 0;
+  virtual StringRef getRegName(MCRegister Reg) const = 0;
 
   void printOperand(const MCInst *MI, unsigned OpNo, raw_ostream &OS);
   void printOperand(const MCInst *MI, uint64_t Address, unsigned OpNo,

llvm/lib/Target/Z80/MCTargetDesc/Z80TargetStreamer.cpp

@@ -15,6 +15,8 @@
 #include "llvm/MC/MCContext.h"
 #include "llvm/Support/FormattedStream.h"
 
+#include <llvm/MC/MCSymbol.h>
+
 using namespace llvm;
 
 Z80TargetStreamer::Z80TargetStreamer(MCStreamer &S)

llvm/lib/Target/Z80/MCTargetDesc/Z80TargetStreamer.h

@@ -20,6 +20,7 @@
 #include "llvm/Support/Alignment.h"
 
 namespace llvm {
+class MCAsmInfo;
 class formatted_raw_ostream;
 
 class Z80TargetStreamer : public MCTargetStreamer {