From f68ddebf905935cebbf6f98e150aa6af7b75fafc Mon Sep 17 00:00:00 2001 From: wheremyfoodat Date: Wed, 25 Jan 2023 01:44:14 +0200 Subject: [PATCH] Fix SleepThread SVC (Fixes nullptr access in SM3DL and Pokemon Rumble Blast) --- CMakeLists.txt | 2 +- src/core/kernel/threads.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f619e720..e96014e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ if(NOT CMAKE_BUILD_TYPE) endif() project(Alber) -set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) include_directories(${PROJECT_SOURCE_DIR}/include/) include_directories(${PROJECT_SOURCE_DIR}/include/kernel) diff --git a/src/core/kernel/threads.cpp b/src/core/kernel/threads.cpp index d55b5472..c42f6c06 100644 --- a/src/core/kernel/threads.cpp +++ b/src/core/kernel/threads.cpp @@ -207,8 +207,8 @@ void Kernel::svcSleepThread() { const s64 ns = s64(u64(regs[0]) | (u64(regs[1]) << 32)); logSVC("SleepThread(ns = %lld)\n", ns); - sleepThread(ns); regs[0] = SVCResult::Success; + sleepThread(ns); } void Kernel::getThreadID() {