From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Tue, 5 Mar 2019 11:06:54 +0000 (+0000)
Subject: use binary test rather than comparison against 1,
X-Git-Tag: div_pipeline~2349
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=84e550df1396b75ec30026dd108014adea61e5be;p=soc.git

use binary test rather than comparison against 1,
and invert the if-else, removing the comparator against zero
---

diff --git a/TLB/src/Cam.py b/TLB/src/Cam.py
index 2d1e7828..16a7814b 100644
--- a/TLB/src/Cam.py
+++ b/TLB/src/Cam.py
@@ -68,7 +68,7 @@ class Cam():
 
         # Set the key value for every CamEntry
         for index in range(self.cam_size):
-            with m.If(self.enable == 1):
+            with m.If(self.enable):
 
                 # Read Operation
                 with m.If(self.write_enable == 0):
@@ -87,18 +87,18 @@ class Cam():
                 m.d.comb += self.encoder.i[index].eq(entry_array[index].match)
 
                 # Process out data based on encoder address
-                with m.If(self.encoder.n == 0):
-                    m.d.comb += [
-                        self.single_match.eq(1),
-                        self.match_address.eq(self.encoder.o)
-                    ]
-                with m.Else():
+                with m.If(self.encoder.n):
                     m.d.comb += [
                         self.read_warning.eq(0),
                         self.single_match.eq(0),
                         self.multiple_match.eq(0),
                         self.match_address.eq(0)
                     ]
+                with m.Else():
+                    m.d.comb += [
+                        self.single_match.eq(1),
+                        self.match_address.eq(self.encoder.o)
+                    ]
 
             with m.Else():
                 m.d.comb += [