mirror of
https://github.com/YosysHQ/yosys.git
synced 2026-08-29 01:24:25 +02:00
Fixed memory->start_offset handling
This commit is contained in:
@@ -839,14 +839,15 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
|
||||
memory->attributes["\\src"] = stringf("%s:%d", filename.c_str(), linenum);
|
||||
memory->name = str;
|
||||
memory->width = children[0]->range_left - children[0]->range_right + 1;
|
||||
memory->start_offset = children[0]->range_right;
|
||||
memory->size = children[1]->range_left - children[1]->range_right;
|
||||
if (children[1]->range_right < children[1]->range_left) {
|
||||
memory->start_offset = children[1]->range_right;
|
||||
memory->size = children[1]->range_left - children[1]->range_right + 1;
|
||||
} else {
|
||||
memory->start_offset = children[1]->range_left;
|
||||
memory->size = children[1]->range_right - children[1]->range_left + 1;
|
||||
}
|
||||
current_module->memories[memory->name] = memory;
|
||||
|
||||
if (memory->size < 0)
|
||||
memory->size *= -1;
|
||||
memory->size += std::min(children[1]->range_left, children[1]->range_right) + 1;
|
||||
|
||||
for (auto &attr : attributes) {
|
||||
if (attr.second->type != AST_CONSTANT)
|
||||
log_error("Attribute `%s' with non-constant value at %s:%d!\n",
|
||||
|
||||
@@ -183,6 +183,9 @@ memory_options:
|
||||
memory_options TOK_SIZE TOK_INT {
|
||||
current_memory->size = $3;
|
||||
} |
|
||||
memory_options TOK_OFFSET TOK_INT {
|
||||
current_memory->start_offset = $3;
|
||||
} |
|
||||
/* empty */;
|
||||
|
||||
cell_stmt:
|
||||
|
||||
Reference in New Issue
Block a user