mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-06 17:44:09 +00:00
Code Activity

fmt: format %t consistently at initial

Browse source
This commit is contained in:
Charlotte 2023-06-28 11:51:22 +10:00 committed by Marcelina Kościelnicka
parent c391ee7a0d
commit 9f9561379b
3 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
frontends/ast/simplify.cc
View file

@ -48,22 +48,27 @@ Fmt AstNode::processFormat(int stage, bool sformat_like, int default_base, size_
for (size_t index = first_arg_at; index < children.size(); index++) { for (size_t index = first_arg_at; index < children.size(); index++) {
AstNode *node_arg = children[index]; AstNode *node_arg = children[index];
while (node_arg->simplify(true, false, stage, -1, false, false)) { } while (node_arg->simplify(true, false, stage, -1, false, false)) { }
if (node_arg->type != AST_CONSTANT)
input_error("Failed to evaluate system task `%s' with non-constant argument at position %zu.\n", str.c_str(), index + 1);
VerilogFmtArg arg = {}; VerilogFmtArg arg = {};
arg.filename = filename; arg.filename = filename;
arg.first_line = location.first_line; arg.first_line = location.first_line;
if (node_arg->is_string) { if (node_arg->type == AST_CONSTANT && node_arg->is_string) {
arg.type = VerilogFmtArg::STRING; arg.type = VerilogFmtArg::STRING;
arg.str = node_arg->bitsAsConst().decode_string(); arg.str = node_arg->bitsAsConst().decode_string();
// and in case this will be used as an argument... // and in case this will be used as an argument...
arg.sig = node_arg->bitsAsConst(); arg.sig = node_arg->bitsAsConst();
arg.signed_ = false; arg.signed_ = false;
} else { } else if (node_arg->type == AST_IDENTIFIER && node_arg->str == "$time") {
arg.type = VerilogFmtArg::TIME;
} else if (node_arg->type == AST_IDENTIFIER && node_arg->str == "$realtime") {
arg.type = VerilogFmtArg::TIME;
arg.realtime = true;
} else if (node_arg->type == AST_CONSTANT) {
arg.type = VerilogFmtArg::INTEGER; arg.type = VerilogFmtArg::INTEGER;
arg.sig = node_arg->bitsAsConst(); arg.sig = node_arg->bitsAsConst();
arg.signed_ = node_arg->is_signed; arg.signed_ = node_arg->is_signed;
} else {
log_file_error(filename, location.first_line, "Failed to evaluate system task `%s' with non-constant argument at position %zu.\n", str.c_str(), index + 1);
} }
args.push_back(arg); args.push_back(arg);
} }

10
kernel/fmt.cc
View file

@ -606,6 +606,7 @@ std::string Fmt::render() const
break; break;
case FmtPart::INTEGER: case FmtPart::INTEGER:
case FmtPart::TIME:
case FmtPart::CHARACTER: { case FmtPart::CHARACTER: {
std::string buf; std::string buf;
if (part.type == FmtPart::INTEGER) { if (part.type == FmtPart::INTEGER) {
@ -689,6 +690,9 @@ std::string Fmt::render() const
} else log_abort(); } else log_abort();
} else if (part.type == FmtPart::CHARACTER) { } else if (part.type == FmtPart::CHARACTER) {
buf = part.sig.as_const().decode_string(); buf = part.sig.as_const().decode_string();
} else if (part.type == FmtPart::TIME) {
// We only render() during initial, so time is always zero.
buf = "0";
} }
log_assert(part.width == 0 || part.padding != '\0'); log_assert(part.width == 0 || part.padding != '\0');
@ -705,12 +709,6 @@ std::string Fmt::render() const
str += std::string(part.width - buf.size(), part.padding); str += std::string(part.width - buf.size(), part.padding);
break; break;
} }
case FmtPart::TIME: {
// We only render() during initial, so time is always zero.
str += "0";
break;
}
} }
} }

10
tests/fmt/initial_display.v
View file

@ -193,6 +193,16 @@ module m;
initial $display(":%020b:", 16'shaaaa); initial $display(":%020b:", 16'shaaaa);
initial $display(":%-020b:", 16'shaaaa); initial $display(":%-020b:", 16'shaaaa);
initial $display("==> time %%t");
initial $display(":%t:", $time);
initial $display(":%-t:", $time);
initial $display(":%0t:", $time);
initial $display(":%-0t:", $time);
initial $display(":%10t:", $time);
initial $display(":%-10t:", $time);
initial $display(":%015t:", $time);
initial $display(":%-015t:", $time);
initial $display("===> %%s"); initial $display("===> %%s");
initial $display(":%10s:", "foo"); initial $display(":%10s:", "foo");
initial $display(":%010s:", "foo"); initial $display(":%010s:", "foo");