use PowerDecoderSubsets for FUs, except for TRAP which uses the main one

[soc.git] / src / soc / decoder / power_decoder2.py

diff --git a/src/soc/decoder/power_decoder2.py b/src/soc/decoder/power_decoder2.py
index 57faf239fc3eec81a9fb641344683994b759769a..decdad46c53aa1e2df32911f326a376376c1968e 100644 (file)
--- a/src/soc/decoder/power_decoder2.py
+++ b/src/soc/decoder/power_decoder2.py
@@ -623,7 +623,10 @@ class PowerDecodeSubset(Elaboratable):
         return self.dec.ports() + self.e.ports()
 
     def needs_field(self, field, op_field):
-        do = self.e_tmp.do
+        if self.final:
+            do = self.e.do
+        else:
+            do = self.e_tmp.do
         return hasattr(do, field) and self.op_get(op_field) is not None
 
     def do_copy(self, field, val, final=False):