aboutsummaryrefslogtreecommitdiff
path: root/debug
diff options
context:
space:
mode:
authorTim Newsome <tim@sifive.com>2018-10-24 16:39:18 -0700
committerTim Newsome <tim@sifive.com>2018-10-24 16:39:18 -0700
commitee6c720e4db50b73dd8f45c70a6868b88cd4a8b1 (patch)
tree7b1b34368bf3ba77b6e411bc52fedbfe7a5ab680 /debug
parentacc87e14d9a6e4e6c3f019e79cb5c047162228c1 (diff)
parentcfe78c775598b9d9a77cd4012df025512a62be19 (diff)
downloadriscv-tests-ee6c720e4db50b73dd8f45c70a6868b88cd4a8b1.zip
riscv-tests-ee6c720e4db50b73dd8f45c70a6868b88cd4a8b1.tar.gz
riscv-tests-ee6c720e4db50b73dd8f45c70a6868b88cd4a8b1.tar.bz2
Merge branch 'TriggerLoadAddressInstant'
Diffstat (limited to 'debug')
-rwxr-xr-xdebug/gdbserver.py13
1 files changed, 1 insertions, 12 deletions
diff --git a/debug/gdbserver.py b/debug/gdbserver.py
index e17cf8d..b6e7cf9 100755
--- a/debug/gdbserver.py
+++ b/debug/gdbserver.py
@@ -865,18 +865,7 @@ class TriggerStoreAddressInstant(TriggerTest):
write_loop = self.gdb.p("&write_loop")
data = self.gdb.p("&data")
self.gdb.command("watch *0x%x" % data)
- output = self.gdb.c()
- if "_exit (status=0)" in output:
- # We ran to _exit. It looks as if we didn't hit the trigger at all.
- # However this can be "correct" behavior. gdb's definition of
- # "watch" is to run until the value in memory changes. To do this
- # it reads the memory value when the trigger is set, and then when
- # the halt happens. Because our triggers can fire just before the
- # write happens, when gdb does this check the memory hasn't
- # changed. So it silently resumes running.
- # https://github.com/riscv/riscv-openocd/issues/295 tracks this
- # problem. Until it's fixed, we're going to allow running to _exit.
- return
+ self.gdb.c()
# Accept hitting the breakpoint before or after the store instruction.
assertIn(self.gdb.p("$pc"), [write_loop, write_loop + 4])