rtlil: add Module* back-pointer to RTLIL::Memory

This commit is contained in:
Emil J. Tywoniak 2026-06-05 13:49:50 +02:00
parent 9ed93e210b
commit e70eed3296
7 changed files with 17 additions and 3 deletions

View File

@ -1567,6 +1567,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
input_error("Memory `%s' with non-constant width or size!\n", str); input_error("Memory `%s' with non-constant width or size!\n", str);
RTLIL::Memory *memory = new RTLIL::Memory; RTLIL::Memory *memory = new RTLIL::Memory;
memory->module = current_module;
set_src_attr(memory, this); set_src_attr(memory, this);
memory->name = str; memory->name = str;
memory->width = children[0]->range_left - children[0]->range_right + 1; memory->width = children[0]->range_left - children[0]->range_right + 1;

View File

@ -604,6 +604,7 @@ void json_import(Design *design, string &modname, JsonNode *node)
RTLIL::Memory *mem = new RTLIL::Memory; RTLIL::Memory *mem = new RTLIL::Memory;
mem->name = memory_name; mem->name = memory_name;
mem->module = module;
if (memory_node->type != 'D') if (memory_node->type != 'D')
log_error("JSON memory node '%s' is not a dictionary.\n", memory_name.unescape()); log_error("JSON memory node '%s' is not a dictionary.\n", memory_name.unescape());

View File

@ -680,6 +680,7 @@ struct RTLILFrontendWorker {
void parse_memory() void parse_memory()
{ {
RTLIL::Memory *memory = new RTLIL::Memory; RTLIL::Memory *memory = new RTLIL::Memory;
memory->module = current_module;
memory->absorb_attrs(&design->src_twines, std::move(attrbuf)); memory->absorb_attrs(&design->src_twines, std::move(attrbuf));
int width = 1; int width = 1;

View File

@ -1625,6 +1625,7 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
{ {
RTLIL::Memory *memory = new RTLIL::Memory; RTLIL::Memory *memory = new RTLIL::Memory;
memory->name = RTLIL::escape_id(net->Name()); memory->name = RTLIL::escape_id(net->Name());
memory->module = module;
log_assert(module->count_id(memory->name) == 0); log_assert(module->count_id(memory->name) == 0);
module->memories[memory->name] = memory; module->memories[memory->name] = memory;
import_attributes(memory->attributes, net, nl); import_attributes(memory->attributes, net, nl);

View File

@ -294,6 +294,7 @@ void Mem::emit() {
memid = NEW_ID; memid = NEW_ID;
mem = new RTLIL::Memory; mem = new RTLIL::Memory;
mem->name = memid; mem->name = memid;
mem->module = module;
module->memories[memid] = mem; module->memories[memid] = mem;
} }
mem->width = width; mem->width = width;

View File

@ -3611,6 +3611,7 @@ RTLIL::Memory *RTLIL::Module::addMemory(RTLIL::IdString name)
{ {
RTLIL::Memory *mem = new RTLIL::Memory; RTLIL::Memory *mem = new RTLIL::Memory;
mem->name = std::move(name); mem->name = std::move(name);
mem->module = this;
memories[mem->name] = mem; memories[mem->name] = mem;
return mem; return mem;
} }
@ -3619,14 +3620,15 @@ RTLIL::Memory *RTLIL::Module::addMemory(RTLIL::IdString name, const RTLIL::Memor
{ {
RTLIL::Memory *mem = new RTLIL::Memory; RTLIL::Memory *mem = new RTLIL::Memory;
mem->name = std::move(name); mem->name = std::move(name);
mem->module = this;
mem->width = other->width; mem->width = other->width;
mem->start_offset = other->start_offset; mem->start_offset = other->start_offset;
mem->size = other->size; mem->size = other->size;
mem->attributes = other->attributes; mem->attributes = other->attributes;
{ {
// Memory has no module backpointer of its own — we can't know its // Clone path drops src for now — caller responsible for migrating
// source pool from `other` alone. Drop src in the rare clone-of- // src across the design boundary if needed. addMemory(name) is the
// memory path; addMemory(name) is the common one and starts fresh. // common case.
(void)other; (void)other;
} }
memories[mem->name] = mem; memories[mem->name] = mem;

View File

@ -2286,6 +2286,13 @@ struct RTLIL::Memory : public RTLIL::NamedObject
Memory(); Memory();
// Back-pointer to the owning module — same role as Cell::module /
// Wire::module. Set by Module::addMemory / the frontends that
// construct Memory free-standing before attaching to a module.
// Lets Memory's src access (and the upcoming per-Design meta vector
// lookup) resolve uniformly via module->design.
RTLIL::Module *module = nullptr;
int width, start_offset, size; int width, start_offset, size;
#ifdef YOSYS_ENABLE_PYTHON #ifdef YOSYS_ENABLE_PYTHON
~Memory(); ~Memory();