aboutsummaryrefslogtreecommitdiff
path: root/src/core/loader/nca.cpp
diff options
context:
space:
mode:
authorJPikachu <jpikachu.eden@gmail.com>2025-04-26 13:19:44 +0100
committerJPikachu <jpikachu@noreply.localhost>2025-04-30 06:35:22 +0000
commit8599c47fe06f26ec57718fccdf0b438471129186 (patch)
tree921a477ec7fb1eb74b270912d04a4e767ba60224 /src/core/loader/nca.cpp
parente57b12d0207cd0cc35069e4d532cb3b5ca104591 (diff)
service: sm/kernel/loader: Implement QueryPointerBufferSize, automatic pointer buffer sizing, and SM service improvements
This commit introduces multiple improvements to IPC handling and system management services, enhancing game compatibility and emulator stability. --- 1. Fully Implemented QueryPointerBufferSize Service: - Exposes the per-process IPC pointer buffer size through `QueryPointerBufferSize` instead of returning stubbed values. - Added `m_pointer_buffer_size` field to `KProcess`, initialized with a safe default (0x8000). - Introduced getter and setter methods (`GetPointerBufferSize()` / `SetPointerBufferSize()`). - Registered new handler in `sm_controller` for handling QueryPointerBufferSize requests. - Ensures accurate buffer size reporting for games relying on this service. --- 2. Automatic Pointer Buffer Sizing Per-Game: - Automatically determines heap size by parsing `main.npdm` from the game’s ExeFS: - Heap size > 1 GiB → pointer buffer size set to `0x10000`. - Heap size > 512 MiB → pointer buffer size set to `0xC000`. - Otherwise, defaults to `0x8000`. - Gracefully handles missing or malformed `main.npdm` by falling back to default settings. - Automatically configures pointer buffer size during `AppLoader_NCA::Load`. - Added logging for heap size detection and buffer size configuration for easier debugging. --- 3. SM Service Improvements: - Added full implementation of `QueryPointerBufferSize` within the SM service framework. - Cleaned up stubbed methods and ensured correct domain handling. - Registered new service commands (e.g., `SetPointerBufferSize` and `QueryPointerBufferSize`) in `sm_controller`. - Improved session handling with proper conversion to domain objects where necessary. --- Benefits: - Greatly improves compatibility with games that require larger IPC pointer buffers - Eliminates the need for manual per-game pointer buffer overrides. - More accurate emulation of Switch system services, improving stability for both commercial titles and homebrew. - Provides cleaner logging for easier debugging and maintenance. - Future-proofs IPC handling for upcoming titles with higher memory demands. --- Additional Notes: - Default pointer buffer size remains 0x8000 for smaller titles or if heap size cannot be determined. - Falls back to safe defaults without affecting overall emulator performance. - All new service calls properly registered and integrated without breaking existing functionality.
Diffstat (limited to 'src/core/loader/nca.cpp')
-rw-r--r--src/core/loader/nca.cpp39
1 files changed, 37 insertions, 2 deletions
diff --git a/src/core/loader/nca.cpp b/src/core/loader/nca.cpp
index de27ec49e2..4a87ab53e7 100644
--- a/src/core/loader/nca.cpp
+++ b/src/core/loader/nca.cpp
@@ -15,9 +15,20 @@
#include "core/loader/deconstructed_rom_directory.h"
#include "core/loader/nca.h"
#include "mbedtls/sha256.h"
+#include "common/literals.h"
namespace Loader {
+static u32 CalculatePointerBufferSize(size_t heap_size) {
+ if (heap_size > 1073741824) { // Games with 1 GiB
+ return 0x10000;
+ } else if (heap_size > 536870912) { // Games with 512 MiB
+ return 0xC000;
+ } else {
+ return 0x8000; // Default for all other games
+ }
+}
+
AppLoader_NCA::AppLoader_NCA(FileSys::VirtualFile file_)
: AppLoader(std::move(file_)), nca(std::make_unique<FileSys::NCA>(file)) {}
@@ -52,8 +63,6 @@ AppLoader_NCA::LoadResult AppLoader_NCA::Load(Kernel::KProcess& process, Core::S
if (exefs == nullptr) {
LOG_INFO(Loader, "No ExeFS found in NCA, looking for ExeFS from update");
- // This NCA may be a sparse base of an installed title.
- // Try to fetch the ExeFS from the installed update.
const auto& installed = system.GetContentProvider();
const auto update_nca = installed.GetEntry(FileSys::GetUpdateTitleID(nca->GetTitleId()),
FileSys::ContentRecordType::Program);
@@ -69,11 +78,37 @@ AppLoader_NCA::LoadResult AppLoader_NCA::Load(Kernel::KProcess& process, Core::S
directory_loader = std::make_unique<AppLoader_DeconstructedRomDirectory>(exefs, true);
+ // Read heap size from main.npdm in ExeFS
+ u64 heap_size = 0;
+
+ if (exefs) {
+ const auto npdm_file = exefs->GetFile("main.npdm");
+ if (npdm_file) {
+ auto npdm_data = npdm_file->ReadAllBytes();
+ if (npdm_data.size() >= 0x30) {
+ heap_size = *reinterpret_cast<const u64*>(&npdm_data[0x28]);
+ LOG_INFO(Loader, "Read heap size {:#x} bytes from main.npdm", heap_size);
+ } else {
+ LOG_WARNING(Loader, "main.npdm too small to read heap size!");
+ }
+ } else {
+ LOG_WARNING(Loader, "No main.npdm found in ExeFS!");
+ }
+ }
+
+ // Set pointer buffer size based on heap size
+ process.SetPointerBufferSize(CalculatePointerBufferSize(heap_size));
+
+ // Load modules
const auto load_result = directory_loader->Load(process, system);
if (load_result.first != ResultStatus::Success) {
return load_result;
}
+ LOG_INFO(Loader, "Set pointer buffer size to {:#x} bytes for ProgramID {:#018x} (Heap size: {:#x})",
+ process.GetPointerBufferSize(), nca->GetTitleId(), heap_size);
+
+ // Register the process in the file system controller
system.GetFileSystemController().RegisterProcess(
process.GetProcessId(), nca->GetTitleId(),
std::make_shared<FileSys::RomFSFactory>(*this, system.GetContentProvider(),