ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "[Kernel] Fix wide-printf functions not processing %ws format correctly" 

This reverts commit 811825afab.
This commit is contained in:
illusion 2020-02-25 11:49:47 +07:00
parent 2e80fc00fe
commit 86180769a9
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/xenia/kernel/xboxkrnl/xboxkrnl_strings.cc
View File

@ -49,9 +49,6 @@ enum FormatFlags {
FF_IsWide = 1 << 9, FF_IsWide = 1 << 9,
FF_IsSigned = 1 << 10, FF_IsSigned = 1 << 10,
FF_ForceLeadingZero = 1 << 11, FF_ForceLeadingZero = 1 << 11,
// IsWide gets used as an "is opposite encoding" flag, but this flag means
// it's definitely wide
FF_IsAlwaysWide = 1 << 12,
}; };
enum ArgumentSize { enum ArgumentSize {
@ -295,7 +292,7 @@ int32_t format_core(PPCContext* ppc_context, FormatData& data, ArgList& args,
state = FS_Type; state = FS_Type;
continue; continue;
} else if (c == 'w') { } else if (c == 'w') {
flags |= (FF_IsWide | FF_IsAlwaysWide); flags |= FF_IsWide;
state = FS_Type; state = FS_Type;
continue; continue;
} else if (c == 'I') { } else if (c == 'I') {
@ -340,7 +337,7 @@ int32_t format_core(PPCContext* ppc_context, FormatData& data, ArgList& args,
// functions and with C in wprintf functions." // functions and with C in wprintf functions."
is_wide = false; is_wide = false;
} else { } else {
is_wide = (((flags & FF_IsWide) != 0) ^ wide) || (flags & FF_IsAlwaysWide) != 0; is_wide = ((flags & FF_IsWide) != 0) ^ wide;
} }
auto value = args.get32(); auto value = args.get32();
@ -555,7 +552,7 @@ int32_t format_core(PPCContext* ppc_context, FormatData& data, ArgList& args,
// functions and with S in wprintf functions." // functions and with S in wprintf functions."
is_wide = false; is_wide = false;
} else { } else {
is_wide = (((flags & (FF_IsWide)) != 0) ^ wide) || (flags & FF_IsAlwaysWide) != 0; is_wide = ((flags & (FF_IsWide)) != 0) ^ wide;
} }
int32_t length; int32_t length;