From cfca06d7963fa0909f90483b42a6d7d194d01e08 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sun, 26 Jul 2020 19:36:28 +0000 Subject: Vendor import of llvm-project master 2e10b7a39b9, the last commit before the llvmorg-12-init tag, from which release/11.x was branched. --- llvm/lib/MC/MCDisassembler/MCDisassembler.cpp | 60 +++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 4 deletions(-) (limited to 'llvm/lib/MC/MCDisassembler/MCDisassembler.cpp') diff --git a/llvm/lib/MC/MCDisassembler/MCDisassembler.cpp b/llvm/lib/MC/MCDisassembler/MCDisassembler.cpp index 373916fbed78..a58e8f6d9bcc 100644 --- a/llvm/lib/MC/MCDisassembler/MCDisassembler.cpp +++ b/llvm/lib/MC/MCDisassembler/MCDisassembler.cpp @@ -16,12 +16,11 @@ using namespace llvm; MCDisassembler::~MCDisassembler() = default; -MCDisassembler::DecodeStatus -MCDisassembler::onSymbolStart(StringRef Name, uint64_t &Size, +Optional +MCDisassembler::onSymbolStart(SymbolInfoTy &Symbol, uint64_t &Size, ArrayRef Bytes, uint64_t Address, raw_ostream &CStream) const { - Size = 0; - return MCDisassembler::Success; + return None; } bool MCDisassembler::tryAddingSymbolicOperand(MCInst &Inst, int64_t Value, @@ -43,3 +42,56 @@ void MCDisassembler::tryAddingPcLoadReferenceComment(int64_t Value, void MCDisassembler::setSymbolizer(std::unique_ptr Symzer) { Symbolizer = std::move(Symzer); } + +#define SMC_PCASE(A, P) \ + case XCOFF::XMC_##A: \ + return P; + +static uint8_t getSMCPriority(XCOFF::StorageMappingClass SMC) { + switch (SMC) { + SMC_PCASE(PR, 1) + SMC_PCASE(RO, 1) + SMC_PCASE(DB, 1) + SMC_PCASE(GL, 1) + SMC_PCASE(XO, 1) + SMC_PCASE(SV, 1) + SMC_PCASE(SV64, 1) + SMC_PCASE(SV3264, 1) + SMC_PCASE(TI, 1) + SMC_PCASE(TB, 1) + SMC_PCASE(RW, 1) + SMC_PCASE(TC0, 0) + SMC_PCASE(TC, 1) + SMC_PCASE(TD, 1) + SMC_PCASE(DS, 1) + SMC_PCASE(UA, 1) + SMC_PCASE(BS, 1) + SMC_PCASE(UC, 1) + SMC_PCASE(TL, 1) + SMC_PCASE(UL, 1) + SMC_PCASE(TE, 1) +#undef SMC_PCASE + } + return 0; +} + +/// The function is for symbol sorting when symbols have the same address. +/// The symbols in the same section are sorted in ascending order. +/// llvm-objdump -D will choose the highest priority symbol to display when +/// there are symbols with the same address. +bool XCOFFSymbolInfo::operator<(const XCOFFSymbolInfo &SymInfo) const { + // Label symbols have higher priority than non-label symbols. + if (IsLabel != SymInfo.IsLabel) + return SymInfo.IsLabel; + + // Symbols with a StorageMappingClass have higher priority than those without. + if (StorageMappingClass.hasValue() != SymInfo.StorageMappingClass.hasValue()) + return SymInfo.StorageMappingClass.hasValue(); + + if (StorageMappingClass.hasValue()) { + return getSMCPriority(StorageMappingClass.getValue()) < + getSMCPriority(SymInfo.StorageMappingClass.getValue()); + } + + return false; +} -- cgit v1.2.3