Skip to content
This repository has been archived by the owner on Aug 17, 2022. It is now read-only.

Make "set arch" update the register size. #11

Merged
merged 1 commit into from
Jul 13, 2016
Merged

Make "set arch" update the register size. #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions gdb/riscv-tdep.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,11 +1078,13 @@ riscv_gdbarch_init (struct gdbarch_info info,
{
struct gdbarch *gdbarch;
struct gdbarch_tdep *tdep;
const struct bfd_arch_info *binfo;
const struct bfd_arch_info *binfo = info.bfd_arch_info;

int abi, i;

/* For now, base the abi on the elf class. */
/* Allow the ELF class to override the register size. Ideally the target
* (OpenOCD/spike/...) would communicate the register size to gdb instead. */
abi = RISCV_ABI_FLAG_RV32I;
if (info.abfd && bfd_get_flavour (info.abfd) == bfd_target_elf_flavour)
{
Expand All @@ -1092,6 +1094,18 @@ riscv_gdbarch_init (struct gdbarch_info info,
abi = RISCV_ABI_FLAG_RV32I;
else if (eclass == ELFCLASS64)
abi = RISCV_ABI_FLAG_RV64I;
else
internal_error (__FILE__, __LINE__, _("unknown ELF header class %d"), eclass);
}
else
{
if (binfo->bits_per_word == 32)
abi = RISCV_ABI_FLAG_RV32I;
else if (binfo->bits_per_word == 64)
abi = RISCV_ABI_FLAG_RV64I;
else
internal_error (__FILE__, __LINE__, _("unknown bits_per_word %d"),
binfo->bits_per_word);
}

/* Find a candidate among the list of pre-declared architectures. */
Expand All @@ -1105,23 +1119,21 @@ riscv_gdbarch_init (struct gdbarch_info info,
Can't initialize all the target dependencies until we actually know which
target we are talking to, but put in some defaults for now. */

binfo = info.bfd_arch_info;
tdep = xmalloc (sizeof *tdep);
gdbarch = gdbarch_alloc (&info, tdep);

tdep->riscv_abi = abi;
tdep->register_size = 4;
switch (abi)
{
case RISCV_ABI_FLAG_RV128I:
tdep->register_size <<= 1;
case RISCV_ABI_FLAG_RV64I:
tdep->register_size <<= 1;
case RISCV_ABI_FLAG_RV32I:
case RISCV_ABI_FLAG_RV32E:
tdep->register_size = 4;
break;
case RISCV_ABI_FLAG_RV64I:
tdep->register_size = 8;
break;
default:
internal_error (__FILE__, __LINE__, _("unknown abi %i"), abi);
tdep->register_size = 4;
break;
}

Expand Down