[patch] Reading coff-pe-read files

[Kai Tietz <Kai.Tietz@onevision.com>]

[-- Attachment #1: Type: text/plain, Size: 820 bytes --]

Hi,

One small piece for x86_64 windows support in coff-pe-read.c seems to be 
missing. In function read_pe_exported_syms wrong indexes are used to find 
exports of the image.
The source uses here the same pattern as in bfd/pe-dll.c.

ChangeLog

2009-01-07  Kai Tietz  <kai.tietz@onevision.com>

        * coff-pe-read.c (read_pe_exported_syms): Enable read of PE+ 
export directory.


I am uncertain, which macro I should use here (or if it would be better to 
make for PE+ a copy of this file), so I used _WIN64 as condition.

Cheers,
Kai

PS: I have already papers ready with FSF for gdb, so there shouldn't be 
any problem about taking parts of my donated  code, I've provided to Joel 
IMHO.



|  (\_/)  This is Bunny. Copy and paste Bunny
| (='.'=) into your signature to help him gain
| (")_(") world domination.

[-- Attachment #2: pe-coff-read.diff --]
[-- Type: application/octet-stream, Size: 1503 bytes --]

Index: src/gdb/coff-pe-read.c
===================================================================
--- src.orig/gdb/coff-pe-read.c
+++ src/gdb/coff-pe-read.c
@@ -205,7 +205,10 @@ read_pe_exported_syms (struct objfile *o
 
   char const *target = bfd_get_target (objfile->obfd);
 
-  if ((strcmp (target, "pe-i386") != 0) && (strcmp (target, "pei-i386") != 0))
+  if ((strcmp (target, "pe-i386") != 0)
+      && (strcmp (target, "pei-i386") != 0)
+      && (strcmp (target, "pe-x86-64") != 0)
+      && (strcmp (target, "pei-x86-64") != 0))
     {
       /* This is not an i386 format file. Abort now, because the code
          is untested on anything else. *FIXME* test on further
@@ -216,15 +219,24 @@ read_pe_exported_syms (struct objfile *o
   /* Get pe_header, optional header and numbers of export entries.  */
   pe_header_offset = pe_get32 (dll, 0x3c);
   opthdr_ofs = pe_header_offset + 4 + 20;
+#ifdef _WIN64
+  num_entries = pe_get32 (dll, opthdr_ofs + 92 + 16);
+#else
   num_entries = pe_get32 (dll, opthdr_ofs + 92);
+#endif
 
   if (num_entries < 1)		/* No exports.  */
     {
       return;
     }
 
+#ifdef _WIN64
+  export_rva = pe_get32 (dll, opthdr_ofs + 96 + 16);
+  export_size = pe_get32 (dll, opthdr_ofs + 100 + 16);
+#else
   export_rva = pe_get32 (dll, opthdr_ofs + 96);
   export_size = pe_get32 (dll, opthdr_ofs + 100);
+#endif
   nsections = pe_get16 (dll, pe_header_offset + 4 + 2);
   secptr = (pe_header_offset + 4 + 20 +
 	    pe_get16 (dll, pe_header_offset + 4 + 16));