michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch: riscv: update coredump for 64BIT RISCV

Browse source 
Add RISCV 64bit registers and parse them in coredump script.

Signed-off-by: Aleksandar Cecaric <aleksandar.cecaric@nextsilicon.com>
This commit is contained in:
Aleksandar Cecaric 2024-03-27 11:19:32 +01:00 • committed by Anas Nashif
commit 0144ed6b63
2 changed files with 39 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

27
arch/riscv/core/coredump.c
View file

@ -7,9 +7,35 @@
#include <string.h> #include <string.h>
#include <zephyr/debug/coredump.h> #include <zephyr/debug/coredump.h>
#ifndef CONFIG_64BIT
#define ARCH_HDR_VER 1 #define ARCH_HDR_VER 1
#else
#define ARCH_HDR_VER 2
#endif
struct riscv_arch_block { struct riscv_arch_block {
#ifdef CONFIG_64BIT
struct {
uint64_t ra;
uint64_t tp;
uint64_t t0;
uint64_t t1;
uint64_t t2;
uint64_t a0;
uint64_t a1;
uint64_t a2;
uint64_t a3;
uint64_t a4;
uint64_t a5;
uint64_t a6;
uint64_t a7;
uint64_t t3;
uint64_t t4;
uint64_t t5;
uint64_t t6;
uint64_t pc;
} r;
#else /* !CONFIG_64BIT */
struct { struct {
uint32_t ra; uint32_t ra;
uint32_t tp; uint32_t tp;
@ -32,6 +58,7 @@ struct riscv_arch_block {
#endif /* !CONFIG_RISCV_ISA_RV32E */ #endif /* !CONFIG_RISCV_ISA_RV32E */
uint32_t pc; uint32_t pc;
} r; } r;
#endif /* CONFIG_64BIT */
} __packed; } __packed;
/* /*

17
scripts/coredump/gdbstubs/arch/risc_v.py
View file

@ -13,7 +13,6 @@ from gdbstubs.gdbstub import GdbStub
logger = logging.getLogger("gdbstub") logger = logging.getLogger("gdbstub")
class RegNum(): class RegNum():
ZERO = 0 ZERO = 0
RA = 1 RA = 1
@ -52,6 +51,7 @@ class RegNum():
class GdbStub_RISC_V(GdbStub): class GdbStub_RISC_V(GdbStub):
ARCH_DATA_BLK_STRUCT = "<IIIIIIIIIIIIIIIIII" ARCH_DATA_BLK_STRUCT = "<IIIIIIIIIIIIIIIIII"
ARCH_DATA_BLK_STRUCT_2 = "<QQQQQQQQQQQQQQQQQQ"
GDB_SIGNAL_DEFAULT = 7 GDB_SIGNAL_DEFAULT = 7
@ -66,7 +66,12 @@ class GdbStub_RISC_V(GdbStub):
def parse_arch_data_block(self): def parse_arch_data_block(self):
arch_data_blk = self.logfile.get_arch_data()['data'] arch_data_blk = self.logfile.get_arch_data()['data']
tu = struct.unpack(self.ARCH_DATA_BLK_STRUCT, arch_data_blk) self.arch_data_ver = self.logfile.get_arch_data()['hdr_ver']
if self.arch_data_ver == 1:
tu = struct.unpack(self.ARCH_DATA_BLK_STRUCT, arch_data_blk)
elif self.arch_data_ver == 2:
tu = struct.unpack(self.ARCH_DATA_BLK_STRUCT_2, arch_data_blk)
self.registers = dict() self.registers = dict()
@ -90,7 +95,7 @@ class GdbStub_RISC_V(GdbStub):
self.registers[RegNum.PC] = tu[17] self.registers[RegNum.PC] = tu[17]
def handle_register_group_read_packet(self): def handle_register_group_read_packet(self):
reg_fmt = "<I" reg_fmt = "<I" if self.arch_data_ver == 1 else "<Q"
idx = 0 idx = 0
pkt = b'' pkt = b''
@ -102,7 +107,8 @@ class GdbStub_RISC_V(GdbStub):
else: else:
# Register not in coredump -> unknown value # Register not in coredump -> unknown value
# Send in "xxxxxxxx" # Send in "xxxxxxxx"
pkt += b'x' * 8 length = 8 if self.arch_data_ver == 1 else 16
pkt += b'x' * length
idx += 1 idx += 1
@ -111,4 +117,5 @@ class GdbStub_RISC_V(GdbStub):
def handle_register_single_read_packet(self, pkt): def handle_register_single_read_packet(self, pkt):
# Mark registers as "<unavailable>". 'p' packets are not sent for the registers # Mark registers as "<unavailable>". 'p' packets are not sent for the registers
# currently handled in this file so we can safely reply "xxxxxxxx" here. # currently handled in this file so we can safely reply "xxxxxxxx" here.
self.put_gdb_packet(b'x' * 8) length = 8 if self.arch_data_ver == 1 else 16
self.put_gdb_packet(b'x' * length)