/* D30V-specific support for 32-bit ELF
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998 Free Software Foundation, Inc.
Contributed by Martin Hunt (hunt@cygnus.com).
This file is part of BFD, the Binary File Descriptor library.
PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
static void d30v_info_to_howto_rel
PARAMS ((bfd *, arelent *, Elf32_Internal_Rel *));
+static void d30v_info_to_howto_rela
+ PARAMS ((bfd *, arelent *, Elf32_Internal_Rela *));
static bfd_reloc_status_type bfd_elf_d30v_reloc PARAMS ((
bfd *abfd,
arelent *reloc_entry,
asection *input_section,
bfd *output_bfd,
char **error_message));
-
-/* Use REL instead of RELA to save space */
-#define USE_REL
+static bfd_reloc_status_type bfd_elf_d30v_reloc_21 PARAMS ((
+ bfd *abfd,
+ arelent *reloc_entry,
+ asymbol *symbol,
+ PTR data,
+ asection *input_section,
+ bfd *output_bfd,
+ char **error_message));
enum reloc_type
{
R_D30V_NONE = 0,
R_D30V_6,
+ R_D30V_9_PCREL,
+ R_D30V_9_PCREL_R,
R_D30V_15,
R_D30V_15_PCREL,
+ R_D30V_15_PCREL_R,
R_D30V_21,
R_D30V_21_PCREL,
+ R_D30V_21_PCREL_R,
R_D30V_32,
R_D30V_32_PCREL,
R_D30V_32_NORMAL,
0x3f, /* dst_mask */
false), /* pcrel_offset */
+ /* A relative 9 bit relocation, right shifted by 3 */
+ HOWTO (R_D30V_9_PCREL, /* type */
+ 3, /* rightshift */
+ 2, /* size (0 = byte, 1 = short, 2 = long) */
+ 6, /* bitsize */
+ true, /* pc_relative */
+ 0, /* bitpos */
+ complain_overflow_signed, /* complain_on_overflow */
+ bfd_elf_d30v_reloc_21, /* special_function */
+ "R_D30V_9_PCREL", /* name */
+ false, /* partial_inplace */
+ 0x3f, /* src_mask */
+ 0x3f, /* dst_mask */
+ true), /* pcrel_offset */
+
+ /* A relative 9 bit relocation, right shifted by 3 */
+ HOWTO (R_D30V_9_PCREL_R, /* type */
+ 3, /* rightshift */
+ 2, /* size (0 = byte, 1 = short, 2 = long) */
+ 6, /* bitsize */
+ true, /* pc_relative */
+ 0, /* bitpos */
+ complain_overflow_signed, /* complain_on_overflow */
+ bfd_elf_d30v_reloc_21, /* special_function */
+ "R_D30V_9_PCREL_R", /* name */
+ false, /* partial_inplace */
+ 0x3f, /* src_mask */
+ 0x3f, /* dst_mask */
+ true), /* pcrel_offset */
+
/* An absolute 15 bit relocation, right shifted by 3 */
HOWTO (R_D30V_15, /* type */
3, /* rightshift */
2, /* size (0 = byte, 1 = short, 2 = long) */
- 15, /* bitsize */
+ 12, /* bitsize */
false, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
HOWTO (R_D30V_15_PCREL, /* type */
3, /* rightshift */
2, /* size (0 = byte, 1 = short, 2 = long) */
- 15, /* bitsize */
+ 12, /* bitsize */
true, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
- bfd_elf_generic_reloc, /* special_function */
+ bfd_elf_d30v_reloc_21, /* special_function */
"R_D30V_15_PCREL", /* name */
false, /* partial_inplace */
0xfff, /* src_mask */
0xfff, /* dst_mask */
true), /* pcrel_offset */
+ /* A relative 15 bit relocation, right shifted by 3 */
+ HOWTO (R_D30V_15_PCREL_R, /* type */
+ 3, /* rightshift */
+ 2, /* size (0 = byte, 1 = short, 2 = long) */
+ 12, /* bitsize */
+ true, /* pc_relative */
+ 0, /* bitpos */
+ complain_overflow_signed, /* complain_on_overflow */
+ bfd_elf_d30v_reloc_21, /* special_function */
+ "R_D30V_15_PCREL_R", /* name */
+ false, /* partial_inplace */
+ 0xfff, /* src_mask */
+ 0xfff, /* dst_mask */
+ true), /* pcrel_offset */
+
/* An absolute 21 bit relocation, right shifted by 3 */
- HOWTO (R_D30V_21_PCREL, /* type */
+ HOWTO (R_D30V_21, /* type */
3, /* rightshift */
2, /* size (0 = byte, 1 = short, 2 = long) */
- 21, /* bitsize */
+ 18, /* bitsize */
false, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
HOWTO (R_D30V_21_PCREL, /* type */
3, /* rightshift */
2, /* size (0 = byte, 1 = short, 2 = long) */
- 21, /* bitsize */
+ 18, /* bitsize */
true, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
- bfd_elf_generic_reloc, /* special_function */
+ bfd_elf_d30v_reloc_21, /* special_function */
"R_D30V_21_PCREL", /* name */
false, /* partial_inplace */
0x3ffff, /* src_mask */
0x3ffff, /* dst_mask */
true), /* pcrel_offset */
+ /* A relative 21 bit relocation, right shifted by 3, in the Right container */
+ HOWTO (R_D30V_21_PCREL_R, /* type */
+ 3, /* rightshift */
+ 2, /* size (0 = byte, 1 = short, 2 = long) */
+ 18, /* bitsize */
+ true, /* pc_relative */
+ 0, /* bitpos */
+ complain_overflow_signed, /* complain_on_overflow */
+ bfd_elf_d30v_reloc_21, /* special_function */
+ "R_D30V_21_PCREL_R", /* name */
+ false, /* partial_inplace */
+ 0x3ffff, /* src_mask */
+ 0x3ffff, /* dst_mask */
+ true), /* pcrel_offset */
+
/* A D30V 32 bit absolute relocation */
HOWTO (R_D30V_32, /* type */
0, /* rightshift */
/* A regular 32 bit absolute relocation */
HOWTO (R_D30V_32_NORMAL, /* type */
0, /* rightshift */
- 4, /* size (0 = byte, 1 = short, 2 = long) */
+ 2, /* size (0 = byte, 1 = short, 2 = long) */
32, /* bitsize */
false, /* pc_relative */
0, /* bitpos */
};
+#define MIN32 (long long)0xffffffff80000000LL
+#define MAX32 0x7fffffffLL
+
static bfd_reloc_status_type
bfd_elf_d30v_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message)
bfd *abfd;
bfd *output_bfd;
char **error_message;
{
- bfd_vma relocation;
- bfd_vma in1, in2;
+ long long relocation;
+ bfd_vma in1, in2, num;
+ bfd_vma tmp_addr = 0;
bfd_reloc_status_type r;
asection *reloc_target_output_section;
bfd_size_type addr = reloc_entry->address;
bfd_reloc_status_type flag = bfd_reloc_ok;
bfd_vma output_base = 0;
reloc_howto_type *howto = reloc_entry->howto;
+ int make_absolute = 0;
r = bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
input_section, output_bfd, error_message);
return r;
/* a hacked-up version of bfd_perform_reloc() follows */
+ if (bfd_is_und_section (symbol->section)
+ && (symbol->flags & BSF_WEAK) == 0
+ && output_bfd == (bfd *) NULL)
+ flag = bfd_reloc_undefined;
/* Is the address of the relocation really within the section? */
if (reloc_entry->address > input_section->_cooked_size)
else
relocation = symbol->value;
+ reloc_target_output_section = symbol->section->output_section;
+
+ /* Convert input-section-relative symbol value to absolute. */
+ if (output_bfd)
+ output_base = 0;
+ else
+ output_base = reloc_target_output_section->vma;
+
+ relocation += output_base + symbol->section->output_offset;
+
+ /* Add in supplied addend. */
+ relocation += reloc_entry->addend;
+
+ /* Here the variable relocation holds the final address of the
+ symbol we are relocating against, plus any addend. */
+
+ if (howto->pc_relative == true)
+ {
+ tmp_addr = input_section->output_section->vma + input_section->output_offset
+ + reloc_entry->address;
+ relocation -= tmp_addr;
+ }
+
+ if (output_bfd != (bfd *) NULL)
+ {
+ /* This is a partial relocation, and we want to apply the relocation
+ to the reloc entry rather than the raw data. Modify the reloc
+ inplace to reflect what we now know. */
+ reloc_entry->addend = relocation;
+ reloc_entry->address += input_section->output_offset;
+ return flag;
+ }
+ else
+ reloc_entry->addend = 0;
+
+ in1 = bfd_get_32 (abfd, (bfd_byte *) data + addr);
+ in2 = bfd_get_32 (abfd, (bfd_byte *) data + addr + 4);
+
+ /* extract the addend */
+ num = ((in2 & 0x3FFFF)
+ | ((in2 & 0xFF00000) >> 2)
+ | ((in1 & 0x3F) << 26));
+ in1 &= 0xFFFFFFC0;
+ in2 = 0x80000000;
+
+ relocation += num;
+
+ if (howto->pc_relative == true && howto->bitsize == 32)
+ {
+ /* the D30V has a PC that doesn't wrap and PC-relative jumps */
+ /* are signed, so a PC-relative jump can'tbe more than +/- 2^31 byrtes */
+ /* if one exceeds this, change it to an absolute jump */
+ if (relocation > MAX32)
+ {
+ relocation = (relocation + tmp_addr) & 0xffffffff;
+ make_absolute = 1;
+ }
+ else if (relocation < MIN32)
+ {
+ relocation = (relocation + tmp_addr) & 0xffffffff;
+ make_absolute = 1;
+ }
+ }
+
+ in1 |= (relocation >> 26) & 0x3F; /* top 6 bits */
+ in2 |= ((relocation & 0x03FC0000) << 2); /* next 8 bits */
+ in2 |= relocation & 0x0003FFFF; /* bottom 18 bits */
+
+ /* change a PC-relative instruction to its absolute equivalent */
+ /* with this simple hack */
+ if (make_absolute)
+ in1 |= 0x00100000;
+
+ bfd_put_32 (abfd, in1, (bfd_byte *) data + addr);
+ bfd_put_32 (abfd, in2, (bfd_byte *) data + addr + 4);
+
+ return flag;
+}
+
+
+static bfd_reloc_status_type
+bfd_elf_d30v_reloc_21 (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message)
+ bfd *abfd;
+ arelent *reloc_entry;
+ asymbol *symbol;
+ PTR data;
+ asection *input_section;
+ bfd *output_bfd;
+ char **error_message;
+{
+ bfd_vma relocation;
+ bfd_vma in1, num;
+ bfd_reloc_status_type r;
+ asection *reloc_target_output_section;
+ bfd_size_type addr = reloc_entry->address;
+ bfd_reloc_status_type flag = bfd_reloc_ok;
+ bfd_vma output_base = 0;
+ reloc_howto_type *howto = reloc_entry->howto;
+ int mask, max;
+
+ r = bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+ input_section, output_bfd, error_message);
+ if (r != bfd_reloc_continue)
+ return r;
+
+ /* a hacked-up version of bfd_perform_reloc() follows */
+ if (bfd_is_und_section (symbol->section)
+ && (symbol->flags & BSF_WEAK) == 0
+ && output_bfd == (bfd *) NULL)
+ flag = bfd_reloc_undefined;
+
+ /* Is the address of the relocation really within the section? */
+ if (reloc_entry->address > input_section->_cooked_size)
+ return bfd_reloc_outofrange;
+
+ /* Work out which section the relocation is targetted at and the
+ initial relocation command value. */
+
+ /* Get symbol value. (Common symbols are special.) */
+ if (bfd_is_com_section (symbol->section))
+ relocation = 0;
+ else
+ relocation = symbol->value;
reloc_target_output_section = symbol->section->output_section;
if (howto->pc_relative == true)
{
relocation -= input_section->output_section->vma + input_section->output_offset;
-
if (howto->pcrel_offset == true)
relocation -= reloc_entry->address;
}
reloc_entry->addend = 0;
in1 = bfd_get_32 (abfd, (bfd_byte *) data + addr);
- in2 = bfd_get_32 (abfd, (bfd_byte *) data + addr + 4);
- printf("D30V 32-bit reloc at addr 0x%lx insn=0x%08x%08x\n",(long)relocation, (int)in1, (int)in2);
+ mask = (1 << howto->bitsize) - 1;
+ if (howto->bitsize == 6)
+ mask <<= 12;
+ max = (1 << (howto->bitsize + 2)) - 1;
+
+ /* extract the addend */
+ num = in1 & mask; /* 18 bits */
+ if (howto->bitsize == 6)
+ num >>= 12;
+ num <<= 3; /* shift left 3 */
+ in1 &= ~mask; /* mask out addend */
+
+ relocation += num;
+ if (howto->type == R_D30V_21_PCREL_R || howto->type == R_D30V_15_PCREL_R ||
+ howto->type == R_D30V_9_PCREL_R )
+ {
+ relocation += 4;
+ }
+
+ if ((int)relocation < 0 )
+ {
+ if (~(int)relocation > max)
+ flag = bfd_reloc_overflow;
+ }
+ else
+ {
+ if ((int)relocation > max)
+ flag = bfd_reloc_overflow;
+ }
+ relocation >>= 3;
+ if (howto->bitsize == 6)
+ in1 |= ((relocation & (mask >> 12)) << 12);
+ else
+ in1 |= relocation & mask;
+
bfd_put_32 (abfd, in1, (bfd_byte *) data + addr);
- bfd_put_32 (abfd, in2, (bfd_byte *) data + addr + 4);
return flag;
}
struct d30v_reloc_map
{
- unsigned char bfd_reloc_val;
+ bfd_reloc_code_real_type bfd_reloc_val;
unsigned char elf_reloc_val;
};
{
{ BFD_RELOC_NONE, R_D30V_NONE, },
{ BFD_RELOC_D30V_6, R_D30V_6 },
+ { BFD_RELOC_D30V_9_PCREL, R_D30V_9_PCREL },
+ { BFD_RELOC_D30V_9_PCREL_R, R_D30V_9_PCREL_R },
{ BFD_RELOC_D30V_15, R_D30V_15 },
{ BFD_RELOC_D30V_15_PCREL, R_D30V_15_PCREL },
+ { BFD_RELOC_D30V_15_PCREL_R, R_D30V_15_PCREL_R },
{ BFD_RELOC_D30V_21, R_D30V_21 },
{ BFD_RELOC_D30V_21_PCREL, R_D30V_21_PCREL },
+ { BFD_RELOC_D30V_21_PCREL_R, R_D30V_21_PCREL_R },
{ BFD_RELOC_D30V_32, R_D30V_32 },
{ BFD_RELOC_D30V_32_PCREL, R_D30V_32_PCREL },
{ BFD_RELOC_32, R_D30V_32_NORMAL },
return NULL;
}
-/* Set the howto pointer for an D30V ELF reloc. */
+/* Set the howto pointer for an D30V ELF reloc (type REL). */
static void
d30v_info_to_howto_rel (abfd, cache_ptr, dst)
cache_ptr->howto = &elf_d30v_howto_table[r_type];
}
+/* Set the howto pointer for an D30V ELF reloc (type RELA). */
+
+static void
+d30v_info_to_howto_rela (abfd, cache_ptr, dst)
+ bfd *abfd;
+ arelent *cache_ptr;
+ Elf32_Internal_Rela *dst;
+{
+ unsigned int r_type;
+
+ r_type = ELF32_R_TYPE (dst->r_info);
+ BFD_ASSERT (r_type < (unsigned int) R_D30V_max);
+ cache_ptr->howto = &elf_d30v_howto_table[r_type];
+}
+
#define ELF_ARCH bfd_arch_d30v
#define ELF_MACHINE_CODE EM_CYGNUS_D30V
#define ELF_MAXPAGESIZE 0x1000
#define TARGET_BIG_SYM bfd_elf32_d30v_vec
#define TARGET_BIG_NAME "elf32-d30v"
-#define elf_info_to_howto 0
+#define elf_info_to_howto d30v_info_to_howto_rela
#define elf_info_to_howto_rel d30v_info_to_howto_rel
#define elf_backend_object_p 0
#define elf_backend_final_write_processing 0