mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-08-24 03:57:54 +00:00
Code Activity

Merge ffd52a0d8e into 262b00d5e5

Browse source
This commit is contained in:
Robert O'Callahan 2025-07-31 10:57:08 +00:00 • committed by GitHub
commit 0f94fc6a26
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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") {

2
kernel/io.h
View file

@ -62,7 +62,7 @@ enum ConversionSpecifier : uint8_t
CONVSPEC_UNSIGNED_INT,
// Consumes a "double"
CONVSPEC_DOUBLE,
// Consumes a "const char*"
// Consumes a "const char*" or other string type
CONVSPEC_CHAR_PTR,
// Consumes a "void*"
CONVSPEC_VOID_PTR,

72
tests/unit/kernel/ioTest.cc Normal file
View file

@ -0,0 +1,72 @@
#include <gtest/gtest.h>
#include "kernel/io.h"
YOSYS_NAMESPACE_BEGIN
TEST(KernelStringfTest, integerTruncation)
{
EXPECT_EQ(stringf("%d", 1LL << 32), "0");
EXPECT_EQ(stringf("%u", 1LL << 32), "0");
EXPECT_EQ(stringf("%x", 0xff12345678LL), "12345678");
EXPECT_EQ(stringf("%hu", 0xff12345678LL), "22136");
}
TEST(KernelStringfTest, charFormat)
{
EXPECT_EQ(stringf("%c", 256), std::string_view("\0", 1));
EXPECT_EQ(stringf("%c", -1), "\377");
}
TEST(KernelStringfTest, floatFormat)
{
EXPECT_EQ(stringf("%g", 1.0), "1");
}
TEST(KernelStringfTest, intToFloat)
{
EXPECT_EQ(stringf("%g", 1), "1");
}
TEST(KernelStringfTest, floatToInt)
{
EXPECT_EQ(stringf("%d", 1.0), "1");
EXPECT_EQ(stringf("%d", -1.6), "-1");
}
TEST(KernelStringfTest, stringParam)
{
EXPECT_EQ(stringf("%s", std::string("hello")), "hello");
}
TEST(KernelStringfTest, stringViewParam)
{
EXPECT_EQ(stringf("%s", std::string_view("hello")), "hello");
}
TEST(KernelStringfTest, escapePercent)
{
EXPECT_EQ(stringf("%%"), "%");
}
TEST(KernelStringfTest, trailingPercent)
{
EXPECT_EQ(stringf("%"), "%");
}
TEST(KernelStringfTest, dynamicWidth)
{
EXPECT_EQ(stringf("%*s", 8, "hello"), " hello");
}
TEST(KernelStringfTest, dynamicPrecision)
{
EXPECT_EQ(stringf("%.*f", 4, 1.0), "1.0000");
}
TEST(KernelStringfTest, dynamicWidthAndPrecision)
{
EXPECT_EQ(stringf("%*.*f", 8, 4, 1.0), " 1.0000");
}
YOSYS_NAMESPACE_END