<p dir="ltr">Are there no unit tests to test new interface points of libObject?</p>
<div class="gmail_quote">On Oct 29, 2012 3:48 AM, "Tim Northover" <<a href="mailto:Tim.Northover@arm.com">Tim.Northover@arm.com</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: tnorthover<br>
Date: Mon Oct 29 05:47:00 2012<br>
New Revision: 166918<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=166918&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=166918&view=rev</a><br>
Log:<br>
Add interface for querying object files for symbol values.<br>
<br>
Currently only implemented for ELF.<br>
<br>
Patch by Amara Emerson.<br>
<br>
Modified:<br>
llvm/trunk/include/llvm/Object/COFF.h<br>
llvm/trunk/include/llvm/Object/ELF.h<br>
llvm/trunk/include/llvm/Object/MachO.h<br>
llvm/trunk/include/llvm/Object/ObjectFile.h<br>
llvm/trunk/lib/Object/COFFObjectFile.cpp<br>
llvm/trunk/lib/Object/MachOObjectFile.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/Object/COFF.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/COFF.h?rev=166918&r1=166917&r2=166918&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/COFF.h?rev=166918&r1=166917&r2=166918&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/Object/COFF.h (original)<br>
+++ llvm/trunk/include/llvm/Object/COFF.h Mon Oct 29 05:47:00 2012<br>
@@ -116,6 +116,7 @@<br>
virtual error_code getSymbolType(DataRefImpl Symb, SymbolRef::Type &Res) const;<br>
virtual error_code getSymbolSection(DataRefImpl Symb,<br>
section_iterator &Res) const;<br>
+ virtual error_code getSymbolValue(DataRefImpl Symb, uint64_t &Val) const;<br>
<br>
virtual error_code getSectionNext(DataRefImpl Sec, SectionRef &Res) const;<br>
virtual error_code getSectionName(DataRefImpl Sec, StringRef &Res) const;<br>
<br>
Modified: llvm/trunk/include/llvm/Object/ELF.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/ELF.h?rev=166918&r1=166917&r2=166918&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/ELF.h?rev=166918&r1=166917&r2=166918&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/Object/ELF.h (original)<br>
+++ llvm/trunk/include/llvm/Object/ELF.h Mon Oct 29 05:47:00 2012<br>
@@ -620,6 +620,7 @@<br>
virtual error_code getSymbolType(DataRefImpl Symb, SymbolRef::Type &Res) const;<br>
virtual error_code getSymbolSection(DataRefImpl Symb,<br>
section_iterator &Res) const;<br>
+ virtual error_code getSymbolValue(DataRefImpl Symb, uint64_t &Val) const;<br>
<br>
friend class DynRefImpl<target_endianness, is64Bits>;<br>
virtual error_code getDynNext(DataRefImpl DynData, DynRef &Result) const;<br>
@@ -1162,6 +1163,16 @@<br>
<br>
template<support::endianness target_endianness, bool is64Bits><br>
error_code ELFObjectFile<target_endianness, is64Bits><br>
+ ::getSymbolValue(DataRefImpl Symb,<br>
+ uint64_t &Val) const {<br>
+ validateSymbol(Symb);<br>
+ const Elf_Sym *symb = getSymbol(Symb);<br>
+ Val = symb->st_value;<br>
+ return object_error::success;<br>
+}<br>
+<br>
+template<support::endianness target_endianness, bool is64Bits><br>
+error_code ELFObjectFile<target_endianness, is64Bits><br>
::getSectionNext(DataRefImpl Sec, SectionRef &Result) const {<br>
const uint8_t *sec = reinterpret_cast<const uint8_t *>(Sec.p);<br>
sec += Header->e_shentsize;<br>
<br>
Modified: llvm/trunk/include/llvm/Object/MachO.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/MachO.h?rev=166918&r1=166917&r2=166918&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/MachO.h?rev=166918&r1=166917&r2=166918&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/Object/MachO.h (original)<br>
+++ llvm/trunk/include/llvm/Object/MachO.h Mon Oct 29 05:47:00 2012<br>
@@ -61,6 +61,7 @@<br>
virtual error_code getSymbolType(DataRefImpl Symb, SymbolRef::Type &Res) const;<br>
virtual error_code getSymbolSection(DataRefImpl Symb,<br>
section_iterator &Res) const;<br>
+ virtual error_code getSymbolValue(DataRefImpl Symb, uint64_t &Val) const;<br>
<br>
virtual error_code getSectionNext(DataRefImpl Sec, SectionRef &Res) const;<br>
virtual error_code getSectionName(DataRefImpl Sec, StringRef &Res) const;<br>
<br>
Modified: llvm/trunk/include/llvm/Object/ObjectFile.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/ObjectFile.h?rev=166918&r1=166917&r2=166918&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/ObjectFile.h?rev=166918&r1=166917&r2=166918&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/Object/ObjectFile.h (original)<br>
+++ llvm/trunk/include/llvm/Object/ObjectFile.h Mon Oct 29 05:47:00 2012<br>
@@ -234,6 +234,9 @@<br>
/// end_sections() if it is undefined or is an absolute symbol.<br>
error_code getSection(section_iterator &Result) const;<br>
<br>
+ /// @brief Get value of the symbol in the symbol table.<br>
+ error_code getValue(uint64_t &Val) const;<br>
+<br>
DataRefImpl getRawDataRefImpl() const;<br>
};<br>
typedef content_iterator<SymbolRef> symbol_iterator;<br>
@@ -300,6 +303,7 @@<br>
uint32_t &Res) const = 0;<br>
virtual error_code getSymbolSection(DataRefImpl Symb,<br>
section_iterator &Res) const = 0;<br>
+ virtual error_code getSymbolValue(DataRefImpl Symb, uint64_t &Val) const = 0;<br>
<br>
// Same as above for SectionRef.<br>
friend class SectionRef;<br>
@@ -444,6 +448,10 @@<br>
return OwningObject->getSymbolType(SymbolPimpl, Result);<br>
}<br>
<br>
+inline error_code SymbolRef::getValue(uint64_t &Val) const {<br>
+ return OwningObject->getSymbolValue(SymbolPimpl, Val);<br>
+}<br>
+<br>
inline DataRefImpl SymbolRef::getRawDataRefImpl() const {<br>
return SymbolPimpl;<br>
}<br>
<br>
Modified: llvm/trunk/lib/Object/COFFObjectFile.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/COFFObjectFile.cpp?rev=166918&r1=166917&r2=166918&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/COFFObjectFile.cpp?rev=166918&r1=166917&r2=166918&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Object/COFFObjectFile.cpp (original)<br>
+++ llvm/trunk/lib/Object/COFFObjectFile.cpp Mon Oct 29 05:47:00 2012<br>
@@ -288,6 +288,11 @@<br>
return object_error::success;<br>
}<br>
<br>
+error_code COFFObjectFile::getSymbolValue(DataRefImpl Symb,<br>
+ uint64_t &Val) const {<br>
+ report_fatal_error("getSymbolValue unimplemented in COFFObjectFile");<br>
+}<br>
+<br>
error_code COFFObjectFile::getSectionNext(DataRefImpl Sec,<br>
SectionRef &Result) const {<br>
const coff_section *sec = toSec(Sec);<br>
<br>
Modified: llvm/trunk/lib/Object/MachOObjectFile.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/MachOObjectFile.cpp?rev=166918&r1=166917&r2=166918&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/MachOObjectFile.cpp?rev=166918&r1=166917&r2=166918&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Object/MachOObjectFile.cpp (original)<br>
+++ llvm/trunk/lib/Object/MachOObjectFile.cpp Mon Oct 29 05:47:00 2012<br>
@@ -363,6 +363,10 @@<br>
return object_error::success;<br>
}<br>
<br>
+error_code MachOObjectFile::getSymbolValue(DataRefImpl Symb,<br>
+ uint64_t &Val) const {<br>
+ report_fatal_error("getSymbolValue unimplemented in MachOObjectFile");<br>
+}<br>
<br>
symbol_iterator MachOObjectFile::begin_symbols() const {<br>
// DRI.d.a = segment number; DRI.d.b = symbol index.<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>