From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Tue, 7 Jul 2020 15:11:40 +0000 (+0100)
Subject: whoops got Function.NONE test wrong in PowerDecode2
X-Git-Tag: div_pipeline~162^2~6
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fb10af90d67e4a88adaf11830eb88b5cbe4818ab;p=soc.git

whoops got Function.NONE test wrong in PowerDecode2
---

diff --git a/src/soc/decoder/power_decoder2.py b/src/soc/decoder/power_decoder2.py
index 4f814cf7..612a44d8 100644
--- a/src/soc/decoder/power_decoder2.py
+++ b/src/soc/decoder/power_decoder2.py
@@ -588,11 +588,11 @@ class PowerDecode2(Elaboratable):
         # set up instruction, pick fn unit
         comb += e.nia.eq(0)    # XXX TODO (or remove? not sure yet)
         fu = op.function_unit
-        with m.If((fu == Function.NONE) |
-                   (op.internal_op == InternalOp.OP_ATTN)):
-            comb += do.insn_type.eq(op.internal_op)
-        with m.Else():
+        with m.If((fu == Function.NONE) &
+                   (op.internal_op != InternalOp.OP_ATTN)):
             comb += do.insn_type.eq(InternalOp.OP_ILLEGAL)
+        with m.Else():
+            comb += do.insn_type.eq(op.internal_op)
         comb += do.fn_unit.eq(fu)
 
         # registers a, b, c and out and out2 (LD/ST EA)