[m88k] Fix errors due to upstream changes

- copyPhysReg() has new parameters
- some function in the AsmParser were renamed

Author: redstar

llvm/lib/Target/M88k/AsmParser/M88kAsmParser.cpp

@@ -213,7 +213,7 @@ class M88kAsmParser : public MCTargetAsmParser {
   }
 
   bool ParseDirective(AsmToken DirectiveID) override;
-  bool ParseInstruction(ParseInstructionInfo &Info, StringRef Name,
+  bool parseInstruction(ParseInstructionInfo &Info, StringRef Name,
                         SMLoc NameLoc, OperandVector &Operands) override;
   bool parseRegister(MCRegister &RegNo, SMLoc &StartLoc,
                      SMLoc &EndLoc) override;
@@ -242,7 +242,7 @@ class M88kAsmParser : public MCTargetAsmParser {
     return parsePCRel(Operands, 28);
   }
 
-  bool MatchAndEmitInstruction(SMLoc IdLoc, unsigned &Opcode,
+  bool matchAndEmitInstruction(SMLoc IdLoc, unsigned &Opcode,
                                OperandVector &Operands, MCStreamer &Out,
                                uint64_t &ErrorInfo,
                                bool MatchingInlineAsm) override;
@@ -338,7 +338,7 @@ bool M88kAsmParser::ParseDirective(AsmToken DirectiveID) {
   return true;
 }
 
-bool M88kAsmParser::ParseInstruction(ParseInstructionInfo &Info, StringRef Name,
+bool M88kAsmParser::parseInstruction(ParseInstructionInfo &Info, StringRef Name,
                                      SMLoc NameLoc, OperandVector &Operands) {
   // First operand in MCInst is instruction mnemonic.
   Operands.push_back(M88kOperand::createToken(Name, NameLoc));
@@ -671,7 +671,7 @@ ParseStatus M88kAsmParser::tryParseRegister(MCRegister &RegNo, SMLoc &StartLoc,
   return ParseStatus::Success;
 }
 
-bool M88kAsmParser::MatchAndEmitInstruction(SMLoc IdLoc, unsigned &Opcode,
+bool M88kAsmParser::matchAndEmitInstruction(SMLoc IdLoc, unsigned &Opcode,
                                             OperandVector &Operands,
                                             MCStreamer &Out,
                                             uint64_t &ErrorInfo,

llvm/lib/Target/M88k/M88kInstrInfo.cpp

@@ -538,7 +538,8 @@ unsigned M88kInstrInfo::getInstSizeInBytes(const MachineInstr &MI) const {
 void M88kInstrInfo::copyPhysReg(MachineBasicBlock &MBB,
                                 MachineBasicBlock::iterator MBBI,
                                 const DebugLoc &DL, MCRegister DestReg,
-                                MCRegister SrcReg, bool KillSrc) const {
+                                MCRegister SrcReg, bool KillSrc,
+                                bool RenamableDest, bool RenamableSrc) const {
   // Split 64-bit GPR moves into two 64-bit moves. Add implicit uses of the
   // super register in case one of the subregs is undefined.
   if (M88k::GPR64RegClass.contains(DestReg, SrcReg)) {

llvm/lib/Target/M88k/M88kInstrInfo.h

@@ -92,9 +92,10 @@ class M88kInstrInfo : public M88kGenInstrInfo {
 
   unsigned getInstSizeInBytes(const MachineInstr &MI) const override;
 
-  void copyPhysReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI,
+  void copyPhysReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI,
                    const DebugLoc &DL, MCRegister DestReg, MCRegister SrcReg,
-                   bool KillSrc) const override;
+                   bool KillSrc, bool RenamableDest = false,
+                   bool RenamableSrc = false) const override;
 
   std::optional<DestSourcePair>
   isCopyInstrImpl(const MachineInstr &MI) const override;