github/amigaos-binutils
2
0
Fork 0
mirror of https://frontier.innolan.net/github/amigaos-binutils.git synced 2025-11-19 21:30:24 +00:00
Code Releases Activity

Simplify logic dealing with RELOC32SHORT data from an executable.

Browse Source 
* bfd/amigaos.c (howto_for_raw_reloc): New parameter indicating file type.
  Use it for mapping HUNK_DREL32 to ABS32 or SD32.
  (amiga_handle_rest): Remove special handling of HUNK_DREL32.
  (read_raw_relocs): Likewise.
This commit is contained in:
Gunther Nikl
2015-06-03 18:03:28 +00:00
parent 75ee6e77cc
commit d2bd053001
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bfd/amigaos.c
View File

@ -161,7 +161,7 @@ typedef struct amiga_ardata_struct {
#define MAX_NAME_SIZE 124
static bfd_boolean amiga_reloc_long_p PARAMS ((unsigned long, bfd_boolean));
static reloc_howto_type *howto_for_raw_reloc PARAMS ((unsigned long));
static reloc_howto_type *howto_for_raw_reloc PARAMS ((unsigned long, bfd_boolean));
static reloc_howto_type *howto_for_reloc PARAMS ((unsigned long));
static bfd_boolean get_long PARAMS ((bfd *, unsigned long *));
static bfd_boolean get_word PARAMS ((bfd *, unsigned long *));
@ -288,8 +288,9 @@ amiga_reloc_long_p (type, isload)
}
static reloc_howto_type *
howto_for_raw_reloc (type)
howto_for_raw_reloc (type, isload)
unsigned long type;
bfd_boolean isload;
{
switch (type)
{
@ -301,7 +302,7 @@ howto_for_raw_reloc (type)
case HUNK_RELRELOC8:
return &howto_table[R_PC8];
case HUNK_DREL32:
return &howto_table[R_SD32];
return &howto_table[isload ? R_ABS32 : R_SD32];
case HUNK_DREL16:
return &howto_table[R_SD16];
case HUNK_DREL8:
@ -1139,12 +1140,10 @@ amiga_handle_rest (abfd, current_section, isload)
return TRUE;
break;
case HUNK_DREL32:
if (isload)
hunk_value = HUNK_RELOC32SHORT;
case HUNK_ABSRELOC32:
case HUNK_RELRELOC16:
case HUNK_RELRELOC8:
case HUNK_DREL32:
case HUNK_DREL16:
case HUNK_DREL8:
case HUNK_RELOC32SHORT:
@ -2685,10 +2684,7 @@ read_raw_relocs (abfd, section, d_offset, count)
if (!get_long (abfd, &type))
return FALSE;
if (type==HUNK_DREL32 && AMIGA_DATA(abfd)->IsLoadFile)
type = HUNK_RELOC32SHORT;
howto = howto_for_raw_reloc (type);
howto = howto_for_raw_reloc (type, AMIGA_DATA(abfd)->IsLoadFile);
if (howto == NULL)
{
bfd_set_error (bfd_error_wrong_format);