Update formatting to ISO-C90
This commit is contained in:
parent
df406460e9
commit
4cdc7696f5
|
@ -1,3 +1,8 @@
|
||||||
|
2006-03-03 Nick Clifton <nickc@redhat.com>
|
||||||
|
|
||||||
|
* cpu-avr.c: Update to ISO-C90 formatting.
|
||||||
|
* elf32-avr.c: Likewise.
|
||||||
|
|
||||||
2006-03-03 Bjoern Haase <bjoern.m.haase@web.de>
|
2006-03-03 Bjoern Haase <bjoern.m.haase@web.de>
|
||||||
|
|
||||||
* elf32-avr.c (avr_reloc_map): Insert BFD_RELOC_AVR_MS8_LDI
|
* elf32-avr.c (avr_reloc_map): Insert BFD_RELOC_AVR_MS8_LDI
|
||||||
|
|
108
bfd/cpu-avr.c
108
bfd/cpu-avr.c
|
@ -1,75 +1,34 @@
|
||||||
/* BFD library support routines for the AVR architecture.
|
/* BFD library support routines for the AVR architecture.
|
||||||
Copyright 1999, 2000, 2002 Free Software Foundation, Inc.
|
Copyright 1999, 2000, 2002, 2006 Free Software Foundation, Inc.
|
||||||
Contributed by Denis Chertykov <denisc@overta.ru>
|
Contributed by Denis Chertykov <denisc@overta.ru>
|
||||||
|
|
||||||
This file is part of BFD, the Binary File Descriptor library.
|
This file is part of BFD, the Binary File Descriptor library.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
the Free Software Foundation; either version 2 of the License, or
|
the Free Software Foundation; either version 2 of the License, or
|
||||||
(at your option) any later version.
|
(at your option) any later version.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
|
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
|
||||||
|
|
||||||
#include "bfd.h"
|
#include "bfd.h"
|
||||||
#include "sysdep.h"
|
#include "sysdep.h"
|
||||||
#include "libbfd.h"
|
#include "libbfd.h"
|
||||||
|
|
||||||
static const bfd_arch_info_type *compatible
|
|
||||||
PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
|
|
||||||
|
|
||||||
#define N(addr_bits, machine, print, default, next) \
|
|
||||||
{ \
|
|
||||||
8, /* 8 bits in a word */ \
|
|
||||||
addr_bits, /* bits in an address */ \
|
|
||||||
8, /* 8 bits in a byte */ \
|
|
||||||
bfd_arch_avr, \
|
|
||||||
machine, /* machine */ \
|
|
||||||
"avr", /* arch_name */ \
|
|
||||||
print, /* printable name */ \
|
|
||||||
1, /* section align power */ \
|
|
||||||
default, /* the default machine */ \
|
|
||||||
compatible, \
|
|
||||||
bfd_default_scan, \
|
|
||||||
next \
|
|
||||||
}
|
|
||||||
|
|
||||||
static const bfd_arch_info_type arch_info_struct[] =
|
|
||||||
{
|
|
||||||
/* AT90S1200, ATtiny1x, ATtiny28 */
|
|
||||||
N (16, bfd_mach_avr1, "avr:1", FALSE, & arch_info_struct[1]),
|
|
||||||
|
|
||||||
/* AT90S2xxx, AT90S4xxx, AT90S8xxx, ATtiny22 */
|
|
||||||
N (16, bfd_mach_avr2, "avr:2", FALSE, & arch_info_struct[2]),
|
|
||||||
|
|
||||||
/* ATmega103, ATmega603 */
|
|
||||||
N (22, bfd_mach_avr3, "avr:3", FALSE, & arch_info_struct[3]),
|
|
||||||
|
|
||||||
/* ATmega83, ATmega85 */
|
|
||||||
N (16, bfd_mach_avr4, "avr:4", FALSE, & arch_info_struct[4]),
|
|
||||||
|
|
||||||
/* ATmega161, ATmega163, ATmega32, AT94K */
|
|
||||||
N (22, bfd_mach_avr5, "avr:5", FALSE, NULL)
|
|
||||||
};
|
|
||||||
|
|
||||||
const bfd_arch_info_type bfd_avr_arch =
|
|
||||||
N (16, bfd_mach_avr2, "avr", TRUE, & arch_info_struct[0]);
|
|
||||||
|
|
||||||
/* This routine is provided two arch_infos and works out which AVR
|
/* This routine is provided two arch_infos and works out which AVR
|
||||||
machine which would be compatible with both and returns a pointer
|
machine which would be compatible with both and returns a pointer
|
||||||
to its info structure. */
|
to its info structure. */
|
||||||
|
|
||||||
static const bfd_arch_info_type *
|
static const bfd_arch_info_type *
|
||||||
compatible (a,b)
|
compatible (const bfd_arch_info_type * a,
|
||||||
const bfd_arch_info_type * a;
|
const bfd_arch_info_type * b)
|
||||||
const bfd_arch_info_type * b;
|
|
||||||
{
|
{
|
||||||
/* If a & b are for different architectures we can do nothing. */
|
/* If a & b are for different architectures we can do nothing. */
|
||||||
if (a->arch != b->arch)
|
if (a->arch != b->arch)
|
||||||
|
@ -91,3 +50,40 @@ compatible (a,b)
|
||||||
/* Never reached! */
|
/* Never reached! */
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define N(addr_bits, machine, print, default, next) \
|
||||||
|
{ \
|
||||||
|
8, /* 8 bits in a word. */ \
|
||||||
|
addr_bits, /* bits in an address. */ \
|
||||||
|
8, /* 8 bits in a byte. */ \
|
||||||
|
bfd_arch_avr, \
|
||||||
|
machine, /* Machine number. */ \
|
||||||
|
"avr", /* Architecture name. */ \
|
||||||
|
print, /* Printable name. */ \
|
||||||
|
1, /* Section align power. */ \
|
||||||
|
default, /* Is this the default ? */ \
|
||||||
|
compatible, \
|
||||||
|
bfd_default_scan, \
|
||||||
|
next \
|
||||||
|
}
|
||||||
|
|
||||||
|
static const bfd_arch_info_type arch_info_struct[] =
|
||||||
|
{
|
||||||
|
/* AT90S1200, ATtiny1x, ATtiny28. */
|
||||||
|
N (16, bfd_mach_avr1, "avr:1", FALSE, & arch_info_struct[1]),
|
||||||
|
|
||||||
|
/* AT90S2xxx, AT90S4xxx, AT90S8xxx, ATtiny22. */
|
||||||
|
N (16, bfd_mach_avr2, "avr:2", FALSE, & arch_info_struct[2]),
|
||||||
|
|
||||||
|
/* ATmega103, ATmega603. */
|
||||||
|
N (22, bfd_mach_avr3, "avr:3", FALSE, & arch_info_struct[3]),
|
||||||
|
|
||||||
|
/* ATmega83, ATmega85. */
|
||||||
|
N (16, bfd_mach_avr4, "avr:4", FALSE, & arch_info_struct[4]),
|
||||||
|
|
||||||
|
/* ATmega161, ATmega163, ATmega32, AT94K. */
|
||||||
|
N (22, bfd_mach_avr5, "avr:5", FALSE, NULL)
|
||||||
|
};
|
||||||
|
|
||||||
|
const bfd_arch_info_type bfd_avr_arch =
|
||||||
|
N (16, bfd_mach_avr2, "avr", TRUE, & arch_info_struct[0]);
|
||||||
|
|
1425
bfd/elf32-avr.c
1425
bfd/elf32-avr.c
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue