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: e5b170f02d7e
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: b93df693a48f
Choose a head ref
  • 3 commits
  • 5 files changed
  • 1 contributor

Commits on Apr 23, 2015

  1. doc: fix warnings during doc build

    fallen authored and sbourdeauducq committed Apr 23, 2015

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2f45d46 View commit details
  2. Add conda recipe for Migen

    fallen authored and sbourdeauducq committed Apr 23, 2015
    Copy the full SHA
    7280bdb View commit details
  3. Copy the full SHA
    b93df69 View commit details
Showing with 105 additions and 57 deletions.
  1. +21 −0 .travis.yml
  2. +1 −0 conda/migen/bld.bat
  3. +26 −0 conda/migen/meta.yaml
  4. +6 −6 doc/api.rst
  5. +51 −51 doc/fhdl.rst
21 changes: 21 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -2,6 +2,16 @@ language: python
python:
- "3.4"

env:
global:
- PATH=$HOME/miniconda/bin:$PATH

before_install:
# Install Miniconda
- wget https://raw.githubusercontent.com/m-labs/artiq/master/.travis/get-anaconda.sh
- chmod +x get-anaconda.sh
- ./get-anaconda.sh binstar numpydoc
- source $HOME/miniconda/bin/activate py34
install:
# Install iverilog package.
- "sudo add-apt-repository -y ppa:mithro/iverilog-backport"
@@ -13,9 +23,20 @@ install:
# Install verilator package
- "sudo apt-get install verilator"
- "verilator --version; true"
# Build and install Migen conda package
- "conda build conda/migen"
- "conda install $HOME/miniconda/conda-bld/linux-64/migen-*.tar.bz2"

script:
# Run tests
- "python setup.py test"
# Generate HTML documentation
- "make -C doc html"

after_success:
# Upload Migen conda package to binstar
- binstar login --hostname $(hostname) --username $binstar_login --password $binstar_password
- binstar upload --user $binstar_login --channel dev --force $HOME/miniconda/conda-bld/linux-64/migen-*.tar.bz2

notifications:
email: false
1 change: 1 addition & 0 deletions conda/migen/bld.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
%PYTHON% setup.py install
26 changes: 26 additions & 0 deletions conda/migen/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package:
name: migen
version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}

source:
git_url: https://github.com/m-labs/migen
git_tag: master

build:
number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
script: $PYTHON setup.py install

requirements:
build:
- python
run:
- python

test:
imports:
- migen

about:
home: http://m-labs.hk/gateware.html
license: 3-clause BSD
summary: 'A Python toolbox for building complex digital hardware'
12 changes: 6 additions & 6 deletions doc/api.rst
Original file line number Diff line number Diff line change
@@ -2,42 +2,42 @@ migen API Documentation
=======================

:mod:`fhdl.structure` Module
------------------------------
----------------------------

.. automodule:: migen.fhdl.structure
:members:
:show-inheritance:

:mod:`fhdl.bitcontainer` Module
------------------------------
-------------------------------

.. automodule:: migen.fhdl.bitcontainer
:members:
:show-inheritance:

:mod:`genlib.fifo` Module
------------------------------
-------------------------

.. automodule:: migen.genlib.fifo
:members:
:show-inheritance:

:mod:`genlib.coding` Module
------------------------------
---------------------------

.. automodule:: migen.genlib.coding
:members:
:show-inheritance:

:mod:`genlib.cordic` Module
------------------------------
---------------------------

.. automodule:: migen.genlib.cordic
:members:
:show-inheritance:

:mod:`genlib.sort` Module
------------------------------
-------------------------

.. automodule:: migen.genlib.sort
:members:
102 changes: 51 additions & 51 deletions doc/fhdl.rst
Original file line number Diff line number Diff line change
@@ -260,57 +260,57 @@ Summary of special attributes

.. table:: Summary of special attributes

