X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fcpu-h8300.c;h=03691ccb48a57195288995f683e5b8fb6896d9c2;hb=030a2e78acf66c5c12e073ec3887a167da7a7195;hp=931c3c10fc2a8778471ad5a4b2fa51f5d3f90475;hpb=3b4f1a5d05c9dc94e6708eecaf9ed8dc9832a48a;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/cpu-h8300.c b/bfd/cpu-h8300.c
index 931c3c10fc..03691ccb48 100644
--- a/bfd/cpu-h8300.c
+++ b/bfd/cpu-h8300.c
@@ -1,409 +1,175 @@
-/* BFD library support routines for the Hitachi H8/300 architecture.
-   Copyright (C) 1990-1991 Free Software Foundation, Inc.
+/* BFD library support routines for the Renesas H8/300 architecture.
+   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 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
-(at your option) any later version.
+   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 3 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   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., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
+#include "cpu-h8300.h"
 
-#define DEFINE_TABLE 
-#include "h8300-opcode.h"
-
-#define MAXSAME 14
-
-static struct h8_opcode * h8_opcodes_sorted[256][MAXSAME];
-
-/* Run through the opcodes and sort them into order to make them easy
-   to disassemble
- */
-static void
-DEFUN_VOID(bfd_h8_disassemble_init)
+static bfd_boolean
+h8300_scan (const struct bfd_arch_info *info, const char *string)
 {
-  unsigned int i;	
-  struct h8_opcode *p; 
-    
-  for (p = h8_opcodes; p->name; p++) {	
-    int where = 0;
-    int n1 = 0;
-    int n2 = 0;
-    int n3 = 0;
-    int n4= 0;
-    if ((int)p->data.nib[0] < 16) {
-      n1 =(int) p->data.nib[0] ;
-    } else n1 = 0;
-    if ((int)p->data.nib[1] < 16) {
-      n2 = (int) p->data.nib[1];
-    }else n2 = 0;
-
-    for (i = 0; i < MAXSAME; i++) {
-      int j = n1 * 16 + n2;
-      if (h8_opcodes_sorted[j][i] == (struct h8_opcode *)NULL) {
-	h8_opcodes_sorted[j][i] = p;
-	break;
-      }
+  if (*string != 'h' && *string != 'H')
+    return FALSE;
+
+  string++;
+  if (*string != '8')
+    return FALSE;
+
+  string++;
+  if (*string == '/')
+    string++;
+
+  if (*string != '3')
+    return FALSE;
+  string++;
+  if (*string != '0')
+    return FALSE;
+  string++;
+  if (*string != '0')
+    return FALSE;
+  string++;
+  if (*string == '-')
+    string++;
+
+  /* In ELF linker scripts, we typically express the architecture/machine
+     as architecture:machine.
+
+     So if we've matched so far and encounter a colon, try to match the
+     string following the colon.  */
+  if (*string == ':')
+    {
+      string++;
+      return h8300_scan (info, string);
     }
-    
-    if (i==MAXSAME)abort();
-
-    /* Just make sure there are an even number of nibbles in it, and
-       that the count is the same s the length */
-    for (i = 0; p->data.nib[i] != E; i++) ;
-    if (i & 1) abort();
-    if (i/2 != p->length) abort();
-  }
-  for (i = 0; i < 256; i++) 
-      {
-	if (h8_opcodes_sorted[i][0]) 
-	  p = h8_opcodes_sorted[i][0];
-	else h8_opcodes_sorted[i][0] = p;
-      }
-}
 
+  if (*string == 'h' || *string == 'H')
+    {
+      string++;
+      if (*string == 'n' || *string == 'N')
+	return (info->mach == bfd_mach_h8300hn);
 
-unsigned int
-DEFUN(bfd_h8_disassemble,(addr, data, stream),
-bfd_vma addr AND
-CONST bfd_byte *data AND
-FILE *stream)
-{
-  /* Find the first entry in the table for this opcode */
-  CONST static char *regnames[] = {
-    "r0h","r1h","r2h","r3h","r4h","r5h","r6h","r7h",
-    "r0l","r1l","r2l","r3l","r4l","r5l","r6l","r7l" };
-
-  int rs = 0;
-  int rd = 0;
-  int rdisp = 0;
-  int abs = 0;
-  struct h8_opcode **p = h8_opcodes_sorted[(unsigned)(data[0])];
-  struct h8_opcode *q;
-
-  /* Find the exact opcode/arg combo */
-  while (*p) {
-    op_type *nib;
-    unsigned int len = 0;
-    q = *p++;
-    nib  =q->data.nib;
-    while (*nib != E) {
-      op_type looking_for = *nib;
-      int thisnib = data[len>>1] ;
-      thisnib = (len & 1) ? (thisnib & 0xf) : ((thisnib >> 4) & 0xf);
-      if ((int)looking_for & (int)B31) {
-	if (((int)thisnib & 0x8) ==0) goto fail;
-	looking_for = (op_type)((int)looking_for &  ~(int)B31);
-      }
-      if ((int)looking_for & (int)B30) {
-	if (((int)thisnib & 0x8) !=0) goto fail;
-	looking_for = (op_type)((int)looking_for &  ~(int)B30);
-      }
-      switch (looking_for) {
-      case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7: 
-      case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
-	if ((int)looking_for != thisnib) goto fail;
-	break;
-      case ABS16SRC:
-      case ABS16DST:
-      case DISPSRC:
-      case DISPDST:
-      case IMM16:
-	abs = (data[len>>1]) * 256 + data[(len+2)>>1];
-	len+=3;
-	nib+=3;
-	break;
-      case DISPREG:
-	rdisp = thisnib; 
-	break;
-      case KBIT:
-	abs = thisnib == 0x8 ? 2:1;
-	break;
-      case IMM8:
-      case ABS8SRC:
-      case ABS8DST:
-      case DISP8:
-	abs= data[len>>1];
-	len++;
-	nib++;
-	break;
-      case IMM3:
-	abs = thisnib ;
-	break;
-      case RS8:
-      case RS16:
-      case RSINC:
-      case RSIND:
-	rs = thisnib;
-	break;
-      case RD16:
-      case RDDEC:
-      case RD8:
-      case RDIND:
-	rd = thisnib;
-	break;
-      default:
-	fprintf(stream, "Dont understand \n");
-	goto found;
-      }
-      len++;
-      nib++;
+      return (info->mach == bfd_mach_h8300h);
     }
-    goto found;
-  fail: 
-    ;
-
-  }
-  fprintf(stream, "%02x %02x        .word\tH'%x,H'%x",
-	  data[0], data[1],
-	  data[0], data[1]);
-  return 2;
- found:;
-    { int i;
-
-      for (i = 0; i < q->length; i++) {
-	fprintf(stream, "%02x ", data[i]);
-      }
-      for (; i < 6; i++) {
-	fprintf(stream, "   ");
-      }
-    }
-  fprintf(stream, "%s\t",q->name);
-  /* Now print out the args */
+  else if (*string == 's' || *string == 'S')
     {
-      op_type *args = q->args.nib;
-      int hadone = 0;
-      while (*args != E) {
-	if (hadone)
-	  fprintf(stream, ",");
-	switch ((int)(*args) & ~((int)B30|(int)B31)) {
-	case IMM16:
-	case IMM8:
-	case IMM3:
-	  fprintf(stream, "#0x%x", (unsigned)abs); break;
-	case RD8:
-	  fprintf(stream, "%s", regnames[rd]); break;
-	case RS8:
-	  fprintf(stream, "%s",regnames[rs]); break;
-	case RD16:
-	  fprintf(stream, "r%d", rd& 0x7); break;
-	case RS16:
-	  fprintf(stream, "r%d", rs & 0x7); break;
-	case RSINC:
-	  fprintf(stream, "@r%d+", rs & 0x7); break;
-	case RDDEC:
-	  fprintf(stream, "@-r%d", rd & 0x7); break;
-	case RDIND: 
-	  fprintf(stream, "@r%d", rd & 0x7); break;
-	case RSIND:
-	  fprintf(stream, "@r%d",rs & 0x7); break;
-	case ABS8SRC:
-	case ABS16SRC:
-	case ABS16DST:
-	case ABS8DST:
-	  fprintf(stream, "@0x%x", (unsigned)abs); break;
-	case DISP8:
-	  fprintf(stream, ".%s%d (%x)",(char)abs>0 ? "+" :"", (char)abs,
-		  addr + (char)abs);
-	  break;
-	case DISPSRC:
-	case DISPDST:
-	  fprintf(stream, "@(0x%x,r%d)", abs, rdisp & 0x7); break;
-	case CCR:
-	  fprintf(stream, "ccr"); break;
-	case KBIT:
-	  fprintf(stream, "#%d",abs); break;
-	default:
-	  abort();
-	}
-	hadone = 1;
-	args++;
-      }
-    }
-  return q->length;
-}
-
-
-
-unsigned int DEFUN(print_insn_h8300,(addr, data, file),
-bfd_vma addr AND
-CONST char *data AND
-PTR file)
-{
-  static boolean init;
-  if (!init) {
-    bfd_h8_disassemble_init();
-    init= 1;
-  }
-
-  return   bfd_h8_disassemble(addr, (bfd_byte *)data, file);
-}
-
-/* 
-Relocations for the H8
-
-*/
-static bfd_reloc_status_type 
-DEFUN(howto16_callback,(abfd, reloc_entry, symbol_in, data, ignore_input_section),
-bfd *abfd AND
-arelent *reloc_entry AND
-asymbol *symbol_in AND
-unsigned char *data AND
-asection *ignore_input_section)
-{
-  long relocation = 0;
-  bfd_vma addr = reloc_entry->address;
-  long x = bfd_get_16(abfd, (bfd_byte *)data + addr);
-
-  HOWTO_PREPARE(relocation, symbol_in);
+      string++;
+      if (*string == 'n' || *string == 'N')
+	return (info->mach == bfd_mach_h8300sn);
 
-  x = (x + relocation + reloc_entry->addend);
+      if (*string == 'x' || *string == 'X')
+	{
+	  string++;
+	  if (*string == 'n' || *string == 'N')
+	    return (info->mach == bfd_mach_h8300sxn);
 
-  bfd_put_16(abfd, x, (bfd_byte *)data + addr);
-  return bfd_reloc_ok;
-}
-
-
-static bfd_reloc_status_type 
-DEFUN(howto8_callback,(abfd, reloc_entry, symbol_in, data, ignore_input_section),
-bfd *abfd AND
-arelent *reloc_entry AND
-asymbol *symbol_in AND
-unsigned char *data AND
-asection *ignore_input_section)
-{
-  long relocation = 0;
-  bfd_vma addr = reloc_entry->address;
-  long x = bfd_get_8(abfd, (bfd_byte *)data + addr);
-
-  HOWTO_PREPARE(relocation, symbol_in);
-
-  x = (x + relocation + reloc_entry->addend);
+	  return (info->mach == bfd_mach_h8300sx);
+	}
 
-  bfd_put_8(abfd, x, (bfd_byte *)data + addr);
-  return bfd_reloc_ok;
+      return (info->mach == bfd_mach_h8300s);
+    }
+  else
+    return info->mach == bfd_mach_h8300;
 }
 
+/* This routine is provided two arch_infos and works out the machine
+   which would be compatible with both and returns a pointer to its
+   info structure.  */
 
-static bfd_reloc_status_type 
-DEFUN(howto8_FFnn_callback,(abfd, reloc_entry, symbol_in, data, ignore_input_section),
-bfd *abfd AND
-arelent *reloc_entry AND
-asymbol *symbol_in AND
-unsigned char *data AND
-asection *ignore_input_section)
+static const bfd_arch_info_type *
+compatible (const bfd_arch_info_type *in, const bfd_arch_info_type *out)
 {
-  long relocation = 0;
-  bfd_vma addr = reloc_entry->address;
-
-  long x = bfd_get_8(abfd, (bfd_byte *)data + addr);
-  abort();
-  HOWTO_PREPARE(relocation, symbol_in);
-
-  x = (x + relocation + reloc_entry->addend);
-
-  bfd_put_8(abfd, x, (bfd_byte *)data + addr);
-  return bfd_reloc_ok;
+  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->mach != out->mach)
+    return 0;
+  else
+    return in;
 }
 
