mirror of https://github.com/YosysHQ/yosys.git
Encode filename unprintable chars
This commit is contained in:
parent
2b1aeb44d9
commit
6c65ca4e50
|
@ -45,7 +45,7 @@ using namespace AST_INTERNAL;
|
||||||
// helper function for creating RTLIL code for unary operations
|
// helper function for creating RTLIL code for unary operations
|
||||||
static RTLIL::SigSpec uniop2rtlil(AstNode *that, IdString type, int result_width, const RTLIL::SigSpec &arg, bool gen_attributes = true)
|
static RTLIL::SigSpec uniop2rtlil(AstNode *that, IdString type, int result_width, const RTLIL::SigSpec &arg, bool gen_attributes = true)
|
||||||
{
|
{
|
||||||
IdString name = stringf("%s$%s:%d$%d", type.c_str(), that->filename.c_str(), that->location.first_line, autoidx++);
|
IdString name = stringf("%s$%s:%d$%d", type.c_str(), RTLIL::encode_filename(that->filename).c_str(), that->location.first_line, autoidx++);
|
||||||
RTLIL::Cell *cell = current_module->addCell(name, type);
|
RTLIL::Cell *cell = current_module->addCell(name, type);
|
||||||
set_src_attr(cell, that);
|
set_src_attr(cell, that);
|
||||||
|
|
||||||
|
@ -77,7 +77,7 @@ static void widthExtend(AstNode *that, RTLIL::SigSpec &sig, int width, bool is_s
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
IdString name = stringf("$extend$%s:%d$%d", that->filename.c_str(), that->location.first_line, autoidx++);
|
IdString name = stringf("$extend$%s:%d$%d", RTLIL::encode_filename(that->filename).c_str(), that->location.first_line, autoidx++);
|
||||||
RTLIL::Cell *cell = current_module->addCell(name, ID($pos));
|
RTLIL::Cell *cell = current_module->addCell(name, ID($pos));
|
||||||
set_src_attr(cell, that);
|
set_src_attr(cell, that);
|
||||||
|
|
||||||
|
@ -104,7 +104,7 @@ static void widthExtend(AstNode *that, RTLIL::SigSpec &sig, int width, bool is_s
|
||||||
// helper function for creating RTLIL code for binary operations
|
// helper function for creating RTLIL code for binary operations
|
||||||
static RTLIL::SigSpec binop2rtlil(AstNode *that, IdString type, int result_width, const RTLIL::SigSpec &left, const RTLIL::SigSpec &right)
|
static RTLIL::SigSpec binop2rtlil(AstNode *that, IdString type, int result_width, const RTLIL::SigSpec &left, const RTLIL::SigSpec &right)
|
||||||
{
|
{
|
||||||
IdString name = stringf("%s$%s:%d$%d", type.c_str(), that->filename.c_str(), that->location.first_line, autoidx++);
|
IdString name = stringf("%s$%s:%d$%d", type.c_str(), RTLIL::encode_filename(that->filename).c_str(), that->location.first_line, autoidx++);
|
||||||
RTLIL::Cell *cell = current_module->addCell(name, type);
|
RTLIL::Cell *cell = current_module->addCell(name, type);
|
||||||
set_src_attr(cell, that);
|
set_src_attr(cell, that);
|
||||||
|
|
||||||
|
@ -138,7 +138,7 @@ static RTLIL::SigSpec mux2rtlil(AstNode *that, const RTLIL::SigSpec &cond, const
|
||||||
log_assert(cond.size() == 1);
|
log_assert(cond.size() == 1);
|
||||||
|
|
||||||
std::stringstream sstr;
|
std::stringstream sstr;
|
||||||
sstr << "$ternary$" << that->filename << ":" << that->location.first_line << "$" << (autoidx++);
|
sstr << "$ternary$" << RTLIL::encode_filename(that->filename) << ":" << that->location.first_line << "$" << (autoidx++);
|
||||||
|
|
||||||
RTLIL::Cell *cell = current_module->addCell(sstr.str(), ID($mux));
|
RTLIL::Cell *cell = current_module->addCell(sstr.str(), ID($mux));
|
||||||
set_src_attr(cell, that);
|
set_src_attr(cell, that);
|
||||||
|
@ -321,7 +321,7 @@ struct AST_INTERNAL::ProcessGenerator
|
||||||
LookaheadRewriter la_rewriter(always);
|
LookaheadRewriter la_rewriter(always);
|
||||||
|
|
||||||
// generate process and simple root case
|
// generate process and simple root case
|
||||||
proc = current_module->addProcess(stringf("$proc$%s:%d$%d", always->filename.c_str(), always->location.first_line, autoidx++));
|
proc = current_module->addProcess(stringf("$proc$%s:%d$%d", RTLIL::encode_filename(always->filename).c_str(), always->location.first_line, autoidx++));
|
||||||
set_src_attr(proc, always);
|
set_src_attr(proc, always);
|
||||||
for (auto &attr : always->attributes) {
|
for (auto &attr : always->attributes) {
|
||||||
if (attr.second->type != AST_CONSTANT)
|
if (attr.second->type != AST_CONSTANT)
|
||||||
|
@ -1776,7 +1776,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
|
||||||
case AST_MEMRD:
|
case AST_MEMRD:
|
||||||
{
|
{
|
||||||
std::stringstream sstr;
|
std::stringstream sstr;
|
||||||
sstr << "$memrd$" << str << "$" << filename << ":" << location.first_line << "$" << (autoidx++);
|
sstr << "$memrd$" << str << "$" << RTLIL::encode_filename(filename) << ":" << location.first_line << "$" << (autoidx++);
|
||||||
|
|
||||||
RTLIL::Cell *cell = current_module->addCell(sstr.str(), ID($memrd));
|
RTLIL::Cell *cell = current_module->addCell(sstr.str(), ID($memrd));
|
||||||
set_src_attr(cell, this);
|
set_src_attr(cell, this);
|
||||||
|
@ -1814,7 +1814,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
|
||||||
case AST_MEMINIT:
|
case AST_MEMINIT:
|
||||||
{
|
{
|
||||||
std::stringstream sstr;
|
std::stringstream sstr;
|
||||||
sstr << "$meminit$" << str << "$" << filename << ":" << location.first_line << "$" << (autoidx++);
|
sstr << "$meminit$" << str << "$" << RTLIL::encode_filename(filename) << ":" << location.first_line << "$" << (autoidx++);
|
||||||
|
|
||||||
SigSpec en_sig = children[2]->genRTLIL();
|
SigSpec en_sig = children[2]->genRTLIL();
|
||||||
|
|
||||||
|
@ -1869,7 +1869,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
|
||||||
|
|
||||||
IdString cellname;
|
IdString cellname;
|
||||||
if (str.empty())
|
if (str.empty())
|
||||||
cellname = stringf("%s$%s:%d$%d", celltype.c_str(), filename.c_str(), location.first_line, autoidx++);
|
cellname = stringf("%s$%s:%d$%d", celltype.c_str(), RTLIL::encode_filename(filename).c_str(), location.first_line, autoidx++);
|
||||||
else
|
else
|
||||||
cellname = str;
|
cellname = str;
|
||||||
|
|
||||||
|
|
|
@ -1240,7 +1240,7 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
|
||||||
|
|
||||||
// create the indirection wire
|
// create the indirection wire
|
||||||
std::stringstream sstr;
|
std::stringstream sstr;
|
||||||
sstr << "$indirect$" << ref->name.c_str() << "$" << filename << ":" << location.first_line << "$" << (autoidx++);
|
sstr << "$indirect$" << ref->name.c_str() << "$" << RTLIL::encode_filename(filename) << ":" << location.first_line << "$" << (autoidx++);
|
||||||
std::string tmp_str = sstr.str();
|
std::string tmp_str = sstr.str();
|
||||||
add_wire_for_ref(ref, tmp_str);
|
add_wire_for_ref(ref, tmp_str);
|
||||||
|
|
||||||
|
@ -2127,7 +2127,7 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
|
||||||
std::swap(data_range_left, data_range_right);
|
std::swap(data_range_left, data_range_right);
|
||||||
|
|
||||||
std::stringstream sstr;
|
std::stringstream sstr;
|
||||||
sstr << "$mem2bits$" << str << "$" << filename << ":" << location.first_line << "$" << (autoidx++);
|
sstr << "$mem2bits$" << str << "$" << RTLIL::encode_filename(filename) << ":" << location.first_line << "$" << (autoidx++);
|
||||||
std::string wire_id = sstr.str();
|
std::string wire_id = sstr.str();
|
||||||
|
|
||||||
AstNode *wire = new AstNode(AST_WIRE, new AstNode(AST_RANGE, mkconst_int(data_range_left, true), mkconst_int(data_range_right, true)));
|
AstNode *wire = new AstNode(AST_WIRE, new AstNode(AST_RANGE, mkconst_int(data_range_left, true), mkconst_int(data_range_right, true)));
|
||||||
|
@ -2714,14 +2714,14 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
|
||||||
// mask and shift operations, disabled for now
|
// mask and shift operations, disabled for now
|
||||||
|
|
||||||
AstNode *wire_mask = new AstNode(AST_WIRE, new AstNode(AST_RANGE, mkconst_int(source_width-1, true), mkconst_int(0, true)));
|
AstNode *wire_mask = new AstNode(AST_WIRE, new AstNode(AST_RANGE, mkconst_int(source_width-1, true), mkconst_int(0, true)));
|
||||||
wire_mask->str = stringf("$bitselwrite$mask$%s:%d$%d", filename.c_str(), location.first_line, autoidx++);
|
wire_mask->str = stringf("$bitselwrite$mask$%s:%d$%d", RTLIL::encode_filename(filename).c_str(), location.first_line, autoidx++);
|
||||||
wire_mask->attributes[ID::nosync] = AstNode::mkconst_int(1, false);
|
wire_mask->attributes[ID::nosync] = AstNode::mkconst_int(1, false);
|
||||||
wire_mask->is_logic = true;
|
wire_mask->is_logic = true;
|
||||||
while (wire_mask->simplify(true, false, false, 1, -1, false, false)) { }
|
while (wire_mask->simplify(true, false, false, 1, -1, false, false)) { }
|
||||||
current_ast_mod->children.push_back(wire_mask);
|
current_ast_mod->children.push_back(wire_mask);
|
||||||
|
|
||||||
AstNode *wire_data = new AstNode(AST_WIRE, new AstNode(AST_RANGE, mkconst_int(source_width-1, true), mkconst_int(0, true)));
|
AstNode *wire_data = new AstNode(AST_WIRE, new AstNode(AST_RANGE, mkconst_int(source_width-1, true), mkconst_int(0, true)));
|
||||||
wire_data->str = stringf("$bitselwrite$data$%s:%d$%d", filename.c_str(), location.first_line, autoidx++);
|
wire_data->str = stringf("$bitselwrite$data$%s:%d$%d", RTLIL::encode_filename(filename).c_str(), location.first_line, autoidx++);
|
||||||
wire_data->attributes[ID::nosync] = AstNode::mkconst_int(1, false);
|
wire_data->attributes[ID::nosync] = AstNode::mkconst_int(1, false);
|
||||||
wire_data->is_logic = true;
|
wire_data->is_logic = true;
|
||||||
while (wire_data->simplify(true, false, false, 1, -1, false, false)) { }
|
while (wire_data->simplify(true, false, false, 1, -1, false, false)) { }
|
||||||
|
@ -2732,7 +2732,7 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
|
||||||
shift_expr->detectSignWidth(shamt_width_hint, shamt_sign_hint);
|
shift_expr->detectSignWidth(shamt_width_hint, shamt_sign_hint);
|
||||||
|
|
||||||
AstNode *wire_sel = new AstNode(AST_WIRE, new AstNode(AST_RANGE, mkconst_int(shamt_width_hint-1, true), mkconst_int(0, true)));
|
AstNode *wire_sel = new AstNode(AST_WIRE, new AstNode(AST_RANGE, mkconst_int(shamt_width_hint-1, true), mkconst_int(0, true)));
|
||||||
wire_sel->str = stringf("$bitselwrite$sel$%s:%d$%d", filename.c_str(), location.first_line, autoidx++);
|
wire_sel->str = stringf("$bitselwrite$sel$%s:%d$%d", RTLIL::encode_filename(filename).c_str(), location.first_line, autoidx++);
|
||||||
wire_sel->attributes[ID::nosync] = AstNode::mkconst_int(1, false);
|
wire_sel->attributes[ID::nosync] = AstNode::mkconst_int(1, false);
|
||||||
wire_sel->is_logic = true;
|
wire_sel->is_logic = true;
|
||||||
wire_sel->is_signed = shamt_sign_hint;
|
wire_sel->is_signed = shamt_sign_hint;
|
||||||
|
@ -2809,7 +2809,7 @@ skip_dynamic_range_lvalue_expansion:;
|
||||||
if (stage > 1 && (type == AST_ASSERT || type == AST_ASSUME || type == AST_LIVE || type == AST_FAIR || type == AST_COVER) && current_block != NULL)
|
if (stage > 1 && (type == AST_ASSERT || type == AST_ASSUME || type == AST_LIVE || type == AST_FAIR || type == AST_COVER) && current_block != NULL)
|
||||||
{
|
{
|
||||||
std::stringstream sstr;
|
std::stringstream sstr;
|
||||||
sstr << "$formal$" << filename << ":" << location.first_line << "$" << (autoidx++);
|
sstr << "$formal$" << RTLIL::encode_filename(filename) << ":" << location.first_line << "$" << (autoidx++);
|
||||||
std::string id_check = sstr.str() + "_CHECK", id_en = sstr.str() + "_EN";
|
std::string id_check = sstr.str() + "_CHECK", id_en = sstr.str() + "_EN";
|
||||||
|
|
||||||
AstNode *wire_check = new AstNode(AST_WIRE);
|
AstNode *wire_check = new AstNode(AST_WIRE);
|
||||||
|
@ -2918,7 +2918,7 @@ skip_dynamic_range_lvalue_expansion:;
|
||||||
newNode = new AstNode(AST_BLOCK);
|
newNode = new AstNode(AST_BLOCK);
|
||||||
|
|
||||||
AstNode *wire_tmp = new AstNode(AST_WIRE, new AstNode(AST_RANGE, mkconst_int(width_hint-1, true), mkconst_int(0, true)));
|
AstNode *wire_tmp = new AstNode(AST_WIRE, new AstNode(AST_RANGE, mkconst_int(width_hint-1, true), mkconst_int(0, true)));
|
||||||
wire_tmp->str = stringf("$splitcmplxassign$%s:%d$%d", filename.c_str(), location.first_line, autoidx++);
|
wire_tmp->str = stringf("$splitcmplxassign$%s:%d$%d", RTLIL::encode_filename(filename).c_str(), location.first_line, autoidx++);
|
||||||
current_ast_mod->children.push_back(wire_tmp);
|
current_ast_mod->children.push_back(wire_tmp);
|
||||||
current_scope[wire_tmp->str] = wire_tmp;
|
current_scope[wire_tmp->str] = wire_tmp;
|
||||||
wire_tmp->attributes[ID::nosync] = AstNode::mkconst_int(1, false);
|
wire_tmp->attributes[ID::nosync] = AstNode::mkconst_int(1, false);
|
||||||
|
@ -2956,7 +2956,7 @@ skip_dynamic_range_lvalue_expansion:;
|
||||||
(children[0]->children.size() == 1 || children[0]->children.size() == 2) && children[0]->children[0]->type == AST_RANGE)
|
(children[0]->children.size() == 1 || children[0]->children.size() == 2) && children[0]->children[0]->type == AST_RANGE)
|
||||||
{
|
{
|
||||||
std::stringstream sstr;
|
std::stringstream sstr;
|
||||||
sstr << "$memwr$" << children[0]->str << "$" << filename << ":" << location.first_line << "$" << (autoidx++);
|
sstr << "$memwr$" << children[0]->str << "$" << RTLIL::encode_filename(filename) << ":" << location.first_line << "$" << (autoidx++);
|
||||||
std::string id_addr = sstr.str() + "_ADDR", id_data = sstr.str() + "_DATA", id_en = sstr.str() + "_EN";
|
std::string id_addr = sstr.str() + "_ADDR", id_data = sstr.str() + "_DATA", id_en = sstr.str() + "_EN";
|
||||||
|
|
||||||
int mem_width, mem_size, addr_bits;
|
int mem_width, mem_size, addr_bits;
|
||||||
|
@ -3228,7 +3228,7 @@ skip_dynamic_range_lvalue_expansion:;
|
||||||
AstNode *reg = new AstNode(AST_WIRE, new AstNode(AST_RANGE,
|
AstNode *reg = new AstNode(AST_WIRE, new AstNode(AST_RANGE,
|
||||||
mkconst_int(width_hint-1, true), mkconst_int(0, true)));
|
mkconst_int(width_hint-1, true), mkconst_int(0, true)));
|
||||||
|
|
||||||
reg->str = stringf("$past$%s:%d$%d$%d", filename.c_str(), location.first_line, myidx, i);
|
reg->str = stringf("$past$%s:%d$%d$%d", RTLIL::encode_filename(filename).c_str(), location.first_line, myidx, i);
|
||||||
reg->is_reg = true;
|
reg->is_reg = true;
|
||||||
reg->is_signed = sign_hint;
|
reg->is_signed = sign_hint;
|
||||||
|
|
||||||
|
@ -3733,7 +3733,7 @@ skip_dynamic_range_lvalue_expansion:;
|
||||||
|
|
||||||
|
|
||||||
std::stringstream sstr;
|
std::stringstream sstr;
|
||||||
sstr << str << "$func$" << filename << ":" << location.first_line << "$" << (autoidx++) << '.';
|
sstr << str << "$func$" << RTLIL::encode_filename(filename) << ":" << location.first_line << "$" << (autoidx++) << '.';
|
||||||
std::string prefix = sstr.str();
|
std::string prefix = sstr.str();
|
||||||
|
|
||||||
AstNode *decl = current_scope[str];
|
AstNode *decl = current_scope[str];
|
||||||
|
@ -4586,7 +4586,7 @@ static void mark_memories_assign_lhs_complex(dict<AstNode*, pool<std::string>> &
|
||||||
if (that->type == AST_IDENTIFIER && that->id2ast && that->id2ast->type == AST_MEMORY) {
|
if (that->type == AST_IDENTIFIER && that->id2ast && that->id2ast->type == AST_MEMORY) {
|
||||||
AstNode *mem = that->id2ast;
|
AstNode *mem = that->id2ast;
|
||||||
if (!(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_CMPLX_LHS))
|
if (!(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_CMPLX_LHS))
|
||||||
mem2reg_places[mem].insert(stringf("%s:%d", that->filename.c_str(), that->location.first_line));
|
mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(that->filename).c_str(), that->location.first_line));
|
||||||
mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_CMPLX_LHS;
|
mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_CMPLX_LHS;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4614,14 +4614,14 @@ void AstNode::mem2reg_as_needed_pass1(dict<AstNode*, pool<std::string>> &mem2reg
|
||||||
// activate mem2reg if this is assigned in an async proc
|
// activate mem2reg if this is assigned in an async proc
|
||||||
if (flags & AstNode::MEM2REG_FL_ASYNC) {
|
if (flags & AstNode::MEM2REG_FL_ASYNC) {
|
||||||
if (!(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_SET_ASYNC))
|
if (!(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_SET_ASYNC))
|
||||||
mem2reg_places[mem].insert(stringf("%s:%d", filename.c_str(), location.first_line));
|
mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(filename).c_str(), location.first_line));
|
||||||
mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_SET_ASYNC;
|
mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_SET_ASYNC;
|
||||||
}
|
}
|
||||||
|
|
||||||
// remember if this is assigned blocking (=)
|
// remember if this is assigned blocking (=)
|
||||||
if (type == AST_ASSIGN_EQ) {
|
if (type == AST_ASSIGN_EQ) {
|
||||||
if (!(proc_flags[mem] & AstNode::MEM2REG_FL_EQ1))
|
if (!(proc_flags[mem] & AstNode::MEM2REG_FL_EQ1))
|
||||||
mem2reg_places[mem].insert(stringf("%s:%d", filename.c_str(), location.first_line));
|
mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(filename).c_str(), location.first_line));
|
||||||
proc_flags[mem] |= AstNode::MEM2REG_FL_EQ1;
|
proc_flags[mem] |= AstNode::MEM2REG_FL_EQ1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4638,11 +4638,11 @@ void AstNode::mem2reg_as_needed_pass1(dict<AstNode*, pool<std::string>> &mem2reg
|
||||||
// remember where this is
|
// remember where this is
|
||||||
if (flags & MEM2REG_FL_INIT) {
|
if (flags & MEM2REG_FL_INIT) {
|
||||||
if (!(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_SET_INIT))
|
if (!(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_SET_INIT))
|
||||||
mem2reg_places[mem].insert(stringf("%s:%d", filename.c_str(), location.first_line));
|
mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(filename).c_str(), location.first_line));
|
||||||
mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_SET_INIT;
|
mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_SET_INIT;
|
||||||
} else {
|
} else {
|
||||||
if (!(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_SET_ELSE))
|
if (!(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_SET_ELSE))
|
||||||
mem2reg_places[mem].insert(stringf("%s:%d", filename.c_str(), location.first_line));
|
mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(filename).c_str(), location.first_line));
|
||||||
mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_SET_ELSE;
|
mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_SET_ELSE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4656,7 +4656,7 @@ void AstNode::mem2reg_as_needed_pass1(dict<AstNode*, pool<std::string>> &mem2reg
|
||||||
|
|
||||||
// flag if used after blocking assignment (in same proc)
|
// flag if used after blocking assignment (in same proc)
|
||||||
if ((proc_flags[mem] & AstNode::MEM2REG_FL_EQ1) && !(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_EQ2)) {
|
if ((proc_flags[mem] & AstNode::MEM2REG_FL_EQ1) && !(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_EQ2)) {
|
||||||
mem2reg_places[mem].insert(stringf("%s:%d", filename.c_str(), location.first_line));
|
mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(filename).c_str(), location.first_line));
|
||||||
mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_EQ2;
|
mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_EQ2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4846,7 +4846,7 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
|
||||||
children[0]->children[0]->children[0]->type != AST_CONSTANT)
|
children[0]->children[0]->children[0]->type != AST_CONSTANT)
|
||||||
{
|
{
|
||||||
std::stringstream sstr;
|
std::stringstream sstr;
|
||||||
sstr << "$mem2reg_wr$" << children[0]->str << "$" << filename << ":" << location.first_line << "$" << (autoidx++);
|
sstr << "$mem2reg_wr$" << children[0]->str << "$" << RTLIL::encode_filename(filename) << ":" << location.first_line << "$" << (autoidx++);
|
||||||
std::string id_addr = sstr.str() + "_ADDR", id_data = sstr.str() + "_DATA";
|
std::string id_addr = sstr.str() + "_ADDR", id_data = sstr.str() + "_DATA";
|
||||||
|
|
||||||
int mem_width, mem_size, addr_bits;
|
int mem_width, mem_size, addr_bits;
|
||||||
|
@ -4962,7 +4962,7 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
std::stringstream sstr;
|
std::stringstream sstr;
|
||||||
sstr << "$mem2reg_rd$" << str << "$" << filename << ":" << location.first_line << "$" << (autoidx++);
|
sstr << "$mem2reg_rd$" << str << "$" << RTLIL::encode_filename(filename) << ":" << location.first_line << "$" << (autoidx++);
|
||||||
std::string id_addr = sstr.str() + "_ADDR", id_data = sstr.str() + "_DATA";
|
std::string id_addr = sstr.str() + "_ADDR", id_data = sstr.str() + "_DATA";
|
||||||
|
|
||||||
int mem_width, mem_size, addr_bits;
|
int mem_width, mem_size, addr_bits;
|
||||||
|
|
|
@ -183,7 +183,7 @@ RTLIL::IdString VerificImporter::new_verific_id(Verific::DesignObj *obj)
|
||||||
{
|
{
|
||||||
std::string s = stringf("$verific$%s", obj->Name());
|
std::string s = stringf("$verific$%s", obj->Name());
|
||||||
if (obj->Linefile())
|
if (obj->Linefile())
|
||||||
s += stringf("$%s:%d", Verific::LineFile::GetFileName(obj->Linefile()), Verific::LineFile::GetLineNo(obj->Linefile()));
|
s += stringf("$%s:%d", RTLIL::encode_filename(Verific::LineFile::GetFileName(obj->Linefile())).c_str(), Verific::LineFile::GetLineNo(obj->Linefile()));
|
||||||
s += stringf("$%d", autoidx++);
|
s += stringf("$%d", autoidx++);
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
|
@ -440,6 +440,21 @@ namespace RTLIL
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static inline std::string encode_filename(const std::string &filename)
|
||||||
|
{
|
||||||
|
std::stringstream val;
|
||||||
|
if (!std::any_of(filename.begin(), filename.end(), [](char c) {
|
||||||
|
return static_cast<unsigned char>(c) < 33 || static_cast<unsigned char>(c) > 126;
|
||||||
|
})) return filename;
|
||||||
|
for (unsigned char const c : filename) {
|
||||||
|
if (c < 33 || c > 126)
|
||||||
|
val << stringf("$%02x", c);
|
||||||
|
else
|
||||||
|
val << c;
|
||||||
|
}
|
||||||
|
return val.str();
|
||||||
|
}
|
||||||
|
|
||||||
// see calc.cc for the implementation of this functions
|
// see calc.cc for the implementation of this functions
|
||||||
RTLIL::Const const_not (const RTLIL::Const &arg1, const RTLIL::Const &arg2, bool signed1, bool signed2, int result_len);
|
RTLIL::Const const_not (const RTLIL::Const &arg1, const RTLIL::Const &arg2, bool signed1, bool signed2, int result_len);
|
||||||
RTLIL::Const const_and (const RTLIL::Const &arg1, const RTLIL::Const &arg2, bool signed1, bool signed2, int result_len);
|
RTLIL::Const const_and (const RTLIL::Const &arg1, const RTLIL::Const &arg2, bool signed1, bool signed2, int result_len);
|
||||||
|
|
Loading…
Reference in New Issue