Re: [patch] Reading coff-pe-read files

Kai Tietz
2009-01-07T13:51:30Z

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

Hello,

I modified my patch, so that it doesn't need a #if clause anymore.

Cheers,
Kai

| (\_/) 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: 2049 bytes --]

Index: src/gdb/coff-pe-read.c
===================================================================
--- src.orig/gdb/coff-pe-read.c
+++ src/gdb/coff-pe-read.c
@@ -191,6 +191,8 @@ read_pe_exported_syms (struct objfile *o
unsigned char *expdata, *erva;
unsigned long name_rvas, ordinals, nexp, ordbase;
char *dll_name;
+ int be64 = 0;
+ int be32 = 0;

/* Array elements are for text, data and bss in that order
Initialization with start_rva > end_rva guarantees that
@@ -205,7 +207,11 @@ 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))
+ be64 = ((strcmp (target, "pe-x86-64") == 0)
+ || ((strcmp (target, "pei-x86-64") == 0));
+ be32 = ((strcmp (target, "pe-i386") == 0)
+ || (strcmp (target, "pei-i386") == 0));
+ if (!be32 && !be64)
{
/* This is not an i386 format file. Abort now, because the code
is untested on anything else. *FIXME* test on further
@@ -216,15 +222,26 @@ 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;
- num_entries = pe_get32 (dll, opthdr_ofs + 92);
+ if (be64)
+ num_entries = pe_get32 (dll, opthdr_ofs + 92 + 16);
+ else
+ num_entries = pe_get32 (dll, opthdr_ofs + 92);

if (num_entries < 1) /* No exports. */
{
return;
}

- export_rva = pe_get32 (dll, opthdr_ofs + 96);
- export_size = pe_get32 (dll, opthdr_ofs + 100);
+ if (be64)
+ {
+ 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);
+ }
nsections = pe_get16 (dll, pe_header_offset + 4 + 2);
secptr = (pe_header_offset + 4 + 20 +
pe_get16 (dll, pe_header_offset + 4 + 16));