[debug] Support mcontrol and mcontrol6 based on HwbpManual

* support mcontrol6 in HwbpManual
* test non-zero maskmax is supported for mcontrol

Author: lz-bro

debug/gdbserver.py

@@ -651,12 +651,16 @@ def test(self):
         self.gdb.b("_exit")
         self.exit()
 
-def MCONTROL_TYPE(xlen):
+def TDATA1_TYPE(xlen):
     return 0xf<<((xlen)-4)
-def MCONTROL_DMODE(xlen):
+def TDATA1_DMODE(xlen):
     return 1<<((xlen)-5)
 def MCONTROL_MASKMAX(xlen):
-    return 0x3<<((xlen)-11)
+    return 0x3f<<((xlen)-11)
+
+TDATA1_TYPE_NONE = 0
+TDATA1_TYPE_MATCH = 2
+TDATA1_TYPE_MATCH6 = 6
 
 MCONTROL_SELECT = 1<<19
 MCONTROL_TIMING = 1<<18
@@ -671,9 +675,6 @@ def MCONTROL_MASKMAX(xlen):
 MCONTROL_STORE = 1<<1
 MCONTROL_LOAD = 1<<0
 
-MCONTROL_TYPE_NONE = 0
-MCONTROL_TYPE_MATCH = 2
-
 MCONTROL_ACTION_DEBUG_EXCEPTION = 0
 MCONTROL_ACTION_DEBUG_MODE = 1
 MCONTROL_ACTION_TRACE_START = 2
@@ -687,6 +688,37 @@ def MCONTROL_MASKMAX(xlen):
 MCONTROL_MATCH_MASK_LOW = 4
 MCONTROL_MATCH_MASK_HIGH = 5
 
+MCONTROL6_UNCERTAIN = 1<<26
+MCONTROL6_HIT1 = 1<<25
+MCONTROL6_VS = 1<<24
+MCONTROL6_VU = 1<<23
+MCONTROL6_HIT0 = 1<<22
+MCONTROL6_SELECT = 1<<21
+MCONTROL6_SIZE = 0x7<<16
+MCONTROL6_ACTION = 0xf<<12
+MCONTROL6_CHAIN = 1<<11
+MCONTROL6_MATCH = 0xf<<7
+MCONTROL6_M = 1<<6
+MCONTROL6_UNCERTAINEN = 1<<5
+MCONTROL6_S = 1<<4
+MCONTROL6_U = 1<<3
+MCONTROL6_EXECUTE = 1<<2
+MCONTROL6_STORE = 1<<1
+MCONTROL6_LOAD = 1<<0
+
+MCONTROL6_ACTION_DEBUG_EXCEPTION = 0
+MCONTROL6_ACTION_DEBUG_MODE = 1
+MCONTROL6_ACTION_TRACE_START = 2
+MCONTROL6_ACTION_TRACE_STOP = 3
+MCONTROL6_ACTION_TRACE_EMIT = 4
+
+MCONTROL6_MATCH_EQUAL = 0
+MCONTROL6_MATCH_NAPOT = 1
+MCONTROL6_MATCH_GE = 2
+MCONTROL6_MATCH_LT = 3
+MCONTROL6_MATCH_MASK_LOW = 4
+MCONTROL6_MATCH_MASK_HIGH = 5
+
 def set_field(reg, mask, val):
     return ((reg) & ~(mask)) | (((val) * ((mask) & ~((mask) << 1))) & (mask))
 
@@ -707,7 +739,7 @@ def check_reserve_trigger_support(self):
                     not_supp_msg + "}").splitlines():
             raise TestNotApplicable
 
-    def set_manual_trigger(self, tdata1, tdata2):
+    def set_manual_trigger(self, tdata1, tdata2, maskmax_mask):
         for tselect in itertools.count(0):
             self.gdb.p(f"$tselect={tselect}")
             if self.gdb.p("$tselect") != tselect:
@@ -724,21 +756,23 @@ def set_manual_trigger(self, tdata1, tdata2):
 
             tdata2_rb = self.gdb.p("$tdata2")
             tdata1_rb = self.gdb.p("$tdata1")
-            if tdata1_rb == tdata1 and tdata2_rb == tdata2:
-                return tselect
 
