From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Tue, 4 Dec 2018 20:06:51 +0000 (+0100)
Subject: gen: integrate migen changes
X-Git-Tag: 24jan2021_ls180~1450
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bf3b4eec34836f8d64e2fd0d95dff14dab257a62;p=litex.git

gen: integrate migen changes
---

diff --git a/litex/gen/fhdl/verilog.py b/litex/gen/fhdl/verilog.py
index 07efc011..9f3d1b67 100644
--- a/litex/gen/fhdl/verilog.py
+++ b/litex/gen/fhdl/verilog.py
@@ -377,8 +377,8 @@ def convert(f, ios=None, name="top",
     f = lower_complex_slices(f)
     insert_resets(f)
     f = lower_basics(f)
-    fs, lowered_specials = lower_specials(special_overrides, f.specials)
-    f += lower_basics(fs)
+    f, lowered_specials = lower_specials(special_overrides, f)
+    f = lower_basics(f)
 
     for io in sorted(ios, key=lambda x: x.duid):
         if io.name_override is None:
diff --git a/litex/gen/sim/core.py b/litex/gen/sim/core.py
index 2ba0cebc..3aca202b 100644
--- a/litex/gen/sim/core.py
+++ b/litex/gen/sim/core.py
@@ -250,9 +250,7 @@ class Simulator:
 
         overrides = {AsyncResetSynchronizer: DummyAsyncResetSynchronizer}
         overrides.update(special_overrides)
-        fs, lowered = lower_specials(overrides=overrides, specials=self.fragment.specials)
-        self.fragment += fs
-        self.fragment.specials -= lowered
+        f, lowered = lower_specials(overrides, self.fragment)
         if self.fragment.specials:
             raise ValueError("Could not lower all specials", self.fragment.specials)