From afc31db1d093e8427afec750191c65574ddeb1da Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Sun, 5 Aug 2018 20:20:53 +0100 Subject: [PATCH] axi_fastaddr_map becomes class --- src/bsv/peripheral_gen/base.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/bsv/peripheral_gen/base.py b/src/bsv/peripheral_gen/base.py index e96504e..53b5360 100644 --- a/src/bsv/peripheral_gen/base.py +++ b/src/bsv/peripheral_gen/base.py @@ -639,7 +639,7 @@ class PeripheralIface(object): return ('', 0) return self.slow.axi_slave_idx(start, self.ifacename, count, typ) - def axi_fastaddr_map(self, count): + def axi_fastaddr_map(self, name, count): if not self.slow: return '' return self.slow.axi_fastaddr_map(self.ifacename, count) @@ -675,6 +675,7 @@ class PeripheralInterfaces(object): ('_mk_clk_con', MkClkCon, 8), ('mk_ext_ifacedef', MkExtIface, 8), ('axi_addr_map', MkAxiAddrMap, 8), + ('axi_fastaddr_map', MkAxiFastAddrMap, 8), ): fn = CallIfaceFn(self, kls, indent) setattr(self, fname, types.MethodType(fn, self)) @@ -799,15 +800,6 @@ class PeripheralInterfaces(object): return self._axi_num_idx(0, axi_fastslave_declarations, 'fastslave', 'fast', *args) - def axi_fastaddr_map(self, *args): - ret = [] - for (name, count) in self.ifacecount: - for i in range(count): - if self.is_on_fastbus(name, i): - continue - ret.append(self.data[name].axi_fastaddr_map(i)) - return '\n'.join(li(list(filter(None, ret)), 8)) - def mkfast_peripheral(self, *args): ret = [] for (name, count) in self.ifacecount: @@ -971,6 +963,16 @@ class IfaceIter(object): def next(self): return self.__next__() + +class MkAxiFastAddrMap(IfaceIter): + + def check(self, name, i): + return not self.ifaces.is_on_fastbus(name, i) + + def item(self, name, i): + return self.ifaces.data[name].axi_fastaddr_map(name, i) + + class MkAxiAddrMap(IfaceIter): def check(self, name, i): -- 2.30.2