From 1d321434a202b12b3afe6f305262b930bbf05665 Mon Sep 17 00:00:00 2001 From: Aditya Kumar Date: Thu, 7 Nov 2019 21:20:34 -0800 Subject: [PATCH] [llvm-xray] Add AArch64 to llvm-xray extract This required adding support for resolving R_AARCH64_ABS64 relocations to get accurate addresses for function names to resolve. Authored by: ianlevesque (Ian Levesque) Reviewers: dberris, phosek, smeenai, tetsuo-cpp Differential Revision: https://reviews.llvm.org/D69967 --- llvm/lib/XRay/InstrumentationMap.cpp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/llvm/lib/XRay/InstrumentationMap.cpp b/llvm/lib/XRay/InstrumentationMap.cpp index 7453613c7038..1e9b69a5f9dc 100644 --- a/llvm/lib/XRay/InstrumentationMap.cpp +++ b/llvm/lib/XRay/InstrumentationMap.cpp @@ -20,6 +20,7 @@ #include "llvm/Object/Binary.h" #include "llvm/Object/ELFObjectFile.h" #include "llvm/Object/ObjectFile.h" +#include "llvm/Object/RelocationResolver.h" #include "llvm/Support/DataExtractor.h" #include "llvm/Support/Error.h" #include "llvm/Support/FileSystem.h" @@ -59,7 +60,8 @@ loadObj(StringRef Filename, object::OwningBinary &ObjFile, // Find the section named "xray_instr_map". if ((!ObjFile.getBinary()->isELF() && !ObjFile.getBinary()->isMachO()) || !(ObjFile.getBinary()->getArch() == Triple::x86_64 || - ObjFile.getBinary()->getArch() == Triple::ppc64le)) + ObjFile.getBinary()->getArch() == Triple::ppc64le || + ObjFile.getBinary()->getArch() == Triple::aarch64)) return make_error( "File format not supported (only does ELF and Mach-O little endian 64-bit).", std::make_error_code(std::errc::not_supported)); @@ -99,12 +101,22 @@ loadObj(StringRef Filename, object::OwningBinary &ObjFile, return static_cast(0); }(ObjFile.getBinary()); + bool (*SupportsRelocation)(uint64_t); + object::RelocationResolver Resolver; + std::tie(SupportsRelocation, Resolver) = + object::getRelocationResolver(*ObjFile.getBinary()); + for (const object::SectionRef &Section : Sections) { for (const object::RelocationRef &Reloc : Section.relocations()) { - if (Reloc.getType() != RelativeRelocation) - continue; - if (auto AddendOrErr = object::ELFRelocationRef(Reloc).getAddend()) - Relocs.insert({Reloc.getOffset(), *AddendOrErr}); + if (SupportsRelocation && SupportsRelocation(Reloc.getType())) { + auto AddendOrErr = object::ELFRelocationRef(Reloc).getAddend(); + auto A = AddendOrErr ? *AddendOrErr : 0; + uint64_t resolved = Resolver(Reloc, Reloc.getSymbol()->getValue(), A); + Relocs.insert({Reloc.getOffset(), resolved}); + } else if (Reloc.getType() == RelativeRelocation) { + if (auto AddendOrErr = object::ELFRelocationRef(Reloc).getAddend()) + Relocs.insert({Reloc.getOffset(), *AddendOrErr}); + } } } } -- GitLab