self.gdb.load()
for hart in self.target.harts:
self.gdb.select_hart(hart)
+ self.gdb.p("$mhartid")
self.gdb.p("$pc=_start")
def test(self):
previous_hart_count = [0 for h in self.target.harts]
previous_interrupt_count = [0 for h in self.target.harts]
- for _ in range(10):
- self.gdb.c(wait=False)
- time.sleep(2)
- self.gdb.interrupt()
- self.gdb.p("$mie")
- self.gdb.p("$mip")
- self.gdb.p("$mstatus")
- self.gdb.p("$priv")
- self.gdb.p("buf", fmt="")
- hart_count = self.gdb.p("hart_count")
- interrupt_count = self.gdb.p("interrupt_count")
- for i, h in enumerate(self.target.harts):
- assertGreater(hart_count[i], previous_hart_count[i])
- assertGreater(interrupt_count[i], previous_interrupt_count[i])
- self.gdb.select_hart(h)
- pc = self.gdb.p("$pc")
- self.gdb.stepi()
- stepped_pc = self.gdb.p("$pc")
- assertNotEqual(pc, stepped_pc)
+ # Check 10 times
+ for i in range(10):
+ # 3 attempts for each time we want the check to pass
+ for attempt in range(3):
+ self.gdb.global_command("echo round %d attempt %d\\n" % (i,
+ attempt))
+ self.gdb.c_all(wait=False)
+ time.sleep(2)
+ self.gdb.interrupt_all()
+ hart_count = self.gdb.p("hart_count")
+ interrupt_count = self.gdb.p("interrupt_count")
+ ok = True
+ for i, h in enumerate(self.target.harts):
+ if hart_count[i] <= previous_hart_count[i]:
+ ok = False
+ break
+ if interrupt_count[i] <= previous_interrupt_count[i]:
+ ok = False
+ break
+ self.gdb.p("$mie")
+ self.gdb.p("$mip")
+ self.gdb.p("$mstatus")
+ self.gdb.p("$priv")
+ self.gdb.p("buf", fmt="")
+ self.gdb.select_hart(h)
+ pc = self.gdb.p("$pc")
+ self.gdb.stepi()
+ stepped_pc = self.gdb.p("$pc")
+ assertNotEqual(pc, stepped_pc)
+ previous_hart_count = hart_count
+ previous_interrupt_count = interrupt_count
+ if ok:
+ break
+ else:
+ assert False, \
+ "hart count or interrupt didn't increment as expected"
class MulticoreRunAllHaltOne(GdbTest):
compile_args = ("programs/multicore.c", "-DMULTICORE")
self.gdb.c()
read_loop = self.gdb.p("&read_loop")
read_again = self.gdb.p("&read_again")
- self.gdb.command("rwatch data")
+ data = self.gdb.p("&data")
+ self.gdb.command("rwatch *0x%x" % data)
self.gdb.c()
# Accept hitting the breakpoint before or after the load instruction.
assertIn(self.gdb.p("$pc"), [read_loop, read_loop + 4])
self.gdb.command("b just_before_write_loop")
self.gdb.c()
write_loop = self.gdb.p("&write_loop")
- self.gdb.command("watch data")
+ data = self.gdb.p("&data")
+ self.gdb.command("watch *0x%x" % data)
self.gdb.c()
# Accept hitting the breakpoint before or after the store instruction.
assertIn(self.gdb.p("$pc"), [write_loop, write_loop + 4])