binutils-gdb/bfd/cpu-riscv.c
Alan Modra ba9b3ef5ee RISCV changes broke 32-bit --enable-targets=all
By the look of it, git commit 39ff0b8123 broke 32-bit host
--enable-targets=all binutils builds.

/usr/local/bin/ld: ../opcodes/.libs/libopcodes.a(riscv-dis.o): in function `parse_riscv_dis_option':
/home/alan/src/binutils-gdb/opcodes/riscv-dis.c:102: undefined reference to `riscv_get_priv_spec_class'
collect2: error: ld returned 1 exit status
Makefile:925: recipe for target 'objdump' failed

The problem is that elfxx-riscv.c is not built for a 32-bit host
without --enable-64-bit-bfd or unless RISCV is given specifically as a
target.  No such trimming of 64-bit only targets is done in opcodes.

One solution is to move these support functions to cpu-riscv.c, which
runs into "error: implicit declaration of function ‘xmalloc’".  Now,
xmalloc is not supposed to be used in libbfd or libopcodes - it's rude
to crash out of an application that calls libbfd or libopcodes
functions without giving it a chance to deal with out-of-memory
itself.  So I removed the xmalloc and instead used a fixed size
buffer.  If you are worried about adding 36 bytes for the buffer to
the riscv_get_priv_spec_class_from_numbers stack frame size, then you
have no idea of the likely xmalloc + malloc stack frame size!  Trying
to reduce memory usage is commendable, but in this instance
riscv_estimate_digit and malloc for a temp buffer uses a lot more
memory than a fixed max-size buffer.

	* elfxx-riscv.c (struct priv_spec_t, priv_specs),
	(riscv_get_priv_spec_class, riscv_get_priv_spec_class_from_numbers),
	(riscv_get_priv_spec_name): Move to..
	* cpu-riscv.c: ..here.
	(riscv_get_priv_spec_class_from_numbers): Don't xmalloc temp buffer.
	Use %u to print unsigned numbers.
2020-06-26 10:58:03 +09:30

188 lines
5.2 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"
#include "elfxx-riscv.h"
/* Record the priv spec version string and the corresponding class. */
struct priv_spec_t
{
const char *name;
enum riscv_priv_spec_class class;
};
/* List for all supported privilege versions. */
static const struct priv_spec_t priv_specs[] =
{
{"1.9.1", PRIV_SPEC_CLASS_1P9P1},
{"1.10", PRIV_SPEC_CLASS_1P10},
{"1.11", PRIV_SPEC_CLASS_1P11},
/* Terminate the list. */
{NULL, 0}
};
/* Get the corresponding CSR version class by giving a privilege
version string. */
int
riscv_get_priv_spec_class (const char *s,
enum riscv_priv_spec_class *class)
{
const struct priv_spec_t *version;
if (s == NULL)
return 0;
for (version = &priv_specs[0]; version->name != NULL; ++version)
if (strcmp (version->name, s) == 0)
{
*class = version->class;
return 1;
}
/* Can not find the supported privilege version. */
return 0;
}
/* Get the corresponding CSR version class by giving privilege
version numbers. It is usually used to convert the priv
attribute numbers into the corresponding class. */
int
riscv_get_priv_spec_class_from_numbers (unsigned int major,
unsigned int minor,
unsigned int revision,
enum riscv_priv_spec_class *class)
{
char buf[36];
if (major == 0 && minor == 0 && revision == 0)
{
*class = PRIV_SPEC_CLASS_NONE;
return 1;
}
if (revision != 0)
snprintf (buf, sizeof (buf), "%u.%u.%u", major, minor, revision);
else
snprintf (buf, sizeof (buf), "%u.%u", major, minor);
return riscv_get_priv_spec_class (buf, class);
}
/* Get the corresponding privilege version string by giving a CSR
version class. */
const char *
riscv_get_priv_spec_name (enum riscv_priv_spec_class class)
{
/* The first enum is PRIV_SPEC_CLASS_NONE. */
return priv_specs[class - 1].name;
}
/* 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 incoming STRING might take the form of riscv:rvXXzzz, where XX is
32 or 64, and zzz are one or more extension characters. As we
currently only have 3 architectures defined, 'riscv', 'riscv:rv32',
and 'riscv:rv64', we would like to ignore the zzz for the purpose of
matching here.
However, we don't want the default 'riscv' to match over a more
specific 'riscv:rv32' or 'riscv:rv64', so in the case of the default
architecture (with the shorter 'riscv' name) we don't allow any
special matching, but for the 'riscv:rvXX' cases, we allow a match
with any additional trailing characters being ignored. */
if (!info->the_default
&& 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]);