From c1dad9516a8b9b7d3395ef030f6cc3c5679118e8 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Wed, 21 Feb 2024 11:06:15 +0100 Subject: [PATCH] interconnect/wishbone/Remapper: Shift origin when in word mode, fixes unit-test. --- litex/soc/interconnect/wishbone.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/litex/soc/interconnect/wishbone.py b/litex/soc/interconnect/wishbone.py index b92df344a..7b8d28af1 100644 --- a/litex/soc/interconnect/wishbone.py +++ b/litex/soc/interconnect/wishbone.py @@ -152,7 +152,8 @@ class Remapper(Module): size = 2**master.address_width log2_size = int(log2(size)) if master.addressing == "word": - log2_size -= int(log2(len(master.dat_w)//8)) + log2_size -= int(log2(len(master.dat_w)//8)) + origin >>= int(log2(len(master.dat_w)//8)) adr_mask = 2**log2_size - 1 # Apply Address Origin/Mask Remapping. adr_remap = (origin | (master.adr & adr_mask))