From 513a68650e53224497e4a67a460a8fc7d7bb196a Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 11 Mar 2025 10:46:49 +0100 Subject: [PATCH] Utils: Comment out unused code in ElfReader Change-Id: I34d335282190e62c3f5df73c82b082abcc5b2e4a Reviewed-by: hjk --- src/libs/utils/elfreader.cpp | 102 +++++++++++++++++------------------ src/libs/utils/elfreader.h | 22 ++++---- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/src/libs/utils/elfreader.cpp b/src/libs/utils/elfreader.cpp index 3607ecf3637..bb8e3951f2e 100644 --- a/src/libs/utils/elfreader.cpp +++ b/src/libs/utils/elfreader.cpp @@ -70,15 +70,15 @@ static void parseSectionHeader(const uchar *s, ElfSectionHeader *sh, const ElfDa sh->size = getOffset(s, context); } -static void parseProgramHeader(const uchar *s, ElfProgramHeader *sh, const ElfData &context) -{ - sh->type = getWord(s, context); - sh->offset = getOffset(s, context); - /* p_vaddr = */ getAddress(s, context); - /* p_paddr = */ getAddress(s, context); - sh->filesz = getWord(s, context); - sh->memsz = getWord(s, context); -} +// static void parseProgramHeader(const uchar *s, ElfProgramHeader *sh, const ElfData &context) +// { +// sh->type = getWord(s, context); +// sh->offset = getOffset(s, context); +// /* p_vaddr = */ getAddress(s, context); +// /* p_paddr = */ getAddress(s, context); +// sh->filesz = getWord(s, context); +// sh->memsz = getWord(s, context); +// } ElfMapper::ElfMapper(const ElfReader *reader) : binary(reader->m_binary) @@ -135,8 +135,8 @@ ElfReader::Result ElfReader::readIt() { if (!m_elfData.sectionHeaders.isEmpty()) return Ok; - if (!m_elfData.programHeaders.isEmpty()) - return Ok; + // if (!m_elfData.programHeaders.isEmpty()) + // return Ok; ElfMapper mapper(this); if (!mapper.map()) @@ -187,7 +187,7 @@ ElfReader::Result ElfReader::readIt() /* e_version = */ getWord(data, m_elfData); m_elfData.entryPoint = getAddress(data, m_elfData); - quint64 e_phoff = getOffset(data, m_elfData); + /* quint64 e_phoff = */ getOffset(data, m_elfData); quint64 e_shoff = getOffset(data, m_elfData); /* e_flags = */ getWord(data, m_elfData); @@ -200,7 +200,7 @@ ElfReader::Result ElfReader::readIt() quint32 e_phentsize = getHalfWord(data, m_elfData); QTC_CHECK(e_phentsize == (is64Bit ? 56 : 32)); - quint32 e_phnum = getHalfWord(data, m_elfData); + /* quint32 e_phnum = */ getHalfWord(data, m_elfData); quint32 e_shentsize = getHalfWord(data, m_elfData); @@ -272,14 +272,14 @@ ElfReader::Result ElfReader::readIt() } } - if (e_phoff) { - for (quint32 i = 0; i < e_phnum; ++i) { - const uchar *s = mapper.ustart + e_phoff + i * e_phentsize; - ElfProgramHeader ph; - parseProgramHeader(s, &ph, m_elfData); - m_elfData.programHeaders.append(ph); - } - } + // if (e_phoff) { + // for (quint32 i = 0; i < e_phnum; ++i) { + // const uchar *s = mapper.ustart + e_phoff + i * e_phentsize; + // ElfProgramHeader ph; + // parseProgramHeader(s, &ph, m_elfData); + // m_elfData.programHeaders.append(ph); + // } + // } return Ok; } @@ -301,44 +301,44 @@ std::unique_ptr ElfReader::readSection(const QByteArray &name) return mapper; } -static QByteArray cutout(const char *s) -{ - QByteArray res(s, 80); - const int pos = res.indexOf('\0'); - if (pos != -1) - res.resize(pos - 1); - return res; -} +// static QByteArray cutout(const char *s) +// { +// QByteArray res(s, 80); +// const int pos = res.indexOf('\0'); +// if (pos != -1) +// res.resize(pos - 1); +// return res; +// } -QByteArray ElfReader::readCoreName(bool *isCore) -{ - *isCore = false; +// QByteArray ElfReader::readCoreName(bool *isCore) +// { +// *isCore = false; - readIt(); +// readIt(); - ElfMapper mapper(this); - if (!mapper.map()) - return QByteArray(); +// ElfMapper mapper(this); +// if (!mapper.map()) +// return QByteArray(); - if (m_elfData.elftype != Elf_ET_CORE) - return QByteArray(); +// if (m_elfData.elftype != Elf_ET_CORE) +// return QByteArray(); - *isCore = true; +// *isCore = true; - for (int i = 0, n = m_elfData.sectionHeaders.size(); i != n; ++i) - if (m_elfData.sectionHeaders.at(i).type == Elf_SHT_NOTE) { - const ElfSectionHeader &header = m_elfData.sectionHeaders.at(i); - return cutout(mapper.start + header.offset + 0x40); - } +// for (int i = 0, n = m_elfData.sectionHeaders.size(); i != n; ++i) +// if (m_elfData.sectionHeaders.at(i).type == Elf_SHT_NOTE) { +// const ElfSectionHeader &header = m_elfData.sectionHeaders.at(i); +// return cutout(mapper.start + header.offset + 0x40); +// } - for (int i = 0, n = m_elfData.programHeaders.size(); i != n; ++i) - if (m_elfData.programHeaders.at(i).type == Elf_PT_NOTE) { - const ElfProgramHeader &header = m_elfData.programHeaders.at(i); - return cutout(mapper.start + header.offset + 0xec); - } +// for (int i = 0, n = m_elfData.programHeaders.size(); i != n; ++i) +// if (m_elfData.programHeaders.at(i).type == Elf_PT_NOTE) { +// const ElfProgramHeader &header = m_elfData.programHeaders.at(i); +// return cutout(mapper.start + header.offset + 0xec); +// } - return QByteArray(); -} +// return QByteArray(); +// } int ElfData::indexOf(const QByteArray &name) const { diff --git a/src/libs/utils/elfreader.h b/src/libs/utils/elfreader.h index 55aff6e82ff..8d4daab189c 100644 --- a/src/libs/utils/elfreader.h +++ b/src/libs/utils/elfreader.h @@ -104,15 +104,15 @@ public: quint64 addr; }; -class ElfProgramHeader -{ -public: - quint32 name; - quint32 type; - quint64 offset; - quint64 filesz; - quint64 memsz; -}; +// class ElfProgramHeader +// { +// public: +// quint32 name; +// quint32 type; +// quint64 offset; +// quint64 filesz; +// quint64 memsz; +// }; class QTCREATOR_UTILS_EXPORT ElfData { @@ -130,7 +130,7 @@ public: QByteArray buildId; DebugSymbolsType symbolsType = UnknownSymbols; QList sectionHeaders; - QList programHeaders; + // QList programHeaders; }; class QTCREATOR_UTILS_EXPORT ElfReader @@ -142,7 +142,7 @@ public: ElfData readHeaders(); std::unique_ptr readSection(const QByteArray §ionName); QString errorString() const { return m_errorString; } - QByteArray readCoreName(bool *isCore); + // QByteArray readCoreName(bool *isCore); private: friend class ElfMapper;