-            type_rb = tdata1_rb & MCONTROL_TYPE(self.hart.xlen)
-            type_none = set_field(0, MCONTROL_TYPE(self.hart.xlen),
-                                  MCONTROL_TYPE_NONE)
+            type_rb = tdata1_rb & TDATA1_TYPE(self.hart.xlen)
+            type_none = set_field(0, TDATA1_TYPE(self.hart.xlen),
+                                  TDATA1_TYPE_NONE)
             if type_rb == type_none:
                 raise TestNotApplicable
 
+            tdata1 = set_field(tdata1, maskmax_mask, tdata1_rb & maskmax_mask)
+            if tdata1_rb == tdata1 and tdata2_rb == tdata2:
+                return tselect
+
             self.gdb.p("$tdata1=0")
             self.gdb.command(
                     f"monitor riscv reserve_trigger {tselect} off")
         assert False
 
-    def test(self):
+    def run_test(self, tdata1, maskmax_mask):
         if not self.hart.honors_tdata1_dmode:
             # Run to main before setting the breakpoint, because startup code
             # will otherwise clear the trigger that we set.
@@ -753,20 +787,10 @@ def test(self):
         self.check_reserve_trigger_support()
 
         #self.gdb.hbreak("rot13")
-        tdata1 = MCONTROL_DMODE(self.hart.xlen)
-        tdata1 = set_field(tdata1, MCONTROL_TYPE(self.hart.xlen),
-                           MCONTROL_TYPE_MATCH)
-        tdata1 = set_field(tdata1, MCONTROL_ACTION, MCONTROL_ACTION_DEBUG_MODE)
-        tdata1 = set_field(tdata1, MCONTROL_MATCH, MCONTROL_MATCH_EQUAL)
-        tdata1 |= MCONTROL_M | MCONTROL_EXECUTE
-        if self.hart.extensionSupported("S"):
-            tdata1 |= MCONTROL_S
-        if self.hart.extensionSupported("U"):
-            tdata1 |= MCONTROL_U
 
         tdata2 = self.gdb.p("&rot13")
 
-        tselect = self.set_manual_trigger(tdata1, tdata2)
+        tselect = self.set_manual_trigger(tdata1, tdata2, maskmax_mask)
 
         # The breakpoint should be hit exactly 2 times.
         for _ in range(2):
@@ -802,6 +826,39 @@ def test(self):
         self.gdb.b("_exit")
         self.exit()
 
+class McontrolManual(HwbpManual):
+    def test(self):
+        if not self.target.support_mcontrol:
+            raise TestNotApplicable
+
+        tdata1 = TDATA1_DMODE(self.hart.xlen)
+        tdata1 = set_field(tdata1, TDATA1_TYPE(self.hart.xlen),
+                           TDATA1_TYPE_MATCH)
+        tdata1 = set_field(tdata1, MCONTROL_ACTION, MCONTROL_ACTION_DEBUG_MODE)
+        tdata1 = set_field(tdata1, MCONTROL_MATCH, MCONTROL_MATCH_EQUAL)
+        tdata1 |= MCONTROL_M | MCONTROL_EXECUTE
+        if self.hart.extensionSupported("S"):
+            tdata1 |= MCONTROL_S
+        if self.hart.extensionSupported("U"):
+            tdata1 |= MCONTROL_U
+        self.run_test(tdata1, MCONTROL_MASKMAX(self.hart.xlen))
+
+class Mcontrol6Manual(HwbpManual):
+    def test(self):
+        if not self.target.support_mcontrol6:
+            raise TestNotApplicable
+
+        tdata1 = TDATA1_DMODE(self.hart.xlen)
+        tdata1 = set_field(tdata1, TDATA1_TYPE(self.hart.xlen),
+                           TDATA1_TYPE_MATCH6)
+        tdata1 = set_field(tdata1, MCONTROL6_ACTION, MCONTROL6_ACTION_DEBUG_MODE)
+        tdata1 = set_field(tdata1, MCONTROL6_MATCH, MCONTROL6_MATCH_EQUAL)
+        tdata1 |= MCONTROL6_M | MCONTROL6_EXECUTE
+        if self.hart.extensionSupported("S"):
+            tdata1 |= MCONTROL6_S
+        if self.hart.extensionSupported("U"):
+            tdata1 |= MCONTROL6_U
+        self.run_test(tdata1, 0)
 
 class Hwbp2(DebugTest):
     def early_applicable(self):