mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-05-24 19:54:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

dmnt-cheat: Implement real workaround for 6.0.0+ kernel bug

Browse source
This commit is contained in:
Michael Scire 2019-03-15 03:30:51 -07:00
parent 274035edd6
commit e5ecd243f2
3 changed files with 237 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

37
stratosphere/dmnt/source/dmnt_cheat_manager.cpp
View file

@ -19,6 +19,7 @@
#include "dmnt_cheat_manager.hpp"
#include "dmnt_cheat_vm.hpp"
#include "dmnt_config.hpp"
#include "dmnt_cheat_debug_events_manager.hpp"
#include "pm_shim.h"
static HosMutex g_cheat_lock;
@ -46,10 +47,6 @@ static CheatEntry g_cheat_entries[DmntCheatManager::MaxCheatCount];
/* Global frozen address storage. */
static std::map<u64, FrozenAddressValue> g_frozen_addresses_map;
/* WORKAROUND: These prevent a kernel deadlock from occurring on 6.0.0+ */
static HosThread g_workaround_threads[4];
static void KernelWorkaroundThreadFunc(void *arg) { svcSleepThread(INT64_MAX); }
void DmntCheatManager::StartDebugEventsThread() {
std::scoped_lock<HosMutex> lk(g_debug_event_thread_lock);
@ -122,21 +119,6 @@ bool DmntCheatManager::HasActiveCheatProcess() {
return has_cheat_process;
}
void DmntCheatManager::ContinueCheatProcess() {
/* Loop getting debug events. */
u8 debug_event_buf[0x50];
while (R_SUCCEEDED(svcGetDebugEvent((u8 *)debug_event_buf, g_cheat_process_debug_hnd))) {
/* ... */
}
/* Continue the process, if needed. */
if (kernelAbove300()) {
svcContinueDebugEvent(g_cheat_process_debug_hnd, 5, nullptr, 0);
} else {
svcLegacyContinueDebugEvent(g_cheat_process_debug_hnd, 5, 0);
}
}
Result DmntCheatManager::ReadCheatProcessMemoryForVm(u64 proc_addr, void *out_data, size_t size) {
if (HasActiveCheatProcess()) {
return svcReadDebugProcessMemory(out_data, g_cheat_process_debug_hnd, proc_addr, size);
@ -933,7 +915,7 @@ void DmntCheatManager::DebugEventsThread(void *arg) {
/* Handle any pending debug events. */
if (HasActiveCheatProcess()) {
ContinueCheatProcess();
DmntCheatDebugEventsManager::ContinueCheatProcess(g_cheat_process_debug_hnd);
}
}
@ -975,19 +957,8 @@ void DmntCheatManager::InitializeCheatManager() {
}
}
/* WORKAROUND: On 6.0.0+, we must ensure that every core has at least one non-game thread. */
/* This prevents a kernel deadlock when continuing debug events. */
if (kernelAbove600()) {
for (size_t i = 0; i < sizeof(g_workaround_threads) / sizeof(g_workaround_threads[0]); i++) {
if (R_FAILED(g_workaround_threads[i].Initialize(&KernelWorkaroundThreadFunc, nullptr, 0x1000, 0, i))) {
std::abort();
}
if (R_FAILED(g_workaround_threads[i].Start())) {
std::abort();
}
}
}
/* Initialize debug events manager. */
DmntCheatDebugEventsManager::Initialize();
/* Spawn application detection thread, spawn cheat vm thread. */
if (R_FAILED(g_detect_thread.Initialize(&DmntCheatManager::DetectThread, nullptr, 0x4000, 39))) {