bus/asmibus/hub: forward data and tag_call

This commit is contained in:
Sebastien Bourdeauducq 2012-02-14 14:00:17 +01:00
parent 0c214b484e
commit 46b1f74e98
1 changed files with 21 additions and 1 deletions

View File

@ -1,4 +1,5 @@
from migen.fhdl.structure import * from migen.fhdl.structure import *
from migen.corelogic.misc import optree
class FinalizeError(Exception): class FinalizeError(Exception):
pass pass
@ -119,6 +120,12 @@ class Hub:
self.ports = [] self.ports = []
self.finalized = False self.finalized = False
self.call = Signal()
# tag_call is created by finalize()
self.dat_r = Signal(BV(self.dw))
self.dat_w = Signal(BV(self.dw))
self.dat_wm = Signal(BV(self.dw//8))
def get_port(self, nslots=1): def get_port(self, nslots=1):
if self.finalized: if self.finalized:
raise FinalizeError raise FinalizeError
@ -136,6 +143,7 @@ class Hub:
for port in self.ports: for port in self.ports:
port.finalize(tagbits, base) port.finalize(tagbits, base)
base += len(port.slots) base += len(port.slots)
self.tag_call = Signal(BV(tagbits))
def get_slots(self): def get_slots(self):
return sum([port.slots for port in self.ports], []) return sum([port.slots for port in self.ports], [])
@ -143,4 +151,16 @@ class Hub:
def get_fragment(self): def get_fragment(self):
if not self.finalized: if not self.finalized:
raise FinalizeError raise FinalizeError
return sum([port.get_fragment() for port in self.ports], Fragment()) ports = sum([port.get_fragment() for port in self.ports], Fragment())
comb = []
for port in self.ports:
comb += [
port.call.eq(self.call),
port.tag_call.eq(self.tag_call),
port.dat_r.eq(self.dat_r)
]
comb += [
self.dat_w.eq(optree("|", [port.dat_w for port in self.ports])),
self.dat_wm.eq(optree("|", [port.dat_wm for port in self.ports]))
]
return ports + Fragment(comb)