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

Make sys_tty accurate in release console mode, message saving in log

Browse Source
This commit is contained in:
Eladash 2019-12-05 15:34:19 +02:00 committed by Ivan
parent 401813f962
commit 98970884c8
1 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
rpcs3/Emu/Cell/lv2/sys_tty.cpp
View File

@ -22,7 +22,7 @@ error_code sys_tty_read(s32 ch, vm::ptr<char> buf, u32 len, vm::ptr<u32> preadle
return CELL_EIO;
}
if (ch > 15 || !buf)
if (ch > 15 || ch < 0 || !buf)
{
return CELL_EINVAL;
}
@ -88,29 +88,54 @@ error_code sys_tty_read(s32 ch, vm::ptr<char> buf, u32 len, vm::ptr<u32> preadle
error_code sys_tty_write(s32 ch, vm::cptr<char> buf, u32 len, vm::ptr<u32> pwritelen)
{
sys_tty.notice("sys_tty_write(ch=%d, buf=*0x%x, len=%d, pwritelen=*0x%x)", ch, buf, len, pwritelen);
std::string msg;
if (ch > 15)
if (static_cast<s32>(len) > 0 && vm::check_addr(buf.addr(), len))
{
msg.resize(len);
if (!vm::try_access(buf.addr(), msg.data(), len, false))
{
msg.clear();
}
}
sys_tty.notice("sys_tty_write(ch=%d, buf=*0x%x(%s), len=%d, pwritelen=*0x%x)", ch, buf, msg, len, pwritelen);
// Hack: write to tty even on CEX mode, but disable all error checks
if ((ch < 0 || ch > 15) && g_cfg.core.debug_console_mode)
{
return CELL_EINVAL;
}
const u32 written_len = static_cast<s32>(len) > 0 ? len : 0;
if (written_len > 0 && g_tty)
if (g_cfg.core.debug_console_mode)
{
// Lock size by making it negative
g_tty_size -= (1ll << 48);
g_tty.write(buf.get_ptr(), len);
g_tty_size += (1ll << 48) + len;
// Don't modify it in CEX mode
len = static_cast<s32>(len) > 0 ? len : 0;
}
if (!pwritelen)
if (static_cast<s32>(len) > 0)
{
if (!msg.empty())
{
if (g_tty)
{
// Lock size by making it negative
g_tty_size -= (1ll << 48);
g_tty.write(msg);
g_tty_size += (1ll << 48) + len;
}
}
else if (g_cfg.core.debug_console_mode)
{
return CELL_EFAULT;
}
}
if (!pwritelen.try_write(len))
{
return CELL_EFAULT;
}
*pwritelen = written_len;
return CELL_OK;
}