[haiku-commits] haiku: hrev44868 - src/tools
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 20 Nov 2012 22:58:54 +0100 (CET)
hrev44868 adds 1 changeset to branch 'master'
old head: 93b5e5614cab5777788dff6f6ecd7cbe00892fe0
new head: 9761f00b1b520e6fb3c60d8d408559a637ffe1a4
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=9761f00+%5E93b5e56
----------------------------------------------------------------------------
9761f00: Fix build of set_haiku_revision.cpp with gcc2 (on haiku)
* move template method implementations out of class body, as otherwise
gcc2 bails with internal compiler error - thanks to Christof Lutteroth
for reporting
[ Oliver Tappe <zooey@xxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev44868
Commit: 9761f00b1b520e6fb3c60d8d408559a637ffe1a4
URL: http://cgit.haiku-os.org/haiku/commit/?id=9761f00
Author: Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date: Tue Nov 20 21:51:27 2012 UTC
----------------------------------------------------------------------------
1 file changed, 137 insertions(+), 129 deletions(-)
src/tools/set_haiku_revision.cpp | 266 ++++++++++++++++++-----------------
----------------------------------------------------------------------------
diff --git a/src/tools/set_haiku_revision.cpp b/src/tools/set_haiku_revision.cpp
index acaa697..88c4704 100644
--- a/src/tools/set_haiku_revision.cpp
+++ b/src/tools/set_haiku_revision.cpp
@@ -450,137 +450,10 @@ public:
private:
template<typename EhdrType, typename ShdrType>
- void _ParseELFHeader()
- {
- // read ELF header
- EhdrType fileHeader;
- Read(0, &fileHeader, sizeof(EhdrType), "Failed to read ELF
header.");
-
- // check data encoding (endianess)
- switch (fileHeader.e_ident[EI_DATA]) {
- case ELFDATA2LSB:
- fHostEndianess = (htonl(1) != 1);
- break;
- case ELFDATA2MSB:
- fHostEndianess = (htonl(1) == 1);
- break;
- default:
- case ELFDATANONE:
- throw Exception(EIO, "Unsupported ELF data
encoding.");
- break;
- }
-
- // get the header values
- fELFHeaderSize = GetValue(fileHeader.e_ehsize);
- fSectionHeaderTableOffset = GetValue(fileHeader.e_shoff);
- fSectionHeaderSize = GetValue(fileHeader.e_shentsize);
- fSectionHeaderCount = GetValue(fileHeader.e_shnum);
- bool hasSectionHeaderTable = (fSectionHeaderTableOffset != 0);
-
- // check the sanity of the header values
- // ELF header size
- if (fELFHeaderSize < sizeof(EhdrType)) {
- throw Exception(EIO,
- "Invalid ELF header: invalid ELF header size:
%lu.",
- fELFHeaderSize);
- }
-
- // section header table offset and entry count/size
- if (hasSectionHeaderTable) {
- if (fSectionHeaderTableOffset < (off_t)fELFHeaderSize
- || fSectionHeaderTableOffset > fFileSize) {
- throw Exception(EIO, "Invalid ELF header:
invalid section "
- "header table
offset: %llu.",
-
fSectionHeaderTableOffset);
- }
- size_t sectionHeaderTableSize
- = fSectionHeaderSize * fSectionHeaderCount;
- if (fSectionHeaderSize < (off_t)sizeof(ShdrType)
- || fSectionHeaderTableOffset +
(off_t)sectionHeaderTableSize
- > fFileSize) {
- throw Exception(EIO, "Invalid ELF header:
section header "
- "table exceeds
file: %llu.",
-
fSectionHeaderTableOffset
- +
sectionHeaderTableSize);
- }
-
-
- // load section header string section
- uint16_t sectionHeaderStringSectionIndex
- = GetValue(fileHeader.e_shstrndx);
- if (sectionHeaderStringSectionIndex != SHN_UNDEF) {
- if (sectionHeaderStringSectionIndex >=
fSectionHeaderCount) {
- throw Exception(EIO, "Invalid ELF
header: invalid section "
- "header
string section index: %u.",
-
sectionHeaderStringSectionIndex);
- }
-
- // get the section info
- SectionInfo info;
- if
(_ReadSectionHeader<ShdrType>(sectionHeaderStringSectionIndex,
- info)) {
- fSectionHeaderStrings = new
char[info.size + 1];
- Read(info.offset,
fSectionHeaderStrings, info.size,
- "Failed to read section header
string section.");
- fSectionHeaderStringsLength = info.size;
- // null-terminate to be on the safe side
- fSectionHeaderStrings[info.size] = '\0';
- }
- }
- }
- }
+ void _ParseELFHeader();
template<typename ShdrType>
- bool _ReadSectionHeader(int index, SectionInfo& info)
- {
- off_t shOffset = fSectionHeaderTableOffset
- + index * fSectionHeaderSize;
- ShdrType sectionHeader;
- Read(shOffset, §ionHeader, sizeof(ShdrType),
- "Failed to read ELF section header.");
-
- // get the header values
- uint32_t type = GetValue(sectionHeader.sh_type);
- off_t offset = GetValue(sectionHeader.sh_offset);
- size_t size =
GetValue(sectionHeader.sh_size);
- uint32_t nameIndex = GetValue(sectionHeader.sh_name);
-
- // check the values
- // SHT_NULL marks the header unused,
- if (type == SHT_NULL)
- return false;
-
- // SHT_NOBITS sections take no space in the file
- if (type != SHT_NOBITS) {
- if (offset < (off_t)fELFHeaderSize || offset >
fFileSize) {
- throw Exception(EIO, "Invalid ELF section
header: "
- "invalid
section offset: %llu.", offset);
- }
- off_t sectionEnd = offset + size;
- if (sectionEnd > fFileSize) {
- throw Exception(EIO, "Invalid ELF section
header: "
- "section
exceeds file: %llu.", sectionEnd);
- }
- }
-
- // get name, if we have a string section
- if (fSectionHeaderStrings) {
- if (nameIndex >= (uint32_t)fSectionHeaderStringsLength)
{
- throw Exception(EIO, "Invalid ELF section
header: "
- "invalid name
index: %lu.", nameIndex);
- }
- info.name = fSectionHeaderStrings + nameIndex;
- } else {
- info.name = "";
- }
-
- info.type = type;
- info.offset = offset;
- info.size = size;
-
-
- return true;
- }
+ bool _ReadSectionHeader(int index, SectionInfo& info);
// _SwapUInt16
static inline uint16_t _SwapUInt16(uint16_t value)
@@ -658,6 +531,141 @@ uint64_t ELFObject::GetValue(uint64_t& value)
}
+template<typename EhdrType, typename ShdrType>
+void ELFObject::_ParseELFHeader()
+{
+ // read ELF header
+ EhdrType fileHeader;
+ Read(0, &fileHeader, sizeof(EhdrType), "Failed to read ELF header.");
+
+ // check data encoding (endianess)
+ switch (fileHeader.e_ident[EI_DATA]) {
+ case ELFDATA2LSB:
+ fHostEndianess = (htonl(1) != 1);
+ break;
+ case ELFDATA2MSB:
+ fHostEndianess = (htonl(1) == 1);
+ break;
+ default:
+ case ELFDATANONE:
+ throw Exception(EIO, "Unsupported ELF data encoding.");
+ break;
+ }
+
+ // get the header values
+ fELFHeaderSize = GetValue(fileHeader.e_ehsize);
+ fSectionHeaderTableOffset = GetValue(fileHeader.e_shoff);
+ fSectionHeaderSize = GetValue(fileHeader.e_shentsize);
+ fSectionHeaderCount = GetValue(fileHeader.e_shnum);
+ bool hasSectionHeaderTable = (fSectionHeaderTableOffset != 0);
+
+ // check the sanity of the header values
+ // ELF header size
+ if (fELFHeaderSize < sizeof(EhdrType)) {
+ throw Exception(EIO,
+ "Invalid ELF header: invalid ELF header size: %lu.",
+ fELFHeaderSize);
+ }
+
+ // section header table offset and entry count/size
+ if (hasSectionHeaderTable) {
+ if (fSectionHeaderTableOffset < (off_t)fELFHeaderSize
+ || fSectionHeaderTableOffset > fFileSize) {
+ throw Exception(EIO, "Invalid ELF header: invalid
section "
+ "header table offset:
%llu.",
+
fSectionHeaderTableOffset);
+ }
+ size_t sectionHeaderTableSize
+ = fSectionHeaderSize * fSectionHeaderCount;
+ if (fSectionHeaderSize < (off_t)sizeof(ShdrType)
+ || fSectionHeaderTableOffset +
(off_t)sectionHeaderTableSize
+ > fFileSize) {
+ throw Exception(EIO, "Invalid ELF header: section
header "
+ "table exceeds file:
%llu.",
+
fSectionHeaderTableOffset
+ +
sectionHeaderTableSize);
+ }
+
+
+ // load section header string section
+ uint16_t sectionHeaderStringSectionIndex
+ = GetValue(fileHeader.e_shstrndx);
+ if (sectionHeaderStringSectionIndex != SHN_UNDEF) {
+ if (sectionHeaderStringSectionIndex >=
fSectionHeaderCount) {
+ throw Exception(EIO, "Invalid ELF header:
invalid section "
+ "header string
section index: %u.",
+
sectionHeaderStringSectionIndex);
+ }
+
+ // get the section info
+ SectionInfo info;
+ if
(_ReadSectionHeader<ShdrType>(sectionHeaderStringSectionIndex,
+ info)) {
+ fSectionHeaderStrings = new char[info.size + 1];
+ Read(info.offset, fSectionHeaderStrings,
info.size,
+ "Failed to read section header string
section.");
+ fSectionHeaderStringsLength = info.size;
+ // null-terminate to be on the safe side
+ fSectionHeaderStrings[info.size] = '\0';
+ }
+ }
+ }
+}
+
+
+template<typename ShdrType>
+bool ELFObject::_ReadSectionHeader(int index, SectionInfo& info)
+{
+ off_t shOffset = fSectionHeaderTableOffset
+ + index * fSectionHeaderSize;
+ ShdrType sectionHeader;
+ Read(shOffset, §ionHeader, sizeof(ShdrType),
+ "Failed to read ELF section header.");
+
+ // get the header values
+ uint32_t type = GetValue(sectionHeader.sh_type);
+ off_t offset = GetValue(sectionHeader.sh_offset);
+ size_t size = GetValue(sectionHeader.sh_size);
+ uint32_t nameIndex = GetValue(sectionHeader.sh_name);
+
+ // check the values
+ // SHT_NULL marks the header unused,
+ if (type == SHT_NULL)
+ return false;
+
+ // SHT_NOBITS sections take no space in the file
+ if (type != SHT_NOBITS) {
+ if (offset < (off_t)fELFHeaderSize || offset > fFileSize) {
+ throw Exception(EIO, "Invalid ELF section header: "
+ "invalid section
offset: %llu.", offset);
+ }
+ off_t sectionEnd = offset + size;
+ if (sectionEnd > fFileSize) {
+ throw Exception(EIO, "Invalid ELF section header: "
+ "section exceeds file:
%llu.", sectionEnd);
+ }
+ }
+
+ // get name, if we have a string section
+ if (fSectionHeaderStrings) {
+ if (nameIndex >= (uint32_t)fSectionHeaderStringsLength) {
+ throw Exception(EIO, "Invalid ELF section header: "
+ "invalid name index:
%lu.", nameIndex);
+ }
+ info.name = fSectionHeaderStrings + nameIndex;
+ } else {
+ info.name = "";
+ }
+
+ info.type = type;
+ info.offset = offset;
+ info.size = size;
+
+
+ return true;
+}
+
+
// main
int
main(int argc, const char* const* argv)
Other related posts:
- » [haiku-commits] haiku: hrev44868 - src/tools - zooey