ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Seems addend is calculated differently.

This commit is contained in:
Christian Speckner 2024-07-23 23:10:28 +02:00
parent 33a83c42a4
commit cbe3fb3308
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emucore/elf/ElfLinker.cxx
View File

@ -439,7 +439,7 @@ void ElfLinker::applyRelocationToSection(const ElfFile::Relocation& relocation,
{ {
const uInt32 op = read32(target); const uInt32 op = read32(target);
const Int32 offset = relocatedSymbol->value + relocation.addend.value_or(elfUtil::decode_B_BL(op)) - const Int32 offset = relocatedSymbol->value + relocation.addend.value_or(elfUtil::decode_B_BL(op) + 4) -
getSegmentBase(targetSectionRelocated.segment) - getSegmentBase(targetSectionRelocated.segment) -
targetSectionRelocated.offset - targetSectionRelocated.offset -
relocation.offset - 4; relocation.offset - 4;

18
src/emucore/elf/LinkerTest.cxx
View File

@ -697,7 +697,7 @@ TEST(ElfLinker, RodataSectionsGoToRodata) {
.addSection(".text.2", ElfFile::SHT_PROGBITS, 0x10, 0x20) .addSection(".text.2", ElfFile::SHT_PROGBITS, 0x10, 0x20)
.addSymbol("foo", 0x04, 2) .addSymbol("foo", 0x04, 2)
.addRelocation(1, 0, 0x08, ElfFile::R_ARM_THM_CALL) .addRelocation(1, 0, 0x08, ElfFile::R_ARM_THM_CALL)
.write32(0x08, 0xf800f000); .write32(0x08, 0xfffef7ff);
linker.link({}); linker.link({});
@ -713,7 +713,7 @@ TEST(ElfLinker, RodataSectionsGoToRodata) {
.addSection(".text.2", ElfFile::SHT_PROGBITS, 0x10, 0x20) .addSection(".text.2", ElfFile::SHT_PROGBITS, 0x10, 0x20)
.addSymbol("foo", 0x04, 2) .addSymbol("foo", 0x04, 2)
.addRelocation(1, 0, 0x08, ElfFile::R_ARM_THM_CALL, -2) .addRelocation(1, 0, 0x08, ElfFile::R_ARM_THM_CALL, -2)
.write32(0x08, 0xf800f000); .write32(0x08, 0xfffef7ff);
linker.link({}); linker.link({});
@ -729,7 +729,7 @@ TEST(ElfLinker, RodataSectionsGoToRodata) {
.addSection(".text.2", ElfFile::SHT_PROGBITS, 0x10, 0x20) .addSection(".text.2", ElfFile::SHT_PROGBITS, 0x10, 0x20)
.addSymbol("foo", 0x04, 2) .addSymbol("foo", 0x04, 2)
.addRelocation(1, 0, 0x08, ElfFile::R_ARM_THM_CALL) .addRelocation(1, 0, 0x08, ElfFile::R_ARM_THM_CALL)
.write32(0x08, 0xfffff7ff); .write32(0x08, 0xfffdf7ff);
linker.link({}); linker.link({});
@ -745,12 +745,12 @@ TEST(ElfLinker, RodataSectionsGoToRodata) {
.addSection(".text.2", ElfFile::SHT_PROGBITS, 0x10, 0x20) .addSection(".text.2", ElfFile::SHT_PROGBITS, 0x10, 0x20)
.addSymbol("foo", 0x04, 2) .addSymbol("foo", 0x04, 2)
.addRelocation(1, 0, 0x08, ElfFile::R_ARM_THM_CALL, 0x7fffff00) .addRelocation(1, 0, 0x08, ElfFile::R_ARM_THM_CALL, 0x7fffff00)
.write32(0x08, 0xfffff7ff); .write32(0x08, 0xfffef7ff);
EXPECT_THROW(linker.link({}), ElfLinker::ElfLinkError); EXPECT_THROW(linker.link({}), ElfLinker::ElfLinkError);
} }
TEST(ElfLinker, R_ARM_THM_JUMP24L_PatchesOffset) { TEST(ElfLinker, R_ARM_THM_JUMP24_PatchesOffset) {
ElfFixture fixture(1000); ElfFixture fixture(1000);
ElfLinker linker(0x00100000, 0x00200000, 0x00300000, fixture); ElfLinker linker(0x00100000, 0x00200000, 0x00300000, fixture);
@ -759,7 +759,7 @@ TEST(ElfLinker, RodataSectionsGoToRodata) {
.addSection(".text.2", ElfFile::SHT_PROGBITS, 0x10, 0x20) .addSection(".text.2", ElfFile::SHT_PROGBITS, 0x10, 0x20)
.addSymbol("foo", 0x04, 2) .addSymbol("foo", 0x04, 2)
.addRelocation(1, 0, 0x08, ElfFile::R_ARM_THM_JUMP24) .addRelocation(1, 0, 0x08, ElfFile::R_ARM_THM_JUMP24)
.write32(0x08, 0xb800f000); .write32(0x08, 0xbffef7ff);
linker.link({}); linker.link({});
@ -775,7 +775,7 @@ TEST(ElfLinker, RodataSectionsGoToRodata) {
.addSection(".text.2", ElfFile::SHT_PROGBITS, 0x10, 0x20) .addSection(".text.2", ElfFile::SHT_PROGBITS, 0x10, 0x20)
.addSymbol("foo", 0x04, 2) .addSymbol("foo", 0x04, 2)
.addRelocation(1, 0, 0x08, ElfFile::R_ARM_THM_JUMP24, -2) .addRelocation(1, 0, 0x08, ElfFile::R_ARM_THM_JUMP24, -2)
.write32(0x08, 0xb800f000); .write32(0x08, 0xbffef7ff);
linker.link({}); linker.link({});
@ -791,7 +791,7 @@ TEST(ElfLinker, RodataSectionsGoToRodata) {
.addSection(".text.2", ElfFile::SHT_PROGBITS, 0x10, 0x20) .addSection(".text.2", ElfFile::SHT_PROGBITS, 0x10, 0x20)
.addSymbol("foo", 0x04, 2) .addSymbol("foo", 0x04, 2)
.addRelocation(1, 0, 0x08, ElfFile::R_ARM_THM_JUMP24) .addRelocation(1, 0, 0x08, ElfFile::R_ARM_THM_JUMP24)
.write32(0x08, 0xbffff7ff); .write32(0x08, 0xbffdf7ff);
linker.link({}); linker.link({});
@ -807,7 +807,7 @@ TEST(ElfLinker, RodataSectionsGoToRodata) {
.addSection(".text.2", ElfFile::SHT_PROGBITS, 0x10, 0x20) .addSection(".text.2", ElfFile::SHT_PROGBITS, 0x10, 0x20)
.addSymbol("foo", 0x04, 2) .addSymbol("foo", 0x04, 2)
.addRelocation(1, 0, 0x08, ElfFile::R_ARM_THM_JUMP24, 0x7fffff00) .addRelocation(1, 0, 0x08, ElfFile::R_ARM_THM_JUMP24, 0x7fffff00)
.write32(0x08, 0xbffff7ff); .write32(0x08, 0xbffef7ff);
EXPECT_THROW(linker.link({}), ElfLinker::ElfLinkError); EXPECT_THROW(linker.link({}), ElfLinker::ElfLinkError);
} }