RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-06 15:05:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

ARMv7: LDR_REG, LDRD_IMM, LDREX, STREX

Browse source 
sceLibc: printf() improved
sceLibKernel: sceKernelGetThreadId(), sceKernelWaitThreadEnd()
This commit is contained in:
Nekotekina 2015-01-21 01:29:33 +03:00
parent 5dd3437da9
commit 2d7bf06dea
6 changed files with 296 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

60
rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
View file

@ -26,11 +26,67 @@ namespace sce_libc_func
});
}
void printf(vm::psv::ptr<const char> fmt) // va_args...
void printf(ARMv7Context& context, vm::psv::ptr<const char> fmt) // va_args...
{
sceLibc.Error("printf(fmt=0x%x)", fmt);
LOG_NOTICE(TTY, "%s", fmt.get_ptr());
sceLibc.Notice("*** *fmt = '%s'", fmt.get_ptr());
std::string result;
u32 g_count = 1;
u32 f_count = 0;
u32 v_count = 0;
for (char c = *fmt++; c; c = *fmt++)
{
switch (c)
{
case '%':
{
const auto start = fmt - 1;
const bool <EFBFBD>” = *fmt == '#' ? fmt++, true : false;
switch (*fmt++)
{
case '%':
{
result += '%';
continue;
}
case 'd':
case 'i':
{
// signed decimal
const s64 value = context.get_next_gpr_arg(g_count, f_count, v_count);
result += fmt::to_sdec(value);
continue;
}
case 'x':
{
// hexadecimal
const u64 value = context.get_next_gpr_arg(g_count, f_count, v_count);
if (<EFBFBD>” && value)
{
result += "0x";
}
result += fmt::to_hex(value);
continue;
}
default:
{
throw fmt::Format("printf(): unknown formatting: '%s'", start.get_ptr());
}
}
}
}
result += c;
}
LOG_NOTICE(TTY, result);
}
void __cxa_set_dso_handle_main()