[PATCH] Add Archive::getNumberOfSymbols()
Rui Ueyama
ruiu at google.com
Mon May 25 18:21:13 PDT 2015
Hi rafael,
Add Archive::getNumberOfSymbols() which returns number of symbols
in archive headers.
http://reviews.llvm.org/D10028
Files:
include/llvm/Object/Archive.h
lib/Object/Archive.cpp
Index: include/llvm/Object/Archive.h
===================================================================
--- include/llvm/Object/Archive.h
+++ include/llvm/Object/Archive.h
@@ -207,6 +207,7 @@
bool hasSymbolTable() const;
child_iterator getSymbolTableChild() const { return SymbolTable; }
+ uint32_t getNumberOfSymbols() const;
private:
child_iterator SymbolTable;
Index: lib/Object/Archive.cpp
===================================================================
--- lib/Object/Archive.cpp
+++ lib/Object/Archive.cpp
@@ -487,22 +487,21 @@
Archive::symbol_iterator Archive::symbol_end() const {
if (!hasSymbolTable())
return symbol_iterator(Symbol(this, 0, 0));
+ return symbol_iterator(Symbol(this, getNumberOfSymbols(), 0));
+}
+uint32_t Archive::getNumberOfSymbols() const {
const char *buf = SymbolTable->getBuffer().begin();
- uint32_t symbol_count = 0;
- if (kind() == K_GNU) {
- symbol_count = read32be(buf);
- } else if (kind() == K_MIPS64) {
- symbol_count = read64be(buf);
- } else if (kind() == K_BSD) {
- symbol_count = read32le(buf) / 8;
- } else {
- uint32_t member_count = 0;
- member_count = read32le(buf);
- buf += 4 + (member_count * 4); // Skip offsets.
- symbol_count = read32le(buf);
- }
- return symbol_iterator(Symbol(this, symbol_count, 0));
+ if (kind() == K_GNU)
+ return read32be(buf);
+ if (kind() == K_MIPS64)
+ return read64be(buf);
+ if (kind() == K_BSD)
+ return read32le(buf) / 8;
+ uint32_t member_count = 0;
+ member_count = read32le(buf);
+ buf += 4 + (member_count * 4); // Skip offsets.
+ return read32le(buf);
}
Archive::child_iterator Archive::findSym(StringRef name) const {
EMAIL PREFERENCES
http://reviews.llvm.org/settings/panel/emailpreferences/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D10028.26500.patch
Type: text/x-patch
Size: 1693 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150526/837fe89e/attachment.bin>
More information about the llvm-commits
mailing list