This is an archive of the discontinued LLVM Phabricator instance.

[RuntimeDyld] Fix R_AARCH64_TSTBR14 relocation
ClosedPublic

Authored by yota9 on Jun 28 2022, 10:02 AM.

Download Raw Diff

Details

Reviewers

rafauler
lhames

Commits

rGb27d6ffe4e4a: [RuntimeDyld] Fix R_AARCH64_TSTBR14 relocation

Summary

Wrong mask was used to get branch instruction imm value.

Diff Detail

Repository: rG LLVM Github Monorepo

Event Timeline

yota9 created this revision.Jun 28 2022, 10:02 AM

Herald added a project: Restricted Project. · View Herald TranscriptJun 28 2022, 10:02 AM

Herald added subscribers: StephenFan, hiraditya, kristof.beyls. · View Herald Transcript

yota9 requested review of this revision.Jun 28 2022, 10:02 AM

Herald added a project: Restricted Project. · View Herald TranscriptJun 28 2022, 10:02 AM

Herald added a subscriber: llvm-commits. · View Herald Transcript

Harbormaster completed remote builds in B172521: Diff 440674.Jun 28 2022, 11:21 AM

Add test

I've checked previous run and seems to be that the failed tests have nothing to do with this patch :)

nit

Harbormaster completed remote builds in B172580: Diff 440755.Jun 28 2022, 3:31 PM

LGTM. Thanks @yota9!

This revision is now accepted and ready to land.Jul 4 2022, 1:35 PM

This revision was landed with ongoing or failed builds.Jul 5 2022, 6:41 AM

Closed by commit rGb27d6ffe4e4a: [RuntimeDyld] Fix R_AARCH64_TSTBR14 relocation (authored by yota9). · Explain Why

This revision was automatically updated to reflect the committed changes.

yota9 added a commit: rGb27d6ffe4e4a: [RuntimeDyld] Fix R_AARCH64_TSTBR14 relocation.

Revision Contents

Path

Size

llvm/

lib/

ExecutionEngine/

RuntimeDyld/

RuntimeDyldELF.cpp

2 lines

test/

ExecutionEngine/

RuntimeDyld/

AArch64/

ELF_ARM64_TSTBR14.s

14 lines

Diff 442287

llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp

Show First 20 Lines • Show All 473 Lines • ▼ Show 20 Lines	void RuntimeDyldELF::resolveAArch64Relocation(const SectionEntry &Section,
}		}
case ELF::R_AARCH64_TSTBR14: {		case ELF::R_AARCH64_TSTBR14: {
uint64_t BranchImm = Value + Addend - FinalAddress;		uint64_t BranchImm = Value + Addend - FinalAddress;

assert(isInt<16>(BranchImm));		assert(isInt<16>(BranchImm));

*TargetPtr &= 0xfff8001fU;		*TargetPtr &= 0xfff8001fU;
// Immediate:15:2 goes in bits 18:5 of TBZ, TBNZ		// Immediate:15:2 goes in bits 18:5 of TBZ, TBNZ
or32le(TargetPtr, (BranchImm & 0x0FFFFFFC) << 3);		or32le(TargetPtr, (BranchImm & 0x0000FFFC) << 3);
break;		break;
}		}
case ELF::R_AARCH64_CALL26: // fallthrough		case ELF::R_AARCH64_CALL26: // fallthrough
case ELF::R_AARCH64_JUMP26: {		case ELF::R_AARCH64_JUMP26: {
// Operation: S+A-P. Set Call or B immediate value to bits fff_fffc of the		// Operation: S+A-P. Set Call or B immediate value to bits fff_fffc of the
// calculation.		// calculation.
uint64_t BranchImm = Value + Addend - FinalAddress;		uint64_t BranchImm = Value + Addend - FinalAddress;

▲ Show 20 Lines • Show All 1,913 Lines • Show Last 20 Lines

llvm/test/ExecutionEngine/RuntimeDyld/AArch64/ELF_ARM64_TSTBR14.s

This file was added.

				# RUN: llvm-mc -triple=arm64-none-linux-gnu -filetype=obj -o %t %s
				# RUN: llvm-rtdyld -triple=aarch64_be-none-linux-gnu -verify -check=%s %t

				.section .text.1,"ax"
				.globl foo
				foo:
				ret

				.globl _main
				_main:
				tbnz x0, #1, foo

				## Branch 1 instruction back from _main
				# rtdyld-check: *{4}(_main) = 0x370FFFE0