maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Add getHeader helper and move ToHeader to the cpp file. 

llvm-svn: 185933
This commit is contained in:
Rafael Espindola 2013-07-09 12:22:05 +00:00
parent faba61a7bc
commit 97ee9de652
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
llvm/include/llvm/Object/Archive.h
View File

@ -36,10 +36,6 @@ struct ArchiveMemberHeader {
uint64_t getSize() const;
};
static const ArchiveMemberHeader *ToHeader(const char *base) {
return reinterpret_cast<const ArchiveMemberHeader *>(base);
}
class Archive : public Binary {
virtual void anchor();
public:
@ -50,6 +46,10 @@ public:
/// \brief Offset from Data to the start of the file.
uint16_t StartOfFile;
const ArchiveMemberHeader *getHeader() const {
return reinterpret_cast<const ArchiveMemberHeader *>(Data.data());
}
public:
Child(const Archive *Parent, const char *Start);
@ -64,7 +64,7 @@ public:
Child getNext() const;
error_code getName(StringRef &Result) const;
StringRef getRawName() const { return ToHeader(Data.data())->getName(); }
StringRef getRawName() const { return getHeader()->getName(); }
/// \return the size of the archive member without the header or padding.
uint64_t getSize() const { return Data.size() - StartOfFile; }

8
llvm/lib/Object/Archive.cpp
View File

@ -61,12 +61,16 @@ uint64_t ArchiveMemberHeader::getSize() const {
return ret;
}
static const ArchiveMemberHeader *toHeader(const char *base) {
return reinterpret_cast<const ArchiveMemberHeader *>(base);
}
Archive::Child::Child(const Archive *Parent, const char *Start)
: Parent(Parent) {
if (!Start)
return;
const ArchiveMemberHeader *Header = ToHeader(Start);
const ArchiveMemberHeader *Header = toHeader(Start);
Data = StringRef(Start, sizeof(ArchiveMemberHeader) + Header->getSize());
// Setup StartOfFile and PaddingBytes.
@ -270,7 +274,7 @@ Archive::child_iterator Archive::begin_children(bool skip_internal) const {
const char *Loc = Data->getBufferStart() + strlen(Magic);
Child c(this, Loc);
// Skip internals at the beginning of an archive.
if (skip_internal && isInternalMember(*ToHeader(Loc)))
if (skip_internal && isInternalMember(*toHeader(Loc)))
return c.getNext();
return c;
}