RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-21 18:22:33 +01:00
Code Issues Releases Wiki Activity

cfmt/StrFmt: support s128 formatting (untested)

Browse Source
This commit is contained in:
Nekotekina 2022-11-24 17:17:46 +03:00 committed by Ivan
parent 661be41c5a
commit bf388e5428
2 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Utilities/StrFmt.cpp
View File

@ -449,7 +449,7 @@ struct fmt::cfmt_src
{ {
// Hack: use known function pointers to determine type // Hack: use known function pointers to determine type
#define TYPE(type) \ #define TYPE(type) \
if (sup[extra].fmt_string == &fmt_class_string<type>::format) return sizeof(type); if (sup[extra].fmt_string == &fmt_class_string<type>::format) return sizeof(type);
TYPE(int); TYPE(int);
TYPE(llong); TYPE(llong);
@ -457,10 +457,11 @@ struct fmt::cfmt_src
TYPE(short); TYPE(short);
if (std::is_signed<char>::value) TYPE(char); if (std::is_signed<char>::value) TYPE(char);
TYPE(long); TYPE(long);
TYPE(u128);
TYPE(s128); TYPE(s128);
#undef TYPE #undef TYPE
if (sup[extra].fmt_string == &fmt_class_string<u128>::format)
return -1;
return 0; return 0;
} }

53
Utilities/cfmt.h
View File

@ -367,9 +367,11 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
break; break;
} }
if (!ctx.type) const usz src_type = src.type(ctx.args);
if (!ctx.type || src_type > 8)
{ {
ctx.type = static_cast<u8>(src.type(ctx.args)); ctx.type = static_cast<u8>(src_type);
if (!ctx.type) if (!ctx.type)
{ {
@ -379,7 +381,13 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
// Sign-extended argument expected // Sign-extended argument expected
const u64 val = src.template get<u64>(ctx.args); const u64 val = src.template get<u64>(ctx.args);
const bool negative = ctx.type && static_cast<s64>(val) < 0; bool negative = ctx.type && ctx.type <= 8 && static_cast<s64>(val) < 0;
if (ctx.type == 16)
{
u128 val2 = *reinterpret_cast<const u128*>(val);
negative = !!(val2 & (u128{1} << 127));
}
const usz start = out.size(); const usz start = out.size();
@ -398,15 +406,14 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
out.push_back(' '); out.push_back(' ');
} }
if (ctx.type == 16) if (ctx.type >= 16)
{ {
// TODO: support negative values (s128) u128 val2 = *reinterpret_cast<const u128*>(val);
u128 val2 = *reinterpret_cast<u128*>(val); write_decimal(negative ? u128{} - val2 : val2, ctx.prec);
write_decimal(val2, ctx.prec);
} }
else else
{ {
write_decimal(negative ? 0 - val : val, ctx.prec); write_decimal(negative ? u64{} - val : val, ctx.prec);
} }
} }
@ -438,9 +445,11 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
break; break;
} }
if (!ctx.type) const usz src_type = src.type(ctx.args);
if (!ctx.type || src_type > 8)
{ {
ctx.type = static_cast<u8>(src.type(ctx.args)); ctx.type = static_cast<u8>(src_type);
if (!ctx.type) if (!ctx.type)
{ {
@ -471,9 +480,9 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
if ((ctx.alter && val) || !ctx.dot || ctx.prec) if ((ctx.alter && val) || !ctx.dot || ctx.prec)
{ {
if (ctx.type == 16) if (ctx.type >= 16)
{ {
u128 val2 = *reinterpret_cast<u128*>(val); u128 val2 = *reinterpret_cast<const u128*>(val);
write_octal(val2, ctx.prec); write_octal(val2, ctx.prec);
} }
else else
@ -504,9 +513,11 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
break; break;
} }
if (!ctx.type) const usz src_type = src.type(ctx.args);
if (!ctx.type || src_type > 8)
{ {
ctx.type = static_cast<u8>(src.type(ctx.args)); ctx.type = static_cast<u8>(src_type);
if (!ctx.type) if (!ctx.type)
{ {
@ -537,9 +548,9 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
if ((ctx.alter && val) || !ctx.dot || ctx.prec) if ((ctx.alter && val) || !ctx.dot || ctx.prec)
{ {
if (ctx.type == 16) if (ctx.type >= 16)
{ {
u128 val2 = *reinterpret_cast<u128*>(val); u128 val2 = *reinterpret_cast<const u128*>(val);
write_hex(val2, ch == 'X', ctx.prec); write_hex(val2, ch == 'X', ctx.prec);
} }
else else
@ -576,9 +587,11 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
break; break;
} }
if (!ctx.type) const usz src_type = src.type(ctx.args);
if (!ctx.type || src_type > 8)
{ {
ctx.type = static_cast<u8>(src.type(ctx.args)); ctx.type = static_cast<u8>(src_type);
if (!ctx.type) if (!ctx.type)
{ {
@ -599,9 +612,9 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
if (!ctx.dot || ctx.prec) if (!ctx.dot || ctx.prec)
{ {
if (ctx.type == 16) if (ctx.type >= 16)
{ {
u128 val2 = *reinterpret_cast<u128*>(val); u128 val2 = *reinterpret_cast<const u128*>(val);
write_decimal(val2, ctx.prec); write_decimal(val2, ctx.prec);
} }
else else