mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-08-04 02:10:24 +00:00
Code Activity

Making stringf() use the format conversion specs as-is without widening them.

Browse source 
And make sure our fast-path for `%d` and `%u` narrows to `int` correctly.

Resolves #5260
This commit is contained in:
Robert O'Callahan 2025-07-31 10:19:44 +00:00
parent 262b00d5e5
commit ffd52a0d8e
3 changed files with 76 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

34
kernel/io.cc
View file

@ -405,37 +405,9 @@ std::string unescape_format_string(std::string_view fmt)
static std::string string_view_stringf(std::string_view spec, ...)
{
std::string fmt(spec);
char format_specifier = fmt[fmt.size() - 1];
switch (format_specifier) {
case 'd':
case 'i':
case 'o':
case 'u':
case 'x':
case 'X': {
// Strip any length modifier off `fmt`
std::string long_fmt;
for (size_t i = 0; i + 1 < fmt.size(); ++i) {
char ch = fmt[i];
if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')) {
break;
}
long_fmt.push_back(ch);
}
// Add `lld` or whatever
long_fmt += "ll";
long_fmt.push_back(format_specifier);
fmt = long_fmt;
break;
}
default:
break;
}
va_list ap;
va_start(ap, spec);
std::string result = vstringf(fmt.c_str(), ap);
std::string result = vstringf(std::string(spec).c_str(), ap);
va_end(ap);
return result;
}
@ -464,7 +436,7 @@ void format_emit_long_long(std::string &result, std::string_view spec, int *dyna
{
if (spec == "%d") {
// Format checking will have guaranteed num_dynamic_ints == 0.
result += std::to_string(arg);
result += std::to_string(static_cast<int>(arg));
return;
}
format_emit_stringf(result, spec, dynamic_ints, num_dynamic_ints, arg);
@ -475,7 +447,7 @@ void format_emit_unsigned_long_long(std::string &result, std::string_view spec,
{
if (spec == "%u") {
// Format checking will have guaranteed num_dynamic_ints == 0.
result += std::to_string(arg);
result += std::to_string(static_cast<unsigned int>(arg));
return;
}
if (spec == "%c") {