RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2026-07-19 23:23:38 -04:00
Code Issues Packages Projects Releases 10 Wiki Activity

[XCOFF] Use a single symbolic constant for the size of an embeded name. [NFC]

Browse Source 
Convert SymbolNameSize and SectionNameSize into just `NameSize`. The length of
a name embeded in a symbol table entry or section header table entry is length 8
for Sections, Symbols and Files. No need to have a distinct constant for each
one. Also removes the Size argument to 'generateStringRef' as the size is
always 'XCOFF::NameSize'.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@368584 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Sean Fertile
2019-08-12 15:27:40 +00:00
parent 6c7af34052
commit 4ad4c5dcde
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Object/XCOFFObjectFile.cpp
+9 -9
View File
@@ -37,10 +37,11 @@ template <typename T> static const T *viewAs(uintptr_t in) {
return reinterpret_cast<const T *>(in);
}
static StringRef generateStringRef(const char *Name, uint64_t Size) {
auto NulCharPtr = static_cast<const char *>(memchr(Name, '\0', Size));
static StringRef generateStringRef(const char *Name) {
auto NulCharPtr =
static_cast<const char *>(memchr(Name, '\0', XCOFF::NameSize));
return NulCharPtr ? StringRef(Name, NulCharPtr - Name)
: StringRef(Name, Size);
: StringRef(Name, XCOFF::NameSize);
}
void XCOFFObjectFile::checkSectionAddress(uintptr_t Addr,
@@ -114,7 +115,7 @@ Expected<StringRef> XCOFFObjectFile::getSymbolName(DataRefImpl Symb) const {
const XCOFFSymbolEntry *SymEntPtr = toSymbolEntry(Symb);
if (SymEntPtr->NameInStrTbl.Magic != XCOFFSymbolEntry::NAME_IN_STR_TBL_MAGIC)
return generateStringRef(SymEntPtr->SymbolName, XCOFF::SymbolNameSize);
return generateStringRef(SymEntPtr->SymbolName);
// A storage class value with the high-order bit on indicates that the name is
// a symbolic debugger stabstring.
@@ -180,7 +181,7 @@ void XCOFFObjectFile::moveSectionNext(DataRefImpl &Sec) const {
}
Expected<StringRef> XCOFFObjectFile::getSectionName(DataRefImpl Sec) const {
return generateStringRef(getSectionNameInternal(Sec), XCOFF::SectionNameSize);
return generateStringRef(getSectionNameInternal(Sec));
}
uint64_t XCOFFObjectFile::getSectionAddress(DataRefImpl Sec) const {
@@ -388,8 +389,7 @@ XCOFFObjectFile::getSymbolSectionName(const XCOFFSymbolEntry *SymEntPtr) const {
default:
Expected<DataRefImpl> SecRef = getSectionByNum(SectionNum);
if (SecRef)
return generateStringRef(getSectionNameInternal(SecRef.get()),
XCOFF::SectionNameSize);
return generateStringRef(getSectionNameInternal(SecRef.get()));
return SecRef.takeError();
}
}
@@ -568,11 +568,11 @@ ObjectFile::createXCOFFObjectFile(MemoryBufferRef MemBufRef,
}
StringRef XCOFFSectionHeader32::getName() const {
return generateStringRef(Name, XCOFF::SectionNameSize);
return generateStringRef(Name);
}
StringRef XCOFFSectionHeader64::getName() const {
return generateStringRef(Name, XCOFF::SectionNameSize);
return generateStringRef(Name);
}
} // namespace object