From 34c69db14aced5ce010666b3b1e538d967a9fe3e Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 7 Jan 2012 21:21:46 +0100 Subject: [PATCH] endpoint: add _i/_o suffix on signal names --- migen/fhdl/structure.py | 21 +++++++++++---------- migen/flow/actor.py | 9 ++++++--- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/migen/fhdl/structure.py b/migen/fhdl/structure.py index 532098ddb..90b6e416e 100644 --- a/migen/fhdl/structure.py +++ b/migen/fhdl/structure.py @@ -152,16 +152,17 @@ def _try_module_name(frame): else: return None -def _make_signal_name(): +def _make_signal_name(name=None): frame = inspect.currentframe().f_back.f_back - line = inspect.getframeinfo(frame).code_context[0] - m = re.match('[\t ]*([0-9A-Za-z_\.]+)[\t ]*=', line) - if m is None: - name = "anonymous" - else: - names = m.group(1).split('.') - name = names[len(names)-1] + if name is None: + line = inspect.getframeinfo(frame).code_context[0] + m = re.match('[\t ]*([0-9A-Za-z_\.]+)[\t ]*=', line) + if m is None: + name = "anonymous" + else: + names = m.group(1).split('.') + name = names[len(names)-1] prefix = _try_class_name(frame) if prefix is None: @@ -174,12 +175,12 @@ def _make_signal_name(): return prefix + name class Signal(Value): - def __init__(self, bv=BV(), name=None, variable=False, reset=0): + def __init__(self, bv=BV(), name=None, variable=False, reset=0, namer=None): self.bv = bv self.variable = variable self.name = name if self.name is None: - self.name = _make_signal_name() + self.name = _make_signal_name(namer) self.reset = Constant(reset, bv) def __hash__(self): diff --git a/migen/flow/actor.py b/migen/flow/actor.py index 15eb512f9..6110c406d 100644 --- a/migen/flow/actor.py +++ b/migen/flow/actor.py @@ -22,9 +22,12 @@ class SchedulingModel: class Endpoint: def __init__(self, token): self.token = token - self.stb = Signal() - self.ack = Signal() - + if isinstance(self, Sink): + self.stb = Signal(namer="stb_i") + self.ack = Signal(namer="ack_o") + else: + self.stb = Signal(namer="stb_o") + self.ack = Signal(namer="ack_i") def __hash__(self): return id(self)