<div dir="ltr">Hi Nakamura-san,<div><br></div><div>Thank you for doing this. I think it's safe to truncate uint64_t to 32 here because this path is used only when the file being read is x86 executable. PE32Header should never be nullptr. I'll add an assert there.</div>

</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Feb 20, 2014 at 2:27 AM, NAKAMURA Takumi <span dir="ltr"><<a href="mailto:geek4civic@gmail.com" target="_blank">geek4civic@gmail.com</a>></span> wrote:<br>

<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Ueyama san,<br>
<br>
Tweaked in r201769 to appease msvc.<br>
I wonder if I could truncate i64 here...<br>
<br>
...Takumi<br>
<br>
2014-02-20 15:51 GMT+09:00 Rui Ueyama <<a href="mailto:ruiu@google.com">ruiu@google.com</a>>:<br>
<div class="HOEnZb"><div class="h5">> Author: ruiu<br>
> Date: Thu Feb 20 00:51:07 2014<br>
> New Revision: 201760<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=201760&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=201760&view=rev</a><br>
> Log:<br>
> llvm-objdump/COFF: Print SEH table addresses.<br>
><br>
> SEH table addresses are VA in COFF file. In this patch we convert VA to RVA<br>
> before printing it, because dumpbin prints them as RVAs.<br>
><br>
> Modified:<br>
>     llvm/trunk/include/llvm/Object/COFF.h<br>
>     llvm/trunk/lib/Object/COFFObjectFile.cpp<br>
>     llvm/trunk/test/tools/llvm-objdump/coff-private-headers.test<br>
>     llvm/trunk/tools/llvm-objdump/COFFDump.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=201760&r1=201759&r2=201760&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/COFF.h?rev=201760&r1=201759&r2=201760&view=diff</a><br>


> ==============================================================================<br>
> --- llvm/trunk/include/llvm/Object/COFF.h (original)<br>
> +++ llvm/trunk/include/llvm/Object/COFF.h Thu Feb 20 00:51:07 2014<br>
> @@ -397,6 +397,7 @@ public:<br>
>    error_code getSectionContents(const coff_section *Sec,<br>
>                                  ArrayRef<uint8_t> &Res) const;<br>
><br>
> +  error_code getVaPtr(uint32_t Rva, uintptr_t &Res) const;<br>
>    error_code getRvaPtr(uint32_t Rva, uintptr_t &Res) const;<br>
>    error_code getHintName(uint32_t Rva, uint16_t &Hint, StringRef &Name) const;<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=201760&r1=201759&r2=201760&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/COFFObjectFile.cpp?rev=201760&r1=201759&r2=201760&view=diff</a><br>


