aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/mem.cc
diff options
context:
space:
mode:
authorMarcelina Koƛcielnicka <mwk@0x04.net>2021-06-01 01:48:35 +0200
committerMarcelina Koƛcielnicka <mwk@0x04.net>2021-06-01 03:18:02 +0200
commit6d5d8457883e5de8df58997d95373d3433b781bf (patch)
tree39c7b75417a8266281ac90335f919f15ff63b26d /kernel/mem.cc
parent13b901bf1c5ac7d25ea061fc129d944ea0317150 (diff)
downloadyosys-6d5d8457883e5de8df58997d95373d3433b781bf.tar.gz
yosys-6d5d8457883e5de8df58997d95373d3433b781bf.tar.bz2
yosys-6d5d8457883e5de8df58997d95373d3433b781bf.zip
kernel/mem: Recognize some deprecated memory port configs.
Transparency is meaningless for asynchronous ports, so we assume transparent == false to simplify the code in this case. Likewise, enable is meaningless, and we assume it is const-1. However, turns out that nMigen emits the former, and Verilog frontend emits the latter, so squash these issues when ingesting a $memrd cell. Fixes #2811.
Diffstat (limited to 'kernel/mem.cc')
-rw-r--r--kernel/mem.cc10
1 files changed, 10 insertions, 0 deletions
diff --git a/kernel/mem.cc b/kernel/mem.cc
index 848dc9f3a..82942d9be 100644
--- a/kernel/mem.cc
+++ b/kernel/mem.cc
@@ -291,6 +291,7 @@ void Mem::check() {
log_assert(GetSize(port.srst_value) == (width << port.wide_log2));
if (!port.clk_enable) {
log_assert(!port.transparent);
+ log_assert(port.en == State::S1);
log_assert(port.arst == State::S0);
log_assert(port.srst == State::S0);
}
@@ -370,6 +371,15 @@ namespace {
mrd.init_value = Const(State::Sx, mem->width << mrd.wide_log2);
mrd.srst = State::S0;
mrd.arst = State::S0;
+ if (!mrd.clk_enable) {
+ // Fix some patterns that we'll allow for backwards compatibility,
+ // but don't want to see moving forwards: async transparent
+ // ports (inherently meaningless) and async ports without
+ // const 1 tied to EN bit (which may mean a latch in the future).
+ mrd.transparent = false;
+ if (mrd.en == State::Sx)
+ mrd.en = State::S1;
+ }
res.rd_ports.push_back(mrd);
}
}