From: Tommy Thorn <tommy-github-email@thorn.ws>
Date: Thu, 6 Sep 2018 18:07:42 +0000 (-0700)
Subject: breakpoint.S: Don't assume trigger is hardwired to breakpoint (#158) (#159)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=901a2694d5384e4ef9af8e4fb0c9a07eb24d0028;p=riscv-tests.git

breakpoint.S: Don't assume trigger is hardwired to breakpoint (#158) (#159)
---

diff --git a/isa/rv64mi/breakpoint.S b/isa/rv64mi/breakpoint.S
index 647430b..df415a1 100644
--- a/isa/rv64mi/breakpoint.S
+++ b/isa/rv64mi/breakpoint.S
@@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN
 
   la a2, 1f
   csrw tdata2, a2
-  li a0, MCONTROL_M | MCONTROL_EXECUTE
+  li a0, (2 << (__riscv_xlen - 4)) | MCONTROL_M | MCONTROL_EXECUTE
   csrw tdata1, a0
   # Skip if breakpoint type is unsupported.
   csrr a1, tdata1