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: 1ac783fd0c81
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: 9a6fdea3d2f9
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 28, 2017

  1. Signal.like(): inherit only if similar

    @jordens
    jordens committed Jun 28, 2017
    Copy the full SHA
    45c6410 View commit details

  2. ise: fix attribute dropping

    @jordens
    jordens committed Jun 28, 2017
    Copy the full SHA
    9a6fdea View commit details
Showing with 6 additions and 4 deletions.
  1. +1 −1 migen/build/xilinx/ise.py
  2. +5 −3 migen/fhdl/structure.py
2 changes: 1 addition & 1 deletion migen/build/xilinx/ise.py
View file
Original file line number Diff line number Diff line change
@@ -130,7 +130,7 @@ class XilinxISEToolchain:
"no_retiming": ("register_balancing", "no"),
"async_reg": None,
"ars_ff": None,
"ars_meta": None,
"ars_false_path": None,
"no_shreg_extract": ("shreg_extract", "no")
}

8 changes: 5 additions & 3 deletions migen/fhdl/structure.py
View file
Original file line number Diff line number Diff line change
@@ -383,9 +383,11 @@ def like(cls, other, **kwargs):
See `migen.fhdl.bitcontainer.value_bits_sign` for details.
"""
from migen.fhdl.bitcontainer import value_bits_sign
kw = dict(bits_sign=value_bits_sign(other), variable=other.variable,
reset=other.reset.value, reset_less=other.reset_less,
related=other.related, attr=set(other.attr))
kw = dict(bits_sign=value_bits_sign(other))
if isinstance(other, cls):
kw.update(variable=other.variable,
reset=other.reset.value, reset_less=other.reset_less,
related=other.related, attr=set(other.attr))
kw.update(kwargs)
return cls(**kw)