> ==============================================================================<br>
> --- llvm/trunk/lib/Object/COFFObjectFile.cpp (original)<br>
> +++ llvm/trunk/lib/Object/COFFObjectFile.cpp Thu Feb 20 00:51:07 2014<br>
> @@ -381,15 +381,21 @@ error_code COFFObjectFile::initSymbolTab<br>
>    return object_error::success;<br>
>  }<br>
><br>
> +// Returns the file offset for the given VA.<br>
> +error_code COFFObjectFile::getVaPtr(uint32_t Addr, uintptr_t &Res) const {<br>
> +  uint32_t ImageBase = PE32Header ? PE32Header->ImageBase : PE32PlusHeader->ImageBase;<br>
> +  return getRvaPtr(Addr - ImageBase, Res);<br>
> +}<br>
> +<br>
>  // Returns the file offset for the given RVA.<br>
> -error_code COFFObjectFile::getRvaPtr(uint32_t Rva, uintptr_t &Res) const {<br>
> +error_code COFFObjectFile::getRvaPtr(uint32_t Addr, uintptr_t &Res) const {<br>
>    for (section_iterator I = section_begin(), E = section_end(); I != E;<br>
>         ++I) {<br>
>      const coff_section *Section = getCOFFSection(I);<br>
>      uint32_t SectionStart = Section->VirtualAddress;<br>
>      uint32_t SectionEnd = Section->VirtualAddress + Section->VirtualSize;<br>
> -    if (SectionStart <= Rva && Rva < SectionEnd) {<br>
> -      uint32_t Offset = Rva - SectionStart;<br>
> +    if (SectionStart <= Addr && Addr < SectionEnd) {<br>
> +      uint32_t Offset = Addr - SectionStart;<br>
>        Res = uintptr_t(base()) + Section->PointerToRawData + Offset;<br>
>        return object_error::success;<br>
>      }<br>
><br>
> Modified: llvm/trunk/test/tools/llvm-objdump/coff-private-headers.test<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/coff-private-headers.test?rev=201760&r1=201759&r2=201760&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/coff-private-headers.test?rev=201760&r1=201759&r2=201760&view=diff</a><br>


> ==============================================================================<br>
> --- llvm/trunk/test/tools/llvm-objdump/coff-private-headers.test (original)<br>
> +++ llvm/trunk/test/tools/llvm-objdump/coff-private-headers.test Thu Feb 20 00:51:07 2014<br>
> @@ -64,3 +64,4 @@ LOADCFG-NEXT:   CSD Version: 0<br>
>  LOADCFG-NEXT:   Security Cookie: 4206616<br>
>  LOADCFG-NEXT:   SEH Table: 4202768<br>
>  LOADCFG-NEXT:   SEH Count: 1<br>
> +LOADCFG:      SEH Table: 0x401689<br>
><br>
> Modified: llvm/trunk/tools/llvm-objdump/COFFDump.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/COFFDump.cpp?rev=201760&r1=201759&r2=201760&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/COFFDump.cpp?rev=201760&r1=201759&r2=201760&view=diff</a><br>


> ==============================================================================<br>
> --- llvm/trunk/tools/llvm-objdump/COFFDump.cpp (original)<br>
> +++ llvm/trunk/tools/llvm-objdump/COFFDump.cpp Thu Feb 20 00:51:07 2014<br>
> @@ -233,6 +233,25 @@ static void printCOFFSymbolAddress(llvm:<br>
>      Out << format(" + 0x%04x", Disp);<br>
>  }<br>
><br>
> +static void<br>
> +printSEHTable(const COFFObjectFile *Obj, uint32_t TableVA, int Count) {<br>
> +  if (Count == 0)<br>
> +    return;<br>
> +<br>
> +  const pe32_header *PE32Header;<br>
> +  if (error(Obj->getPE32Header(PE32Header)))<br>
> +    return;<br>
> +  uint32_t ImageBase = PE32Header->ImageBase;<br>
> +  uintptr_t IntPtr = 0;<br>
> +  if (error(Obj->getVaPtr(TableVA, IntPtr)))<br>
> +    return;<br>
> +  const support::ulittle32_t *P = (const support::ulittle32_t *)IntPtr;<br>
> +  outs() << "SEH Table:";<br>
> +  for (int I = 0; I < Count; ++I)<br>
> +    outs() << format(" 0x%x", P[I] + ImageBase);<br>
> +  outs() << "\n\n";<br>
> +}<br>
> +<br>
>  static void printLoadConfiguration(const COFFObjectFile *Obj) {<br>
>    const coff_file_header *Header;<br>
>    if (error(Obj->getCOFFHeader(Header)))<br>
> @@ -249,6 +268,7 @@ static void printLoadConfiguration(const<br>
>      return;<br>
>    if (error(Obj->getRvaPtr(DataDir->RelativeVirtualAddress, IntPtr)))<br>
>      return;<br>
> +<br>
>    const coff_load_configuration32 *LoadConf =<br>
>        reinterpret_cast<const coff_load_configuration32 *>(IntPtr);<br>
><br>
> @@ -271,6 +291,8 @@ static void printLoadConfiguration(const<br>
>           << "\n  SEH Table: " << LoadConf->SEHandlerTable<br>
>           << "\n  SEH Count: " << LoadConf->SEHandlerCount<br>
>           << "\n\n";<br>
> +  printSEHTable(Obj, LoadConf->SEHandlerTable, LoadConf->SEHandlerCount);<br>
> +  outs() << "\n";<br>
>  }<br>
><br>
>  // Prints import tables. The import table is a table containing the list of<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>
</div></div></blockquote></div><br></div>