From cebab4a63983df15d612e5e873106ca6152ae78e Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Wed, 28 Mar 2018 21:33:31 +0000 Subject: [PATCH] ELF: Make required Thunk methods pure virtual and remove an unused argument. NFC. Also make certain Thunk methods non-const as this will be required for an upcoming change. Differential Revision: https://reviews.llvm.org/D44961 llvm-svn: 328732 --- lld/ELF/SyntheticSections.cpp | 4 +-- lld/ELF/SyntheticSections.h | 2 +- lld/ELF/Thunks.cpp | 54 +++++++++++++++++------------------ lld/ELF/Thunks.h | 6 ++-- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/lld/ELF/SyntheticSections.cpp b/lld/ELF/SyntheticSections.cpp index 5ff8ac0fc750..279511fcf67c 100644 --- a/lld/ELF/SyntheticSections.cpp +++ b/lld/ELF/SyntheticSections.cpp @@ -2629,8 +2629,8 @@ void ThunkSection::addThunk(Thunk *T) { } void ThunkSection::writeTo(uint8_t *Buf) { - for (const Thunk *T : Thunks) - T->writeTo(Buf + T->Offset, *this); + for (Thunk *T : Thunks) + T->writeTo(Buf + T->Offset); } InputSection *ThunkSection::getTargetInputSection() const { diff --git a/lld/ELF/SyntheticSections.h b/lld/ELF/SyntheticSections.h index 9ad76a6525da..975921c13a2a 100644 --- a/lld/ELF/SyntheticSections.h +++ b/lld/ELF/SyntheticSections.h @@ -825,7 +825,7 @@ public: InputSection *getTargetInputSection() const; private: - std::vector Thunks; + std::vector Thunks; size_t Size = 0; }; diff --git a/lld/ELF/Thunks.cpp b/lld/ELF/Thunks.cpp index 6ba7a43b4968..05663101943f 100644 --- a/lld/ELF/Thunks.cpp +++ b/lld/ELF/Thunks.cpp @@ -51,16 +51,16 @@ namespace { class AArch64ABSLongThunk final : public Thunk { public: AArch64ABSLongThunk(Symbol &Dest) : Thunk(Dest) {} - uint32_t size() const override { return 16; } - void writeTo(uint8_t *Buf, ThunkSection &IS) const override; + uint32_t size() override { return 16; } + void writeTo(uint8_t *Buf) override; void addSymbols(ThunkSection &IS) override; }; class AArch64ADRPThunk final : public Thunk { public: AArch64ADRPThunk(Symbol &Dest) : Thunk(Dest) {} - uint32_t size() const override { return 12; } - void writeTo(uint8_t *Buf, ThunkSection &IS) const override; + uint32_t size() override { return 12; } + void writeTo(uint8_t *Buf) override; void addSymbols(ThunkSection &IS) override; }; @@ -70,8 +70,8 @@ class ARMV7ABSLongThunk final : public Thunk { public: ARMV7ABSLongThunk(Symbol &Dest) : Thunk(Dest) {} - uint32_t size() const override { return 12; } - void writeTo(uint8_t *Buf, ThunkSection &IS) const override; + uint32_t size() override { return 12; } + void writeTo(uint8_t *Buf) override; void addSymbols(ThunkSection &IS) override; bool isCompatibleWith(RelType Type) const override; }; @@ -80,8 +80,8 @@ class ARMV7PILongThunk final : public Thunk { public: ARMV7PILongThunk(Symbol &Dest) : Thunk(Dest) {} - uint32_t size() const override { return 16; } - void writeTo(uint8_t *Buf, ThunkSection &IS) const override; + uint32_t size() override { return 16; } + void writeTo(uint8_t *Buf) override; void addSymbols(ThunkSection &IS) override; bool isCompatibleWith(RelType Type) const override; }; @@ -90,8 +90,8 @@ class ThumbV7ABSLongThunk final : public Thunk { public: ThumbV7ABSLongThunk(Symbol &Dest) : Thunk(Dest) { Alignment = 2; } - uint32_t size() const override { return 10; } - void writeTo(uint8_t *Buf, ThunkSection &IS) const override; + uint32_t size() override { return 10; } + void writeTo(uint8_t *Buf) override; void addSymbols(ThunkSection &IS) override; bool isCompatibleWith(RelType Type) const override; }; @@ -100,8 +100,8 @@ class ThumbV7PILongThunk final : public Thunk { public: ThumbV7PILongThunk(Symbol &Dest) : Thunk(Dest) { Alignment = 2; } - uint32_t size() const override { return 12; } - void writeTo(uint8_t *Buf, ThunkSection &IS) const override; + uint32_t size() override { return 12; } + void writeTo(uint8_t *Buf) override; void addSymbols(ThunkSection &IS) override; bool isCompatibleWith(RelType Type) const override; }; @@ -111,8 +111,8 @@ class MipsThunk final : public Thunk { public: MipsThunk(Symbol &Dest) : Thunk(Dest) {} - uint32_t size() const override { return 16; } - void writeTo(uint8_t *Buf, ThunkSection &IS) const override; + uint32_t size() override { return 16; } + void writeTo(uint8_t *Buf) override; void addSymbols(ThunkSection &IS) override; InputSection *getTargetInputSection() const override; }; @@ -122,8 +122,8 @@ class MicroMipsThunk final : public Thunk { public: MicroMipsThunk(Symbol &Dest) : Thunk(Dest) {} - uint32_t size() const override { return 14; } - void writeTo(uint8_t *Buf, ThunkSection &IS) const override; + uint32_t size() override { return 14; } + void writeTo(uint8_t *Buf) override; void addSymbols(ThunkSection &IS) override; InputSection *getTargetInputSection() const override; }; @@ -133,8 +133,8 @@ class MicroMipsR6Thunk final : public Thunk { public: MicroMipsR6Thunk(Symbol &Dest) : Thunk(Dest) {} - uint32_t size() const override { return 12; } - void writeTo(uint8_t *Buf, ThunkSection &IS) const override; + uint32_t size() override { return 12; } + void writeTo(uint8_t *Buf) override; void addSymbols(ThunkSection &IS) override; InputSection *getTargetInputSection() const override; }; @@ -148,7 +148,7 @@ static uint64_t getAArch64ThunkDestVA(const Symbol &S) { return V; } -void AArch64ABSLongThunk::writeTo(uint8_t *Buf, ThunkSection &IS) const { +void AArch64ABSLongThunk::writeTo(uint8_t *Buf) { const uint8_t Data[] = { 0x50, 0x00, 0x00, 0x58, // ldr x16, L0 0x00, 0x02, 0x1f, 0xd6, // br x16 @@ -173,7 +173,7 @@ void AArch64ABSLongThunk::addSymbols(ThunkSection &IS) { // clang and gcc do not support the large code model for position independent // code so it is safe to use this for position independent thunks without // worrying about the destination being more than 4Gb away. -void AArch64ADRPThunk::writeTo(uint8_t *Buf, ThunkSection &IS) const { +void AArch64ADRPThunk::writeTo(uint8_t *Buf) { const uint8_t Data[] = { 0x10, 0x00, 0x00, 0x90, // adrp x16, Dest R_AARCH64_ADR_PREL_PG_HI21(Dest) 0x10, 0x02, 0x00, 0x91, // add x16, x16, R_AARCH64_ADD_ABS_LO12_NC(Dest) @@ -201,7 +201,7 @@ static uint64_t getARMThunkDestVA(const Symbol &S) { return SignExtend64<32>(V); } -void ARMV7ABSLongThunk::writeTo(uint8_t *Buf, ThunkSection &IS) const { +void ARMV7ABSLongThunk::writeTo(uint8_t *Buf) { const uint8_t Data[] = { 0x00, 0xc0, 0x00, 0xe3, // movw ip,:lower16:S 0x00, 0xc0, 0x40, 0xe3, // movt ip,:upper16:S @@ -225,7 +225,7 @@ bool ARMV7ABSLongThunk::isCompatibleWith(RelType Type) const { return Type != R_ARM_THM_JUMP19 && Type != R_ARM_THM_JUMP24; } -void ThumbV7ABSLongThunk::writeTo(uint8_t *Buf, ThunkSection &IS) const { +void ThumbV7ABSLongThunk::writeTo(uint8_t *Buf) { const uint8_t Data[] = { 0x40, 0xf2, 0x00, 0x0c, // movw ip, :lower16:S 0xc0, 0xf2, 0x00, 0x0c, // movt ip, :upper16:S @@ -249,7 +249,7 @@ bool ThumbV7ABSLongThunk::isCompatibleWith(RelType Type) const { return Type != R_ARM_JUMP24 && Type != R_ARM_PC24 && Type != R_ARM_PLT32; } -void ARMV7PILongThunk::writeTo(uint8_t *Buf, ThunkSection &IS) const { +void ARMV7PILongThunk::writeTo(uint8_t *Buf) { const uint8_t Data[] = { 0xf0, 0xcf, 0x0f, 0xe3, // P: movw ip,:lower16:S - (P + (L1-P) + 8) 0x00, 0xc0, 0x40, 0xe3, // movt ip,:upper16:S - (P + (L1-P) + 8) @@ -276,7 +276,7 @@ bool ARMV7PILongThunk::isCompatibleWith(RelType Type) const { return Type != R_ARM_THM_JUMP19 && Type != R_ARM_THM_JUMP24; } -void ThumbV7PILongThunk::writeTo(uint8_t *Buf, ThunkSection &IS) const { +void ThumbV7PILongThunk::writeTo(uint8_t *Buf) { const uint8_t Data[] = { 0x4f, 0xf6, 0xf4, 0x7c, // P: movw ip,:lower16:S - (P + (L1-P) + 4) 0xc0, 0xf2, 0x00, 0x0c, // movt ip,:upper16:S - (P + (L1-P) + 4) @@ -304,7 +304,7 @@ bool ThumbV7PILongThunk::isCompatibleWith(RelType Type) const { } // Write MIPS LA25 thunk code to call PIC function from the non-PIC one. -void MipsThunk::writeTo(uint8_t *Buf, ThunkSection &) const { +void MipsThunk::writeTo(uint8_t *Buf) { uint64_t S = Destination.getVA(); write32(Buf, 0x3c190000); // lui $25, %hi(func) write32(Buf + 4, 0x08000000 | (S >> 2)); // j func @@ -327,7 +327,7 @@ InputSection *MipsThunk::getTargetInputSection() const { // Write microMIPS R2-R5 LA25 thunk code // to call PIC function from the non-PIC one. -void MicroMipsThunk::writeTo(uint8_t *Buf, ThunkSection &) const { +void MicroMipsThunk::writeTo(uint8_t *Buf) { uint64_t S = Destination.getVA() | 1; write16(Buf, 0x41b9); // lui $25, %hi(func) write16(Buf + 4, 0xd400); // j func @@ -352,7 +352,7 @@ InputSection *MicroMipsThunk::getTargetInputSection() const { // Write microMIPS R6 LA25 thunk code // to call PIC function from the non-PIC one. -void MicroMipsR6Thunk::writeTo(uint8_t *Buf, ThunkSection &) const { +void MicroMipsR6Thunk::writeTo(uint8_t *Buf) { uint64_t S = Destination.getVA() | 1; uint64_t P = ThunkSym->getVA(); write16(Buf, 0x1320); // lui $25, %hi(func) diff --git a/lld/ELF/Thunks.h b/lld/ELF/Thunks.h index 828fac0bf53b..0dd933a92330 100644 --- a/lld/ELF/Thunks.h +++ b/lld/ELF/Thunks.h @@ -30,12 +30,12 @@ public: Thunk(Symbol &Destination); virtual ~Thunk(); - virtual uint32_t size() const { return 0; } - virtual void writeTo(uint8_t *Buf, ThunkSection &IS) const {} + virtual uint32_t size() = 0; + virtual void writeTo(uint8_t *Buf) = 0; // All Thunks must define at least one symbol ThunkSym so that we can // redirect relocations to it. - virtual void addSymbols(ThunkSection &IS) {} + virtual void addSymbols(ThunkSection &IS) = 0; // Some Thunks must be placed immediately before their Target as they elide // a branch and fall through to the first Symbol in the Target.