FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pe.em and pep.em make_import_fixup

Browse source 
This is a little cleanup that I made when looking at pr30343 that
makes it more obvious that make_import_fixup in both files are
identical (and in fact the new pep.em read_addend could be used in
both files).

	* emultempl/pep.em (read_addend): Extract from..
	(make_import_fixup): ..here.
	* emultempl/pe.em (read_addend): Similarly.
	(make_import_fixup): Similarly.  Add debug code from pep.em.
This commit is contained in:
Alan Modra 2023-05-08 09:16:24 +09:30
parent defb881754
commit f35cc0decd
2 changed files with 82 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ld/emultempl/pe.em
View file

@ -1236,23 +1236,42 @@ pe_fixup_stdcalls (void)
}
}
static bfd_vma
read_addend (arelent *rel, asection *s)
{
char buf[4];
bfd_vma addend = 0;
if (!bfd_get_section_contents (s->owner, s, buf, rel->address, sizeof (buf)))
einfo (_("%P: %C: cannot get section contents - auto-import exception\n"),
s->owner, s, rel->address);
else
addend = bfd_get_32 (s->owner, buf);
return addend;
}
static void
make_import_fixup (arelent *rel, asection *s, char *name, const char *symname)
{
struct bfd_symbol *sym = *rel->sym_ptr_ptr;
char addend[4];
bfd_vma _addend;
bfd_vma addend;
if (pe_dll_extra_pe_debug)
printf ("arelent: %s@%#lx: add=%li\n", sym->name,
(unsigned long) rel->address, (long) rel->addend);
if (! bfd_get_section_contents (s->owner, s, addend, rel->address, sizeof (addend)))
einfo (_("%P: %C: cannot get section contents - auto-import exception\n"),
s->owner, s, rel->address);
addend = read_addend (rel, s);
_addend = bfd_get_32 (s->owner, addend);
pe_create_import_fixup (rel, s, _addend, name, symname);
if (pe_dll_extra_pe_debug)
{
printf ("import of 0x%lx(0x%lx) sec_addr=0x%lx",
(long) addend, (long) rel->addend, (long) rel->address);
if (rel->howto->pc_relative)
printf (" pcrel");
printf (" %d bit rel.\n", (int) rel->howto->bitsize);
}
pe_create_import_fixup (rel, s, addend, name, symname);
}
static void

95
ld/emultempl/pep.em
View file

@ -1197,63 +1197,80 @@ pep_fixup_stdcalls (void)
}
}
static bfd_vma
read_addend (arelent *rel, asection *s)
{
char buf[8];
bfd_vma addend = 0;
bool ok = false;
switch (rel->howto->bitsize)
{
case 8:
ok = bfd_get_section_contents (s->owner, s, buf, rel->address, 1);
if (ok)
{
if (rel->howto->pc_relative)
addend = bfd_get_signed_8 (s->owner, buf);
else
addend = bfd_get_8 (s->owner, buf);
}
break;
case 16:
ok = bfd_get_section_contents (s->owner, s, buf, rel->address, 2);
if (ok)
{
if (rel->howto->pc_relative)
addend = bfd_get_signed_16 (s->owner, buf);
else
addend = bfd_get_16 (s->owner, buf);
}
break;
case 26:
case 32:
ok = bfd_get_section_contents (s->owner, s, buf, rel->address, 4);
if (ok)
{
if (rel->howto->pc_relative)
addend = bfd_get_signed_32 (s->owner, buf);
else
addend = bfd_get_32 (s->owner, buf);
}
break;
case 64:
ok = bfd_get_section_contents (s->owner, s, buf, rel->address, 8);
if (ok)
addend = bfd_get_64 (s->owner, buf);
break;
}
if (!ok)
einfo (_("%P: %C: cannot get section contents - auto-import exception\n"),
s->owner, s, rel->address);
return addend;
}
static void
make_import_fixup (arelent *rel, asection *s, char *name, const char *symname)
{
struct bfd_symbol *sym = *rel->sym_ptr_ptr;
char addend[8];
bfd_vma _addend = 0;
int suc = 0;
bfd_vma addend;
if (pep_dll_extra_pe_debug)
printf ("arelent: %s@%#lx: add=%li\n", sym->name,
(unsigned long) rel->address, (long) rel->addend);
memset (addend, 0, sizeof (addend));
switch ((rel->howto->bitsize))
{
case 8:
suc = bfd_get_section_contents (s->owner, s, addend, rel->address, 1);
if (suc && rel->howto->pc_relative)
_addend = bfd_get_signed_8 (s->owner, addend);
else if (suc)
_addend = bfd_get_8 (s->owner, addend);
break;
case 16:
suc = bfd_get_section_contents (s->owner, s, addend, rel->address, 2);
if (suc && rel->howto->pc_relative)
_addend = bfd_get_signed_16 (s->owner, addend);
else if (suc)
_addend = bfd_get_16 (s->owner, addend);
break;
case 26:
case 32:
suc = bfd_get_section_contents (s->owner, s, addend, rel->address, 4);
if (suc && rel->howto->pc_relative)
_addend = bfd_get_signed_32 (s->owner, addend);
else if (suc)
_addend = bfd_get_32 (s->owner, addend);
break;
case 64:
suc = bfd_get_section_contents (s->owner, s, addend, rel->address, 8);
if (suc)
_addend = bfd_get_64 (s->owner, addend);
break;
}
if (! suc)
einfo (_("%P: %C: cannot get section contents - auto-import exception\n"),
s->owner, s, rel->address);
addend = read_addend (rel, s);
if (pep_dll_extra_pe_debug)
{
printf ("import of 0x%lx(0x%lx) sec_addr=0x%lx",
(long) _addend, (long) rel->addend, (long) rel->address);
(long) addend, (long) rel->addend, (long) rel->address);
if (rel->howto->pc_relative)
printf (" pcrel");
printf (" %d bit rel.\n", (int) rel->howto->bitsize);
}
pep_create_import_fixup (rel, s, _addend, name, symname);
pep_create_import_fixup (rel, s, addend, name, symname);
}
static void