Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-12-13 06:14:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools/minidumpserver: fix 32bit crash log parsing

Browse Source 
Need to distinguish between 32bit and 64bit registers, format the gdb reply message using struct.pack with correct format.
'<I' is used for 32bit registers, '<Q' for 64bit

Do not raise exeption for unrecognized registers in log, since they are
not used.

Signed-off-by: Xu Xingliang <xuxingliang@xiaomi.com>
This commit is contained in:
Xu Xingliang
2024-06-07 18:53:21 +08:00
committed by Xiang Xiao
parent 3d1b3ba1f5
commit 5fd03186af
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/minidumpserver.py
View File

@@ -335,6 +335,7 @@ class DumpLogFile:
self.registers = [] self.registers = []
self.__memories = list() self.__memories = list()
self.reg_table = dict() self.reg_table = dict()
self.reg_len = 32
def _init_register(self): def _init_register(self):
# registers list should be able to hold the max index # registers list should be able to hold the max index
@@ -353,8 +354,7 @@ class DumpLogFile:
if reg_name in self.reg_table: if reg_name in self.reg_table:
reg_index = self.reg_table[reg_name] reg_index = self.reg_table[reg_name]
self.registers[reg_index] = int(reg_val, 16) self.registers[reg_index] = int(reg_val, 16)
else: self.reg_len = max(self.reg_len, len(reg_val) * 4)
raise Exception("Unknown register name: ", reg_name)
return True return True
@@ -386,8 +386,9 @@ class DumpLogFile:
data = b"" data = b""
start = addr_start start = addr_start
reg_fmt = "<I" if self.reg_len <= 32 else "<Q"
for val in match_res.groupdict()["VALS"].split(): for val in match_res.groupdict()["VALS"].split():
data = data + struct.pack("<Q", int(val, 16)) data = data + struct.pack(reg_fmt, int(val, 16))
return start, data return start, data
@@ -437,6 +438,7 @@ class GDBStub:
self.gdb_signal = GDB_SIGNAL_DEFAULT self.gdb_signal = GDB_SIGNAL_DEFAULT
self.mem_regions = self.elffile.get_memories() + self.logfile.get_memories() self.mem_regions = self.elffile.get_memories() + self.logfile.get_memories()
self.reg_digits = elffile.xlen() // 4 self.reg_digits = elffile.xlen() // 4
self.reg_fmt = "<I" if elffile.xlen() <= 32 else "<Q"
self.mem_regions.sort(key=lambda x: x["start"]) self.mem_regions.sort(key=lambda x: x["start"])
@@ -508,12 +510,11 @@ class GDBStub:
self.put_gdb_packet(pkt) self.put_gdb_packet(pkt)
def handle_register_group_read_packet(self): def handle_register_group_read_packet(self):
reg_fmt = "<Q"
pkt = b"" pkt = b""
for reg in self.logfile.registers: for reg in self.logfile.registers:
if reg != b"x": if reg != b"x":
bval = struct.pack(reg_fmt, reg) bval = struct.pack(self.reg_fmt, reg)
pkt += binascii.hexlify(bval) pkt += binascii.hexlify(bval)
else: else:
# Register not in coredump -> unknown value # Register not in coredump -> unknown value
@@ -523,12 +524,11 @@ class GDBStub:
self.put_gdb_packet(pkt) self.put_gdb_packet(pkt)
def handle_register_single_read_packet(self, pkt): def handle_register_single_read_packet(self, pkt):
reg_fmt = "<Q"
logger.debug(f"pkt: {pkt}") logger.debug(f"pkt: {pkt}")
reg = int("0x" + pkt[1:].decode("utf8"), 16) reg = int("0x" + pkt[1:].decode("utf8"), 16)
if reg < len(self.logfile.registers) and self.logfile.registers[reg] != b"x": if reg < len(self.logfile.registers) and self.logfile.registers[reg] != b"x":
bval = struct.pack(reg_fmt, self.logfile.registers[reg]) bval = struct.pack(self.reg_fmt, self.logfile.registers[reg])
self.put_gdb_packet(binascii.hexlify(bval)) self.put_gdb_packet(binascii.hexlify(bval))
else: else:
self.put_gdb_packet(b"x" * self.reg_digits) self.put_gdb_packet(b"x" * self.reg_digits)