gdb: riscv: enable sim integration
Now the simulator can be loaded via gdb using "target sim".
This commit is contained in:
parent
b9249c461c
commit
04b4939b03
@ -1,3 +1,7 @@
|
||||
2021-02-04 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* configure.tgt (riscv*-*-*): Set gdb_sim.
|
||||
|
||||
2021-02-04 Simon Marchi <simon.marchi@polymtl.ca>
|
||||
|
||||
* target.c (target_is_non_stop_p): Return bool.
|
||||
|
@ -554,6 +554,7 @@ riscv*-*-linux*)
|
||||
riscv*-*-*)
|
||||
# Target: RISC-V architecture
|
||||
gdb_target_obs=""
|
||||
gdb_sim=../sim/riscv/libsim.a
|
||||
;;
|
||||
|
||||
rl78-*-elf)
|
||||
|
@ -1,3 +1,7 @@
|
||||
2021-02-04 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* sim-riscv.h: New file.
|
||||
|
||||
2021-01-07 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* remote-sim.h (sim_memory_map): Define.
|
||||
|
99
include/gdb/sim-riscv.h
Normal file
99
include/gdb/sim-riscv.h
Normal file
@ -0,0 +1,99 @@
|
||||
/* This file defines the interface between the RISC-V simulator and GDB.
|
||||
|
||||
Copyright (C) 2005-2021 Free Software Foundation, Inc.
|
||||
Contributed by Mike Frysinger.
|
||||
|
||||
This file is part of GDB.
|
||||
|
||||
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. If not, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
/* Order has to match gdb riscv-tdep list. */
|
||||
enum sim_riscv_regnum {
|
||||
SIM_RISCV_ZERO_REGNUM = 0,
|
||||
SIM_RISCV_RA_REGNUM,
|
||||
SIM_RISCV_SP_REGNUM,
|
||||
SIM_RISCV_GP_REGNUM,
|
||||
SIM_RISCV_TP_REGNUM,
|
||||
SIM_RISCV_T0_REGNUM,
|
||||
SIM_RISCV_T1_REGNUM,
|
||||
SIM_RISCV_T2_REGNUM,
|
||||
SIM_RISCV_S0_REGNUM,
|
||||
#define SIM_RISCV_FP_REGNUM SIM_RISCV_S0_REGNUM
|
||||
SIM_RISCV_S1_REGNUM,
|
||||
SIM_RISCV_A0_REGNUM,
|
||||
SIM_RISCV_A1_REGNUM,
|
||||
SIM_RISCV_A2_REGNUM,
|
||||
SIM_RISCV_A3_REGNUM,
|
||||
SIM_RISCV_A4_REGNUM,
|
||||
SIM_RISCV_A5_REGNUM,
|
||||
SIM_RISCV_A6_REGNUM,
|
||||
SIM_RISCV_A7_REGNUM,
|
||||
SIM_RISCV_S2_REGNUM,
|
||||
SIM_RISCV_S3_REGNUM,
|
||||
SIM_RISCV_S4_REGNUM,
|
||||
SIM_RISCV_S5_REGNUM,
|
||||
SIM_RISCV_S6_REGNUM,
|
||||
SIM_RISCV_S7_REGNUM,
|
||||
SIM_RISCV_S8_REGNUM,
|
||||
SIM_RISCV_S9_REGNUM,
|
||||
SIM_RISCV_S10_REGNUM,
|
||||
SIM_RISCV_S11_REGNUM,
|
||||
SIM_RISCV_T3_REGNUM,
|
||||
SIM_RISCV_T4_REGNUM,
|
||||
SIM_RISCV_T5_REGNUM,
|
||||
SIM_RISCV_T6_REGNUM,
|
||||
SIM_RISCV_PC_REGNUM,
|
||||
SIM_RISCV_FT0_REGNUM,
|
||||
#define SIM_RISCV_FIRST_FP_REGNUM SIM_RISCV_FT0_REGNUM
|
||||
SIM_RISCV_FT1_REGNUM,
|
||||
SIM_RISCV_FT2_REGNUM,
|
||||
SIM_RISCV_FT3_REGNUM,
|
||||
SIM_RISCV_FT4_REGNUM,
|
||||
SIM_RISCV_FT5_REGNUM,
|
||||
SIM_RISCV_FT6_REGNUM,
|
||||
SIM_RISCV_FT7_REGNUM,
|
||||
SIM_RISCV_FS0_REGNUM,
|
||||
SIM_RISCV_FS1_REGNUM,
|
||||
SIM_RISCV_FA0_REGNUM,
|
||||
SIM_RISCV_FA1_REGNUM,
|
||||
SIM_RISCV_FA2_REGNUM,
|
||||
SIM_RISCV_FA3_REGNUM,
|
||||
SIM_RISCV_FA4_REGNUM,
|
||||
SIM_RISCV_FA5_REGNUM,
|
||||
SIM_RISCV_FA6_REGNUM,
|
||||
SIM_RISCV_FA7_REGNUM,
|
||||
SIM_RISCV_FS2_REGNUM,
|
||||
SIM_RISCV_FS3_REGNUM,
|
||||
SIM_RISCV_FS4_REGNUM,
|
||||
SIM_RISCV_FS5_REGNUM,
|
||||
SIM_RISCV_FS6_REGNUM,
|
||||
SIM_RISCV_FS7_REGNUM,
|
||||
SIM_RISCV_FS8_REGNUM,
|
||||
SIM_RISCV_FS9_REGNUM,
|
||||
SIM_RISCV_FS10_REGNUM,
|
||||
SIM_RISCV_FS11_REGNUM,
|
||||
SIM_RISCV_FT8_REGNUM,
|
||||
SIM_RISCV_FT9_REGNUM,
|
||||
SIM_RISCV_FT10_REGNUM,
|
||||
SIM_RISCV_FT11_REGNUM,
|
||||
#define SIM_RISCV_LAST_FP_REGNUM SIM_RISCV_FT11_REGNUM
|
||||
|
||||
#define SIM_RISCV_FIRST_CSR_REGNUM SIM_RISCV_LAST_FP_REGNUM + 1
|
||||
#define DECLARE_CSR(name, num, ...) SIM_RISCV_ ## num ## _REGNUM,
|
||||
#include "opcode/riscv-opc.h"
|
||||
#undef DECLARE_CSR
|
||||
#define SIM_RISCV_LAST_CSR_REGNUM SIM_RISCV_LAST_REGNUM - 1
|
||||
|
||||
SIM_RISCV_LAST_REGNUM
|
||||
};
|
@ -1,3 +1,9 @@
|
||||
2021-02-04 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* sim-main.c: Include gdb/sim-riscv.h.
|
||||
(reg_fetch, reg_store): Define.
|
||||
(initialize_cpu): Assign reg_fetch & reg_store.
|
||||
|
||||
2021-02-04 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* Makefile.in, configure.ac, interp.c, machs.c, machs.h,
|
||||
|
@ -31,6 +31,8 @@
|
||||
|
||||
#include "opcode/riscv.h"
|
||||
|
||||
#include "gdb/sim-riscv.h"
|
||||
|
||||
#include "targ-vals.h"
|
||||
|
||||
#define TRACE_REG(cpu, reg) \
|
||||
@ -1019,6 +1021,72 @@ pc_set (sim_cpu *cpu, sim_cia pc)
|
||||
cpu->pc = pc;
|
||||
}
|
||||
|
||||
static int
|
||||
reg_fetch (sim_cpu *cpu, int rn, unsigned char *buf, int len)
|
||||
{
|
||||
if (len <= 0 || len > sizeof (unsigned_word))
|
||||
return -1;
|
||||
|
||||
switch (rn)
|
||||
{
|
||||
case SIM_RISCV_ZERO_REGNUM:
|
||||
memset (buf, 0, len);
|
||||
return len;
|
||||
case SIM_RISCV_RA_REGNUM ... SIM_RISCV_T6_REGNUM:
|
||||
memcpy (buf, &cpu->regs[rn], len);
|
||||
return len;
|
||||
case SIM_RISCV_FIRST_FP_REGNUM ... SIM_RISCV_LAST_FP_REGNUM:
|
||||
memcpy (buf, &cpu->fpregs[rn - SIM_RISCV_FIRST_FP_REGNUM], len);
|
||||
return len;
|
||||
case SIM_RISCV_PC_REGNUM:
|
||||
memcpy (buf, &cpu->pc, len);
|
||||
return len;
|
||||
|
||||
#define DECLARE_CSR(name, num, ...) \
|
||||
case SIM_RISCV_ ## num ## _REGNUM: \
|
||||
memcpy (buf, &cpu->csr.name, len); \
|
||||
return len;
|
||||
#include "opcode/riscv-opc.h"
|
||||
#undef DECLARE_CSR
|
||||
|
||||
default:
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
static int
|
||||
reg_store (sim_cpu *cpu, int rn, unsigned char *buf, int len)
|
||||
{
|
||||
if (len <= 0 || len > sizeof (unsigned_word))
|
||||
return -1;
|
||||
|
||||
switch (rn)
|
||||
{
|
||||
case SIM_RISCV_ZERO_REGNUM:
|
||||
/* Ignore writes. */
|
||||
return len;
|
||||
case SIM_RISCV_RA_REGNUM ... SIM_RISCV_T6_REGNUM:
|
||||
memcpy (&cpu->regs[rn], buf, len);
|
||||
return len;
|
||||
case SIM_RISCV_FIRST_FP_REGNUM ... SIM_RISCV_LAST_FP_REGNUM:
|
||||
memcpy (&cpu->fpregs[rn - SIM_RISCV_FIRST_FP_REGNUM], buf, len);
|
||||
return len;
|
||||
case SIM_RISCV_PC_REGNUM:
|
||||
memcpy (&cpu->pc, buf, len);
|
||||
return len;
|
||||
|
||||
#define DECLARE_CSR(name, num, ...) \
|
||||
case SIM_RISCV_ ## num ## _REGNUM: \
|
||||
memcpy (&cpu->csr.name, buf, len); \
|
||||
return len;
|
||||
#include "opcode/riscv-opc.h"
|
||||
#undef DECLARE_CSR
|
||||
|
||||
default:
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
/* Initialize the state for a single cpu. Usuaully this involves clearing all
|
||||
registers back to their reset state. Should also hook up the fetch/store
|
||||
helper functions too. */
|
||||
@ -1032,6 +1100,8 @@ initialize_cpu (SIM_DESC sd, SIM_CPU *cpu, int mhartid)
|
||||
|
||||
CPU_PC_FETCH (cpu) = pc_get;
|
||||
CPU_PC_STORE (cpu) = pc_set;
|
||||
CPU_REG_FETCH (cpu) = reg_fetch;
|
||||
CPU_REG_STORE (cpu) = reg_store;
|
||||
|
||||
if (!riscv_hash[0])
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user