+--------------------------------------------+--------------------------------------------------------------+
| Syntax | Action |
+============================================+==============================================================+
| self.comb += stmt | Add combinatorial statement to current module. |
+--------------------------------------------+--------------------------------------------------------------+
| self.comb += stmtA, stmtB | Add combinatorial statements A and B to current module. |
| | |
| self.comb += [stmtA, stmtB] | |
+--------------------------------------------+--------------------------------------------------------------+
| self.sync += stmt | Add synchronous statement to current module, in default |
| | clock domain sys. |
+--------------------------------------------+--------------------------------------------------------------+
| self.sync.foo += stmt | Add synchronous statement to current module, in clock domain |
| | foo. |
+--------------------------------------------+--------------------------------------------------------------+
| self.sync.foo += stmtA, stmtB | Add synchronous statements A and B to current module, in |
| | clock domain foo. |
| self.sync.foo += [stmtA, stmtB] | |
+--------------------------------------------+--------------------------------------------------------------+
| self.submodules += mod | Add anonymous submodule to current module. |
+--------------------------------------------+--------------------------------------------------------------+
| self.submodules += modA, modB | Add anonymous submodules A and B to current module. |
| | |
| self.submodules += [modA, modB] | |
+--------------------------------------------+--------------------------------------------------------------+
| self.submodules.bar = mod | Add submodule named bar to current module. The submodule can |
| | then be accessed using self.bar. |
+--------------------------------------------+--------------------------------------------------------------+
| self.specials += spe | Add anonymous special to current module. |
+--------------------------------------------+--------------------------------------------------------------+
| self.specials += speA, speB | Add anonymous specials A and B to current module. |
| | |
| self.specials += [speA, speB] | |
+--------------------------------------------+--------------------------------------------------------------+
| self.specials.bar = spe | Add special named bar to current module. The special can |
| | then be accessed using self.bar. |
+--------------------------------------------+--------------------------------------------------------------+
| self.clock_domains += cd | Add clock domain to current module. |
+--------------------------------------------+--------------------------------------------------------------+
| self.clock_domains += cdA, cdB | Add clock domains A and B to current module. |
| | |
| self.clock_domains += [cdA, cdB] | |
+--------------------------------------------+--------------------------------------------------------------+
| self.clock_domains.pix = ClockDomain() | Create and add clock domain pix to current module. The clock |
| | domain name is pix in all cases. It can be accessed using |
| self.clock_domains._pix = ClockDomain() | self.pix, self._pix, self.cd_pix and self._cd_pix, |
| | respectively. |
| self.clock_domains.cd_pix = ClockDomain() | |
| | |
| self.clock_domains._cd_pix = ClockDomain() | |
+--------------------------------------------+--------------------------------------------------------------+
+--------------------------------------------+--------------------------------------------------------------+
| Syntax | Action |
+============================================+==============================================================+
| self.comb += stmt | Add combinatorial statement to current module. |
+--------------------------------------------+--------------------------------------------------------------+
| self.comb += stmtA, stmtB | Add combinatorial statements A and B to current module. |
| | |
| self.comb += [stmtA, stmtB] | |
+--------------------------------------------+--------------------------------------------------------------+
| self.sync += stmt | Add synchronous statement to current module, in default |
| | clock domain sys. |
+--------------------------------------------+--------------------------------------------------------------+
| self.sync.foo += stmt | Add synchronous statement to current module, in clock domain |
| | foo. |
+--------------------------------------------+--------------------------------------------------------------+
| self.sync.foo += stmtA, stmtB | Add synchronous statements A and B to current module, in |
| | clock domain foo. |
| self.sync.foo += [stmtA, stmtB] | |
+--------------------------------------------+--------------------------------------------------------------+
| self.submodules += mod | Add anonymous submodule to current module. |
+--------------------------------------------+--------------------------------------------------------------+
| self.submodules += modA, modB | Add anonymous submodules A and B to current module. |
| | |
| self.submodules += [modA, modB] | |
+--------------------------------------------+--------------------------------------------------------------+
| self.submodules.bar = mod | Add submodule named bar to current module. The submodule can |
| | then be accessed using self.bar. |
+--------------------------------------------+--------------------------------------------------------------+
| self.specials += spe | Add anonymous special to current module. |
+--------------------------------------------+--------------------------------------------------------------+
| self.specials += speA, speB | Add anonymous specials A and B to current module. |
| | |
| self.specials += [speA, speB] | |
+--------------------------------------------+--------------------------------------------------------------+
| self.specials.bar = spe | Add special named bar to current module. The special can |
| | then be accessed using self.bar. |
+--------------------------------------------+--------------------------------------------------------------+
| self.clock_domains += cd | Add clock domain to current module. |
+--------------------------------------------+--------------------------------------------------------------+
| self.clock_domains += cdA, cdB | Add clock domains A and B to current module. |
| | |
| self.clock_domains += [cdA, cdB] | |
+--------------------------------------------+--------------------------------------------------------------+
| self.clock_domains.pix = ClockDomain() | Create and add clock domain pix to current module. The clock |
| | domain name is pix in all cases. It can be accessed using |
| self.clock_domains._pix = ClockDomain() | self.pix, self._pix, self.cd_pix and self._cd_pix, |
| | respectively. |
| self.clock_domains.cd_pix = ClockDomain() | |
| | |
| self.clock_domains._cd_pix = ClockDomain() | |
+--------------------------------------------+--------------------------------------------------------------+

Clock domain management
=======================