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

Implemented sys_game_watchdog syscalls

Browse Source
This commit is contained in:
brian218 2022-10-16 13:23:48 +08:00 committed by Ivan
parent 00340f33c3
commit 5c24009eb5
4 changed files with 81 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rpcs3/Emu/Cell/PPUThread.cpp
View File

@ -3295,8 +3295,11 @@ bool ppu_initialize(const ppu_module& info, bool check_only)
{
std::unordered_map<std::string, u64> link_table
{
{ "sys_game_board_storage_read", reinterpret_cast<u64>(ppu_execute_syscall) },
{ "sys_game_watchdog_start", reinterpret_cast<u64>(ppu_execute_syscall) },
{ "sys_game_watchdog_stop", reinterpret_cast<u64>(ppu_execute_syscall) },
{ "sys_game_watchdog_clear", reinterpret_cast<u64>(ppu_execute_syscall) },
{ "sys_game_get_system_sw_version", reinterpret_cast<u64>(ppu_execute_syscall) },
{ "sys_game_board_storage_read", reinterpret_cast<u64>(ppu_execute_syscall) },
{ "__trap", reinterpret_cast<u64>(&ppu_trap) },
{ "__error", reinterpret_cast<u64>(&ppu_error) },
{ "__check", reinterpret_cast<u64>(&ppu_check) },

6
rpcs3/Emu/Cell/lv2/lv2.cpp
View File

@ -420,9 +420,9 @@ const std::array<std::pair<ppu_intrp_func_t, std::string_view>, 1024> g_ppu_sysc
BIND_SYSC(sys_uart_send), //369 (0x171) ROOT
BIND_SYSC(sys_uart_get_params), //370 (0x172) ROOT
uns_func, //371 (0x173) UNS
NULL_FUNC(sys_game_watchdog_start), //372 (0x174)
NULL_FUNC(sys_game_watchdog_stop), //373 (0x175)
NULL_FUNC(sys_game_watchdog_clear), //374 (0x176)
BIND_SYSC(_sys_game_watchdog_start), //372 (0x174)
BIND_SYSC(_sys_game_watchdog_stop), //373 (0x175)
BIND_SYSC(_sys_game_watchdog_clear), //374 (0x176)
NULL_FUNC(sys_game_set_system_sw_version), //375 (0x177) ROOT
BIND_SYSC(_sys_game_get_system_sw_version), //376 (0x178) ROOT
NULL_FUNC(sys_sm_set_shop_mode), //377 (0x179) ROOT

75
rpcs3/Emu/Cell/lv2/sys_game.cpp
View File

@ -2,12 +2,82 @@
#include "util/sysinfo.hpp"
#include "Emu/Memory/vm_ptr.h"
#include "Emu/Cell/ErrorCodes.h"
#include "Emu/System.h"
#include "Emu/system_config.h"
#include <thread>
#include "sys_game.h"
LOG_CHANNEL(sys_game);
atomic_t<bool> watchdog_stopped = true;
atomic_t<u64> watchdog_last_clear;
u64 get_timestamp()
{
return (get_system_time() - Emu.GetPauseTime());
}
error_code _sys_game_watchdog_start(u32 timeout)
{
sys_game.trace("sys_game_watchdog_start(timeout=%d)", timeout);
if (!watchdog_stopped)
{
return CELL_EABORT;
}
auto watchdog = [=]()
{
while (!watchdog_stopped)
{
if (Emu.IsStopped() || get_timestamp() - watchdog_last_clear > timeout * 1000000)
{
watchdog_stopped = true;
if (!Emu.IsStopped())
{
sys_game.warning("Watchdog timeout! Restarting the game...");
Emu.CallFromMainThread([]()
{
Emu.Restart();
});
}
break;
}
std::this_thread::sleep_for(1s);
}
};
watchdog_stopped = false;
watchdog_last_clear = get_timestamp();
std::thread(watchdog).detach();
return CELL_OK;
}
error_code _sys_game_watchdog_stop()
{
sys_game.trace("sys_game_watchdog_stop()");
watchdog_stopped = true;
return CELL_OK;
}
error_code _sys_game_watchdog_clear()
{
sys_game.trace("sys_game_watchdog_clear()");
watchdog_last_clear = get_timestamp();
return CELL_OK;
}
u64 _sys_game_get_system_sw_version()
{
return stof(utils::get_firmware_version()) * 10000;
}
error_code _sys_game_board_storage_read(vm::ptr<u8> buffer1, vm::ptr<u8> buffer2)
{
sys_game.trace("sys_game_board_storage_read(buffer1=*0x%x, buffer2=*0x%x)", buffer1, buffer2);
@ -35,8 +105,3 @@ error_code _sys_game_board_storage_read(vm::ptr<u8> buffer1, vm::ptr<u8> buffer2
return CELL_OK;
}
u64 _sys_game_get_system_sw_version()
{
return stof(utils::get_firmware_version()) * 10000;
}

5
rpcs3/Emu/Cell/lv2/sys_game.h
View File

@ -1,4 +1,7 @@
#pragma once
error_code _sys_game_board_storage_read(vm::ptr<u8> buffer1, vm::ptr<u8> buffer2);
error_code _sys_game_watchdog_start(u32 timeout);
error_code _sys_game_watchdog_stop();
error_code _sys_game_watchdog_clear();
u64 _sys_game_get_system_sw_version();
error_code _sys_game_board_storage_read(vm::ptr<u8> buffer1, vm::ptr<u8> buffer2);