[AVR] Migrate to new MCAsmBackend applyFixup

[xiangzhai]

Summary

Hi LLVM developers,

MCAsmBackend added a new parameter MCContext &Ctx for applyFixup, so I just simply migrate it for AVR, please review my patch, thanks a lot!

BG: I am a Arduino fans, ported laserkbd to Linux :) and Thanks for Dylan McKay's great job: avr-llvm I will try it on my UNO v3.0 board :)

Regards,
Leslie Zhai

[jroelofs]

Why didn't the lack of this break the build?

[xiangzhai]

Hi Jonathan,

Thanks for your review!

Why didn't the lack of this break the build?

In file included from /data/project/LLVM/llvm/lib/Target/AVR/MCTargetDesc/AVRAsmBackend.cpp:14:
/data/project/LLVM/llvm/lib/Target/AVR/MCTargetDesc/AVRAsmBackend.h:44:55: error: non-virtual member function marked 'override' hides virtual member function

uint64_t Value, bool IsPCRel) const override;
                                    ^

/data/project/LLVM/llvm/include/llvm/MC/MCAsmBackend.h:76:16: note: hidden overloaded virtual function 'llvm::MCAsmBackend::applyFixup' declared here: different number of parameters (6 vs 5)

virtual void applyFixup(const MCFixup &Fixup, char *Data, unsigned DataSize,
             ^

/data/project/LLVM/llvm/lib/Target/AVR/MCTargetDesc/AVRAsmBackend.cpp:469:14: error: allocating an object of abstract class type 'llvm::AVRAsmBackend'

return new AVRAsmBackend(TT.getOS());
           ^

/data/project/LLVM/llvm/include/llvm/MC/MCAsmBackend.h:76:16: note: unimplemented pure virtual method 'applyFixup' in 'AVRAsmBackend'

virtual void applyFixup(const MCFixup &Fixup, char *Data, unsigned DataSize,
             ^

2 errors generated.

And I do not have commit access, please commit it on my behalf, thanks a lot!

Regards,
Leslie Zhai

[jroelofs]

r299946

lib/Target/AVR/MCTargetDesc/AVRAsmBackend.h

AVRAsmBackend(Triple::OSType OSType)
       : MCAsmBackend(), OSType(OSType) {}
 
   void adjustFixupValue(const MCFixup &Fixup, uint64_t &Value,
                         MCContext *Ctx = nullptr) const;
 
   MCObjectWriter *createObjectWriter(raw_pwrite_stream &OS) const override;
 
   void applyFixup(const MCFixup &Fixup, char *Data, unsigned DataSize,
-                  uint64_t Value, bool IsPCRel) const override;
+                  uint64_t Value, bool IsPCRel, MCContext &Ctx) const override;
 
   const MCFixupKindInfo &getFixupKindInfo(MCFixupKind Kind) const override;
 
   unsigned getNumFixupKinds() const override {
     return AVR::NumTargetFixupKinds;
   }
 
   bool mayNeedRelaxation(const MCInst &Inst) const override { return false; }

lib/Target/AVR/MCTargetDesc/AVRAsmBackend.cpp

 
 MCObjectWriter *AVRAsmBackend::createObjectWriter(raw_pwrite_stream &OS) const {
   return createAVRELFObjectWriter(OS,
                                   MCELFObjectTargetWriter::getOSABI(OSType));
 }
 
 void AVRAsmBackend::applyFixup(const MCFixup &Fixup, char *Data,
                                unsigned DataSize, uint64_t Value,
-                               bool IsPCRel) const {
+                               bool IsPCRel, MCContext &Ctx) const {
   if (Value == 0)
     return; // Doesn't change encoding.
 
   MCFixupKindInfo Info = getFixupKindInfo(Fixup.getKind());
 
   // The number of bits in the fixup mask
   auto NumBits = Info.TargetSize + Info.TargetOffset;
   auto NumBytes = (NumBits / 8) + ((NumBits % 8) == 0 ? 0 : 1);