From fd233d5b3c2e5157febd42bf5c7de4cc622d4cdc Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sun, 24 Jun 2012 19:13:49 +0200 Subject: [PATCH] Move arithmetic actors to actorlib --- examples/dataflow/dma.py | 2 +- examples/dataflow/fibonacci.py | 2 +- migen/{flow => actorlib}/ala.py | 0 migen/{flow => actorlib}/composer.py | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename migen/{flow => actorlib}/ala.py (100%) rename migen/{flow => actorlib}/composer.py (98%) diff --git a/examples/dataflow/dma.py b/examples/dataflow/dma.py index ffc4d9799..6e8c88401 100644 --- a/examples/dataflow/dma.py +++ b/examples/dataflow/dma.py @@ -1,7 +1,7 @@ from random import Random -from migen.flow.ala import * from migen.flow.network import * +from migen.actorlib.ala import * from migen.actorlib import dma_wishbone, dma_asmi from migen.actorlib.sim import * from migen.bus import wishbone, asmibus diff --git a/examples/dataflow/fibonacci.py b/examples/dataflow/fibonacci.py index 709cfe499..e67728bba 100644 --- a/examples/dataflow/fibonacci.py +++ b/examples/dataflow/fibonacci.py @@ -1,6 +1,6 @@ -from migen.flow.ala import * from migen.flow.network import * from migen.flow import plumbing +from migen.actorlib.ala import * from migen.actorlib.sim import * from migen.sim.generic import Simulator from migen.sim.icarus import Runner diff --git a/migen/flow/ala.py b/migen/actorlib/ala.py similarity index 100% rename from migen/flow/ala.py rename to migen/actorlib/ala.py diff --git a/migen/flow/composer.py b/migen/actorlib/composer.py similarity index 98% rename from migen/flow/composer.py rename to migen/actorlib/composer.py index 2c58c9672..683186d1d 100644 --- a/migen/flow/composer.py +++ b/migen/actorlib/composer.py @@ -1,7 +1,7 @@ from migen.flow.actor import * -from migen.flow.ala import * from migen.flow.plumbing import * from migen.flow.network import * +from migen.actorlib.ala import * def _create(a, b, actor_class): assert id(a.dfg) == id(b.dfg)