diff options
| author | Eddie Hung <eddieh@ece.ubc.ca> | 2019-04-03 03:36:11 -0700 |
|---|---|---|
| committer | Eddie Hung <eddieh@ece.ubc.ca> | 2019-04-03 03:36:11 -0700 |
| commit | d8465590ac8d66f6f522aae1007d25abb7efd4d5 (patch) | |
| tree | 927878c0ace042920149d72fe0443f569bd5e54c /passes/memory/memory_bram.cc | |
| parent | f9fb05cf6684d855ce2fc776a20cd5552a4ef4a8 (diff) | |
| parent | 721fa1cbd87c52a3adfce260f35fc33a7ae7ac4d (diff) | |
| download | yosys-d8465590ac8d66f6f522aae1007d25abb7efd4d5.tar.gz yosys-d8465590ac8d66f6f522aae1007d25abb7efd4d5.tar.bz2 yosys-d8465590ac8d66f6f522aae1007d25abb7efd4d5.zip | |
Merge remote-tracking branch 'origin/master' into xc7srl
Diffstat (limited to 'passes/memory/memory_bram.cc')
| -rw-r--r-- | passes/memory/memory_bram.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/passes/memory/memory_bram.cc b/passes/memory/memory_bram.cc index c38eabaee..804aa21f9 100644 --- a/passes/memory/memory_bram.cc +++ b/passes/memory/memory_bram.cc @@ -641,6 +641,7 @@ grow_read_ports:; pi.sig_data = SigSpec(); pi.sig_en = SigSpec(); pi.make_outreg = false; + pi.make_transp = false; } new_portinfos.push_back(pi); if (pi.dupidx == dup_count-1) { @@ -956,6 +957,8 @@ grow_read_ports:; SigSpec addr_ok_q = addr_ok; if ((pi.clocks || pi.make_outreg) && !addr_ok.empty()) { addr_ok_q = module->addWire(NEW_ID); + if (!pi.sig_en.empty()) + addr_ok = module->Mux(NEW_ID, addr_ok_q, addr_ok, pi.sig_en); module->addDff(NEW_ID, pi.sig_clock, addr_ok, addr_ok_q, pi.effective_clkpol); } |