diff options
author | Job Noorman <jnoorman@igalia.com> | 2023-10-20 06:09:01 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-20 06:09:01 +0000 |
commit | 614a8cbfd155b706688cfca0101f8d99988a9871 (patch) | |
tree | a75429f9188e9556753bb39163ebb7d32c430aaf /llvm/tools/llvm-objdump/llvm-objdump.cpp | |
parent | b2d3c7b200492e8b4b45e71da53c3331a557b67c (diff) | |
download | llvm-614a8cbfd155b706688cfca0101f8d99988a9871.zip llvm-614a8cbfd155b706688cfca0101f8d99988a9871.tar.gz llvm-614a8cbfd155b706688cfca0101f8d99988a9871.tar.bz2 |
[MC][NFC] Allow MCInstrAnalysis to store state (#65479)
Currently, all the analysis functions provided by `MCInstrAnalysis` work
on a single instruction. On some targets, this limits the kind of
instructions that can be successfully analyzed as common constructs may
need multiple instructions.
For example, a typical call sequence on RISC-V uses a auipc+jalr pair.
In order to analyse the jalr inside `evaluateBranch`, information about
the corresponding auipc is needed. Similarly, AArch64 uses adrp+ldr
pairs to access globals.
This patch proposes to add state to `MCInstrAnalysis` to support these
use cases. Two new virtual methods are added:
- `updateState`: takes an instruction and its address. This methods
should be called by clients on every instruction and allows targets to
store whatever information they need to analyse future instructions.
- `resetState`: clears the state whenever it becomes irrelevant. Clients
could call this, for example, when starting to disassemble a new
function.
Note that the default implementations do nothing so this patch is NFC.
No actual state is stored inside `MCInstrAnalysis`; deciding the
structure of the state is left to the targets.
This patch also modifies llvm-objdump to use the new interface.
This patch is an alternative to
[D116677](https://reviews.llvm.org/D116677) and the idea of storing
state in `MCInstrAnalysis` was first discussed there.
Diffstat (limited to 'llvm/tools/llvm-objdump/llvm-objdump.cpp')
-rw-r--r-- | llvm/tools/llvm-objdump/llvm-objdump.cpp | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index 537c18b..f02bd6a 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -860,7 +860,7 @@ public: std::unique_ptr<const MCSubtargetInfo> SubtargetInfo; std::shared_ptr<MCContext> Context; std::unique_ptr<MCDisassembler> DisAsm; - std::shared_ptr<const MCInstrAnalysis> InstrAnalysis; + std::shared_ptr<MCInstrAnalysis> InstrAnalysis; std::shared_ptr<MCInstPrinter> InstPrinter; PrettyPrinter *Printer; @@ -1283,14 +1283,19 @@ collectBBAddrMapLabels(const std::unordered_map<uint64_t, BBAddrMap> &AddrToBBAd } } -static void collectLocalBranchTargets( - ArrayRef<uint8_t> Bytes, const MCInstrAnalysis *MIA, MCDisassembler *DisAsm, - MCInstPrinter *IP, const MCSubtargetInfo *STI, uint64_t SectionAddr, - uint64_t Start, uint64_t End, std::unordered_map<uint64_t, std::string> &Labels) { +static void +collectLocalBranchTargets(ArrayRef<uint8_t> Bytes, MCInstrAnalysis *MIA, + MCDisassembler *DisAsm, MCInstPrinter *IP, + const MCSubtargetInfo *STI, uint64_t SectionAddr, + uint64_t Start, uint64_t End, + std::unordered_map<uint64_t, std::string> &Labels) { // So far only supports PowerPC and X86. if (!STI->getTargetTriple().isPPC() && !STI->getTargetTriple().isX86()) return; + if (MIA) + MIA->resetState(); + Labels.clear(); unsigned LabelCount = 0; Start += SectionAddr; @@ -1316,6 +1321,7 @@ static void collectLocalBranchTargets( !Labels.count(Target) && !(STI->getTargetTriple().isPPC() && Target == Index)) Labels[Target] = ("L" + Twine(LabelCount++)).str(); + MIA->updateState(Inst, Index); } Index += Size; } @@ -1967,6 +1973,9 @@ disassembleObject(ObjectFile &Obj, const ObjectFile &DbgObj, BBAddrMapLabels); } + if (DT->InstrAnalysis) + DT->InstrAnalysis->resetState(); + while (Index < End) { // ARM and AArch64 ELF binaries can interleave data and text in the // same section. We rely on the markers introduced to understand what @@ -2183,6 +2192,8 @@ disassembleObject(ObjectFile &Obj, const ObjectFile &DbgObj, if (TargetOS == &CommentStream) *TargetOS << "\n"; } + + DT->InstrAnalysis->updateState(Inst, SectionAddr + Index); } } |