Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/migen
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6ce856290a8d
Choose a base ref
...
head repository: m-labs/migen
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 746acdacd1a9
Choose a head ref
  • 2 commits
  • 5 files changed
  • 1 contributor

Commits on Apr 10, 2013

  1. uio: remove Trampoline (Python 3.3 provides generator delegation inst…

    …ead)
    Sebastien Bourdeauducq committed Apr 10, 2013
    Copy the full SHA
    1cc4c8e View commit details
  2. ioo: move to genlib

    Sebastien Bourdeauducq committed Apr 10, 2013
    Copy the full SHA
    746acda View commit details
Showing with 3 additions and 27 deletions.
  1. +1 −1 examples/pytholite/uio.py
  2. +1 −2 migen/{uio → genlib}/ioo.py
  3. +1 −1 migen/pytholite/io.py
  4. 0 migen/uio/__init__.py
  5. +0 −23 migen/uio/trampoline.py
2 changes: 1 addition & 1 deletion examples/pytholite/uio.py
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
from migen.actorlib.sim import Dumper
from migen.bus import wishbone
from migen.bus.transactions import *
from migen.uio.ioo import UnifiedIOSimulation
from migen.genlib.ioo import UnifiedIOSimulation
from migen.pytholite.transel import Register
from migen.pytholite.compiler import make_pytholite
from migen.sim.generic import Simulator
3 changes: 1 addition & 2 deletions migen/uio/ioo.py → migen/genlib/ioo.py
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@
from migen.actorlib.sim import TokenExchanger
from migen.bus import wishbone, memory
from migen.bus.transactions import *
from migen.uio.trampoline import Trampoline

class UnifiedIOObject(Module):
def __init__(self, dataflow=None, buses={}):
@@ -20,7 +19,7 @@ def __init__(self, dataflow=None, buses={}):

class UnifiedIOSimulation(UnifiedIOObject):
def __init__(self, generator, dataflow=None, buses={}):
self.generator = Trampoline(generator)
self.generator = generator
UnifiedIOObject.__init__(self, dataflow, buses)

callers = []
2 changes: 1 addition & 1 deletion migen/pytholite/io.py
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@

from migen.fhdl.structure import *
from migen.fhdl.specials import Memory
from migen.uio.ioo import UnifiedIOObject
from migen.genlib.ioo import UnifiedIOObject
from migen.flow.actor import Source, Sink
from migen.flow.transactions import *
from migen.bus import wishbone
Empty file removed migen/uio/__init__.py
Empty file.
23 changes: 0 additions & 23 deletions migen/uio/trampoline.py

This file was deleted.