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: 808cf06add64
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: 09003a55e153
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 26, 2015

  1. fhdl/structure: relax type requirements for Array elements

    @sbourdeauducq
    sbourdeauducq committed Sep 26, 2015
    Copy the full SHA
    e136352 View commit details

  2. fhdl/specials/Tristate: handle i=None

    @sbourdeauducq
    sbourdeauducq committed Sep 26, 2015
    Copy the full SHA
    09003a5 View commit details
Showing with 3 additions and 5 deletions.
  1. +3 −2 migen/fhdl/specials.py
  2. +0 −3 migen/fhdl/structure.py
5 changes: 3 additions & 2 deletions migen/fhdl/specials.py
View file
Original file line number Diff line number Diff line change
@@ -44,15 +44,16 @@ def __init__(self, target, o, oe, i=None):
self.target = wrap(target)
self.o = wrap(o)
self.oe = wrap(oe)
self.i = wrap(i)
self.i = wrap(i) if i is not None else None

def iter_expressions(self):
for attr, target_context in [
("target", SPECIAL_INOUT),
("o", SPECIAL_INPUT),
("oe", SPECIAL_INPUT),
("i", SPECIAL_OUTPUT)]:
yield self, attr, target_context
if getattr(self, attr) is not None:
yield self, attr, target_context

@staticmethod
def emit_verilog(tristate, ns, add_data_file):
3 changes: 0 additions & 3 deletions migen/fhdl/structure.py
View file
Original file line number Diff line number Diff line change
@@ -560,9 +560,6 @@ def __init__(self, choices, key):
for c in choices:
if isinstance(c, (bool, int)):
c = Constant(c)
if not isinstance(c, (_Value, Array)):
raise TypeError("Array element is not a Migen value: {}"
.format(c))
self.choices.append(c)
self.key = key