From 714ae43ab8b2e00b17af7376ab012305bef354bc Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Thu, 10 Sep 2015 18:29:57 -0700
Subject: [PATCH] fhdl: remove features new simulator won't use

---
 migen/fhdl/module.py    | 16 +---------------
 migen/fhdl/structure.py | 12 ++----------
 2 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/migen/fhdl/module.py b/migen/fhdl/module.py
index d51cad29e..3c9d558a8 100644
--- a/migen/fhdl/module.py
+++ b/migen/fhdl/module.py
@@ -5,7 +5,6 @@ from migen.util.misc import flat_iteration
 from migen.fhdl.structure import *
 from migen.fhdl.structure import _Fragment
 from migen.fhdl.tools import rename_clock_domain
-from migen.sim.upper import gen_sim, proxy_sim
 
 
 class FinalizeError(Exception):
@@ -118,20 +117,7 @@ class Module:
             self.finalized = False
             return self.finalized
         elif name == "_fragment":
-            simf = None
-            try:
-                simf = self.do_simulation
-            except AttributeError:
-                try:
-                    simg = self.gen_simulation
-                except AttributeError:
-                    pass
-                else:
-                    simf = gen_sim(simg)
-            if simf is not None:
-                simf = proxy_sim(self, simf)
-            sim = [] if simf is None else [simf]
-            self._fragment = _Fragment(sim=sim)
+            self._fragment = _Fragment()
             return self._fragment
         elif name == "_submodules":
             self._submodules = []
diff --git a/migen/fhdl/structure.py b/migen/fhdl/structure.py
index 5547d74c8..d0b302703 100644
--- a/migen/fhdl/structure.py
+++ b/migen/fhdl/structure.py
@@ -572,23 +572,17 @@ class _ClockDomainList(list):
 (SPECIAL_INPUT, SPECIAL_OUTPUT, SPECIAL_INOUT) = range(3)
 
 
-class StopSimulation(Exception):
-    pass
-
-
 class _Fragment:
-    def __init__(self, comb=None, sync=None, specials=None, clock_domains=None, sim=None):
+    def __init__(self, comb=None, sync=None, specials=None, clock_domains=None):
         if comb is None: comb = []
         if sync is None: sync = dict()
         if specials is None: specials = set()
         if clock_domains is None: clock_domains = _ClockDomainList()
-        if sim is None: sim = []
 
         self.comb = comb
         self.sync = sync
         self.specials = specials
         self.clock_domains = _ClockDomainList(clock_domains)
-        self.sim = sim
 
     def __add__(self, other):
         newsync = defaultdict(list)
@@ -598,8 +592,7 @@ class _Fragment:
             newsync[k].extend(v)
         return _Fragment(self.comb + other.comb, newsync,
             self.specials | other.specials,
-            self.clock_domains + other.clock_domains,
-            self.sim + other.sim)
+            self.clock_domains + other.clock_domains)
 
     def __iadd__(self, other):
         newsync = defaultdict(list)
@@ -611,5 +604,4 @@ class _Fragment:
         self.sync = newsync
         self.specials |= other.specials
         self.clock_domains += other.clock_domains
-        self.sim += other.sim
         return self