From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Mon, 8 Jun 2020 22:51:44 +0000 (+0100)
Subject: add traptype and trapaddr to trap_input_data.py
X-Git-Tag: div_pipeline~459
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a5dd715a05d598f9ad01ab5dc51da994a25d55f2;p=soc.git

add traptype and trapaddr to trap_input_data.py
---

diff --git a/src/soc/fu/trap/trap_input_data.py b/src/soc/fu/trap/trap_input_data.py
index 27c2ffad..2a03c42e 100644
--- a/src/soc/fu/trap/trap_input_data.py
+++ b/src/soc/fu/trap/trap_input_data.py
@@ -14,8 +14,8 @@ class CompTrapOpSubset(Record):
         layout = (('insn_type', InternalOp),
                   ('fn_unit', Function),
                   ('insn', 32),
-                  ('read_trap_whole', 1),
-                  ('write_trap_whole', 1),
+                  ('traptype', 4), # see trap main_stage.py and PowerDecoder2
+                  ('trapaddr', 13),
                   )
 
         Record.__init__(self, Layout(layout), name=name)
@@ -24,8 +24,8 @@ class CompTrapOpSubset(Record):
         self.insn_type.reset_less = True
         self.insn.reset_less = True
         self.fn_unit.reset_less = True
-        self.read_trap_whole.reset_less = True
-        self.write_trap_whole.reset_less = True
+        self.traptype.reset_less = True
+        self.trapaddr.reset_less = True
 
     def eq_from_execute1(self, other):
         """ use this to copy in from Decode2Execute1Type
@@ -40,6 +40,6 @@ class CompTrapOpSubset(Record):
         return [self.insn_type,
                 self.insn,
                 self.fn_unit,
-                self.read_trap_whole,
-                self.write_trap_whole,
+                self.traptype,
+                self.trapaddr,
         ]