mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-13 04:28:18 +00:00
Code Activity

Fixes and improvements in AST const folding

Browse source
This commit is contained in:
Clifford Wolf 2013-06-10 13:56:03 +02:00
parent db98a18edb
commit 59dd02baa2
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontends/ast/genrtlil.cc
View file

@ -647,7 +647,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint)
current_module->wires[str] = wire; current_module->wires[str] = wire;
} }
else if (id2ast->type == AST_PARAMETER || id2ast->type == AST_LOCALPARAM) { else if (id2ast->type == AST_PARAMETER || id2ast->type == AST_LOCALPARAM) {
chunk = RTLIL::Const(id2ast->bits); chunk = RTLIL::Const(id2ast->children[0]->bits);
goto use_const_chunk; goto use_const_chunk;
} }
else if (!id2ast || (id2ast->type != AST_WIRE && id2ast->type != AST_AUTOWIRE && else if (!id2ast || (id2ast->type != AST_WIRE && id2ast->type != AST_AUTOWIRE &&

10
frontends/ast/simplify.cc
View file

@ -749,6 +749,7 @@ skip_dynamic_range_lvalue_expansion:;
// perform const folding when activated // perform const folding when activated
if (const_fold && newNode == NULL) if (const_fold && newNode == NULL)
{ {
std::vector<RTLIL::State> tmp_bits;
RTLIL::Const (*const_func)(const RTLIL::Const&, const RTLIL::Const&, bool, bool, int); RTLIL::Const (*const_func)(const RTLIL::Const&, const RTLIL::Const&, bool, bool, int);
RTLIL::Const dummy_arg; RTLIL::Const dummy_arg;
@ -864,7 +865,16 @@ skip_dynamic_range_lvalue_expansion:;
newNode = children[2]->clone(); newNode = children[2]->clone();
} }
break; break;
case AST_CONCAT:
for (auto it = children.begin(); it != children.end(); it++) {
if ((*it)->type != AST_CONSTANT)
goto not_const;
tmp_bits.insert(tmp_bits.end(), (*it)->bits.begin(), (*it)->bits.end());
}
newNode = mkconst_bits(tmp_bits, is_signed);
break;
default: default:
not_const:
break; break;
} }
} }