X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fcpu-h8300.c;h=03691ccb48a57195288995f683e5b8fb6896d9c2;hb=b326e6b0deed5d5ad22767c2800f490f61b37824;hp=daef763a29b0c8496869394fb3b3b9d3763d305a;hpb=c2dcd04ec8f55fb69fabb24fae58555b5ab0a684;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/cpu-h8300.c b/bfd/cpu-h8300.c index daef763a29..03691ccb48 100644 --- a/bfd/cpu-h8300.c +++ b/bfd/cpu-h8300.c @@ -1,13 +1,12 @@ /* BFD library support routines for the Renesas H8/300 architecture. - Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 2000, 2001, 2002, 2003 - Free Software Foundation, Inc. + Copyright (C) 1990-2020 Free Software Foundation, Inc. Hacked by Steve Chamberlain of Cygnus Support. This file is part of BFD, the Binary File Descriptor library. 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 - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -17,21 +16,16 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libbfd.h" - -static bfd_boolean h8300_scan - PARAMS ((const struct bfd_arch_info *, const char *)); -static const bfd_arch_info_type * compatible - PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *)); +#include "cpu-h8300.h" static bfd_boolean -h8300_scan (info, string) - const struct bfd_arch_info *info; - const char *string; +h8300_scan (const struct bfd_arch_info *info, const char *string) { if (*string != 'h' && *string != 'H') return FALSE; @@ -69,16 +63,31 @@ h8300_scan (info, string) if (*string == 'h' || *string == 'H') { + string++; + if (*string == 'n' || *string == 'N') + return (info->mach == bfd_mach_h8300hn); + return (info->mach == bfd_mach_h8300h); } else if (*string == 's' || *string == 'S') { + string++; + if (*string == 'n' || *string == 'N') + return (info->mach == bfd_mach_h8300sn); + + if (*string == 'x' || *string == 'X') + { + string++; + if (*string == 'n' || *string == 'N') + return (info->mach == bfd_mach_h8300sxn); + + return (info->mach == bfd_mach_h8300sx); + } + return (info->mach == bfd_mach_h8300s); } else - { - return info->mach == bfd_mach_h8300; - } + return info->mach == bfd_mach_h8300; } /* This routine is provided two arch_infos and works out the machine @@ -86,61 +95,81 @@ h8300_scan (info, string) info structure. */ static const bfd_arch_info_type * -compatible (in, out) - const bfd_arch_info_type *in; - const bfd_arch_info_type *out; +compatible (const bfd_arch_info_type *in, const bfd_arch_info_type *out) { + if (in->arch != out->arch) + return 0; + if (in->mach == bfd_mach_h8300sx && out->mach == bfd_mach_h8300s) + return in; + if (in->mach == bfd_mach_h8300s && out->mach == bfd_mach_h8300sx) + return out; + if (in->mach == bfd_mach_h8300sxn && out->mach == bfd_mach_h8300sn) + return in; + if (in->mach == bfd_mach_h8300sn && out->mach == bfd_mach_h8300sxn) + return out; /* It's really not a good idea to mix and match modes. */ - if (in->arch != out->arch || in->mach != out->mach) + if (in->mach != out->mach) return 0; else return in; } +#define N(word, addr, number, name, print, default, next) \ + { word, addr, 8, bfd_arch_h8300, number, name, print, 1, default, \ + compatible, h8300_scan, bfd_arch_default_fill, next, 0 } + +static const bfd_arch_info_type h8300sxn_info_struct = + N (32, 16, bfd_mach_h8300sxn, "h8300sxn", "h8300sxn", FALSE, NULL); + +static const bfd_arch_info_type h8300sx_info_struct = + N (32, 32, bfd_mach_h8300sx, "h8300sx", "h8300sx", FALSE, &h8300sxn_info_struct); + +static const bfd_arch_info_type h8300sn_info_struct = + N (32, 16, bfd_mach_h8300sn, "h8300sn", "h8300sn", FALSE, &h8300sx_info_struct); + +static const bfd_arch_info_type h8300hn_info_struct = + N (32, 16, bfd_mach_h8300hn, "h8300hn", "h8300hn", FALSE, &h8300sn_info_struct); + static const bfd_arch_info_type h8300s_info_struct = -{ - 32, /* 32 bits in a word */ - 32, /* 32 bits in an address */ - 8, /* 8 bits in a byte */ - bfd_arch_h8300, - bfd_mach_h8300s, - "h8300s", /* arch_name */ - "h8300s", /* printable name */ - 1, - FALSE, /* the default machine */ - compatible, - h8300_scan, - 0 -}; + N (32, 32, bfd_mach_h8300s, "h8300s", "h8300s", FALSE, & h8300hn_info_struct); static const bfd_arch_info_type h8300h_info_struct = -{ - 32, /* 32 bits in a word */ - 32, /* 32 bits in an address */ - 8, /* 8 bits in a byte */ - bfd_arch_h8300, - bfd_mach_h8300h, - "h8300h", /* arch_name */ - "h8300h", /* printable name */ - 1, - FALSE, /* the default machine */ - compatible, - h8300_scan, - &h8300s_info_struct -}; + N (32, 32, bfd_mach_h8300h, "h8300h", "h8300h", FALSE, &h8300s_info_struct); const bfd_arch_info_type bfd_h8300_arch = + N (16, 16, bfd_mach_h8300, "h8300", "h8300", TRUE, &h8300h_info_struct); + +/* Pad the given address to 32 bits, converting 16-bit and 24-bit + addresses into the values they would have had on a h8s target. */ + +bfd_vma +bfd_h8300_pad_address (bfd *abfd, bfd_vma address) { - 16, /* 16 bits in a word */ - 16, /* 16 bits in an address */ - 8, /* 8 bits in a byte */ - bfd_arch_h8300, - bfd_mach_h8300, - "h8300", /* arch_name */ - "h8300", /* printable name */ - 1, - TRUE, /* the default machine */ - compatible, - h8300_scan, - &h8300h_info_struct -}; + /* Cope with bfd_vma's larger than 32 bits. */ + address &= 0xffffffffu; + + switch (bfd_get_mach (abfd)) + { + case bfd_mach_h8300: + case bfd_mach_h8300hn: + case bfd_mach_h8300sn: + case bfd_mach_h8300sxn: + /* Sign extend a 16-bit address. */ + if (address >= 0x8000) + return address | 0xffff0000u; + return address; + + case bfd_mach_h8300h: + /* Sign extend a 24-bit address. */ + if (address >= 0x800000) + return address | 0xff000000u; + return address; + + case bfd_mach_h8300s: + case bfd_mach_h8300sx: + return address; + + default: + abort (); + } +}