6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-14 11:32:34 +00:00
Code Issues Projects Releases Wiki Activity

80-col

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@174572 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Michael J. Spencer 2013-02-07 01:43:18 +00:00
parent 0fae64fde0
commit 727de1e756
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/llvm/Object/ELF.h
View File

@ -2246,7 +2246,8 @@ template<class ELFT>
typename ELFObjectFile<ELFT>::dyn_iterator typename ELFObjectFile<ELFT>::dyn_iterator
ELFObjectFile<ELFT>::begin_dynamic_table() const { ELFObjectFile<ELFT>::begin_dynamic_table() const {
if (dot_dynamic_sec) if (dot_dynamic_sec)
return dyn_iterator(dot_dynamic_sec->sh_entsize, (const char *)base() + dot_dynamic_sec->sh_offset); return dyn_iterator(dot_dynamic_sec->sh_entsize,
(const char *)base() + dot_dynamic_sec->sh_offset);
return dyn_iterator(0, 0); return dyn_iterator(0, 0);
} }
@ -2254,7 +2255,8 @@ template<class ELFT>
typename ELFObjectFile<ELFT>::dyn_iterator typename ELFObjectFile<ELFT>::dyn_iterator
ELFObjectFile<ELFT>::end_dynamic_table() const { ELFObjectFile<ELFT>::end_dynamic_table() const {
if (dot_dynamic_sec) if (dot_dynamic_sec)
return dyn_iterator(dot_dynamic_sec->sh_entsize, (const char *)base() + dot_dynamic_sec->sh_offset + dot_dynamic_sec->sh_size); return dyn_iterator(dot_dynamic_sec->sh_entsize, (const char *)base() +
dot_dynamic_sec->sh_offset + dot_dynamic_sec->sh_size);
return dyn_iterator(0, 0); return dyn_iterator(0, 0);
} }
@ -2298,14 +2300,16 @@ template<class ELFT>
error_code ELFObjectFile<ELFT>::getLibraryNext(DataRefImpl Data, error_code ELFObjectFile<ELFT>::getLibraryNext(DataRefImpl Data,
LibraryRef &Result) const { LibraryRef &Result) const {
// Use the same DataRefImpl format as DynRef. // Use the same DataRefImpl format as DynRef.
dyn_iterator i = dyn_iterator(dot_dynamic_sec->sh_entsize, reinterpret_cast<const char *>(Data.p)); dyn_iterator i = dyn_iterator(dot_dynamic_sec->sh_entsize,
reinterpret_cast<const char *>(Data.p));
dyn_iterator e = end_dynamic_table(); dyn_iterator e = end_dynamic_table();
// Skip the current dynamic table entry. // Skip the current dynamic table entry.
++i; ++i;
// Find the next DT_NEEDED entry. // Find the next DT_NEEDED entry.
for (; i != e && i->getTag() != ELF::DT_NEEDED; ++i); for (; i != e && i->getTag() != ELF::DT_NEEDED; ++i)
;
DataRefImpl DRI; DataRefImpl DRI;
DRI.p = reinterpret_cast<uintptr_t>(&*i); DRI.p = reinterpret_cast<uintptr_t>(&*i);
@ -2316,7 +2320,8 @@ error_code ELFObjectFile<ELFT>::getLibraryNext(DataRefImpl Data,
template<class ELFT> template<class ELFT>
error_code ELFObjectFile<ELFT>::getLibraryPath(DataRefImpl Data, error_code ELFObjectFile<ELFT>::getLibraryPath(DataRefImpl Data,
StringRef &Res) const { StringRef &Res) const {
dyn_iterator i = dyn_iterator(dot_dynamic_sec->sh_entsize, reinterpret_cast<const char *>(Data.p)); dyn_iterator i = dyn_iterator(dot_dynamic_sec->sh_entsize,
reinterpret_cast<const char *>(Data.p));
if (i == end_dynamic_table()) if (i == end_dynamic_table())
report_fatal_error("getLibraryPath() called on iterator end"); report_fatal_error("getLibraryPath() called on iterator end");