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

Results: Implement namespaced, type-safe results.

Browse source 
Because I was working on multiple things at once, this commit also:
- Adds wrappers for/linker flags to wrap CXX exceptions to make them
  abort. This saves ~0x8000 of memory in every system module.
- Broadly replaces lines of the pattern if (cond) { return ResultX; }
  with R_UNLESS(!cond, ResultX());.
- Reworks the R_TRY_CATCH macros (and the result macros in general).
This commit is contained in:
Michael Scire 2019-10-24 01:40:44 -07:00 • committed by SciresM
parent 15773e4755
commit 4059dc6187
169 changed files with 2172 additions and 1868 deletions
Download patch file Download diff file Expand all files Collapse all files

36
stratosphere/loader/source/ldr_ro_manager.cpp
View file

@ -81,9 +81,7 @@ namespace sts::ldr::ro {
Result PinTitle(PinId *out, const ncm::TitleLocation &loc) {
*out = InvalidPinId;
ProcessInfo *info = GetFreeProcessInfo();
if (info == nullptr) {
return ResultLoaderTooManyProcesses;
}
R_UNLESS(info != nullptr, ldr::ResultTooManyProcesses());
static u64 s_cur_pin_id = 1;
@ -92,46 +90,38 @@ namespace sts::ldr::ro {
info->loc = loc;
info->in_use = true;
*out = info->pin_id;
return ResultSuccess;
return ResultSuccess();
}
Result UnpinTitle(PinId id) {
ProcessInfo *info = GetProcessInfo(id);
if (info == nullptr) {
return ResultLoaderNotPinned;
}
R_UNLESS(info != nullptr, ldr::ResultNotPinned());
info->in_use = false;
return ResultSuccess;
return ResultSuccess();
}
Result GetTitleLocation(ncm::TitleLocation *out, PinId id) {
ProcessInfo *info = GetProcessInfo(id);
if (info == nullptr) {
return ResultLoaderNotPinned;
}
R_UNLESS(info != nullptr, ldr::ResultNotPinned());
*out = info->loc;
return ResultSuccess;
return ResultSuccess();
}
Result RegisterProcess(PinId id, os::ProcessId process_id, ncm::TitleId title_id) {
ProcessInfo *info = GetProcessInfo(id);
if (info == nullptr) {
return ResultLoaderNotPinned;
}
R_UNLESS(info != nullptr, ldr::ResultNotPinned());
info->title_id = title_id;
info->process_id = process_id;
return ResultSuccess;
return ResultSuccess();
}
Result RegisterModule(PinId id, const u8 *build_id, uintptr_t address, size_t size) {
ProcessInfo *info = GetProcessInfo(id);
if (info == nullptr) {
return ResultLoaderNotPinned;
}
R_UNLESS(info != nullptr, ldr::ResultNotPinned());
/* Nintendo doesn't actually care about successful allocation. */
for (size_t i = 0; i < ModuleCountMax; i++) {
@ -147,14 +137,12 @@ namespace sts::ldr::ro {
break;
}
return ResultSuccess;
return ResultSuccess();
}
Result GetProcessModuleInfo(u32 *out_count, ldr::ModuleInfo *out, size_t max_out_count, os::ProcessId process_id) {
const ProcessInfo *info = GetProcessInfo(process_id);
if (info == nullptr) {
return ResultLoaderNotPinned;
}
R_UNLESS(info != nullptr, ldr::ResultNotPinned());
size_t count = 0;
for (size_t i = 0; i < ModuleCountMax && count < max_out_count; i++) {
@ -167,7 +155,7 @@ namespace sts::ldr::ro {
}
*out_count = static_cast<u32>(count);
return ResultSuccess;
return ResultSuccess();
}
}