c35d018b1a
Maciej reported a problem found by his RISC-V gdbserver port. warning: while parsing target description (at line 4): Target description specified unknown architecture "riscv:rv64id" warning: Could not load XML target description; ignoring We only have two arches defined, riscv:rv32 and riscv:rv64. Both bfd and gdb are creating arch strings that have extension letters added to the base architecture. The bfd_default_scan function requires an exact match, so these strings fail to map to a bfd_arch. I think we should ignore the extension letters in a RISC-V specific scan function. bfd/ * cpu-riscv.c (riscv_scan): New. (N): Change bfd_default_scan to riscv_scan. Change-Id: I096476705e1da5cb8934c5005b1eed2a8989f7a7
98 lines
2.9 KiB
C
98 lines
2.9 KiB
C
/* BFD backend for RISC-V
|
|
Copyright (C) 2011-2020 Free Software Foundation, Inc.
|
|
|
|
Contributed by Andrew Waterman (andrew@sifive.com).
|
|
Based on MIPS target.
|
|
|
|
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 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.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; see the file COPYING3. If not,
|
|
see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "sysdep.h"
|
|
#include "bfd.h"
|
|
#include "libbfd.h"
|
|
|
|
/* This routine is provided two arch_infos and returns an arch_info
|
|
that is compatible with both, or NULL if none exists. */
|
|
|
|
static const bfd_arch_info_type *
|
|
riscv_compatible (const bfd_arch_info_type *a, const bfd_arch_info_type *b)
|
|
{
|
|
if (a->arch != b->arch)
|
|
return NULL;
|
|
|
|
/* Machine compatibility is checked in
|
|
_bfd_riscv_elf_merge_private_bfd_data. */
|
|
|
|
return a;
|
|
}
|
|
|
|
/* Return TRUE if STRING matches the architecture described by INFO. */
|
|
|
|
static bfd_boolean
|
|
riscv_scan (const struct bfd_arch_info *info, const char *string)
|
|
{
|
|
if (bfd_default_scan (info, string))
|
|
return TRUE;
|
|
|
|
/* The string might have extra characters for supported subsets. So allow
|
|
a match that ignores trailing characters in string. */
|
|
if (strncasecmp (string, info->printable_name,
|
|
strlen (info->printable_name)) == 0)
|
|
return TRUE;
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
#define N(BITS, NUMBER, PRINT, DEFAULT, NEXT) \
|
|
{ \
|
|
BITS, /* Bits in a word. */ \
|
|
BITS, /* Bits in an address. */ \
|
|
8, /* Bits in a byte. */ \
|
|
bfd_arch_riscv, \
|
|
NUMBER, \
|
|
"riscv", \
|
|
PRINT, \
|
|
3, \
|
|
DEFAULT, \
|
|
riscv_compatible, \
|
|
riscv_scan, \
|
|
bfd_arch_default_fill, \
|
|
NEXT, \
|
|
0 /* Maximum offset of a reloc from the start of an insn. */\
|
|
}
|
|
|
|
/* This enum must be kept in the same order as arch_info_struct. */
|
|
enum
|
|
{
|
|
I_riscv64,
|
|
I_riscv32
|
|
};
|
|
|
|
#define NN(index) (&arch_info_struct[(index) + 1])
|
|
|
|
/* This array must be kept in the same order as the anonymous enum above,
|
|
and each entry except the last should end with NN (my enum value). */
|
|
static const bfd_arch_info_type arch_info_struct[] =
|
|
{
|
|
N (64, bfd_mach_riscv64, "riscv:rv64", FALSE, NN (I_riscv64)),
|
|
N (32, bfd_mach_riscv32, "riscv:rv32", FALSE, NULL)
|
|
};
|
|
|
|
/* The default architecture is riscv:rv64. */
|
|
|
|
const bfd_arch_info_type bfd_riscv_arch =
|
|
N (64, 0, "riscv", TRUE, &arch_info_struct[0]);
|