/* Matsushita 10300 specific support for 32-bit ELF
- Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
This file is part of BFD, the Binary File Descriptor library.
#include "sysdep.h"
#include "libbfd.h"
#include "elf-bfd.h"
-
-#define START_RELOC_NUMBERS(name) enum name {
-#define RELOC_NUMBER(name, number) name = number ,
-#define END_RELOC_NUMBERS R_MN10300_MAX };
#include "elf/mn10300.h"
struct elf32_mn10300_link_hash_entry
/* For function symbols, the size of this function's stack
(if <= 255 bytes). We stuff this into "call" instructions
- to this target when it's valid and profitable to do so. */
+ to this target when it's valid and profitable to do so.
+
+ This does not include stack allocated by movm! */
unsigned char stack_size;
/* For function symbols, arguments (if any) for movm instruction
to the target when it's valid and profitable to do so. */
unsigned char movm_args;
+ /* For funtion symbols, the amount of stack space that would be allocated
+ by the movm instruction. This is redundant with movm_args, but we
+ add it to the hash table to avoid computing it over and over. */
+ unsigned char movm_stack_size;
+
/* When set, convert all "call" instructions to this target into "calls"
instructions. */
#define MN10300_CONVERT_CALL_TO_CALLS 0x1
0, /* src_mask */
0, /* dst_mask */
false), /* pcrel_offset */
+
+ /* Standard 24 bit reloc. */
+ HOWTO (R_MN10300_24,
+ 0,
+ 2,
+ 24,
+ false,
+ 0,
+ complain_overflow_bitfield,
+ bfd_elf_generic_reloc,
+ "R_MN10300_24",
+ false,
+ 0xffffff,
+ 0xffffff,
+ false),
+
};
struct mn10300_reloc_map
{
- unsigned char bfd_reloc_val;
+ bfd_reloc_code_real_type bfd_reloc_val;
unsigned char elf_reloc_val;
};
{ BFD_RELOC_32_PCREL, R_MN10300_PCREL32, },
{ BFD_RELOC_16_PCREL, R_MN10300_PCREL16, },
{ BFD_RELOC_8_PCREL, R_MN10300_PCREL8, },
+ { BFD_RELOC_24, R_MN10300_24, },
{ BFD_RELOC_VTABLE_INHERIT, R_MN10300_GNU_VTINHERIT },
{ BFD_RELOC_VTABLE_ENTRY, R_MN10300_GNU_VTENTRY },
};
static reloc_howto_type *
bfd_elf32_bfd_reloc_type_lookup (abfd, code)
- bfd *abfd;
+ bfd *abfd ATTRIBUTE_UNUSED;
bfd_reloc_code_real_type code;
{
unsigned int i;
static void
mn10300_info_to_howto (abfd, cache_ptr, dst)
- bfd *abfd;
+ bfd *abfd ATTRIBUTE_UNUSED;
arelent *cache_ptr;
Elf32_Internal_Rela *dst;
{
static asection *
mn10300_elf_gc_mark_hook (abfd, info, rel, h, sym)
bfd *abfd;
- struct bfd_link_info *info;
+ struct bfd_link_info *info ATTRIBUTE_UNUSED;
Elf_Internal_Rela *rel;
struct elf_link_hash_entry *h;
Elf_Internal_Sym *sym;
case bfd_link_hash_common:
return h->root.u.c.p->section;
+
+ default:
+ break;
}
}
}
addend, info, sym_sec, is_local)
reloc_howto_type *howto;
bfd *input_bfd;
- bfd *output_bfd;
+ bfd *output_bfd ATTRIBUTE_UNUSED;
asection *input_section;
bfd_byte *contents;
bfd_vma offset;
bfd_vma value;
bfd_vma addend;
- struct bfd_link_info *info;
- asection *sym_sec;
- int is_local;
+ struct bfd_link_info *info ATTRIBUTE_UNUSED;
+ asection *sym_sec ATTRIBUTE_UNUSED;
+ int is_local ATTRIBUTE_UNUSED;
{
unsigned long r_type = howto->type;
bfd_byte *hit_data = contents + offset;
bfd_put_32 (input_bfd, value, hit_data);
return bfd_reloc_ok;
+ case R_MN10300_24:
+ value += addend;
+
+ if ((long)value > 0x7fffff || (long)value < -0x800000)
+ return bfd_reloc_overflow;
+
+ bfd_put_8 (input_bfd, value & 0xff, hit_data);
+ bfd_put_8 (input_bfd, (value >> 8) & 0xff, hit_data + 1);
+ bfd_put_8 (input_bfd, (value >> 16) & 0xff, hit_data + 2);
+ return bfd_reloc_ok;
+
case R_MN10300_16:
value += addend;
static boolean
elf32_mn10300_finish_hash_table_entry (gen_entry, in_args)
struct bfd_hash_entry *gen_entry;
- PTR in_args;
+ PTR in_args ATTRIBUTE_UNUSED;
{
struct elf32_mn10300_link_hash_entry *entry;
unsigned int byte_count = 0;
asection *sym_sec;
const char *sym_name;
char *new_name;
- Elf_Internal_Shdr *hdr;
/* Get cached copy of section contents if it exists. */
if (elf_section_data (section)->this_hdr.contents != NULL)
/* Tack on an ID so we can uniquely identify this
local symbol in the global hash table. */
- new_name = alloca (strlen (sym_name) + 10);
+ new_name = bfd_malloc (strlen (sym_name) + 10);
+ if (new_name == 0)
+ goto error_return;
+
sprintf (new_name, "%s_%08x", sym_name, (int)sym_sec);
sym_name = new_name;
elf_link_hash_lookup (&hash_table->static_hash_table->root,
sym_name, true,
true, false);
+ free (new_name);
}
else
{
/* Tack on an ID so we can uniquely identify this
local symbol in the global hash table. */
- new_name = alloca (strlen (sym_name) + 10);
+ new_name = bfd_malloc (strlen (sym_name) + 10);
+ if (new_name == 0)
+ goto error_return;
+
sprintf (new_name, "%s_%08x", sym_name, (int)sym_sec);
sym_name = new_name;
elf_link_hash_lookup (&hash_table->static_hash_table->root,
sym_name, true,
true, false);
+ free (new_name);
compute_function_info (input_bfd, hash,
isym.st_value, contents);
}
struct elf32_mn10300_link_hash_entry *sym_hash;
asection *sym_sec;
const char *sym_name;
- Elf_Internal_Shdr *hdr;
char *new_name;
bfd_elf32_swap_symbol_in (input_bfd, esym, &isym);
/* Tack on an ID so we can uniquely identify this
local symbol in the global hash table. */
- new_name = alloca (strlen (sym_name) + 10);
+ new_name = bfd_malloc (strlen (sym_name) + 10);
+ if (new_name == 0)
+ goto error_return;
sprintf (new_name, "%s_%08x", sym_name, (int)sym_sec);
sym_name = new_name;
sym_name, false,
false, false);
+ free (new_name);
if (sym_hash == NULL)
continue;
{
Elf_Internal_Sym isym;
asection *sym_sec;
- Elf_Internal_Shdr *hdr;
const char *sym_name;
char *new_name;
/* Tack on an ID so we can uniquely identify this
local symbol in the global hash table. */
- new_name = alloca (strlen (sym_name) + 10);
+ new_name = bfd_malloc (strlen (sym_name) + 10);
+ if (new_name == 0)
+ goto error_return;
sprintf (new_name, "%s_%08x", sym_name, (int)sym_sec);
sym_name = new_name;
h = (struct elf32_mn10300_link_hash_entry *)
elf_link_hash_lookup (&hash_table->static_hash_table->root,
sym_name, false, false, false);
+ free (new_name);
}
else
{
if (code == 0xdd)
{
bfd_put_8 (abfd, h->movm_args, contents + irel->r_offset + 4);
- bfd_put_8 (abfd, h->stack_size,
+ bfd_put_8 (abfd, h->stack_size + h->movm_stack_size,
contents + irel->r_offset + 5);
}
}
if (code == 0xcd)
{
bfd_put_8 (abfd, h->movm_args, contents + irel->r_offset + 2);
- bfd_put_8 (abfd, h->stack_size,
+ bfd_put_8 (abfd, h->stack_size + h->movm_stack_size,
contents + irel->r_offset + 3);
}
}
*again = true;
}
+
/* Try to turn a 32bit immediate, displacement or absolute address
into a 16bit immediate, displacement or absolute address. */
if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_32)
bfd_vma value = symval;
value += irel->r_addend;
+
/* See if the value will fit in 16 bits.
We allow any 16bit match here. We prune those we can't
handle below. */
byte2 = bfd_get_8 (abfd, contents + addr + 1);
}
+ /* Now figure out how much stack space will be allocated by the movm
+ instruction. We need this kept separate from the funtion's normal
+ stack space. */
+ if (hash->movm_args)
+ {
+ /* Space for d2. */
+ if (hash->movm_args & 0x80)
+ hash->movm_stack_size += 4;
+
+ /* Space for d3. */
+ if (hash->movm_args & 0x40)
+ hash->movm_stack_size += 4;
+
+ /* Space for a2. */
+ if (hash->movm_args & 0x20)
+ hash->movm_stack_size += 4;
+
+ /* Space for a3. */
+ if (hash->movm_args & 0x10)
+ hash->movm_stack_size += 4;
+
+ /* "other" space. d0, d1, a0, a1, mdr, lir, lar, 4 byte pad. */
+ if (hash->movm_args & 0x08)
+ hash->movm_stack_size += 8 * 4;
+
+ }
+
/* Now look for the two stack adjustment variants. */
if (byte1 == 0xf8 && byte2 == 0xfe)
{
temp = ((temp & 0xffff) ^ (~0x7fff)) + 0x8000;
temp = -temp;
- if (temp <= 255)
+ if (temp < 255)
hash->stack_size = temp;
}
+
+ /* If the total stack to be allocated by the call instruction is more
+ than 255 bytes, then we can't remove the stack adjustment by using
+ "call" (we might still be able to remove the "movm" instruction. */
+ if (hash->stack_size + hash->movm_stack_size > 255)
+ hash->stack_size = 0;
+
return;
}
{
ret->direct_calls = 0;
ret->stack_size = 0;
+ ret->movm_stack_size = 0;
ret->flags = 0;
ret->movm_args = 0;
}
default:
return bfd_mach_mn10300;
- /* start-sanitize-am33 */
- case E_MN10300_MACH_AM33:
- return bfd_mach_am33;
- /* end-sanitize-am33 */
}
}
void
_bfd_mn10300_elf_final_write_processing (abfd, linker)
bfd *abfd;
- boolean linker;
+ boolean linker ATTRIBUTE_UNUSED;
{
unsigned long val;
- unsigned int i;
- Elf_Internal_Shdr **hdrpp;
- const char *name;
- asection *sec;
switch (bfd_get_mach (abfd))
{
val = E_MN10300_MACH_MN10300;
break;
- /* start-sanitize-am33 */
- case bfd_mach_am33:
- val = E_MN10300_MACH_AM33;
- break;
- /* end-sanitize-am33 */
}
elf_elfheader (abfd)->e_flags &= ~ (EF_MN10300_MACH);