From 318274d5a02a03ac0188bd4fa75251dd7c03e334 Mon Sep 17 00:00:00 2001 From: whitequark Date: Sun, 15 Dec 2019 11:46:14 +0000 Subject: [PATCH] hdl.mem: fix src_loc_at in ReadPort, WritePort. --- nmigen/hdl/mem.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nmigen/hdl/mem.py b/nmigen/hdl/mem.py index 93d5d16..230bfa6 100644 --- a/nmigen/hdl/mem.py +++ b/nmigen/hdl/mem.py @@ -74,9 +74,9 @@ class ReadPort(Elaboratable): self.transparent = transparent self.addr = Signal(range(memory.depth), - name="{}_r_addr".format(memory.name), src_loc_at=2 + src_loc_at) + name="{}_r_addr".format(memory.name), src_loc_at=1 + src_loc_at) self.data = Signal(memory.width, - name="{}_r_data".format(memory.name), src_loc_at=2 + src_loc_at) + name="{}_r_data".format(memory.name), src_loc_at=1 + src_loc_at) if self.domain != "comb" and not transparent: self.en = Signal(name="{}_r_en".format(memory.name), reset=1, src_loc_at=2 + src_loc_at) @@ -151,11 +151,11 @@ class WritePort(Elaboratable): self.granularity = granularity self.addr = Signal(range(memory.depth), - name="{}_w_addr".format(memory.name), src_loc_at=2 + src_loc_at) + name="{}_w_addr".format(memory.name), src_loc_at=1 + src_loc_at) self.data = Signal(memory.width, - name="{}_w_data".format(memory.name), src_loc_at=2 + src_loc_at) + name="{}_w_data".format(memory.name), src_loc_at=1 + src_loc_at) self.en = Signal(memory.width // granularity, - name="{}_w_en".format(memory.name), src_loc_at=2 + src_loc_at) + name="{}_w_en".format(memory.name), src_loc_at=1 + src_loc_at) def elaborate(self, platform): f = Instance("$memwr", -- 2.30.2