Make remaining interrupt conditional predicates single-bit. #54

SystemRDL · Jul 20, 2023 · da8ff4a · da8ff4a
1 parent 18f8f35
commit da8ff4a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/peakrdl_regblock/field_logic/hw_interrupts.py b/src/peakrdl_regblock/field_logic/hw_interrupts.py
@@ -44,7 +44,8 @@ def is_match(self, field: 'FieldNode') -> bool:
         )
 
     def get_predicate(self, field: 'FieldNode') -> str:
-        return self.exp.hwif.get_input_identifier(field)
+        F = self.exp.hwif.get_input_identifier(field)
+        return f"{F} != '0"
 
     def get_assignments(self, field: 'FieldNode') -> List[str]:
         I = self.exp.hwif.get_input_identifier(field)
@@ -69,7 +70,7 @@ def is_match(self, field: 'FieldNode') -> bool:
     def get_predicate(self, field: 'FieldNode') -> str:
         I = self.exp.hwif.get_input_identifier(field)
         Iq = self.exp.field_logic.get_next_q_identifier(field)
-        return f"~{Iq} & {I}"
+        return f"(~{Iq} & {I}) != '0"
 
     def get_assignments(self, field: 'FieldNode') -> List[str]:
         I = self.exp.hwif.get_input_identifier(field)
@@ -95,7 +96,7 @@ def is_match(self, field: 'FieldNode') -> bool:
     def get_predicate(self, field: 'FieldNode') -> str:
         I = self.exp.hwif.get_input_identifier(field)
         Iq = self.exp.field_logic.get_next_q_identifier(field)
-        return f"{Iq} & ~{I}"
+        return f"({Iq} & ~{I}) != '0"
 
     def get_assignments(self, field: 'FieldNode') -> List[str]:
         I = self.exp.hwif.get_input_identifier(field)