-static bfd_reloc_status_type 
-DEFUN(howto8_pcrel_callback,(abfd, reloc_entry, symbol_in, data, ignore_input_section),
-bfd *abfd AND
-arelent *reloc_entry AND
-asymbol *symbol_in AND
-unsigned char *data AND
-asection *ignore_input_section)
-{
-  long relocation = 0;
-  bfd_vma addr = reloc_entry->address;
-  long x = bfd_get_8(abfd, (bfd_byte *)data + addr);
-  abort();
-  HOWTO_PREPARE(relocation, symbol_in);
-
-  x = (x + relocation + reloc_entry->addend);
+#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 }
 
-  bfd_put_8(abfd, x, (bfd_byte *)data + addr);
-  return bfd_reloc_ok;
-}
+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 reloc_howto_type howto_16
-  = NEWHOWTO(howto16_callback,"abs16",1,0,0);
-static reloc_howto_type howto_8
-  = NEWHOWTO(howto8_callback,"abs8",0,0,0);
+static const bfd_arch_info_type h8300sn_info_struct =
+  N (32, 16, bfd_mach_h8300sn, "h8300sn", "h8300sn", FALSE, &h8300sx_info_struct);
 
-static reloc_howto_type howto_8_FFnn
-  = NEWHOWTO(howto8_FFnn_callback,"ff00+abs8",0,0,0);
+static const bfd_arch_info_type h8300hn_info_struct =
+  N (32, 16, bfd_mach_h8300hn, "h8300hn", "h8300hn", FALSE, &h8300sn_info_struct);
 
