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

Kai Tietz
2009-01-08T12:53:43Z

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

Hi Joel,

Joel Brobecker <brobecker@adacore.com> wrote on 08.01.2009 12:10:02:

> > Hmm, at home it isn't hard to do this, but at office I have to fight
with
> > Lotus. I'll see what can do.
>
> Thanks for doing that. Perhaps, if Lotus doesn't muck the contents
> of your emails, one solution is to inline the patch inside the email
> body rather than as an attachment. If, as I fear, Lotus does things
> like breaking lines, etc, then the current approach at least allows
> us to receive the patch intact, which is the most important. Anyway,
> all this monologue just to say: Do your best :).
>
> > > Can you also provide a ChangeLog entry when submitting patches?
> >
> > I did in my first mail. I thought there is no new one necessary.
>
> Hmmm, I thought I double-checked before mentioning it, sorry.
>
> > 2009-01-08 Kai Tietz <kai.tietz@onevision.com>
> >
> > * coff-pe-read.c (read_pe_exported_syms): Enable read of PE+
> > export directory.
>
> Does "PE+" mean PE for 64bit?
>
> > > > + int be64 = 0;
> > > > + int be32 = 0;
> > >
> > > Would you mind explaining what "be" stands for?
> >
> > the "be" from "to be, or not to be" ;)
>
> In that case, I'd really like to use a more meaningful name.
> How about pe32_p and pe64_p? Or is_pe32 and is_pe64?

Fine for me, I changed the attached patch.

[...]
>
> I think that it would be clearer to use 108 in this case than
> "92 + 16", because 92 in the PE+ case doesn't really mean anything,
> does it?
>
> > > Same here.
> >
> > The same reason. Structure IMAGE_DATA_DIRECTORY hasn't changed in
sizes,
> > therefore just the delta is necessary.
>
> I also suggest the same as above, if you agree.

Ok, done.

> > AFAIC I have no write access (or write permissions) to gbd tree. I
have
> > already an account and write permissions for binutils.
>
> Given that this patch qualifies as a good patch (or will qualify as soon
> as we agree on one version of it), you are eligible for receiving "Write
> After Approval" priviledges. What you need to do next, in parallel to
> this discussion, is ask overseers to adjust your priviledges. This is
> what the account request on sourceware says about your case:
>
> Note that if you already have an account on sourceware.org or
> gcc.gnu.org for CVS or Subversion write access, then do not use this
> form. Instead send an email to the overseers mail account at this
site
> telling what project you want write access to and who approved that
> access.
>
> You can list me as the approver.

Thanks, I sent mail to the overseers.

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: 2059 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 is_pe64 = 0;
+ int is_pe32 = 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))
+ is_pe64 = ((strcmp (target, "pe-x86-64") == 0)
+ || ((strcmp (target, "pei-x86-64") == 0));
+ is_pe32 = ((strcmp (target, "pe-i386") == 0)
+ || (strcmp (target, "pei-i386") == 0));
+ if (!is_pe32 && !is_pe64)
{
/* 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 (is_pe64)
+ num_entries = pe_get32 (dll, opthdr_ofs + 108;
+ 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 (is_pe64)
+ {
+ export_rva = pe_get32 (dll, opthdr_ofs + 112);
+ export_size = pe_get32 (dll, opthdr_ofs + 116);
+ }
+ 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));