Skip to content

Commit dfaf8de

Browse files
SFangYyyaozhicheng
authored andcommitted
fix(pdb): resolve API incompatibility with difftest update
This PR updates the xspdb to adapt to the API changes. --------- Co-authored-by: Zhicheng Yao <[email protected]>
1 parent 5990cc6 commit dfaf8de

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed

scripts/xspdb/xscmd/cmd_difftest.py

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,10 @@ def api_init_ref(self, force=False):
7070
self.df.finish_device()
7171
self.df.GoldenMemFinish()
7272
self.df.difftest_finish()
73-
self.df.difftest_init()
73+
self.api_init_mem()
74+
self.df.difftest_init(True, self.exec_bin_file)
7475
self.difftest_stat = self.df.GetDifftest(0).dut
7576
self.df.init_device()
76-
self.df.GoldenMemInit()
77-
self.df.init_nemuproxy(0)
7877
self.difftest_ref_is_inited = True
7978
return True
8079

@@ -326,6 +325,19 @@ def api_difftest_get_instance(self, instance=0):
326325
"""
327326
return self.df.GetDifftest(instance)
328327

328+
def do_xdifftest_turn_on(self, arg):
329+
"""Turn on the difftest diff
330+
331+
Args:
332+
arg (string): Turn on or off
333+
"""
334+
if arg.strip() == "on":
335+
self.api_set_difftest_diff(True)
336+
elif arg.strip() == "off":
337+
self.api_set_difftest_diff(False)
338+
else:
339+
error("usage: xdifftest_turn_on <on|off>")
340+
329341
def complete_xdifftest_turn_on(self, text, line, begidx, endidx):
330342
return [x for x in ["on", "off"] if x.startswith(text)] if text else ["on", "off"]
331343

scripts/xspdb/xspdb.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def __init__(self, dut, default_file=None,
8686
self.df.InitFlash("")
8787
self.xspdb_init_bin = "xspdb_flash_init.bin"
8888
self.flash_bin_file = None
89-
self.df.difftest_init()
89+
self.df.difftest_init(False, self.mem_size)
9090
self.difftest_stat = df.GetDifftest(0).dut
9191
self.difftest_flash = df.GetFlash()
9292
self.register_map = OrderedDict()
@@ -101,17 +101,17 @@ def __init__(self, dut, default_file=None,
101101
def check_is_need_trace(self):
102102
if getattr(self, "__xspdb_need_fast_trace__", False) is True:
103103
setattr(self, "__xspdb_need_fast_trace__" ,False)
104-
info("Force set trace")
104+
info("Force set trace")
105105
self.set_trace()
106106
if self.interrupt is True:
107107
if getattr(self, "__xspdb_set_traced__", None) is None:
108-
self.setattr(self, "__xspdb_set_traced__", True)
108+
self.setattr(self, "__xspdb_set_traced__", True)
109109
info("Find interrupt, set trace")
110110
self.set_trace()
111111
return False
112112

113113
def __init_pdb(self, args):
114-
if args.log:
114+
if args.log:
115115
self.api_log_enable_log(True)
116116
if args.log_file:
117117
self.api_log_set_log_file(args.log_file)

0 commit comments

Comments
 (0)