-static reloc_howto_type howto_8_pcrel
-  = NEWHOWTO(howto8_pcrel_callback,"pcrel8",0,1,1);
+static const bfd_arch_info_type h8300s_info_struct =
+  N (32, 32, bfd_mach_h8300s, "h8300s", "h8300s", FALSE, & h8300hn_info_struct);
 
+static const bfd_arch_info_type h8300h_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);
 
-static CONST struct reloc_howto_struct *
-DEFUN(local_bfd_reloc_type_lookup,(arch, code),
- CONST struct bfd_arch_info *arch AND
- bfd_reloc_code_type code)
-{
-  switch (code) {
-  case BFD_RELOC_16:
-    return &howto_16;
-  case BFD_RELOC_8_FFnn:
-    return &howto_8_FFnn;
-  case BFD_RELOC_8:
-    return &howto_8;
-  case BFD_RELOC_8_PCREL:
-    return &howto_8_pcrel;
-  }
-  return (reloc_howto_type *)NULL;
-}
-
-int bfd_default_scan_num_mach();
+/* 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.  */
 
-static boolean 
-DEFUN(h8300_scan,(info, string),
-CONST struct bfd_arch_info *info AND
-CONST char *string)
+bfd_vma
+bfd_h8300_pad_address (bfd *abfd, bfd_vma address)
 {
-  if (strcmp(string,"h8300") == 0) return true;
-  if (strcmp(string,"H8300") == 0) return true;
-  if (strcmp(string,"h8/300") == 0) return true;
-  if (strcmp(string,"H8/300") == 0) return true;
-  return false;
-}
+  /* Cope with bfd_vma's larger than 32 bits.  */
+  address &= 0xffffffffu;
 
-static bfd_arch_info_type arch_info_struct = 
-  {
-    16,	/* 16 bits in a word */
-    16,	/* 16 bits in an address */
-    8,	/* 8 bits in a byte */
-    bfd_arch_h8300,
-    0,	/* only 1 machine */
-    "H8/300", /* arch_name  */
-    "H8/300", /* printable name */
-    true,	/* the default machine */
-    bfd_default_compatible,
-    h8300_scan,
-    print_insn_h8300,
-    local_bfd_reloc_type_lookup,
-    0,
-  };
-
-void
-DEFUN_VOID(bfd_h8300_arch)
-{
-  bfd_arch_linkin(&arch_info_struct);
+  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 ();
+    }
 }